mirror of
https://github.com/TeamMidnightDust/MidnightControls.git
synced 2025-12-13 23:25:10 +01:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff672f05a1 | ||
|
|
756e7d102d | ||
|
|
45dd94fd34 | ||
|
|
f8cc1fcc20 | ||
|
|
d56126c680 | ||
|
|
5a2fad4445 | ||
|
|
0eadc054b6 | ||
|
|
07a296603a | ||
|
|
8e082404f9 | ||
|
|
8efddb24b0 | ||
|
|
581757aaee | ||
|
|
40dc8d424c | ||
|
|
230a9f6424 | ||
|
|
ba01df036b | ||
|
|
ff90d55351 | ||
|
|
efc2d6284d | ||
|
|
9e2c4720e9 | ||
|
|
8063116820 | ||
|
|
0050b0216c | ||
|
|
e13569b71d |
@@ -5,7 +5,7 @@
|
|||||||

|

|
||||||

|

|
||||||

|

|
||||||
[](https://www.curseforge.com/minecraft/mc-mods/lambdacontrols)
|
[](https://www.curseforge.com/minecraft/mc-mods/lambdacontrols)
|
||||||
|
|
||||||
A Fabric Minecraft mod which adds better controls like controller support.
|
A Fabric Minecraft mod which adds better controls like controller support.
|
||||||
|
|
||||||
|
|||||||
@@ -21,13 +21,14 @@ import java.util.Optional;
|
|||||||
* Represents a feature.
|
* Represents a feature.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public class LambdaControlsFeature implements Nameable
|
public class LambdaControlsFeature implements Nameable
|
||||||
{
|
{
|
||||||
private static final List<LambdaControlsFeature> FEATURES = new ArrayList<>();
|
private static final List<LambdaControlsFeature> FEATURES = new ArrayList<>();
|
||||||
public static final LambdaControlsFeature FRONT_BLOCK_PLACING = new LambdaControlsFeature("front_block_placing", true, false);
|
public static final LambdaControlsFeature FRONT_BLOCK_PLACING = new LambdaControlsFeature("front_block_placing", true, false);
|
||||||
|
public static final LambdaControlsFeature FAST_BLOCK_PLACING = new LambdaControlsFeature("fast_block_placing", true, true);
|
||||||
|
|
||||||
private final String key;
|
private final String key;
|
||||||
private final boolean defaultAllowed;
|
private final boolean defaultAllowed;
|
||||||
@@ -155,5 +156,6 @@ public class LambdaControlsFeature implements Nameable
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
FEATURES.add(FRONT_BLOCK_PLACING);
|
FEATURES.add(FRONT_BLOCK_PLACING);
|
||||||
|
FEATURES.add(FAST_BLOCK_PLACING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.2.6-SNAPSHOT'
|
id 'fabric-loom' version '0.4-SNAPSHOT'
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
@@ -42,12 +42,13 @@ dependencies {
|
|||||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||||
|
|
||||||
modCompile "io.github.prospector:modmenu:1.8.5+build.23"
|
modCompile "io.github.prospector:modmenu:${project.modmenu_version}"
|
||||||
modCompile "com.github.lambdaurora:spruceui:${project.spruceui_version}"
|
modCompile "com.github.lambdaurora:spruceui:${project.spruceui_version}"
|
||||||
include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
|
include "com.github.lambdaurora:spruceui:${project.spruceui_version}"
|
||||||
|
|
||||||
// Compatibility mods
|
// Compatibility mods
|
||||||
modCompile "io.github.joaoh1:okzoomer:2.1.0-beta.2"
|
modCompile "io.github.joaoh1:okzoomer:2.1.0-beta.2"
|
||||||
|
modCompile "me.shedaniel:RoughlyEnoughItems:3.4.5"
|
||||||
|
|
||||||
api project(":core")
|
api project(":core")
|
||||||
shadow project(":core")
|
shadow project(":core")
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
package me.lambdaurora.lambdacontrols.client;
|
package me.lambdaurora.lambdacontrols.client;
|
||||||
|
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
|
||||||
import me.lambdaurora.lambdacontrols.ControlsMode;
|
import me.lambdaurora.lambdacontrols.ControlsMode;
|
||||||
import me.lambdaurora.lambdacontrols.LambdaControls;
|
import me.lambdaurora.lambdacontrols.LambdaControls;
|
||||||
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
||||||
@@ -27,15 +26,11 @@ import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
|
|||||||
import net.fabricmc.fabric.api.event.client.ClientTickCallback;
|
import net.fabricmc.fabric.api.event.client.ClientTickCallback;
|
||||||
import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
|
import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.font.TextRenderer;
|
|
||||||
import net.minecraft.client.gui.DrawableHelper;
|
|
||||||
import net.minecraft.client.resource.language.I18n;
|
|
||||||
import net.minecraft.client.toast.SystemToast;
|
import net.minecraft.client.toast.SystemToast;
|
||||||
import net.minecraft.client.util.InputUtil;
|
import net.minecraft.client.util.InputUtil;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.text.TranslatableText;
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import org.aperlambda.lambdacommon.utils.Pair;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
@@ -43,7 +38,7 @@ import org.lwjgl.glfw.GLFW;
|
|||||||
* Represents the LambdaControls client mod.
|
* Represents the LambdaControls client mod.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public class LambdaControlsClient extends LambdaControls implements ClientModInitializer
|
public class LambdaControlsClient extends LambdaControls implements ClientModInitializer
|
||||||
@@ -59,6 +54,7 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
|
|||||||
InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement").build();
|
InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_4, "key.categories.movement").build();
|
||||||
public static final Identifier CONTROLLER_BUTTONS = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_buttons.png");
|
public static final Identifier CONTROLLER_BUTTONS = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_buttons.png");
|
||||||
public static final Identifier CONTROLLER_AXIS = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_axis.png");
|
public static final Identifier CONTROLLER_AXIS = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/controller_axis.png");
|
||||||
|
public static final Identifier CURSOR_TEXTURE = new Identifier(LambdaControlsConstants.NAMESPACE, "textures/gui/cursor.png");
|
||||||
public final LambdaControlsConfig config = new LambdaControlsConfig(this);
|
public final LambdaControlsConfig config = new LambdaControlsConfig(this);
|
||||||
public final LambdaInput input = new LambdaInput(this);
|
public final LambdaInput input = new LambdaInput(this);
|
||||||
private LambdaControlsHud hud;
|
private LambdaControlsHud hud;
|
||||||
@@ -136,7 +132,7 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
|
|||||||
|
|
||||||
public void onRender(MinecraftClient client)
|
public void onRender(MinecraftClient client)
|
||||||
{
|
{
|
||||||
this.input.onRender(client);
|
this.input.onRender(client.getTickDelta(), client);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -186,141 +182,4 @@ public class LambdaControlsClient extends LambdaControls implements ClientModIni
|
|||||||
{
|
{
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Pair<Integer, Integer> drawButton(int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client)
|
|
||||||
{
|
|
||||||
return drawButton(x, y, button.getButton(), client);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Pair<Integer, Integer> drawButton(int x, int y, int[] buttons, @NotNull MinecraftClient client)
|
|
||||||
{
|
|
||||||
int height = 0;
|
|
||||||
int length = 0;
|
|
||||||
int currentX = x;
|
|
||||||
for (int i = 0; i < buttons.length; i++) {
|
|
||||||
int btn = buttons[i];
|
|
||||||
Pair<Integer, Integer> size = drawButton(currentX, y, btn, client);
|
|
||||||
if (size.key > height)
|
|
||||||
height = size.key;
|
|
||||||
length += size.key;
|
|
||||||
if (i + 1 < buttons.length) {
|
|
||||||
length += 2;
|
|
||||||
currentX = x + length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Pair.of(length, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecated")
|
|
||||||
public static Pair<Integer, Integer> drawButton(int x, int y, int button, @NotNull MinecraftClient client)
|
|
||||||
{
|
|
||||||
boolean second = false;
|
|
||||||
if (button == -1)
|
|
||||||
return Pair.of(0, 0);
|
|
||||||
else if (button >= 500) {
|
|
||||||
button -= 1000;
|
|
||||||
second = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int controllerType = get().config.getControllerType().getId();
|
|
||||||
boolean axis = false;
|
|
||||||
int buttonOffset = button * 15;
|
|
||||||
switch (button) {
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
|
|
||||||
buttonOffset = 7 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
|
|
||||||
buttonOffset = 8 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_BACK:
|
|
||||||
buttonOffset = 4 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_START:
|
|
||||||
buttonOffset = 6 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_GUIDE:
|
|
||||||
buttonOffset = 5 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
|
|
||||||
buttonOffset = 15 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
|
|
||||||
buttonOffset = 16 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
|
|
||||||
buttonOffset = 0;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
|
|
||||||
buttonOffset = 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
|
|
||||||
buttonOffset = 2 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
|
|
||||||
buttonOffset = 3 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
|
|
||||||
buttonOffset = 4 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
|
|
||||||
buttonOffset = 5 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
|
|
||||||
buttonOffset = 6 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
|
|
||||||
buttonOffset = 7 * 18;
|
|
||||||
axis = true;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 100:
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 200:
|
|
||||||
buttonOffset = 9 * 15;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 100:
|
|
||||||
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 200:
|
|
||||||
buttonOffset = 10 * 15;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
client.getTextureManager().bindTexture(axis ? LambdaControlsClient.CONTROLLER_AXIS : LambdaControlsClient.CONTROLLER_BUTTONS);
|
|
||||||
GlStateManager.disableDepthTest();
|
|
||||||
|
|
||||||
GlStateManager.color4f(1.0F, second ? 0.0F : 1.0F, 1.0F, 1.0F);
|
|
||||||
DrawableHelper.blit(x, y, (float) buttonOffset, (float) (controllerType * (axis ? 18 : 15)), axis ? 18 : 15, axis ? 18 : 15, 256, 256);
|
|
||||||
GlStateManager.enableDepthTest();
|
|
||||||
|
|
||||||
return axis ? Pair.of(18, 18) : Pair.of(15, 15);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int drawButtonTip(int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client)
|
|
||||||
{
|
|
||||||
return drawButtonTip(x, y, button.getButton(), button.getTranslationKey(), display, client);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int drawButtonTip(int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client)
|
|
||||||
{
|
|
||||||
if (display) {
|
|
||||||
int buttonWidth = drawButton(x, y, button, client).key;
|
|
||||||
|
|
||||||
String translatedAction = I18n.translate(action);
|
|
||||||
int textY = (15 - client.textRenderer.fontHeight) / 2;
|
|
||||||
client.textRenderer.drawWithShadow(translatedAction, (float) (x + buttonWidth + 5), (float) (y + textY), 14737632);
|
|
||||||
|
|
||||||
return getButtonTipWidth(translatedAction, client.textRenderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
return -10;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int getButtonTipWidth(@NotNull String action, @NotNull TextRenderer textRenderer)
|
|
||||||
{
|
|
||||||
return 15 + 5 + textRenderer.getStringWidth(action);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,15 +40,19 @@ public class LambdaControlsConfig
|
|||||||
private static final boolean DEFAULT_HUD_ENABLE = true;
|
private static final boolean DEFAULT_HUD_ENABLE = true;
|
||||||
private static final HudSide DEFAULT_HUD_SIDE = HudSide.LEFT;
|
private static final HudSide DEFAULT_HUD_SIDE = HudSide.LEFT;
|
||||||
// Gameplay
|
// Gameplay
|
||||||
private static final boolean DEFAULT_FRONT_BLOCK_PLACING = false;
|
private static final boolean DEFAULT_FAST_BLOCK_INTERACTION = true;
|
||||||
private static final boolean DEFAULT_FLY_DRIFTING = false;
|
private static final boolean DEFAULT_FLY_DRIFTING = false;
|
||||||
private static final boolean DEFAULT_FLY_VERTICAL_DRIFTING = true;
|
private static final boolean DEFAULT_FLY_VERTICAL_DRIFTING = true;
|
||||||
|
private static final boolean DEFAULT_FRONT_BLOCK_PLACING = false;
|
||||||
|
private static final boolean DEFAULT_FRONT_BLOCK_OUTLINE = true;
|
||||||
// Controller
|
// Controller
|
||||||
private static final ControllerType DEFAULT_CONTROLLER_TYPE = ControllerType.DEFAULT;
|
private static final ControllerType DEFAULT_CONTROLLER_TYPE = ControllerType.DEFAULT;
|
||||||
private static final double DEFAULT_DEAD_ZONE = 0.25;
|
private static final double DEFAULT_DEAD_ZONE = 0.25;
|
||||||
private static final double DEFAULT_ROTATION_SPEED = 40.0;
|
private static final double DEFAULT_ROTATION_SPEED = 40.0;
|
||||||
private static final double DEFAULT_MOUSE_SPEED = 25.0;
|
private static final double DEFAULT_MOUSE_SPEED = 25.0;
|
||||||
private static final boolean DEFAULT_UNFOCUSED_INPUT = false;
|
private static final boolean DEFAULT_UNFOCUSED_INPUT = false;
|
||||||
|
private static final boolean DEFAULT_VIRTUAL_MOUSE = false;
|
||||||
|
private static final VirtualMouseSkin DEFAULT_VIRTUAL_MOUSE_SKIN = VirtualMouseSkin.DEFAULT_LIGHT;
|
||||||
|
|
||||||
private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
|
private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
|
||||||
|
|
||||||
@@ -56,14 +60,19 @@ public class LambdaControlsConfig
|
|||||||
private final LambdaControlsClient mod;
|
private final LambdaControlsClient mod;
|
||||||
private ControlsMode controlsMode;
|
private ControlsMode controlsMode;
|
||||||
private ControllerType controllerType;
|
private ControllerType controllerType;
|
||||||
// HUD settings.
|
// Gameplay.
|
||||||
private boolean hudEnable;
|
private boolean shouldRenderFrontBlockOutline;
|
||||||
private HudSide hudSide;
|
private int[] frontBlockOutlineColor;
|
||||||
// Controller settings
|
// Controller settings
|
||||||
private double deadZone;
|
private double deadZone;
|
||||||
private double rotationSpeed;
|
private double rotationSpeed;
|
||||||
private double mouseSpeed;
|
private double mouseSpeed;
|
||||||
private boolean unfocusedInput;
|
private boolean unfocusedInput;
|
||||||
|
private boolean virtualMouse;
|
||||||
|
private VirtualMouseSkin virtualMouseSkin;
|
||||||
|
// HUD settings.
|
||||||
|
private boolean hudEnable;
|
||||||
|
private HudSide hudSide;
|
||||||
|
|
||||||
public LambdaControlsConfig(@NotNull LambdaControlsClient mod)
|
public LambdaControlsConfig(@NotNull LambdaControlsClient mod)
|
||||||
{
|
{
|
||||||
@@ -83,13 +92,18 @@ public class LambdaControlsConfig
|
|||||||
this.hudEnable = this.config.getOrElse("hud.enable", DEFAULT_HUD_ENABLE);
|
this.hudEnable = this.config.getOrElse("hud.enable", DEFAULT_HUD_ENABLE);
|
||||||
this.hudSide = HudSide.byId(this.config.getOrElse("hud.side", DEFAULT_HUD_SIDE.getName())).orElse(DEFAULT_HUD_SIDE);
|
this.hudSide = HudSide.byId(this.config.getOrElse("hud.side", DEFAULT_HUD_SIDE.getName())).orElse(DEFAULT_HUD_SIDE);
|
||||||
// Gameplay
|
// Gameplay
|
||||||
LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.front_block_placing", DEFAULT_FRONT_BLOCK_PLACING));
|
LambdaControlsFeature.FAST_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.fast_block_placing", DEFAULT_FAST_BLOCK_INTERACTION));
|
||||||
|
LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(this.config.getOrElse("gameplay.front_block_placing.enabled", DEFAULT_FRONT_BLOCK_PLACING));
|
||||||
|
this.shouldRenderFrontBlockOutline = this.config.getOrElse("gameplay.front_block_placing.outline", DEFAULT_FRONT_BLOCK_OUTLINE);
|
||||||
|
this.frontBlockOutlineColor = this.config.getOptional("gameplay.front_block_placing.outline_color").map(hex -> parseColor((String) hex)).orElse(new int[]{255, 255, 255, 102});
|
||||||
// Controller settings.
|
// Controller settings.
|
||||||
this.controllerType = ControllerType.byId(this.config.getOrElse("controller.type", DEFAULT_CONTROLLER_TYPE.getName())).orElse(DEFAULT_CONTROLLER_TYPE);
|
this.controllerType = ControllerType.byId(this.config.getOrElse("controller.type", DEFAULT_CONTROLLER_TYPE.getName())).orElse(DEFAULT_CONTROLLER_TYPE);
|
||||||
this.deadZone = this.config.getOrElse("controller.dead_zone", DEFAULT_DEAD_ZONE);
|
this.deadZone = this.config.getOrElse("controller.dead_zone", DEFAULT_DEAD_ZONE);
|
||||||
this.rotationSpeed = this.config.getOrElse("controller.rotation_speed", DEFAULT_ROTATION_SPEED);
|
this.rotationSpeed = this.config.getOrElse("controller.rotation_speed", DEFAULT_ROTATION_SPEED);
|
||||||
this.mouseSpeed = this.config.getOrElse("controller.mouse_speed", DEFAULT_MOUSE_SPEED);
|
this.mouseSpeed = this.config.getOrElse("controller.mouse_speed", DEFAULT_MOUSE_SPEED);
|
||||||
this.unfocusedInput = this.config.getOrElse("controller.unfocused_input", DEFAULT_UNFOCUSED_INPUT);
|
this.unfocusedInput = this.config.getOrElse("controller.unfocused_input", DEFAULT_UNFOCUSED_INPUT);
|
||||||
|
this.virtualMouse = this.config.getOrElse("controller.virtual_mouse", DEFAULT_VIRTUAL_MOUSE);
|
||||||
|
this.virtualMouseSkin = VirtualMouseSkin.byId(this.config.getOrElse("controller.virtual_mouse_skin", DEFAULT_VIRTUAL_MOUSE_SKIN.getName())).orElse(DEFAULT_VIRTUAL_MOUSE_SKIN);
|
||||||
// Controller controls.
|
// Controller controls.
|
||||||
InputManager.loadButtonBindings(this);
|
InputManager.loadButtonBindings(this);
|
||||||
}
|
}
|
||||||
@@ -103,6 +117,7 @@ public class LambdaControlsConfig
|
|||||||
this.config.set("controller.rotation_speed", this.rotationSpeed);
|
this.config.set("controller.rotation_speed", this.rotationSpeed);
|
||||||
this.config.set("controller.mouse_speed", this.mouseSpeed);
|
this.config.set("controller.mouse_speed", this.mouseSpeed);
|
||||||
this.config.set("controller.unfocused_input", this.unfocusedInput);
|
this.config.set("controller.unfocused_input", this.unfocusedInput);
|
||||||
|
this.config.set("controller.virtual_mouse", this.virtualMouse);
|
||||||
this.config.save();
|
this.config.save();
|
||||||
this.mod.log("Configuration saved.");
|
this.mod.log("Configuration saved.");
|
||||||
}
|
}
|
||||||
@@ -117,6 +132,24 @@ public class LambdaControlsConfig
|
|||||||
this.config.set(path, String.valueOf(raw));
|
this.config.set(path, String.valueOf(raw));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// This shouldn't happen if the configuration is new.
|
||||||
|
if (!this.config.contains("gameplay.front_block_placing.enabled") && this.config.contains("gameplay.front_block_placing")) {
|
||||||
|
this.config.remove("gameplay.front_block_placing");
|
||||||
|
this.config.set("gameplay.front_block_placing.enabled", DEFAULT_FRONT_BLOCK_PLACING);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.renamed("controller.controls.tab_left", "controller.controls.tab_back");
|
||||||
|
this.renamed("controller.controls.tab_right", "controller.controls.tab_next");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void renamed(String oldPath, String newPath)
|
||||||
|
{
|
||||||
|
if (!this.config.contains(oldPath))
|
||||||
|
return;
|
||||||
|
Object raw = this.config.getRaw(oldPath);
|
||||||
|
this.config.remove(oldPath);
|
||||||
|
this.config.set(newPath, raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -127,19 +160,23 @@ public class LambdaControlsConfig
|
|||||||
// General
|
// General
|
||||||
this.setControlsMode(DEFAULT_CONTROLS_MODE);
|
this.setControlsMode(DEFAULT_CONTROLS_MODE);
|
||||||
this.setAutoSwitchMode(DEFAULT_AUTO_SWITCH_MODE);
|
this.setAutoSwitchMode(DEFAULT_AUTO_SWITCH_MODE);
|
||||||
// HUD
|
|
||||||
this.setHudEnabled(DEFAULT_HUD_ENABLE);
|
|
||||||
this.setHudSide(DEFAULT_HUD_SIDE);
|
|
||||||
// Gameplay
|
// Gameplay
|
||||||
this.setFrontBlockPlacing(DEFAULT_FRONT_BLOCK_PLACING);
|
this.setFastBlockPlacing(DEFAULT_FAST_BLOCK_INTERACTION);
|
||||||
this.setFlyDrifting(DEFAULT_FLY_DRIFTING);
|
this.setFlyDrifting(DEFAULT_FLY_DRIFTING);
|
||||||
this.setFlyVerticalDrifting(DEFAULT_FLY_VERTICAL_DRIFTING);
|
this.setFlyVerticalDrifting(DEFAULT_FLY_VERTICAL_DRIFTING);
|
||||||
|
this.setFrontBlockPlacing(DEFAULT_FRONT_BLOCK_PLACING);
|
||||||
|
this.setRenderFrontBlockOutline(DEFAULT_FRONT_BLOCK_OUTLINE);
|
||||||
// Controller
|
// Controller
|
||||||
this.setControllerType(DEFAULT_CONTROLLER_TYPE);
|
this.setControllerType(DEFAULT_CONTROLLER_TYPE);
|
||||||
this.setDeadZone(DEFAULT_DEAD_ZONE);
|
this.setDeadZone(DEFAULT_DEAD_ZONE);
|
||||||
this.setRotationSpeed(DEFAULT_ROTATION_SPEED);
|
this.setRotationSpeed(DEFAULT_ROTATION_SPEED);
|
||||||
this.setMouseSpeed(DEFAULT_MOUSE_SPEED);
|
this.setMouseSpeed(DEFAULT_MOUSE_SPEED);
|
||||||
this.setUnfocusedInput(DEFAULT_UNFOCUSED_INPUT);
|
this.setUnfocusedInput(DEFAULT_UNFOCUSED_INPUT);
|
||||||
|
this.setVirtualMouse(DEFAULT_VIRTUAL_MOUSE);
|
||||||
|
this.setVirtualMouseSkin(DEFAULT_VIRTUAL_MOUSE_SKIN);
|
||||||
|
// HUD
|
||||||
|
this.setHudEnabled(DEFAULT_HUD_ENABLE);
|
||||||
|
this.setHudSide(DEFAULT_HUD_SIDE);
|
||||||
|
|
||||||
// Collect prevents concurrent modification.
|
// Collect prevents concurrent modification.
|
||||||
InputManager.streamBindings().collect(Collectors.toList()).forEach(binding -> this.setButtonBinding(binding, binding.getDefaultButton()));
|
InputManager.streamBindings().collect(Collectors.toList()).forEach(binding -> this.setButtonBinding(binding, binding.getDefaultButton()));
|
||||||
@@ -237,24 +274,24 @@ public class LambdaControlsConfig
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether front block placing is enabled or not.
|
* Gets whether fast block placing is enabled or not.
|
||||||
*
|
*
|
||||||
* @return True if front block placing is enabled, else false.
|
* @return True if fast block placing is enabled, else false.
|
||||||
*/
|
*/
|
||||||
public boolean hasFrontBlockPlacing()
|
public boolean hasFastBlockPlacing()
|
||||||
{
|
{
|
||||||
return LambdaControlsFeature.FRONT_BLOCK_PLACING.isEnabled();
|
return LambdaControlsFeature.FAST_BLOCK_PLACING.isEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets whether front block placing is enabled or not.
|
* Sets whether fast block placing is enabled or not.
|
||||||
*
|
*
|
||||||
* @param enable True if front block placing is enabled, else false.
|
* @param enable True if fast block placing is enabled, else false.
|
||||||
*/
|
*/
|
||||||
public void setFrontBlockPlacing(boolean enable)
|
public void setFastBlockPlacing(boolean enable)
|
||||||
{
|
{
|
||||||
LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(enable);
|
LambdaControlsFeature.FAST_BLOCK_PLACING.setEnabled(enable);
|
||||||
this.config.set("gameplay.front_block_placing", enable);
|
this.config.set("gameplay.fast_block_placing", enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -297,6 +334,59 @@ public class LambdaControlsConfig
|
|||||||
this.config.set("gameplay.fly.vertical_drifting", flyDrifting);
|
this.config.set("gameplay.fly.vertical_drifting", flyDrifting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether front block placing is enabled or not.
|
||||||
|
*
|
||||||
|
* @return True if front block placing is enabled, else false.
|
||||||
|
*/
|
||||||
|
public boolean hasFrontBlockPlacing()
|
||||||
|
{
|
||||||
|
return LambdaControlsFeature.FRONT_BLOCK_PLACING.isEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether front block placing is enabled or not.
|
||||||
|
*
|
||||||
|
* @param enable True if front block placing is enabled, else false.
|
||||||
|
*/
|
||||||
|
public void setFrontBlockPlacing(boolean enable)
|
||||||
|
{
|
||||||
|
LambdaControlsFeature.FRONT_BLOCK_PLACING.setEnabled(enable);
|
||||||
|
this.config.set("gameplay.front_block_placing.enabled", enable);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether front block placing outline is enabled or not.
|
||||||
|
*
|
||||||
|
* @return True if front block placing outline is enabled, else false.
|
||||||
|
*/
|
||||||
|
public boolean shouldRenderFrontBlockOutline()
|
||||||
|
{
|
||||||
|
return this.shouldRenderFrontBlockOutline;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether front block placing outline is enabled or not.
|
||||||
|
*
|
||||||
|
* @param render True if front block placing outline is enabled, else false.
|
||||||
|
*/
|
||||||
|
public void setRenderFrontBlockOutline(boolean render)
|
||||||
|
{
|
||||||
|
this.config.set("gameplay.front_block_placing.outline", this.shouldRenderFrontBlockOutline = render);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the front block placing outline color as an integer array.
|
||||||
|
* <p>
|
||||||
|
* The integer array has 4 elements: red, green, blue and alpha.
|
||||||
|
*
|
||||||
|
* @return The color as a RGBA integer array.
|
||||||
|
*/
|
||||||
|
public int[] getFrontBlockOutlineColor()
|
||||||
|
{
|
||||||
|
return this.frontBlockOutlineColor;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Controller settings
|
Controller settings
|
||||||
*/
|
*/
|
||||||
@@ -496,6 +586,47 @@ public class LambdaControlsConfig
|
|||||||
this.unfocusedInput = unfocusedInput;
|
this.unfocusedInput = unfocusedInput;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether the mouse is virtual or not.
|
||||||
|
*
|
||||||
|
* @return True if the mouse is virtual, else false.
|
||||||
|
*/
|
||||||
|
public boolean hasVirtualMouse()
|
||||||
|
{
|
||||||
|
return this.virtualMouse;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether the mouse is virtual or not.
|
||||||
|
*
|
||||||
|
* @param virtualMouse True if the mouse is virtual, else false.
|
||||||
|
*/
|
||||||
|
public void setVirtualMouse(boolean virtualMouse)
|
||||||
|
{
|
||||||
|
this.virtualMouse = virtualMouse;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the virtual mouse skin.
|
||||||
|
*
|
||||||
|
* @return The virtual mouse skin.
|
||||||
|
*/
|
||||||
|
public VirtualMouseSkin getVirtualMouseSkin()
|
||||||
|
{
|
||||||
|
return this.virtualMouseSkin;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the virtual mouse skin.
|
||||||
|
*
|
||||||
|
* @param skin The virtual mouse skin.
|
||||||
|
*/
|
||||||
|
public void setVirtualMouseSkin(VirtualMouseSkin skin)
|
||||||
|
{
|
||||||
|
this.virtualMouseSkin = skin;
|
||||||
|
this.config.set("controller.virtual_mouse_skin", skin.getName());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the right X axis sign.
|
* Gets the right X axis sign.
|
||||||
*
|
*
|
||||||
@@ -612,4 +743,32 @@ public class LambdaControlsConfig
|
|||||||
{
|
{
|
||||||
return axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X;
|
return axis == GLFW_GAMEPAD_AXIS_LEFT_Y || axis == GLFW_GAMEPAD_AXIS_LEFT_X;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses a color from a hexadecimal color string.
|
||||||
|
*
|
||||||
|
* @param hex The hexadecimal color.
|
||||||
|
* @return The color instance, null if invalid.
|
||||||
|
*/
|
||||||
|
private static int[] parseColor(String hex)
|
||||||
|
{
|
||||||
|
hex = hex.replace("#", "");
|
||||||
|
switch (hex.length()) {
|
||||||
|
case 6:
|
||||||
|
return new int[]{
|
||||||
|
Integer.valueOf(hex.substring(0, 2), 16),
|
||||||
|
Integer.valueOf(hex.substring(2, 4), 16),
|
||||||
|
Integer.valueOf(hex.substring(4, 6), 16),
|
||||||
|
255
|
||||||
|
};
|
||||||
|
case 8:
|
||||||
|
return new int[]{
|
||||||
|
Integer.valueOf(hex.substring(0, 2), 16),
|
||||||
|
Integer.valueOf(hex.substring(2, 4), 16),
|
||||||
|
Integer.valueOf(hex.substring(4, 6), 16),
|
||||||
|
Integer.valueOf(hex.substring(6, 8), 16)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,19 +9,16 @@
|
|||||||
|
|
||||||
package me.lambdaurora.lambdacontrols.client;
|
package me.lambdaurora.lambdacontrols.client;
|
||||||
|
|
||||||
|
import io.github.prospector.modmenu.api.ConfigScreenFactory;
|
||||||
import io.github.prospector.modmenu.api.ModMenuApi;
|
import io.github.prospector.modmenu.api.ModMenuApi;
|
||||||
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
||||||
import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen;
|
import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsSettingsScreen;
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents the API implementation of ModMenu for LambdaControls.
|
* Represents the API implementation of ModMenu for LambdaControls.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public class LambdaControlsModMenu implements ModMenuApi
|
public class LambdaControlsModMenu implements ModMenuApi
|
||||||
@@ -33,8 +30,8 @@ public class LambdaControlsModMenu implements ModMenuApi
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Function<Screen, ? extends Screen> getConfigScreenFactory()
|
public ConfigScreenFactory<?> getModConfigScreenFactory()
|
||||||
{
|
{
|
||||||
return screen -> new LambdaControlsSettingsScreen(screen, MinecraftClient.getInstance().options, false);
|
return parent -> new LambdaControlsSettingsScreen(parent, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,19 +9,28 @@
|
|||||||
|
|
||||||
package me.lambdaurora.lambdacontrols.client;
|
package me.lambdaurora.lambdacontrols.client;
|
||||||
|
|
||||||
|
import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.Controller;
|
import me.lambdaurora.lambdacontrols.client.controller.Controller;
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.InputManager;
|
import me.lambdaurora.lambdacontrols.client.controller.InputManager;
|
||||||
import me.lambdaurora.lambdacontrols.client.gui.ControllerControlsScreen;
|
import me.lambdaurora.lambdacontrols.client.gui.ControllerControlsScreen;
|
||||||
import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay;
|
import me.lambdaurora.lambdacontrols.client.gui.TouchscreenOverlay;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.mixin.EntryListWidgetAccessor;
|
import me.lambdaurora.lambdacontrols.client.mixin.EntryListWidgetAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
|
||||||
import me.lambdaurora.spruceui.SpruceLabelWidget;
|
import me.lambdaurora.spruceui.SpruceLabelWidget;
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.block.FluidBlock;
|
||||||
|
import net.minecraft.block.SlabBlock;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.Element;
|
import net.minecraft.client.gui.Element;
|
||||||
import net.minecraft.client.gui.ParentElement;
|
import net.minecraft.client.gui.ParentElement;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.screen.advancement.AdvancementTab;
|
||||||
import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
|
import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
||||||
@@ -33,6 +42,13 @@ import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
|
|||||||
import net.minecraft.client.gui.widget.SliderWidget;
|
import net.minecraft.client.gui.widget.SliderWidget;
|
||||||
import net.minecraft.container.Slot;
|
import net.minecraft.container.Slot;
|
||||||
import net.minecraft.container.SlotActionType;
|
import net.minecraft.container.SlotActionType;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.item.BlockItem;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.hit.BlockHitResult;
|
||||||
|
import net.minecraft.util.hit.HitResult;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import org.aperlambda.lambdacommon.utils.Pair;
|
import org.aperlambda.lambdacommon.utils.Pair;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -55,7 +71,7 @@ import static org.lwjgl.glfw.GLFW.*;
|
|||||||
* Represents the LambdaControls' input handler.
|
* Represents the LambdaControls' input handler.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public class LambdaInput
|
public class LambdaInput
|
||||||
@@ -65,9 +81,6 @@ public class LambdaInput
|
|||||||
// Cooldowns
|
// Cooldowns
|
||||||
private int actionGuiCooldown = 0;
|
private int actionGuiCooldown = 0;
|
||||||
private int ignoreNextA = 0;
|
private int ignoreNextA = 0;
|
||||||
// Sneak state.
|
|
||||||
private double prevTargetYaw = 0.0;
|
|
||||||
private double prevTargetPitch = 0.0;
|
|
||||||
private double targetYaw = 0.0;
|
private double targetYaw = 0.0;
|
||||||
private double targetPitch = 0.0;
|
private double targetPitch = 0.0;
|
||||||
private float prevXAxis = 0.F;
|
private float prevXAxis = 0.F;
|
||||||
@@ -89,8 +102,8 @@ public class LambdaInput
|
|||||||
*/
|
*/
|
||||||
public void onTick(@NotNull MinecraftClient client)
|
public void onTick(@NotNull MinecraftClient client)
|
||||||
{
|
{
|
||||||
this.prevTargetYaw = this.targetYaw;
|
this.targetYaw = 0.F;
|
||||||
this.prevTargetPitch = this.targetPitch;
|
this.targetPitch = 0.F;
|
||||||
|
|
||||||
// Handles the key bindings.
|
// Handles the key bindings.
|
||||||
if (LambdaControlsClient.BINDING_LOOK_UP.isPressed()) {
|
if (LambdaControlsClient.BINDING_LOOK_UP.isPressed()) {
|
||||||
@@ -175,20 +188,24 @@ public class LambdaInput
|
|||||||
*
|
*
|
||||||
* @param client The client instance.
|
* @param client The client instance.
|
||||||
*/
|
*/
|
||||||
public void onRender(@NotNull MinecraftClient client)
|
public void onRender(float tickDelta, @NotNull MinecraftClient client)
|
||||||
{
|
{
|
||||||
if ((client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay) &&
|
if (!(client.currentScreen == null || client.currentScreen instanceof TouchscreenOverlay))
|
||||||
(this.prevTargetYaw != this.targetYaw || this.prevTargetPitch != this.targetPitch)) {
|
return;
|
||||||
float deltaYaw = (float) ((this.targetYaw - client.player.prevYaw) * client.getTickDelta());
|
|
||||||
float deltaPitch = (float) ((this.targetPitch - client.player.prevPitch) * client.getTickDelta());
|
PlayerEntity player = client.player;
|
||||||
float rotationYaw = client.player.prevYaw + deltaYaw;
|
if (player == null)
|
||||||
float rotationPitch = client.player.prevPitch + deltaPitch;
|
return;
|
||||||
|
|
||||||
|
if (this.targetYaw != 0F || this.targetPitch != 0F) {
|
||||||
|
float rotationYaw = (float) (player.prevYaw + (this.targetYaw / 0.10) * tickDelta);
|
||||||
|
float rotationPitch = (float) (player.prevPitch + (this.targetPitch / 0.10) * tickDelta);
|
||||||
client.player.yaw = rotationYaw;
|
client.player.yaw = rotationYaw;
|
||||||
client.player.pitch = MathHelper.clamp(rotationPitch, -90.F, 90.F);
|
client.player.pitch = MathHelper.clamp(rotationPitch, -90.F, 90.F);
|
||||||
if (client.player.isRiding()) {
|
if (client.player.isRiding()) {
|
||||||
client.player.getVehicle().copyPositionAndRotation(client.player);
|
client.player.getVehicle().copyPositionAndRotation(client.player);
|
||||||
}
|
}
|
||||||
client.getTutorialManager().onUpdateMouse(deltaPitch, deltaYaw);
|
client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,6 +221,9 @@ public class LambdaInput
|
|||||||
if (client.currentScreen == null) {
|
if (client.currentScreen == null) {
|
||||||
this.mouseSpeedX = this.mouseSpeedY = 0.0F;
|
this.mouseSpeedX = this.mouseSpeedY = 0.0F;
|
||||||
INPUT_MANAGER.resetMousePosition(windowWidth, windowHeight);
|
INPUT_MANAGER.resetMousePosition(windowWidth, windowHeight);
|
||||||
|
} else if (isScreenInteractive(client.currentScreen) && this.config.hasVirtualMouse()) {
|
||||||
|
((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), 0, 0);
|
||||||
|
INPUT_MANAGER.resetMouseTarget(client);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,6 +331,7 @@ public class LambdaInput
|
|||||||
slotAction = SlotActionType.CLONE;
|
slotAction = SlotActionType.CLONE;
|
||||||
}
|
}
|
||||||
client.interactionManager.clickSlot(((ContainerScreen) client.currentScreen).getContainer().syncId, slot.id, GLFW.GLFW_MOUSE_BUTTON_1, slotAction, client.player);
|
client.interactionManager.clickSlot(((ContainerScreen) client.currentScreen).getContainer().syncId, slot.id, GLFW.GLFW_MOUSE_BUTTON_1, slotAction, client.player);
|
||||||
|
client.player.playerContainer.sendContentUpdates();
|
||||||
this.actionGuiCooldown = 5;
|
this.actionGuiCooldown = 5;
|
||||||
return;
|
return;
|
||||||
} else if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
|
} else if (button == GLFW.GLFW_GAMEPAD_BUTTON_B) {
|
||||||
@@ -381,6 +402,8 @@ public class LambdaInput
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double deadZone = this.config.getDeadZone();
|
||||||
|
|
||||||
if (client.currentScreen instanceof ControllerControlsScreen) {
|
if (client.currentScreen instanceof ControllerControlsScreen) {
|
||||||
ControllerControlsScreen screen = (ControllerControlsScreen) client.currentScreen;
|
ControllerControlsScreen screen = (ControllerControlsScreen) client.currentScreen;
|
||||||
if (screen.focusedBinding != null) {
|
if (screen.focusedBinding != null) {
|
||||||
@@ -397,11 +420,30 @@ public class LambdaInput
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
} else if (client.currentScreen instanceof CreativeInventoryScreen) {
|
||||||
|
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
|
||||||
|
CreativeInventoryScreen screen = (CreativeInventoryScreen) client.currentScreen;
|
||||||
|
CreativeInventoryScreenAccessor accessor = (CreativeInventoryScreenAccessor) screen;
|
||||||
|
if (accessor.lambdacontrols_hasScrollbar() && absValue >= deadZone) {
|
||||||
|
screen.mouseScrolled(0.0, 0.0, -value);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else if (client.currentScreen instanceof AdvancementsScreen) {
|
||||||
|
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X || axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
|
||||||
|
AdvancementsScreen screen = (AdvancementsScreen) client.currentScreen;
|
||||||
|
AdvancementsScreenAccessor accessor = (AdvancementsScreenAccessor) screen;
|
||||||
|
if (absValue >= deadZone) {
|
||||||
|
AdvancementTab tab = accessor.getSelectedTab();
|
||||||
|
tab.move(axis == GLFW_GAMEPAD_AXIS_RIGHT_X ? -value * 5.0 : 0.0, axis == GLFW_GAMEPAD_AXIS_RIGHT_Y ? -value * 5.0 : 0.0);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double deadZone = this.config.getDeadZone();
|
|
||||||
if (client.currentScreen == null) {
|
if (client.currentScreen == null) {
|
||||||
// Handles the look direction.
|
// Handles the look direction.
|
||||||
|
absValue -= this.config.getDeadZone();
|
||||||
this.handleLook(client, axis, (float) (absValue / (1.0 - this.config.getDeadZone())), state);
|
this.handleLook(client, axis, (float) (absValue / (1.0 - this.config.getDeadZone())), state);
|
||||||
} else {
|
} else {
|
||||||
boolean allowMouseControl = true;
|
boolean allowMouseControl = true;
|
||||||
@@ -535,7 +577,7 @@ public class LambdaInput
|
|||||||
/**
|
/**
|
||||||
* Handles the look direction input.
|
* Handles the look direction input.
|
||||||
*
|
*
|
||||||
* @param client The client isntance.
|
* @param client The client instance.
|
||||||
* @param axis The axis to change.
|
* @param axis The axis to change.
|
||||||
* @param value The value of the look.
|
* @param value The value of the look.
|
||||||
* @param state The state.
|
* @param state The state.
|
||||||
@@ -544,21 +586,19 @@ public class LambdaInput
|
|||||||
{
|
{
|
||||||
// Handles the look direction.
|
// Handles the look direction.
|
||||||
if (client.player != null) {
|
if (client.player != null) {
|
||||||
double powValue = Math.pow(value, 4.0);
|
double powValue = Math.pow(value, 2.0);
|
||||||
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
|
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
|
||||||
if (state == 2) {
|
if (state == 2) {
|
||||||
this.targetPitch = client.player.pitch - this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
this.targetPitch = -this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
||||||
this.targetPitch = MathHelper.clamp(this.targetPitch, -90.0D, 90.0D);
|
|
||||||
} else if (state == 1) {
|
} else if (state == 1) {
|
||||||
this.targetPitch = client.player.pitch + this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
this.targetPitch = this.config.getRightYAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
||||||
this.targetPitch = MathHelper.clamp(this.targetPitch, -90.0D, 90.0D);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
|
if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
|
||||||
if (state == 2) {
|
if (state == 2) {
|
||||||
this.targetYaw = client.player.yaw - this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
this.targetYaw = -this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
||||||
} else if (state == 1) {
|
} else if (state == 1) {
|
||||||
this.targetYaw = client.player.yaw + this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
this.targetYaw = this.config.getRightXAxisSign() * (this.config.getRotationSpeed() * powValue) * 0.33D;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -578,9 +618,9 @@ public class LambdaInput
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isScreenInteractive(@NotNull Screen screen)
|
public static boolean isScreenInteractive(@NotNull Screen screen)
|
||||||
{
|
{
|
||||||
return !(screen instanceof AdvancementsScreen || screen instanceof ContainerScreen);
|
return !(screen instanceof AdvancementsScreen || screen instanceof ContainerScreen || LambdaControlsCompat.requireMouseOnScreen(screen));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Inspired from https://github.com/MrCrayfish/Controllable/blob/1.14.X/src/main/java/com/mrcrayfish/controllable/client/ControllerInput.java#L686.
|
// Inspired from https://github.com/MrCrayfish/Controllable/blob/1.14.X/src/main/java/com/mrcrayfish/controllable/client/ControllerInput.java#L686.
|
||||||
@@ -590,8 +630,8 @@ public class LambdaInput
|
|||||||
if (screen instanceof ContainerScreen) {
|
if (screen instanceof ContainerScreen) {
|
||||||
ContainerScreen inventoryScreen = (ContainerScreen) screen;
|
ContainerScreen inventoryScreen = (ContainerScreen) screen;
|
||||||
ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventoryScreen;
|
ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventoryScreen;
|
||||||
int guiLeft = accessor.lambdacontrols_getX();
|
int guiLeft = accessor.getX();
|
||||||
int guiTop = accessor.lambdacontrols_getY();
|
int guiTop = accessor.getY();
|
||||||
int mouseX = (int) (targetMouseX * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth());
|
int mouseX = (int) (targetMouseX * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth());
|
||||||
int mouseY = (int) (targetMouseY * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight());
|
int mouseY = (int) (targetMouseY * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight());
|
||||||
|
|
||||||
@@ -639,4 +679,71 @@ public class LambdaInput
|
|||||||
this.mouseSpeedY = 0.F;
|
this.mouseSpeedY = 0.F;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Direction getMoveDirection(@Nullable BlockPos lastPos, @NotNull BlockPos newPos)
|
||||||
|
{
|
||||||
|
if (lastPos == null)
|
||||||
|
return null;
|
||||||
|
BlockPos vector = newPos.subtract(lastPos);
|
||||||
|
if (vector.getX() > 0)
|
||||||
|
return Direction.EAST;
|
||||||
|
else if (vector.getX() < 0)
|
||||||
|
return Direction.WEST;
|
||||||
|
else if (vector.getZ() > 0)
|
||||||
|
return Direction.SOUTH;
|
||||||
|
else if (vector.getZ() < 0)
|
||||||
|
return Direction.NORTH;
|
||||||
|
else if (vector.getY() > 0)
|
||||||
|
return Direction.UP;
|
||||||
|
else if (vector.getY() < 0)
|
||||||
|
return Direction.DOWN;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a nullable block hit result if front placing is possible.
|
||||||
|
*
|
||||||
|
* @param client The client instance.
|
||||||
|
* @return A block hit result if front placing is possible.
|
||||||
|
*/
|
||||||
|
public static @Nullable BlockHitResult tryFrontPlace(@NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
if (!LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable())
|
||||||
|
return null;
|
||||||
|
if (client.player != null && client.crosshairTarget != null && client.crosshairTarget.getType() == HitResult.Type.MISS && client.player.onGround && client.player.pitch > 35.0F) {
|
||||||
|
if (client.player.isRiding())
|
||||||
|
return null;
|
||||||
|
BlockPos playerPos = client.player.getBlockPos().down();
|
||||||
|
BlockPos targetPos = new BlockPos(client.crosshairTarget.getPos()).subtract(playerPos);
|
||||||
|
BlockPos vector = new BlockPos(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
|
||||||
|
BlockPos blockPos = playerPos.add(vector);
|
||||||
|
|
||||||
|
Direction direction = client.player.getHorizontalFacing();
|
||||||
|
|
||||||
|
BlockState state = client.world.getBlockState(blockPos);
|
||||||
|
if (!state.isAir())
|
||||||
|
return null;
|
||||||
|
BlockState adjacentBlockState = client.world.getBlockState(blockPos.offset(direction.getOpposite()));
|
||||||
|
if (adjacentBlockState.isAir() || adjacentBlockState.getBlock() instanceof FluidBlock || (vector.getX() == 0 && vector.getZ() == 0)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new BlockHitResult(client.crosshairTarget.getPos(), direction, blockPos, false);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static @NotNull BlockHitResult withSideForFrontPlace(@NotNull BlockHitResult result, @Nullable ItemStack stack)
|
||||||
|
{
|
||||||
|
if (stack == null || stack.isEmpty() || !(stack.getItem() instanceof BlockItem))
|
||||||
|
return result;
|
||||||
|
return withSideForFrontPlace(result, Block.getBlockFromItem(stack.getItem()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static @NotNull BlockHitResult withSideForFrontPlace(@NotNull BlockHitResult result, @NotNull Block block)
|
||||||
|
{
|
||||||
|
if (block instanceof SlabBlock)
|
||||||
|
result = result.withSide(Direction.DOWN);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.resource.language.I18n;
|
||||||
|
import org.aperlambda.lambdacommon.utils.Nameable;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents the virtual mouse skins.
|
||||||
|
*
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
public enum VirtualMouseSkin implements Nameable
|
||||||
|
{
|
||||||
|
DEFAULT_LIGHT("default_light"),
|
||||||
|
DEFAULT_DARK("default_dark"),
|
||||||
|
SECOND_LIGHT("second_light"),
|
||||||
|
SECOND_DARK("second_dark");
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
VirtualMouseSkin(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next virtual mouse skin available.
|
||||||
|
*
|
||||||
|
* @return The next available virtual mouse skin.
|
||||||
|
*/
|
||||||
|
public VirtualMouseSkin next()
|
||||||
|
{
|
||||||
|
VirtualMouseSkin[] v = values();
|
||||||
|
if (v.length == this.ordinal() + 1)
|
||||||
|
return v[0];
|
||||||
|
return v[this.ordinal() + 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the translated name of this controller type.
|
||||||
|
*
|
||||||
|
* @return The translated name of this controller type.
|
||||||
|
*/
|
||||||
|
public String getTranslatedName()
|
||||||
|
{
|
||||||
|
return I18n.translate("lambdacontrols.virtual_mouse.skin." + this.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull String getName()
|
||||||
|
{
|
||||||
|
return this.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the controller type from its identifier.
|
||||||
|
*
|
||||||
|
* @param id The identifier of the controller type.
|
||||||
|
* @return The controller type if found, else empty.
|
||||||
|
*/
|
||||||
|
public static Optional<VirtualMouseSkin> byId(@NotNull String id)
|
||||||
|
{
|
||||||
|
return Arrays.stream(values()).filter(mode -> mode.getName().equalsIgnoreCase(id)).findFirst();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,13 +10,14 @@
|
|||||||
package me.lambdaurora.lambdacontrols.client.compat;
|
package me.lambdaurora.lambdacontrols.client.compat;
|
||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a compatibility handler for a mod.
|
* Represents a compatibility handler for a mod.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public interface CompatHandler
|
public interface CompatHandler
|
||||||
@@ -27,4 +28,15 @@ public interface CompatHandler
|
|||||||
* @param mod This mod instance.
|
* @param mod This mod instance.
|
||||||
*/
|
*/
|
||||||
void handle(@NotNull LambdaControlsClient mod);
|
void handle(@NotNull LambdaControlsClient mod);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether the mouse is required on the specified screen.
|
||||||
|
*
|
||||||
|
* @param screen The screen.
|
||||||
|
* @return True if the mouse is requried on the specified screen, else false.
|
||||||
|
*/
|
||||||
|
default boolean requireMouseOnScreen(Screen screen)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,9 +12,13 @@ package me.lambdaurora.lambdacontrols.client.compat;
|
|||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.InputManager;
|
import me.lambdaurora.lambdacontrols.client.controller.InputManager;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import org.aperlambda.lambdacommon.utils.LambdaReflection;
|
import org.aperlambda.lambdacommon.utils.LambdaReflection;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a compatibility handler.
|
* Represents a compatibility handler.
|
||||||
*
|
*
|
||||||
@@ -24,6 +28,8 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
*/
|
*/
|
||||||
public class LambdaControlsCompat
|
public class LambdaControlsCompat
|
||||||
{
|
{
|
||||||
|
private static final List<CompatHandler> HANDLERS = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes compatibility with other mods if needed.
|
* Initializes compatibility with other mods if needed.
|
||||||
*
|
*
|
||||||
@@ -33,8 +39,34 @@ public class LambdaControlsCompat
|
|||||||
{
|
{
|
||||||
if (FabricLoader.getInstance().isModLoaded("okzoomer") && LambdaReflection.doesClassExist(OkZoomerCompat.OKZOOMER_CLASS_PATH)) {
|
if (FabricLoader.getInstance().isModLoaded("okzoomer") && LambdaReflection.doesClassExist(OkZoomerCompat.OKZOOMER_CLASS_PATH)) {
|
||||||
mod.log("Adding okzoomer compatibility...");
|
mod.log("Adding okzoomer compatibility...");
|
||||||
new OkZoomerCompat().handle(mod);
|
HANDLERS.add(new OkZoomerCompat());
|
||||||
}
|
}
|
||||||
|
if (isReiPresent()) {
|
||||||
|
mod.log("Adding REI compatiblity...");
|
||||||
|
HANDLERS.add(new ReiCompat());
|
||||||
|
}
|
||||||
|
HANDLERS.forEach(handler -> handler.handle(mod));
|
||||||
InputManager.loadButtonBindings(mod.config);
|
InputManager.loadButtonBindings(mod.config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether the mouse is required on the specified screen.
|
||||||
|
*
|
||||||
|
* @param screen The screen.
|
||||||
|
* @return True if the mouse is requried on the specified screen, else false.
|
||||||
|
*/
|
||||||
|
public static boolean requireMouseOnScreen(Screen screen)
|
||||||
|
{
|
||||||
|
return HANDLERS.stream().anyMatch(handler -> handler.requireMouseOnScreen(screen));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether Roughly Enough Items is present.
|
||||||
|
*
|
||||||
|
* @return True if Roughly Enough Items is present, else false.
|
||||||
|
*/
|
||||||
|
public static boolean isReiPresent()
|
||||||
|
{
|
||||||
|
return FabricLoader.getInstance().isModLoaded("roughlyenoughitems");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.compat;
|
||||||
|
|
||||||
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
|
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
|
||||||
|
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This plugin is only present for the conditional mixins.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
public class LambdaControlsMixinPlugin implements IMixinConfigPlugin
|
||||||
|
{
|
||||||
|
private final HashMap<String, Boolean> conditionalMixins = new HashMap<>();
|
||||||
|
|
||||||
|
public LambdaControlsMixinPlugin()
|
||||||
|
{
|
||||||
|
this.conditionalMixins.put("me.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor", LambdaControlsCompat.isReiPresent());
|
||||||
|
this.conditionalMixins.put("me.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor", LambdaControlsCompat.isReiPresent());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onLoad(String mixinPackage)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getRefMapperConfig()
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldApplyMixin(String targetClassName, String mixinClassName)
|
||||||
|
{
|
||||||
|
return this.conditionalMixins.getOrDefault(mixinClassName, Boolean.TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getMixins()
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.compat;
|
||||||
|
|
||||||
|
import me.lambdaurora.lambdacontrols.client.ButtonState;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.compat.mixin.RecipeViewingScreenAccessor;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.compat.mixin.VillagerRecipeViewingScreenAccessor;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.controller.InputHandlers;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.controller.InputManager;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.controller.PressAction;
|
||||||
|
import me.shedaniel.rei.api.RecipeCategory;
|
||||||
|
import me.shedaniel.rei.gui.ContainerScreenOverlay;
|
||||||
|
import me.shedaniel.rei.gui.RecipeViewingScreen;
|
||||||
|
import me.shedaniel.rei.gui.VillagerRecipeViewingScreen;
|
||||||
|
import me.shedaniel.rei.gui.widget.EntryListWidget;
|
||||||
|
import me.shedaniel.rei.impl.ScreenHelper;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
import org.aperlambda.lambdacommon.utils.LambdaReflection;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import static org.lwjgl.glfw.GLFW.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a compatibility handler for REI.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
public class ReiCompat implements CompatHandler
|
||||||
|
{
|
||||||
|
private static EntryListWidget ENTRY_LIST_WIDGET;
|
||||||
|
public static ButtonBinding TAB_BACK;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void handle(@NotNull LambdaControlsClient mod)
|
||||||
|
{
|
||||||
|
InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "category_back"))
|
||||||
|
.buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
|
||||||
|
.filter((client, binding) -> isViewingScreen(client.currentScreen))
|
||||||
|
.action(handleTab(false))
|
||||||
|
.cooldown(true)
|
||||||
|
.build());
|
||||||
|
InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "category_next"))
|
||||||
|
.buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
|
||||||
|
.filter((client, binding) -> isViewingScreen(client.currentScreen))
|
||||||
|
.action(handleTab(true))
|
||||||
|
.cooldown(true)
|
||||||
|
.build());
|
||||||
|
|
||||||
|
InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "page_back"))
|
||||||
|
.buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, false))
|
||||||
|
.filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
|
||||||
|
.action(handlePage(false))
|
||||||
|
.cooldown(true)
|
||||||
|
.build());
|
||||||
|
InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "page_next"))
|
||||||
|
.buttons(ButtonBinding.axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_X, true))
|
||||||
|
.filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
|
||||||
|
.action(handlePage(true))
|
||||||
|
.cooldown(true)
|
||||||
|
.build());
|
||||||
|
|
||||||
|
// For some reasons this is broken.
|
||||||
|
InputManager.registerBinding(new ButtonBinding.Builder(new Identifier("rei", "show_usage"))
|
||||||
|
.buttons(GLFW_GAMEPAD_BUTTON_RIGHT_THUMB)
|
||||||
|
.filter((client, binding) -> InputHandlers.inInventory(client, binding) || isViewingScreen(client.currentScreen))
|
||||||
|
.action((client, button, action) -> {
|
||||||
|
if (action != ButtonState.RELEASE)
|
||||||
|
return false;
|
||||||
|
Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
|
||||||
|
if (!overlay.isPresent())
|
||||||
|
return false;
|
||||||
|
double mouseX = client.mouse.getX();
|
||||||
|
double mouseY = client.mouse.getY();
|
||||||
|
EntryListWidget widget = getEntryListWidget();
|
||||||
|
if (widget == null)
|
||||||
|
return false;
|
||||||
|
return widget.mouseClicked(mouseX, mouseY, GLFW_MOUSE_BUTTON_2);
|
||||||
|
})
|
||||||
|
.cooldown(true)
|
||||||
|
.build());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean requireMouseOnScreen(Screen screen)
|
||||||
|
{
|
||||||
|
return isViewingScreen(screen);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isViewingScreen(Screen screen)
|
||||||
|
{
|
||||||
|
return screen instanceof RecipeViewingScreen || screen instanceof VillagerRecipeViewingScreen;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static EntryListWidget getEntryListWidget()
|
||||||
|
{
|
||||||
|
if (ENTRY_LIST_WIDGET == null) {
|
||||||
|
ENTRY_LIST_WIDGET = LambdaReflection.getFirstFieldOfType(ContainerScreenOverlay.class, EntryListWidget.class)
|
||||||
|
.map(field -> (EntryListWidget) LambdaReflection.getFieldValue(null, field))
|
||||||
|
.orElse(null);
|
||||||
|
}
|
||||||
|
return ENTRY_LIST_WIDGET;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PressAction handlePage(boolean next)
|
||||||
|
{
|
||||||
|
return (client, button, action) -> {
|
||||||
|
if (action == ButtonState.RELEASE)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
Optional<ContainerScreenOverlay> overlay = ScreenHelper.getOptionalOverlay();
|
||||||
|
if (!overlay.isPresent())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
EntryListWidget widget = getEntryListWidget();
|
||||||
|
if (widget == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (next)
|
||||||
|
widget.nextPage();
|
||||||
|
else
|
||||||
|
widget.previousPage();
|
||||||
|
widget.updateEntriesPosition();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the handler for category tabs buttons.
|
||||||
|
*
|
||||||
|
* @param next True if the action is to switch to the next tab.
|
||||||
|
* @return The handler.
|
||||||
|
*/
|
||||||
|
private static PressAction handleTab(boolean next)
|
||||||
|
{
|
||||||
|
return (client, button, action) -> {
|
||||||
|
if (action != ButtonState.RELEASE)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (client.currentScreen instanceof RecipeViewingScreen) {
|
||||||
|
RecipeViewingScreenAccessor screen = (RecipeViewingScreenAccessor) client.currentScreen;
|
||||||
|
if (next)
|
||||||
|
screen.getCategoryNext().onPressed();
|
||||||
|
else
|
||||||
|
screen.getCategoryBack().onPressed();
|
||||||
|
return true;
|
||||||
|
} else if (client.currentScreen instanceof VillagerRecipeViewingScreen) {
|
||||||
|
VillagerRecipeViewingScreenAccessor screen = (VillagerRecipeViewingScreenAccessor) client.currentScreen;
|
||||||
|
List<RecipeCategory<?>> categories = screen.getCategories();
|
||||||
|
int currentTab = screen.getSelectedCategoryIndex();
|
||||||
|
int nextTab = currentTab + (next ? 1 : -1);
|
||||||
|
if (nextTab < 0)
|
||||||
|
nextTab = categories.size() - 1;
|
||||||
|
else if (nextTab >= categories.size())
|
||||||
|
nextTab = 0;
|
||||||
|
screen.setSelectedCategoryIndex(nextTab);
|
||||||
|
screen.lambdacontrols_init();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.compat.mixin;
|
||||||
|
|
||||||
|
import me.shedaniel.rei.gui.RecipeViewingScreen;
|
||||||
|
import me.shedaniel.rei.gui.widget.ButtonWidget;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents an accessor to REI's RecipeViewingScreen.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
@Mixin(RecipeViewingScreen.class)
|
||||||
|
public interface RecipeViewingScreenAccessor
|
||||||
|
{
|
||||||
|
@Accessor("categoryBack")
|
||||||
|
ButtonWidget getCategoryBack();
|
||||||
|
|
||||||
|
@Accessor("categoryNext")
|
||||||
|
ButtonWidget getCategoryNext();
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.compat.mixin;
|
||||||
|
|
||||||
|
import me.shedaniel.rei.api.RecipeCategory;
|
||||||
|
import me.shedaniel.rei.gui.VillagerRecipeViewingScreen;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents an accessor to REI's VillagerRecipeViewingScreen.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
@Mixin(VillagerRecipeViewingScreen.class)
|
||||||
|
public interface VillagerRecipeViewingScreenAccessor
|
||||||
|
{
|
||||||
|
@Accessor("categories")
|
||||||
|
List<RecipeCategory<?>> getCategories();
|
||||||
|
|
||||||
|
@Accessor("selectedCategoryIndex")
|
||||||
|
int getSelectedCategoryIndex();
|
||||||
|
|
||||||
|
@Accessor("selectedCategoryIndex")
|
||||||
|
void setSelectedCategoryIndex(int selectedCategoryIndex);
|
||||||
|
|
||||||
|
@Invoker("init")
|
||||||
|
void lambdacontrols_init();
|
||||||
|
}
|
||||||
@@ -73,9 +73,9 @@ public class ButtonBinding implements Nameable
|
|||||||
.actions(PressAction.DEFAULT_ACTION, InputHandlers::handleToggleSneak).onlyInGame().cooldown(true).register();
|
.actions(PressAction.DEFAULT_ACTION, InputHandlers::handleToggleSneak).onlyInGame().cooldown(true).register();
|
||||||
public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB).register();
|
public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB).register();
|
||||||
public static final ButtonBinding SWAP_HANDS = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).cooldown(true).register();
|
public static final ButtonBinding SWAP_HANDS = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).cooldown(true).register();
|
||||||
public static final ButtonBinding TAB_LEFT = new Builder("tab_left").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
|
public static final ButtonBinding TAB_LEFT = new Builder("tab_back").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
|
||||||
.action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
|
.action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
|
||||||
public static final ButtonBinding TAB_RIGHT = new Builder("tab_right").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
|
public static final ButtonBinding TAB_RIGHT = new Builder("tab_next").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER)
|
||||||
.action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
|
.action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements)).cooldown(true).register();
|
||||||
public static final ButtonBinding TOGGLE_PERSPECTIVE = new Builder("toggle_perspective").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_Y).cooldown(true).register();
|
public static final ButtonBinding TOGGLE_PERSPECTIVE = new Builder("toggle_perspective").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_Y).cooldown(true).register();
|
||||||
public static final ButtonBinding USE = new Builder("use").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)).register();
|
public static final ButtonBinding USE = new Builder("use").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)).register();
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ package me.lambdaurora.lambdacontrols.client.controller;
|
|||||||
import me.lambdaurora.lambdacontrols.client.ButtonState;
|
import me.lambdaurora.lambdacontrols.client.ButtonState;
|
||||||
import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.mixin.AdvancementsScreenAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.mixin.CreativeInventoryScreenAccessor;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.mixin.RecipeBookWidgetAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
||||||
import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
@@ -19,6 +20,8 @@ import net.minecraft.client.gui.screen.advancement.AdvancementTab;
|
|||||||
import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
|
import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
||||||
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||||
|
import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget;
|
||||||
import net.minecraft.client.util.ScreenshotUtils;
|
import net.minecraft.client.util.ScreenshotUtils;
|
||||||
import net.minecraft.container.Slot;
|
import net.minecraft.container.Slot;
|
||||||
import net.minecraft.item.ItemGroup;
|
import net.minecraft.item.ItemGroup;
|
||||||
@@ -35,7 +38,7 @@ import java.util.stream.Collectors;
|
|||||||
* Represents some input handlers.
|
* Represents some input handlers.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public class InputHandlers
|
public class InputHandlers
|
||||||
@@ -44,7 +47,7 @@ public class InputHandlers
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PressAction handleHotbar(boolean right)
|
public static PressAction handleHotbar(boolean next)
|
||||||
{
|
{
|
||||||
return (client, button, action) -> {
|
return (client, button, action) -> {
|
||||||
if (action == ButtonState.RELEASE)
|
if (action == ButtonState.RELEASE)
|
||||||
@@ -52,33 +55,46 @@ public class InputHandlers
|
|||||||
|
|
||||||
// When ingame
|
// When ingame
|
||||||
if (client.currentScreen == null && client.player != null) {
|
if (client.currentScreen == null && client.player != null) {
|
||||||
if (right)
|
if (next)
|
||||||
client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 8 ? 0 : client.player.inventory.selectedSlot + 1;
|
client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 8 ? 0 : client.player.inventory.selectedSlot + 1;
|
||||||
else
|
else
|
||||||
client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 0 ? 8 : client.player.inventory.selectedSlot - 1;
|
client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 0 ? 8 : client.player.inventory.selectedSlot - 1;
|
||||||
return true;
|
return true;
|
||||||
} else if (client.currentScreen instanceof CreativeInventoryScreen) {
|
} else if (client.currentScreen instanceof CreativeInventoryScreen) {
|
||||||
CreativeInventoryScreenAccessor inventory = (CreativeInventoryScreenAccessor) client.currentScreen;
|
CreativeInventoryScreenAccessor inventory = (CreativeInventoryScreenAccessor) client.currentScreen;
|
||||||
int currentSelectedTab = inventory.lambdacontrols_getSelectedTab();
|
int currentTab = inventory.getSelectedTab();
|
||||||
int nextTab = currentSelectedTab + (right ? 1 : -1);
|
int nextTab = currentTab + (next ? 1 : -1);
|
||||||
if (nextTab < 0)
|
if (nextTab < 0)
|
||||||
nextTab = ItemGroup.GROUPS.length - 1;
|
nextTab = ItemGroup.GROUPS.length - 1;
|
||||||
else if (nextTab >= ItemGroup.GROUPS.length)
|
else if (nextTab >= ItemGroup.GROUPS.length)
|
||||||
nextTab = 0;
|
nextTab = 0;
|
||||||
inventory.lambdacontrols_setSelectedTab(ItemGroup.GROUPS[nextTab]);
|
inventory.lambdacontrols_setSelectedTab(ItemGroup.GROUPS[nextTab]);
|
||||||
return true;
|
return true;
|
||||||
} else if (client.currentScreen instanceof AdvancementsScreen) {
|
} else if (client.currentScreen instanceof InventoryScreen) {
|
||||||
AdvancementsScreenAccessor screen = (AdvancementsScreenAccessor) client.currentScreen;
|
RecipeBookWidgetAccessor recipeBook = (RecipeBookWidgetAccessor) ((InventoryScreen) client.currentScreen).getRecipeBookWidget();
|
||||||
List<AdvancementTab> tabs = screen.lambdacontrols_getTabs().values().stream().distinct().collect(Collectors.toList());
|
List<RecipeGroupButtonWidget> tabs = recipeBook.getTabButtons();
|
||||||
AdvancementTab tab = screen.lambdacontrols_getSelectedTab();
|
RecipeGroupButtonWidget currentTab = recipeBook.getCurrentTab();
|
||||||
for (int i = 0; i < tabs.size(); i++) {
|
int nextTab = tabs.indexOf(currentTab) + (next ? 1 : -1);
|
||||||
if (tabs.get(i).equals(tab)) {
|
|
||||||
int nextTab = i + (right ? 1 : -1);
|
|
||||||
if (nextTab < 0)
|
if (nextTab < 0)
|
||||||
nextTab = tabs.size() - 1;
|
nextTab = tabs.size() - 1;
|
||||||
else if (nextTab >= tabs.size())
|
else if (nextTab >= tabs.size())
|
||||||
nextTab = 0;
|
nextTab = 0;
|
||||||
screen.lambdacontrols_getAdvancementManager().selectTab(tabs.get(nextTab).getRoot(), true);
|
currentTab.setToggled(false);
|
||||||
|
recipeBook.setCurrentTab(currentTab = tabs.get(nextTab));
|
||||||
|
currentTab.setToggled(true);
|
||||||
|
recipeBook.lambdacontrols_refreshResults(true);
|
||||||
|
} else if (client.currentScreen instanceof AdvancementsScreen) {
|
||||||
|
AdvancementsScreenAccessor screen = (AdvancementsScreenAccessor) client.currentScreen;
|
||||||
|
List<AdvancementTab> tabs = screen.getTabs().values().stream().distinct().collect(Collectors.toList());
|
||||||
|
AdvancementTab tab = screen.getSelectedTab();
|
||||||
|
for (int i = 0; i < tabs.size(); i++) {
|
||||||
|
if (tabs.get(i).equals(tab)) {
|
||||||
|
int nextTab = i + (next ? 1 : -1);
|
||||||
|
if (nextTab < 0)
|
||||||
|
nextTab = tabs.size() - 1;
|
||||||
|
else if (nextTab >= tabs.size())
|
||||||
|
nextTab = 0;
|
||||||
|
screen.getAdvancementManager().selectTab(tabs.get(nextTab).getRoot(), true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -134,8 +150,8 @@ public class InputHandlers
|
|||||||
|
|
||||||
ContainerScreen inventory = (ContainerScreen) client.currentScreen;
|
ContainerScreen inventory = (ContainerScreen) client.currentScreen;
|
||||||
ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventory;
|
ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventory;
|
||||||
int guiLeft = accessor.lambdacontrols_getX();
|
int guiLeft = accessor.getX();
|
||||||
int guiTop = accessor.lambdacontrols_getY();
|
int guiTop = accessor.getY();
|
||||||
double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
|
double mouseX = client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth();
|
||||||
double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
|
double mouseY = client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight();
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
|
|||||||
* Represents an input manager for controllers.
|
* Represents an input manager for controllers.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.1.0
|
* @since 1.1.0
|
||||||
*/
|
*/
|
||||||
public class InputManager
|
public class InputManager
|
||||||
@@ -72,6 +72,7 @@ public class InputManager
|
|||||||
if (this.prevTargetMouseX != this.targetMouseX || this.prevTargetMouseY != this.targetMouseY) {
|
if (this.prevTargetMouseX != this.targetMouseX || this.prevTargetMouseY != this.targetMouseY) {
|
||||||
double mouseX = this.prevTargetMouseX + (this.targetMouseX - this.prevTargetMouseX) * client.getTickDelta() + 0.5;
|
double mouseX = this.prevTargetMouseX + (this.targetMouseX - this.prevTargetMouseX) * client.getTickDelta() + 0.5;
|
||||||
double mouseY = this.prevTargetMouseY + (this.targetMouseY - this.prevTargetMouseY) * client.getTickDelta() + 0.5;
|
double mouseY = this.prevTargetMouseY + (this.targetMouseY - this.prevTargetMouseY) * client.getTickDelta() + 0.5;
|
||||||
|
if (!LambdaControlsClient.get().config.hasVirtualMouse())
|
||||||
GLFW.glfwSetCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
|
GLFW.glfwSetCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
|
||||||
((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
|
((MouseAccessor) client.mouse).lambdacontrols_onCursorPos(client.getWindow().getHandle(), mouseX, mouseY);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
|
|
||||||
package me.lambdaurora.lambdacontrols.client.gui;
|
package me.lambdaurora.lambdacontrols.client.gui;
|
||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
||||||
import me.lambdaurora.spruceui.AbstractIconButtonWidget;
|
import me.lambdaurora.spruceui.AbstractIconButtonWidget;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
@@ -52,7 +51,7 @@ public class ControllerButtonWidget extends AbstractIconButtonWidget
|
|||||||
if (this.binding.getButton().length > 1) {
|
if (this.binding.getButton().length > 1) {
|
||||||
x += (this.width / 2 - this.iconWidth / 2) - 4;
|
x += (this.width / 2 - this.iconWidth / 2) - 4;
|
||||||
}
|
}
|
||||||
Pair<Integer, Integer> size = LambdaControlsClient.drawButton(x, y, this.binding, MinecraftClient.getInstance());
|
Pair<Integer, Integer> size = LambdaControlsRenderer.drawButton(x, y, this.binding, MinecraftClient.getInstance());
|
||||||
this.iconWidth = size.key;
|
this.iconWidth = size.key;
|
||||||
return size.value;
|
return size.value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ public class ControllerControlsScreen extends Screen
|
|||||||
btn -> this.minecraft.openScreen(new ControlsOptionsScreen(this, this.minecraft.options))));
|
btn -> this.minecraft.openScreen(new ControlsOptionsScreen(this, this.minecraft.options))));
|
||||||
if (!this.hideSettings)
|
if (!this.hideSettings)
|
||||||
this.addButton(new SpruceButtonWidget(this.width / 2 - 155 + 160, 18, 150, 20, I18n.translate("menu.options"),
|
this.addButton(new SpruceButtonWidget(this.width / 2 - 155 + 160, 18, 150, 20, I18n.translate("menu.options"),
|
||||||
btn -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, this.minecraft.options, true))));
|
btn -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, true))));
|
||||||
this.bindingsListWidget = new ControlsListWidget(this, this.minecraft);
|
this.bindingsListWidget = new ControlsListWidget(this, this.minecraft);
|
||||||
this.children.add(this.bindingsListWidget);
|
this.children.add(this.bindingsListWidget);
|
||||||
this.resetButton = this.addButton(new ButtonWidget(this.width / 2 - 155, this.height - 29, 150, 20, I18n.translate("controls.resetAll"),
|
this.resetButton = this.addButton(new ButtonWidget(this.width / 2 - 155, this.height - 29, 150, 20, I18n.translate("controls.resetAll"),
|
||||||
|
|||||||
@@ -13,26 +13,47 @@ import me.lambdaurora.lambdacontrols.ControlsMode;
|
|||||||
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
import me.lambdaurora.lambdacontrols.LambdaControlsConstants;
|
||||||
import me.lambdaurora.lambdacontrols.client.HudSide;
|
import me.lambdaurora.lambdacontrols.client.HudSide;
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaInput;
|
||||||
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
||||||
import me.lambdaurora.spruceui.hud.Hud;
|
import me.lambdaurora.spruceui.hud.Hud;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.render.Tessellator;
|
||||||
|
import net.minecraft.client.render.VertexConsumerProvider;
|
||||||
|
import net.minecraft.client.resource.language.I18n;
|
||||||
|
import net.minecraft.client.util.math.Matrix4f;
|
||||||
|
import net.minecraft.client.util.math.Rotation3;
|
||||||
|
import net.minecraft.item.BlockItem;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.minecraft.util.hit.BlockHitResult;
|
||||||
import net.minecraft.util.hit.HitResult;
|
import net.minecraft.util.hit.HitResult;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents the LambdaControls HUD.
|
* Represents the LambdaControls HUD.
|
||||||
*
|
*
|
||||||
* @author LambdAurora
|
* @author LambdAurora
|
||||||
* @version 1.1.0
|
* @version 1.2.0
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public class LambdaControlsHud extends Hud
|
public class LambdaControlsHud extends Hud
|
||||||
{
|
{
|
||||||
private final LambdaControlsClient mod;
|
private final LambdaControlsClient mod;
|
||||||
private MinecraftClient client;
|
private MinecraftClient client;
|
||||||
private int widthBottom = 0;
|
private int attackWidth = 0;
|
||||||
private int widthTop = 0;
|
private int attackButtonWidth = 0;
|
||||||
|
private int dropItemWidth = 0;
|
||||||
|
private int dropItemButtonWidth = 0;
|
||||||
|
private int inventoryWidth = 0;
|
||||||
|
private int inventoryButtonWidth = 0;
|
||||||
|
private int swapHandsWidth = 0;
|
||||||
|
private int swapHandsButtonWidth = 0;
|
||||||
|
private int useWidth = 0;
|
||||||
|
private int useButtonWidth = 0;
|
||||||
|
private BlockHitResult placeHitResult;
|
||||||
|
private String attackAction = "";
|
||||||
|
private String placeAction = "";
|
||||||
|
|
||||||
public LambdaControlsHud(@NotNull LambdaControlsClient mod)
|
public LambdaControlsHud(@NotNull LambdaControlsClient mod)
|
||||||
{
|
{
|
||||||
@@ -45,6 +66,14 @@ public class LambdaControlsHud extends Hud
|
|||||||
{
|
{
|
||||||
super.init(client, screenWidth, screenHeight);
|
super.init(client, screenWidth, screenHeight);
|
||||||
this.client = client;
|
this.client = client;
|
||||||
|
this.inventoryWidth = this.width(ButtonBinding.INVENTORY);
|
||||||
|
this.inventoryButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.INVENTORY);
|
||||||
|
this.swapHandsWidth = this.width(ButtonBinding.SWAP_HANDS);
|
||||||
|
this.swapHandsButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.SWAP_HANDS);
|
||||||
|
this.dropItemWidth = this.width(ButtonBinding.DROP_ITEM);
|
||||||
|
this.dropItemButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.DROP_ITEM);
|
||||||
|
this.attackButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.ATTACK);
|
||||||
|
this.useButtonWidth = LambdaControlsRenderer.getBindingIconWidth(ButtonBinding.USE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -53,29 +82,181 @@ public class LambdaControlsHud extends Hud
|
|||||||
public void render(float tickDelta)
|
public void render(float tickDelta)
|
||||||
{
|
{
|
||||||
if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
|
if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
|
||||||
int x = this.mod.config.getHudSide() == HudSide.LEFT ? 10 : client.getWindow().getScaledWidth() - 10 - this.widthBottom, y = bottom(10);
|
int y = bottom(2);
|
||||||
x += (this.widthBottom = this.drawButtonTip(x, y, ButtonBinding.INVENTORY, true) + 10);
|
this.renderFirstIcons(this.mod.config.getHudSide() == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
|
||||||
this.widthBottom += this.drawButtonTip(x, y, ButtonBinding.SWAP_HANDS, true);
|
this.renderSecondIcons(this.mod.config.getHudSide() == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
|
||||||
x = this.mod.config.getHudSide() == HudSide.LEFT ? 10 : client.getWindow().getScaledWidth() - 10 - this.widthTop;
|
VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer());
|
||||||
x += (this.widthTop = this.drawButtonTip(x, (y -= 20), ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()) + 10);
|
Matrix4f matrix4f = Rotation3.identity().getMatrix();
|
||||||
this.widthTop += this.drawButtonTip(x, y, ButtonBinding.ATTACK.getButton(),
|
this.renderFirstSection(this.mod.config.getHudSide() == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y, immediate, matrix4f);
|
||||||
this.client.crosshairTarget.getType() == HitResult.Type.BLOCK ? "lambdacontrols.action.hit" : ButtonBinding.ATTACK.getTranslationKey(),
|
this.renderSecondSection(this.mod.config.getHudSide() == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y, immediate, matrix4f);
|
||||||
this.client.crosshairTarget.getType() != HitResult.Type.MISS);
|
immediate.draw();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void renderFirstIcons(int x, int y)
|
||||||
|
{
|
||||||
|
int offset = 2 + this.inventoryWidth + this.inventoryButtonWidth + 4;
|
||||||
|
int currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x : x - this.inventoryButtonWidth;
|
||||||
|
this.drawButton(currentX, y, ButtonBinding.INVENTORY, true);
|
||||||
|
this.drawButton(currentX += (this.mod.config.getHudSide() == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
|
||||||
|
offset = 2 + this.swapHandsWidth + this.dropItemButtonWidth + 4;
|
||||||
|
if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.RIGHT) {
|
||||||
|
currentX += -offset;
|
||||||
|
} else {
|
||||||
|
currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x : x - this.dropItemButtonWidth;
|
||||||
|
y -= 24;
|
||||||
|
}
|
||||||
|
this.drawButton(currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderSecondIcons(int x, int y)
|
||||||
|
{
|
||||||
|
int offset;
|
||||||
|
int currentX = x;
|
||||||
|
if (!this.placeAction.isEmpty()) {
|
||||||
|
if (this.mod.config.getHudSide() == HudSide.LEFT)
|
||||||
|
currentX -= this.useButtonWidth;
|
||||||
|
this.drawButton(currentX, y, ButtonBinding.USE, true);
|
||||||
|
offset = 2 + this.useWidth + 4;
|
||||||
|
if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.LEFT) {
|
||||||
|
currentX -= offset;
|
||||||
|
} else {
|
||||||
|
currentX = x;
|
||||||
|
y -= 24;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.mod.config.getHudSide() == HudSide.LEFT)
|
||||||
|
currentX -= this.attackButtonWidth;
|
||||||
|
|
||||||
|
this.drawButton(currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderFirstSection(int x, int y, @NotNull VertexConsumerProvider.Immediate immediate, @NotNull Matrix4f matrix4f)
|
||||||
|
{
|
||||||
|
int currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth;
|
||||||
|
this.drawTip(currentX, y, ButtonBinding.INVENTORY, true, immediate, matrix4f);
|
||||||
|
currentX += this.mod.config.getHudSide() == HudSide.LEFT ? this.inventoryWidth + 4 + this.swapHandsButtonWidth + 2
|
||||||
|
: -this.swapHandsWidth - 2 - this.swapHandsButtonWidth - 4;
|
||||||
|
this.drawTip(currentX, y, ButtonBinding.SWAP_HANDS, true, immediate, matrix4f);
|
||||||
|
if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.RIGHT) {
|
||||||
|
currentX += -this.dropItemWidth - 2 - this.dropItemButtonWidth - 4;
|
||||||
|
} else {
|
||||||
|
y -= 24;
|
||||||
|
currentX = this.mod.config.getHudSide() == HudSide.LEFT ? x + this.dropItemButtonWidth + 2 : x - this.dropItemButtonWidth - 2 - this.dropItemWidth;
|
||||||
|
}
|
||||||
|
this.drawTip(currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty(), immediate, matrix4f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderSecondSection(int x, int y, @NotNull VertexConsumerProvider.Immediate immediate, @NotNull Matrix4f matrix4f)
|
||||||
|
{
|
||||||
|
int currentX = x;
|
||||||
|
|
||||||
|
if (!this.placeAction.isEmpty()) {
|
||||||
|
currentX += this.mod.config.getHudSide() == HudSide.RIGHT ? this.useButtonWidth + 2 : -this.useButtonWidth - 2 - this.useWidth;
|
||||||
|
|
||||||
|
this.drawTip(currentX, y, this.placeAction, true, immediate, matrix4f);
|
||||||
|
|
||||||
|
if (this.client.options.showSubtitles && this.mod.config.getHudSide() == HudSide.LEFT) {
|
||||||
|
currentX -= 4;
|
||||||
|
} else {
|
||||||
|
currentX = x;
|
||||||
|
y -= 24;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentX += this.mod.config.getHudSide() == HudSide.RIGHT ? this.attackButtonWidth + 2 : -this.attackButtonWidth - 2 - this.attackWidth;
|
||||||
|
|
||||||
|
this.drawTip(currentX, y, this.attackAction, this.attackWidth != 0, immediate, matrix4f);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick()
|
||||||
|
{
|
||||||
|
super.tick();
|
||||||
|
if (this.mod.config.getControlsMode() == ControlsMode.CONTROLLER) {
|
||||||
|
if (this.client.crosshairTarget == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
String placeAction;
|
||||||
|
|
||||||
|
// Update "Use" tip status.
|
||||||
|
if (this.client.crosshairTarget.getType() == HitResult.Type.MISS) {
|
||||||
|
this.placeHitResult = LambdaInput.tryFrontPlace(this.client);
|
||||||
|
this.attackAction = "";
|
||||||
|
this.attackWidth = 0;
|
||||||
|
} else {
|
||||||
|
if (this.client.crosshairTarget.getType() == HitResult.Type.BLOCK)
|
||||||
|
this.placeHitResult = (BlockHitResult) this.client.crosshairTarget;
|
||||||
|
else
|
||||||
|
this.placeHitResult = null;
|
||||||
|
|
||||||
|
this.attackAction = this.client.crosshairTarget.getType() == HitResult.Type.BLOCK ? "lambdacontrols.action.hit" : ButtonBinding.ATTACK.getTranslationKey();
|
||||||
|
this.attackWidth = this.width(attackAction);
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack stack = this.client.player.getMainHandStack();
|
||||||
|
if ((stack == null || stack.isEmpty()) && ((stack = this.client.player.getOffHandStack()) == null || stack.isEmpty())) {
|
||||||
|
placeAction = "";
|
||||||
|
} else {
|
||||||
|
if (this.placeHitResult != null && stack.getItem() instanceof BlockItem) {
|
||||||
|
placeAction = "lambdacontrols.action.place";
|
||||||
|
} else {
|
||||||
|
placeAction = ButtonBinding.USE.getTranslationKey();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.placeAction = placeAction;
|
||||||
|
|
||||||
|
// Cache the "Use" tip width.
|
||||||
|
if (this.placeAction.isEmpty())
|
||||||
|
this.useWidth = 0;
|
||||||
|
else
|
||||||
|
this.useWidth = this.width(this.placeAction);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasTicks()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private int bottom(int y)
|
private int bottom(int y)
|
||||||
{
|
{
|
||||||
return this.client.getWindow().getScaledHeight() - y - 15;
|
return this.client.getWindow().getScaledHeight() - y - LambdaControlsRenderer.ICON_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int drawButtonTip(int x, int y, @NotNull ButtonBinding button, boolean display)
|
private int width(@NotNull ButtonBinding binding)
|
||||||
{
|
{
|
||||||
return LambdaControlsClient.drawButtonTip(x, y, button, display, this.client);
|
return this.width(binding.getTranslationKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
private int drawButtonTip(int x, int y, int[] button, @NotNull String action, boolean display)
|
private int width(@Nullable String text)
|
||||||
{
|
{
|
||||||
return LambdaControlsClient.drawButtonTip(x, y, button, action, display, this.client);
|
if (text == null || text.isEmpty())
|
||||||
|
return 0;
|
||||||
|
return this.client.textRenderer.getStringWidth(I18n.translate(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawButton(int x, int y, @NotNull ButtonBinding button, boolean display)
|
||||||
|
{
|
||||||
|
if (display)
|
||||||
|
LambdaControlsRenderer.drawButton(x, y, button, this.client);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawTip(int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull VertexConsumerProvider.Immediate immediate, @NotNull Matrix4f matrix4f)
|
||||||
|
{
|
||||||
|
this.drawTip(x, y, button.getTranslationKey(), display, immediate, matrix4f);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawTip(int x, int y, @NotNull String action, boolean display, @NotNull VertexConsumerProvider.Immediate immediate, @NotNull Matrix4f matrix4f)
|
||||||
|
{
|
||||||
|
if (!display)
|
||||||
|
return;
|
||||||
|
String translatedAction = I18n.translate(action);
|
||||||
|
int textY = (LambdaControlsRenderer.ICON_SIZE / 2 - this.client.textRenderer.fontHeight / 2) + 1;
|
||||||
|
client.textRenderer.draw(translatedAction, (float) x, (float) (y + textY), 14737632, true, matrix4f, immediate,
|
||||||
|
false, 0, 15728880);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,297 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.gui;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.font.TextRenderer;
|
||||||
|
import net.minecraft.client.gui.DrawableHelper;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
||||||
|
import net.minecraft.client.resource.language.I18n;
|
||||||
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
import net.minecraft.container.Slot;
|
||||||
|
import org.aperlambda.lambdacommon.utils.Pair;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents the LambdaControls renderer.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
public class LambdaControlsRenderer
|
||||||
|
{
|
||||||
|
public static final int ICON_SIZE = 20;
|
||||||
|
private static final int BUTTON_SIZE = 15;
|
||||||
|
private static final int AXIS_SIZE = 18;
|
||||||
|
|
||||||
|
public static int getButtonSize(int button)
|
||||||
|
{
|
||||||
|
switch (button) {
|
||||||
|
case -1:
|
||||||
|
return 0;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
|
||||||
|
return AXIS_SIZE;
|
||||||
|
default:
|
||||||
|
return BUTTON_SIZE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the binding icon width.
|
||||||
|
*
|
||||||
|
* @param binding The binding.
|
||||||
|
* @return The width.
|
||||||
|
*/
|
||||||
|
public static int getBindingIconWidth(@NotNull ButtonBinding binding)
|
||||||
|
{
|
||||||
|
return getBindingIconWidth(binding.getButton());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the binding icon width.
|
||||||
|
*
|
||||||
|
* @param buttons The buttons.
|
||||||
|
* @return The width.
|
||||||
|
*/
|
||||||
|
public static int getBindingIconWidth(int[] buttons)
|
||||||
|
{
|
||||||
|
int width = 0;
|
||||||
|
for (int i = 0; i < buttons.length; i++) {
|
||||||
|
width += ICON_SIZE;
|
||||||
|
if (i + 1 < buttons.length) {
|
||||||
|
width += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return width;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Pair<Integer, Integer> drawButton(int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
return drawButton(x, y, button.getButton(), client);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Pair<Integer, Integer> drawButton(int x, int y, int[] buttons, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
int height = 0;
|
||||||
|
int length = 0;
|
||||||
|
int currentX = x;
|
||||||
|
for (int i = 0; i < buttons.length; i++) {
|
||||||
|
int btn = buttons[i];
|
||||||
|
int size = drawButton(currentX, y, btn, client);
|
||||||
|
if (size > height)
|
||||||
|
height = size;
|
||||||
|
length += size;
|
||||||
|
if (i + 1 < buttons.length) {
|
||||||
|
length += 2;
|
||||||
|
currentX = x + length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Pair.of(length, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecated")
|
||||||
|
public static int drawButton(int x, int y, int button, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
boolean second = false;
|
||||||
|
if (button == -1)
|
||||||
|
return 0;
|
||||||
|
else if (button >= 500) {
|
||||||
|
button -= 1000;
|
||||||
|
second = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int controllerType = LambdaControlsClient.get().config.getControllerType().getId();
|
||||||
|
boolean axis = false;
|
||||||
|
int buttonOffset = button * 15;
|
||||||
|
switch (button) {
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER:
|
||||||
|
buttonOffset = 7 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER:
|
||||||
|
buttonOffset = 8 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_BACK:
|
||||||
|
buttonOffset = 4 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_START:
|
||||||
|
buttonOffset = 6 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_GUIDE:
|
||||||
|
buttonOffset = 5 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_LEFT_THUMB:
|
||||||
|
buttonOffset = 15 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB:
|
||||||
|
buttonOffset = 16 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 100:
|
||||||
|
buttonOffset = 0;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 100:
|
||||||
|
buttonOffset = 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 100:
|
||||||
|
buttonOffset = 2 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 100:
|
||||||
|
buttonOffset = 3 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_X + 200:
|
||||||
|
buttonOffset = 4 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y + 200:
|
||||||
|
buttonOffset = 5 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X + 200:
|
||||||
|
buttonOffset = 6 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y + 200:
|
||||||
|
buttonOffset = 7 * 18;
|
||||||
|
axis = true;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER + 200:
|
||||||
|
buttonOffset = 9 * 15;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 100:
|
||||||
|
case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 200:
|
||||||
|
buttonOffset = 10 * 15;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
client.getTextureManager().bindTexture(axis ? LambdaControlsClient.CONTROLLER_AXIS : LambdaControlsClient.CONTROLLER_BUTTONS);
|
||||||
|
RenderSystem.disableDepthTest();
|
||||||
|
|
||||||
|
int assetSize = axis ? AXIS_SIZE : BUTTON_SIZE;
|
||||||
|
|
||||||
|
RenderSystem.color4f(1.0F, second ? 0.0F : 1.0F, 1.0F, 1.0F);
|
||||||
|
DrawableHelper.blit(x + (ICON_SIZE / 2 - assetSize / 2), y + (ICON_SIZE / 2 - assetSize / 2),
|
||||||
|
(float) buttonOffset, (float) (controllerType * (axis ? AXIS_SIZE : BUTTON_SIZE)),
|
||||||
|
assetSize, assetSize,
|
||||||
|
256, 256);
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
|
||||||
|
return ICON_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int drawButtonTip(int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
return drawButtonTip(x, y, button.getButton(), button.getTranslationKey(), display, client);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int drawButtonTip(int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
if (display) {
|
||||||
|
int buttonWidth = drawButton(x, y, button, client).key;
|
||||||
|
|
||||||
|
String translatedAction = I18n.translate(action);
|
||||||
|
int textY = (LambdaControlsRenderer.ICON_SIZE / 2 - client.textRenderer.fontHeight / 2) + 1;
|
||||||
|
|
||||||
|
return client.textRenderer.drawWithShadow(translatedAction, (float) (x + buttonWidth + 2), (float) (y + textY), 14737632);
|
||||||
|
}
|
||||||
|
|
||||||
|
return -10;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int getButtonTipWidth(@NotNull String action, @NotNull TextRenderer textRenderer)
|
||||||
|
{
|
||||||
|
return 15 + 5 + textRenderer.getStringWidth(action);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderVirtualCursor(@NotNull MatrixStack matrices, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
if (!LambdaControlsClient.get().config.hasVirtualMouse() || client.currentScreen == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
int mouseX = (int) (client.mouse.getX() * (double) client.getWindow().getScaledWidth() / (double) client.getWindow().getWidth());
|
||||||
|
int mouseY = (int) (client.mouse.getY() * (double) client.getWindow().getScaledHeight() / (double) client.getWindow().getHeight());
|
||||||
|
|
||||||
|
boolean hoverSlot = false;
|
||||||
|
|
||||||
|
if (client.currentScreen instanceof ContainerScreen) {
|
||||||
|
ContainerScreen inventoryScreen = (ContainerScreen) client.currentScreen;
|
||||||
|
ContainerScreenAccessor accessor = (ContainerScreenAccessor) inventoryScreen;
|
||||||
|
int guiLeft = accessor.getX();
|
||||||
|
int guiTop = accessor.getY();
|
||||||
|
|
||||||
|
// Finds the closest slot in the GUI within 14 pixels.
|
||||||
|
int finalMouseX = mouseX;
|
||||||
|
int finalMouseY = mouseY;
|
||||||
|
Optional<Pair<Slot, Double>> closestSlot = inventoryScreen.getContainer().slots.parallelStream()
|
||||||
|
.map(slot -> {
|
||||||
|
int x = guiLeft + slot.xPosition + 8;
|
||||||
|
int y = guiTop + slot.yPosition + 8;
|
||||||
|
|
||||||
|
// Distance between the slot and the cursor.
|
||||||
|
double distance = Math.sqrt(Math.pow(x - finalMouseX, 2) + Math.pow(y - finalMouseY, 2));
|
||||||
|
return Pair.of(slot, distance);
|
||||||
|
}).filter(entry -> entry.value <= 9.0)
|
||||||
|
.min(Comparator.comparingDouble(p -> p.value));
|
||||||
|
|
||||||
|
if (closestSlot.isPresent()) {
|
||||||
|
Slot slot = closestSlot.get().key;
|
||||||
|
mouseX = guiLeft + slot.xPosition;
|
||||||
|
mouseY = guiTop + slot.yPosition;
|
||||||
|
hoverSlot = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hoverSlot) {
|
||||||
|
mouseX -= 8;
|
||||||
|
mouseY -= 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
drawCursor(matrices, mouseX, mouseY, hoverSlot, client);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws the virtual cursor.
|
||||||
|
*
|
||||||
|
* @param matrices The matrix stack.
|
||||||
|
* @param x X coordinate.
|
||||||
|
* @param y Y coordinate.
|
||||||
|
* @param hoverSlot True if hovering a slot, else false.
|
||||||
|
* @param client The client instance.
|
||||||
|
*/
|
||||||
|
public static void drawCursor(@NotNull MatrixStack matrices, int x, int y, boolean hoverSlot, @NotNull MinecraftClient client)
|
||||||
|
{
|
||||||
|
client.getTextureManager().bindTexture(LambdaControlsClient.CURSOR_TEXTURE);
|
||||||
|
|
||||||
|
RenderSystem.disableDepthTest();
|
||||||
|
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
DrawableHelper.blit(x, y, hoverSlot ? 16.F : 0.F, LambdaControlsClient.get().config.getVirtualMouseSkin().ordinal() * 16.F, 16, 16, 32, 64);
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,13 +23,11 @@ import net.minecraft.client.gui.screen.Screen;
|
|||||||
import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
|
import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
|
||||||
import net.minecraft.client.gui.widget.ButtonListWidget;
|
import net.minecraft.client.gui.widget.ButtonListWidget;
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
import net.minecraft.client.options.GameOptions;
|
|
||||||
import net.minecraft.client.options.Option;
|
import net.minecraft.client.options.Option;
|
||||||
import net.minecraft.client.resource.language.I18n;
|
import net.minecraft.client.resource.language.I18n;
|
||||||
import net.minecraft.text.TranslatableText;
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.minecraft.util.Util;
|
import net.minecraft.util.Util;
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -47,6 +45,8 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
private final Option mouseSpeedOption;
|
private final Option mouseSpeedOption;
|
||||||
private final Option resetOption;
|
private final Option resetOption;
|
||||||
// Gameplay options
|
// Gameplay options
|
||||||
|
private final Option autoJumpOption;
|
||||||
|
private final Option fastBlockPlacingOption;
|
||||||
private final Option frontBlockPlacingOption;
|
private final Option frontBlockPlacingOption;
|
||||||
private final Option flyDriftingOption;
|
private final Option flyDriftingOption;
|
||||||
private final Option flyVerticalDriftingOption;
|
private final Option flyVerticalDriftingOption;
|
||||||
@@ -58,6 +58,8 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
private final Option invertsRightXAxis;
|
private final Option invertsRightXAxis;
|
||||||
private final Option invertsRightYAxis;
|
private final Option invertsRightYAxis;
|
||||||
private final Option unfocusedInputOption;
|
private final Option unfocusedInputOption;
|
||||||
|
private final Option virtualMouseOption;
|
||||||
|
private final Option virtualMouseSkinOption;
|
||||||
// Hud options
|
// Hud options
|
||||||
private final Option hudEnableOption;
|
private final Option hudEnableOption;
|
||||||
private final Option hudSideOption;
|
private final Option hudSideOption;
|
||||||
@@ -65,7 +67,7 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
private ButtonListWidget list;
|
private ButtonListWidget list;
|
||||||
private SpruceLabelWidget gamepadToolUrlLabel;
|
private SpruceLabelWidget gamepadToolUrlLabel;
|
||||||
|
|
||||||
public LambdaControlsSettingsScreen(Screen parent, @NotNull GameOptions options, boolean hideControls)
|
public LambdaControlsSettingsScreen(Screen parent, boolean hideControls)
|
||||||
{
|
{
|
||||||
super(new TranslatableText("lambdacontrols.title.settings"));
|
super(new TranslatableText("lambdacontrols.title.settings"));
|
||||||
this.mod = LambdaControlsClient.get();
|
this.mod = LambdaControlsClient.get();
|
||||||
@@ -94,6 +96,9 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
|
this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
|
||||||
});
|
});
|
||||||
// Gameplay options
|
// Gameplay options
|
||||||
|
this.autoJumpOption = SpruceBooleanOption.fromVanilla("options.autoJump", Option.AUTO_JUMP, null, true);
|
||||||
|
this.fastBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.fast_block_placing", this.mod.config::hasFastBlockPlacing,
|
||||||
|
this.mod.config::setFastBlockPlacing, new TranslatableText("lambdacontrols.tooltip.fast_block_placing"), true);
|
||||||
this.frontBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.front_block_placing", this.mod.config::hasFrontBlockPlacing,
|
this.frontBlockPlacingOption = new SpruceBooleanOption("lambdacontrols.menu.front_block_placing", this.mod.config::hasFrontBlockPlacing,
|
||||||
this.mod.config::setFrontBlockPlacing, new TranslatableText("lambdacontrols.tooltip.front_block_placing"), true);
|
this.mod.config::setFrontBlockPlacing, new TranslatableText("lambdacontrols.tooltip.front_block_placing"), true);
|
||||||
this.flyDriftingOption = new SpruceBooleanOption("lambdacontrols.menu.fly_drifting", this.mod.config::hasFlyDrifting,
|
this.flyDriftingOption = new SpruceBooleanOption("lambdacontrols.menu.fly_drifting", this.mod.config::hasFlyDrifting,
|
||||||
@@ -160,6 +165,12 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
}, null, true);
|
}, null, true);
|
||||||
this.unfocusedInputOption = new SpruceBooleanOption("lambdacontrols.menu.unfocused_input", this.mod.config::hasUnfocusedInput,
|
this.unfocusedInputOption = new SpruceBooleanOption("lambdacontrols.menu.unfocused_input", this.mod.config::hasUnfocusedInput,
|
||||||
this.mod.config::setUnfocusedInput, new TranslatableText("lambdacontrols.tooltip.unfocused_input"), true);
|
this.mod.config::setUnfocusedInput, new TranslatableText("lambdacontrols.tooltip.unfocused_input"), true);
|
||||||
|
this.virtualMouseOption = new SpruceBooleanOption("lambdacontrols.menu.virtual_mouse", this.mod.config::hasVirtualMouse,
|
||||||
|
this.mod.config::setVirtualMouse, new TranslatableText("lambdacontrols.tooltip.virtual_mouse"), true);
|
||||||
|
this.virtualMouseSkinOption = new SpruceCyclingOption("lambdacontrols.menu.virtual_mouse.skin",
|
||||||
|
amount -> this.mod.config.setVirtualMouseSkin(this.mod.config.getVirtualMouseSkin().next()),
|
||||||
|
option -> option.getDisplayPrefix() + this.mod.config.getVirtualMouseSkin().getTranslatedName(),
|
||||||
|
null);
|
||||||
// HUD options
|
// HUD options
|
||||||
this.hudEnableOption = new SpruceBooleanOption("lambdacontrols.menu.hud_enable", this.mod.config::isHudEnabled,
|
this.hudEnableOption = new SpruceBooleanOption("lambdacontrols.menu.hud_enable", this.mod.config::isHudEnabled,
|
||||||
this.mod::setHudEnabled, new TranslatableText("lambdacontrols.tooltip.hud_enable"), true);
|
this.mod::setHudEnabled, new TranslatableText("lambdacontrols.tooltip.hud_enable"), true);
|
||||||
@@ -223,7 +234,8 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
this.list.addSingleOptionEntry(this.autoSwitchModeOption);
|
this.list.addSingleOptionEntry(this.autoSwitchModeOption);
|
||||||
// Gameplay options
|
// Gameplay options
|
||||||
this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.gameplay", true, null));
|
this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.gameplay", true, null));
|
||||||
this.list.addSingleOptionEntry(this.frontBlockPlacingOption);
|
this.list.addSingleOptionEntry(this.autoJumpOption);
|
||||||
|
this.list.addOptionEntry(this.fastBlockPlacingOption, this.frontBlockPlacingOption);
|
||||||
this.list.addSingleOptionEntry(this.flyDriftingOption);
|
this.list.addSingleOptionEntry(this.flyDriftingOption);
|
||||||
this.list.addSingleOptionEntry(this.flyVerticalDriftingOption);
|
this.list.addSingleOptionEntry(this.flyVerticalDriftingOption);
|
||||||
// Controller options
|
// Controller options
|
||||||
@@ -232,7 +244,8 @@ public class LambdaControlsSettingsScreen extends Screen
|
|||||||
this.list.addSingleOptionEntry(this.secondControllerOption);
|
this.list.addSingleOptionEntry(this.secondControllerOption);
|
||||||
this.list.addOptionEntry(this.controllerTypeOption, this.deadZoneOption);
|
this.list.addOptionEntry(this.controllerTypeOption, this.deadZoneOption);
|
||||||
this.list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
|
this.list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
|
||||||
this.list.addSingleOptionEntry(this.unfocusedInputOption);
|
this.list.addOptionEntry(this.unfocusedInputOption, this.virtualMouseOption);
|
||||||
|
this.list.addSingleOptionEntry(this.virtualMouseSkinOption);
|
||||||
this.list.addSingleOptionEntry(new ReloadControllerMappingsOption());
|
this.list.addSingleOptionEntry(new ReloadControllerMappingsOption());
|
||||||
// HUD options
|
// HUD options
|
||||||
this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.hud", true, null));
|
this.list.addSingleOptionEntry(new SpruceSeparatorOption("lambdacontrols.menu.title.hud", true, null));
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import net.minecraft.client.gui.screen.Screen;
|
|||||||
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
import net.minecraft.client.gui.widget.TexturedButtonWidget;
|
import net.minecraft.client.gui.widget.TexturedButtonWidget;
|
||||||
import net.minecraft.server.network.packet.PlayerActionC2SPacket;
|
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.util.Arm;
|
import net.minecraft.util.Arm;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
|||||||
@@ -17,5 +17,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
|
|||||||
public interface AbstractButtonWidgetAccessor
|
public interface AbstractButtonWidgetAccessor
|
||||||
{
|
{
|
||||||
@Accessor("height")
|
@Accessor("height")
|
||||||
int lambdacontrols_getHeight();
|
int getHeight();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,11 +25,11 @@ import java.util.Map;
|
|||||||
public interface AdvancementsScreenAccessor
|
public interface AdvancementsScreenAccessor
|
||||||
{
|
{
|
||||||
@Accessor("advancementHandler")
|
@Accessor("advancementHandler")
|
||||||
ClientAdvancementManager lambdacontrols_getAdvancementManager();
|
ClientAdvancementManager getAdvancementManager();
|
||||||
|
|
||||||
@Accessor("tabs")
|
@Accessor("tabs")
|
||||||
Map<Advancement, AdvancementTab> lambdacontrols_getTabs();
|
Map<Advancement, AdvancementTab> getTabs();
|
||||||
|
|
||||||
@Accessor("selectedTab")
|
@Accessor("selectedTab")
|
||||||
AdvancementTab lambdacontrols_getSelectedTab();
|
AdvancementTab getSelectedTab();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import me.lambdaurora.lambdacontrols.LambdaControls;
|
|||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
|
import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
|
||||||
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||||
import net.minecraft.client.network.packet.GameJoinS2CPacket;
|
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
public class ClientPlayNetworkHandlerMixin
|
public class ClientPlayNetworkHandlerMixin
|
||||||
{
|
{
|
||||||
@Inject(method = "onGameJoin", at = @At(value = "TAIL"))
|
@Inject(method = "onGameJoin", at = @At(value = "TAIL"))
|
||||||
private void lambdacontrols_onConnect(GameJoinS2CPacket packet, CallbackInfo ci)
|
private void onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci)
|
||||||
{
|
{
|
||||||
ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.HELLO_CHANNEL, LambdaControls.get().makeHello(LambdaControlsClient.get().config.getControlsMode()));
|
ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.HELLO_CHANNEL, LambdaControls.get().makeHello(LambdaControlsClient.get().config.getControlsMode()));
|
||||||
ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.CONTROLS_MODE_CHANNEL,
|
ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.CONTROLS_MODE_CHANNEL,
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
|
@Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
|
||||||
public void lambdacontrols_move(MovementType type, Vec3d movement, CallbackInfo ci)
|
public void onMove(MovementType type, Vec3d movement, CallbackInfo ci)
|
||||||
{
|
{
|
||||||
LambdaControlsClient mod = LambdaControlsClient.get();
|
LambdaControlsClient mod = LambdaControlsClient.get();
|
||||||
if (type == MovementType.SELF) {
|
if (type == MovementType.SELF) {
|
||||||
@@ -70,7 +70,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
|
@Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
|
||||||
public void lambdacontrols_tickMovement(CallbackInfo ci)
|
public void onTickMovement(CallbackInfo ci)
|
||||||
{
|
{
|
||||||
if (this.abilities.flying && this.isCamera()) {
|
if (this.abilities.flying && this.isCamera()) {
|
||||||
if (LambdaControlsClient.get().config.hasFlyVerticalDrifting())
|
if (LambdaControlsClient.get().config.hasFlyVerticalDrifting())
|
||||||
|
|||||||
@@ -11,12 +11,16 @@ package me.lambdaurora.lambdacontrols.client.mixin;
|
|||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.ControlsMode;
|
import me.lambdaurora.lambdacontrols.ControlsMode;
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.compat.LambdaControlsCompat;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer;
|
||||||
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.ContainerScreenAccessor;
|
||||||
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
import net.minecraft.client.gui.screen.ingame.ContainerScreen;
|
||||||
import net.minecraft.container.Slot;
|
import net.minecraft.container.Slot;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
@@ -28,35 +32,30 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(ContainerScreen.class)
|
@Mixin(ContainerScreen.class)
|
||||||
public abstract class ContainerScreenMixin implements ContainerScreenAccessor
|
public abstract class ContainerScreenMixin implements ContainerScreenAccessor
|
||||||
{
|
{
|
||||||
protected int x;
|
@Accessor("x")
|
||||||
protected int y;
|
public abstract int getX();
|
||||||
|
|
||||||
@Override
|
@Accessor("y")
|
||||||
public int lambdacontrols_getX()
|
public abstract int getY();
|
||||||
{
|
|
||||||
return this.x;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int lambdacontrols_getY()
|
|
||||||
{
|
|
||||||
return this.y;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Invoker("getSlotAt")
|
@Invoker("getSlotAt")
|
||||||
public abstract Slot lambdacontrols_getSlotAt(double posX, double posY);
|
public abstract Slot lambdacontrols_getSlotAt(double posX, double posY);
|
||||||
|
|
||||||
@Inject(method = "render", at = @At("RETURN"))
|
@Inject(method = "render", at = @At("RETURN"))
|
||||||
public void render(int mouseX, int mouseY, float delta, CallbackInfo ci)
|
public void onRender(int mouseX, int mouseY, float delta, CallbackInfo ci)
|
||||||
{
|
{
|
||||||
if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
|
if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
|
||||||
MinecraftClient client = MinecraftClient.getInstance();
|
MinecraftClient client = MinecraftClient.getInstance();
|
||||||
int x = 10, y = client.getWindow().getScaledHeight() - 10 - 15;
|
int x = 2, y = client.getWindow().getScaledHeight() - 2 - LambdaControlsRenderer.ICON_SIZE;
|
||||||
|
|
||||||
x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "lambdacontrols.action.pickup_all", true, client) + 10;
|
x = LambdaControlsRenderer.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "lambdacontrols.action.pickup_all", true, client) + 2;
|
||||||
x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "lambdacontrols.action.exit", true, client) + 10;
|
x = LambdaControlsRenderer.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "lambdacontrols.action.exit", true, client) + 2;
|
||||||
x += LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "lambdacontrols.action.pickup", true, client) + 10;
|
if (LambdaControlsCompat.isReiPresent()) {
|
||||||
LambdaControlsClient.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "lambdacontrols.action.quick_move", true, client);
|
x = 2;
|
||||||
|
y -= 24;
|
||||||
|
}
|
||||||
|
x = LambdaControlsRenderer.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "lambdacontrols.action.pickup", true, client) + 2;
|
||||||
|
LambdaControlsRenderer.drawButtonTip(x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "lambdacontrols.action.quick_move", true, client);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,12 +35,12 @@ public class ControlsOptionsScreenMixin extends GameOptionsScreen
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/options/ControlsOptionsScreen;addButton(Lnet/minecraft/client/gui/widget/AbstractButtonWidget;)Lnet/minecraft/client/gui/widget/AbstractButtonWidget;", ordinal = 1))
|
@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/options/ControlsOptionsScreen;addButton(Lnet/minecraft/client/gui/widget/AbstractButtonWidget;)Lnet/minecraft/client/gui/widget/AbstractButtonWidget;", ordinal = 1))
|
||||||
private AbstractButtonWidget on_init(ControlsOptionsScreen screen, AbstractButtonWidget btn)
|
private AbstractButtonWidget onInit(ControlsOptionsScreen screen, AbstractButtonWidget btn)
|
||||||
{
|
{
|
||||||
if (this.parent instanceof ControllerControlsScreen)
|
if (this.parent instanceof ControllerControlsScreen)
|
||||||
return this.addButton(btn);
|
return this.addButton(btn);
|
||||||
else
|
else
|
||||||
return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).lambdacontrols_getHeight(), I18n.translate("menu.options"),
|
return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).getHeight(), I18n.translate("menu.options"),
|
||||||
b -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, this.gameOptions, true))));
|
b -> this.minecraft.openScreen(new LambdaControlsSettingsScreen(this, true))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public interface CreativeInventoryScreenAccessor
|
|||||||
* @return The selected tab index.
|
* @return The selected tab index.
|
||||||
*/
|
*/
|
||||||
@Accessor("selectedTab")
|
@Accessor("selectedTab")
|
||||||
int lambdacontrols_getSelectedTab();
|
int getSelectedTab();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the selected tab.
|
* Sets the selected tab.
|
||||||
@@ -48,4 +48,12 @@ public interface CreativeInventoryScreenAccessor
|
|||||||
*/
|
*/
|
||||||
@Invoker("isCreativeInventorySlot")
|
@Invoker("isCreativeInventorySlot")
|
||||||
boolean lambdacontrols_isCreativeInventorySlot(@Nullable Slot slot);
|
boolean lambdacontrols_isCreativeInventorySlot(@Nullable Slot slot);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether the current tab has a scrollbar or not.
|
||||||
|
*
|
||||||
|
* @return True if the current tab has a scrollbar, else false.
|
||||||
|
*/
|
||||||
|
@Invoker("hasScrollbar")
|
||||||
|
boolean lambdacontrols_hasScrollbar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.client.options.GameOptions;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a mixin to GameOptions.
|
||||||
|
* <p>
|
||||||
|
* Sets the default of the Auto-Jump option to false.
|
||||||
|
*/
|
||||||
|
@Mixin(GameOptions.class)
|
||||||
|
public class GameOptionsMixin
|
||||||
|
{
|
||||||
|
@Shadow
|
||||||
|
public boolean autoJump;
|
||||||
|
|
||||||
|
@Inject(method = "load", at = @At("HEAD"))
|
||||||
|
public void onInit(CallbackInfo ci)
|
||||||
|
{
|
||||||
|
// Set default value of the Auto-Jump option to false.
|
||||||
|
this.autoJump = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,16 +11,12 @@ package me.lambdaurora.lambdacontrols.client.mixin;
|
|||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.KeyBindingAccessor;
|
||||||
import net.minecraft.client.options.KeyBinding;
|
import net.minecraft.client.options.KeyBinding;
|
||||||
import net.minecraft.client.util.InputUtil;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
|
||||||
@Mixin(KeyBinding.class)
|
@Mixin(KeyBinding.class)
|
||||||
public class KeyBindingMixin implements KeyBindingAccessor
|
public class KeyBindingMixin implements KeyBindingAccessor
|
||||||
{
|
{
|
||||||
@Shadow
|
|
||||||
private InputUtil.KeyCode keyCode;
|
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
private int timesPressed;
|
private int timesPressed;
|
||||||
|
|
||||||
|
|||||||
@@ -11,13 +11,15 @@ package me.lambdaurora.lambdacontrols.client.mixin;
|
|||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
|
import me.lambdaurora.lambdacontrols.LambdaControlsFeature;
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
import net.minecraft.block.BlockState;
|
import me.lambdaurora.lambdacontrols.client.LambdaInput;
|
||||||
import net.minecraft.block.FluidBlock;
|
import me.lambdaurora.lambdacontrols.client.gui.LambdaControlsRenderer;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.util.FrontBlockPlaceResultAccessor;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.client.network.ClientPlayerEntity;
|
import net.minecraft.client.network.ClientPlayerEntity;
|
||||||
import net.minecraft.client.network.ClientPlayerInteractionManager;
|
import net.minecraft.client.network.ClientPlayerInteractionManager;
|
||||||
import net.minecraft.client.render.GameRenderer;
|
import net.minecraft.client.render.GameRenderer;
|
||||||
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.client.world.ClientWorld;
|
import net.minecraft.client.world.ClientWorld;
|
||||||
import net.minecraft.item.BlockItem;
|
import net.minecraft.item.BlockItem;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
@@ -27,7 +29,7 @@ import net.minecraft.util.hit.BlockHitResult;
|
|||||||
import net.minecraft.util.hit.HitResult;
|
import net.minecraft.util.hit.HitResult;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.Vec3d;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
@@ -38,7 +40,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||||
|
|
||||||
@Mixin(MinecraftClient.class)
|
@Mixin(MinecraftClient.class)
|
||||||
public abstract class MinecraftClientMixin
|
public abstract class MinecraftClientMixin implements FrontBlockPlaceResultAccessor
|
||||||
{
|
{
|
||||||
@Shadow
|
@Shadow
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -60,43 +62,97 @@ public abstract class MinecraftClientMixin
|
|||||||
@Final
|
@Final
|
||||||
public GameRenderer gameRenderer;
|
public GameRenderer gameRenderer;
|
||||||
|
|
||||||
|
@Shadow
|
||||||
|
private int itemUseCooldown;
|
||||||
|
|
||||||
|
private BlockHitResult lambdacontrols_frontBlockPlaceResult = null;
|
||||||
|
|
||||||
|
private BlockPos lambdacontrols_lastTargetPos;
|
||||||
|
private Vec3d lambdacontrols_lastPos;
|
||||||
|
private Direction lambdacontrols_lastTargetSide;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable BlockHitResult lambdacontrols_getFrontBlockPlaceResult()
|
||||||
|
{
|
||||||
|
return this.lambdacontrols_frontBlockPlaceResult;
|
||||||
|
}
|
||||||
|
|
||||||
@Inject(method = "<init>", at = @At("RETURN"))
|
@Inject(method = "<init>", at = @At("RETURN"))
|
||||||
private void lambdacontrols_onInit(CallbackInfo ci)
|
private void onInit(CallbackInfo ci)
|
||||||
{
|
{
|
||||||
LambdaControlsClient.get().onMcInit((MinecraftClient) (Object) this);
|
LambdaControlsClient.get().onMcInit((MinecraftClient) (Object) this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "tick", at = @At("HEAD"))
|
||||||
|
private void onStartTick(CallbackInfo ci)
|
||||||
|
{
|
||||||
|
if (this.player == null)
|
||||||
|
return;
|
||||||
|
this.lambdacontrols_frontBlockPlaceResult = LambdaInput.tryFrontPlace(((MinecraftClient) (Object) this));
|
||||||
|
if (!LambdaControlsFeature.FAST_BLOCK_PLACING.isAvailable())
|
||||||
|
return;
|
||||||
|
if (this.lambdacontrols_lastPos == null)
|
||||||
|
this.lambdacontrols_lastPos = this.player.getPos();
|
||||||
|
|
||||||
|
int cooldown = this.itemUseCooldown;
|
||||||
|
BlockHitResult hitResult;
|
||||||
|
if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.BLOCK && this.player.abilities.flying) {
|
||||||
|
hitResult = (BlockHitResult) this.crosshairTarget;
|
||||||
|
BlockPos targetPos = hitResult.getBlockPos();
|
||||||
|
Direction side = hitResult.getSide();
|
||||||
|
|
||||||
|
boolean sidewaysBlockPlacing = this.lambdacontrols_lastTargetPos == null || !targetPos.equals(this.lambdacontrols_lastTargetPos.offset(this.lambdacontrols_lastTargetSide));
|
||||||
|
boolean backwardsBlockPlacing = this.player.input.movementForward < 0.0f && (this.lambdacontrols_lastTargetPos == null || targetPos.equals(this.lambdacontrols_lastTargetPos.offset(this.lambdacontrols_lastTargetSide)));
|
||||||
|
|
||||||
|
if (cooldown > 1
|
||||||
|
&& !targetPos.equals(this.lambdacontrols_lastTargetPos)
|
||||||
|
&& (sidewaysBlockPlacing || backwardsBlockPlacing)) {
|
||||||
|
this.itemUseCooldown = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.lambdacontrols_lastTargetPos = targetPos.toImmutable();
|
||||||
|
this.lambdacontrols_lastTargetSide = side;
|
||||||
|
}
|
||||||
|
// Removed front placing sprinting as way too cheaty.
|
||||||
|
/* else if (this.player.isSprinting()) {
|
||||||
|
hitResult = this.lambdacontrols_frontBlockPlaceResult;
|
||||||
|
if (hitResult != null) {
|
||||||
|
if (cooldown > 0)
|
||||||
|
this.itemUseCooldown = 0;
|
||||||
|
}
|
||||||
|
} */
|
||||||
|
this.lambdacontrols_lastPos = this.player.getPos();
|
||||||
|
}
|
||||||
|
|
||||||
@Inject(method = "render", at = @At("HEAD"))
|
@Inject(method = "render", at = @At("HEAD"))
|
||||||
private void lambdacontrols_onRender(boolean fullRender, CallbackInfo ci)
|
private void onRender(boolean fullRender, CallbackInfo ci)
|
||||||
{
|
{
|
||||||
LambdaControlsClient.get().onRender((MinecraftClient) (Object) (this));
|
LambdaControlsClient.get().onRender((MinecraftClient) (Object) (this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V", shift = At.Shift.AFTER))
|
||||||
|
private void renderVirtualCursor(boolean fullRender, CallbackInfo ci) {
|
||||||
|
LambdaControlsRenderer.renderVirtualCursor(new MatrixStack(), (MinecraftClient) (Object) this);
|
||||||
|
}
|
||||||
|
|
||||||
@Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("RETURN"))
|
@Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("RETURN"))
|
||||||
private void lambdacontrols_onLeave(@Nullable Screen screen, CallbackInfo ci)
|
private void onLeave(@Nullable Screen screen, CallbackInfo ci)
|
||||||
{
|
{
|
||||||
LambdaControlsClient.get().onLeave();
|
LambdaControlsClient.get().onLeave();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "doItemUse()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true)
|
@Inject(method = "doItemUse()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true)
|
||||||
private void lambdacontrols_onItemUse(CallbackInfo ci, Hand[] hands, int handCount, int handIndex, Hand hand, ItemStack stackInHand)
|
private void onItemUse(CallbackInfo ci, Hand[] hands, int handCount, int handIndex, Hand hand, ItemStack stackInHand)
|
||||||
{
|
{
|
||||||
if (!stackInHand.isEmpty() && this.player.pitch > 35.0F && LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable()) {
|
if (!stackInHand.isEmpty() && this.player.pitch > 35.0F && LambdaControlsFeature.FRONT_BLOCK_PLACING.isAvailable()) {
|
||||||
if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.MISS && this.player.onGround) {
|
if (this.crosshairTarget != null && this.crosshairTarget.getType() == HitResult.Type.MISS && this.player.onGround) {
|
||||||
if (!stackInHand.isEmpty() && stackInHand.getItem() instanceof BlockItem) {
|
if (!stackInHand.isEmpty() && stackInHand.getItem() instanceof BlockItem) {
|
||||||
BlockPos playerPos = this.player.getBlockPos().down();
|
BlockHitResult hitResult = LambdaInput.tryFrontPlace(((MinecraftClient) (Object) this));
|
||||||
BlockPos targetPos = new BlockPos(this.crosshairTarget.getPos()).subtract(playerPos);
|
|
||||||
BlockPos vector = new BlockPos(MathHelper.clamp(targetPos.getX(), -1, 1), 0, MathHelper.clamp(targetPos.getZ(), -1, 1));
|
|
||||||
BlockPos blockPos = playerPos.add(vector);
|
|
||||||
|
|
||||||
Direction direction = player.getHorizontalFacing();
|
if (hitResult == null)
|
||||||
|
|
||||||
BlockState adjacentBlockState = this.world.getBlockState(blockPos.offset(direction.getOpposite()));
|
|
||||||
if (adjacentBlockState.isAir() || adjacentBlockState.getBlock() instanceof FluidBlock || (vector.getX() == 0 && vector.getZ() == 0)) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
BlockHitResult hitResult = new BlockHitResult(this.crosshairTarget.getPos(), direction.getOpposite(), blockPos, false);
|
hitResult = LambdaInput.withSideForFrontPlace(hitResult, stackInHand);
|
||||||
|
|
||||||
int previousStackCount = stackInHand.getCount();
|
int previousStackCount = stackInHand.getCount();
|
||||||
ActionResult result = this.interactionManager.interactBlock(this.player, this.world, hand, hitResult);
|
ActionResult result = this.interactionManager.interactBlock(this.player, this.world, hand, hitResult);
|
||||||
|
|||||||
@@ -11,10 +11,11 @@ package me.lambdaurora.lambdacontrols.client.mixin;
|
|||||||
|
|
||||||
import me.lambdaurora.lambdacontrols.ControlsMode;
|
import me.lambdaurora.lambdacontrols.ControlsMode;
|
||||||
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsConfig;
|
||||||
import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
|
import me.lambdaurora.lambdacontrols.client.util.MouseAccessor;
|
||||||
import net.minecraft.client.Mouse;
|
import net.minecraft.client.Mouse;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
@@ -25,22 +26,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(Mouse.class)
|
@Mixin(Mouse.class)
|
||||||
public abstract class MouseMixin implements MouseAccessor
|
public abstract class MouseMixin implements MouseAccessor
|
||||||
{
|
{
|
||||||
@Shadow
|
@Invoker("onCursorPos")
|
||||||
protected abstract void onCursorPos(long window, double x, double y);
|
public abstract void lambdacontrols_onCursorPos(long window, double x, double y);
|
||||||
|
|
||||||
@Shadow
|
|
||||||
protected abstract void onMouseButton(long window, int button, int action, int mods);
|
|
||||||
|
|
||||||
@Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
|
||||||
private void lambdacontrols_onMouseLocked(CallbackInfo ci)
|
private void onMouseLocked(CallbackInfo ci)
|
||||||
{
|
{
|
||||||
if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.TOUCHSCREEN)
|
LambdaControlsConfig config = LambdaControlsClient.get().config;
|
||||||
|
if (config.getControlsMode() == ControlsMode.TOUCHSCREEN || config.hasVirtualMouse())
|
||||||
ci.cancel();
|
ci.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void lambdacontrols_onCursorPos(long window, double x, double y)
|
|
||||||
{
|
|
||||||
this.onCursorPos(window, x, y);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
|
||||||
|
import net.minecraft.client.gui.screen.recipebook.RecipeGroupButtonWidget;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mixin(RecipeBookWidget.class)
|
||||||
|
public interface RecipeBookWidgetAccessor
|
||||||
|
{
|
||||||
|
@Accessor("tabButtons")
|
||||||
|
List<RecipeGroupButtonWidget> getTabButtons();
|
||||||
|
|
||||||
|
@Accessor("currentTab")
|
||||||
|
RecipeGroupButtonWidget getCurrentTab();
|
||||||
|
|
||||||
|
@Accessor("currentTab")
|
||||||
|
void setCurrentTab(RecipeGroupButtonWidget currentTab);
|
||||||
|
|
||||||
|
@Invoker("refreshResults")
|
||||||
|
void lambdacontrols_refreshResults(boolean resetCurrentPage);
|
||||||
|
}
|
||||||
@@ -36,7 +36,7 @@ public class SettingsScreenMixin extends Screen
|
|||||||
private AbstractButtonWidget lambdacontrols_onInit(SettingsScreen screen, AbstractButtonWidget btn)
|
private AbstractButtonWidget lambdacontrols_onInit(SettingsScreen screen, AbstractButtonWidget btn)
|
||||||
{
|
{
|
||||||
if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
|
if (LambdaControlsClient.get().config.getControlsMode() == ControlsMode.CONTROLLER) {
|
||||||
return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).lambdacontrols_getHeight(), btn.getMessage(),
|
return this.addButton(new ButtonWidget(btn.x, btn.y, btn.getWidth(), ((AbstractButtonWidgetAccessor) btn).getHeight(), btn.getMessage(),
|
||||||
b -> this.minecraft.openScreen(new ControllerControlsScreen(this, false))));
|
b -> this.minecraft.openScreen(new ControllerControlsScreen(this, false))));
|
||||||
} else {
|
} else {
|
||||||
return this.addButton(btn);
|
return this.addButton(btn);
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.mixin;
|
||||||
|
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaControlsClient;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.LambdaInput;
|
||||||
|
import me.lambdaurora.lambdacontrols.client.util.FrontBlockPlaceResultAccessor;
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.render.*;
|
||||||
|
import net.minecraft.client.util.math.Matrix4f;
|
||||||
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
import net.minecraft.client.world.ClientWorld;
|
||||||
|
import net.minecraft.entity.EntityContext;
|
||||||
|
import net.minecraft.item.BlockItem;
|
||||||
|
import net.minecraft.item.ItemPlacementContext;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.item.ItemUsageContext;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.hit.BlockHitResult;
|
||||||
|
import net.minecraft.util.hit.HitResult;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.math.Vec3d;
|
||||||
|
import net.minecraft.util.profiler.Profiler;
|
||||||
|
import net.minecraft.util.shape.VoxelShape;
|
||||||
|
import org.spongepowered.asm.mixin.Final;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a mixin to WorldRenderer.
|
||||||
|
* <p>
|
||||||
|
* Handles the rendering of the block outline of the front block placing.
|
||||||
|
*/
|
||||||
|
@Mixin(WorldRenderer.class)
|
||||||
|
public abstract class WorldRendererMixin
|
||||||
|
{
|
||||||
|
@Shadow
|
||||||
|
@Final
|
||||||
|
private MinecraftClient client;
|
||||||
|
|
||||||
|
@Shadow
|
||||||
|
private ClientWorld world;
|
||||||
|
|
||||||
|
@Shadow
|
||||||
|
private static void drawShapeOutline(MatrixStack matrixStack, VertexConsumer vertexConsumer, VoxelShape voxelShape, double d, double e, double f, float g, float h, float i, float j)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
@Inject(
|
||||||
|
method = "render",
|
||||||
|
at = @At(
|
||||||
|
value = "FIELD",
|
||||||
|
target = "Lnet/minecraft/client/MinecraftClient;crosshairTarget:Lnet/minecraft/util/hit/HitResult;",
|
||||||
|
ordinal = 1,
|
||||||
|
shift = At.Shift.AFTER
|
||||||
|
),
|
||||||
|
locals = LocalCapture.CAPTURE_FAILEXCEPTION
|
||||||
|
)
|
||||||
|
private void onOutlineRender(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer,
|
||||||
|
LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci,
|
||||||
|
Profiler profiler, Vec3d cameraPos, double x, double y, double z, Matrix4f modelMatrix, boolean bl, Frustum frustum2, boolean bl3,
|
||||||
|
VertexConsumerProvider.Immediate immediate)
|
||||||
|
{
|
||||||
|
if (this.client.crosshairTarget == null || this.client.crosshairTarget.getType() != HitResult.Type.MISS || !LambdaControlsClient.get().config.shouldRenderFrontBlockOutline())
|
||||||
|
return;
|
||||||
|
BlockHitResult result = ((FrontBlockPlaceResultAccessor) client).lambdacontrols_getFrontBlockPlaceResult();
|
||||||
|
if (result == null)
|
||||||
|
return;
|
||||||
|
BlockPos blockPos = result.getBlockPos();
|
||||||
|
if (this.world.getWorldBorder().contains(blockPos)) {
|
||||||
|
ItemStack stack = this.client.player.getStackInHand(Hand.MAIN_HAND);
|
||||||
|
if (stack == null || !(stack.getItem() instanceof BlockItem))
|
||||||
|
return;
|
||||||
|
Block block = ((BlockItem) stack.getItem()).getBlock();
|
||||||
|
result = LambdaInput.withSideForFrontPlace(result, block);
|
||||||
|
ItemPlacementContext context = new ItemPlacementContext(new ItemUsageContext(this.client.player, Hand.MAIN_HAND, result));
|
||||||
|
VertexConsumer vertexConsumer = immediate.getBuffer(RenderLayer.getLines());
|
||||||
|
BlockState placementState = block.getPlacementState(context);
|
||||||
|
if (placementState == null)
|
||||||
|
return;
|
||||||
|
VoxelShape outlineShape = placementState.getOutlineShape(this.client.world, blockPos, EntityContext.of(camera.getFocusedEntity()));
|
||||||
|
int[] color = LambdaControlsClient.get().config.getFrontBlockOutlineColor();
|
||||||
|
drawShapeOutline(matrices, vertexConsumer, outlineShape, (double) blockPos.getX() - x, (double) blockPos.getY() - y, (double) blockPos.getZ() - z, color[0] / 255.f, color[1] / 255.f, color[2] / 255.f, color[3] / 255.f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,14 +21,14 @@ public interface ContainerScreenAccessor
|
|||||||
*
|
*
|
||||||
* @return The left coordinate of the GUI.
|
* @return The left coordinate of the GUI.
|
||||||
*/
|
*/
|
||||||
int lambdacontrols_getX();
|
int getX();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the top coordinate of the GUI.
|
* Gets the top coordinate of the GUI.
|
||||||
*
|
*
|
||||||
* @return The top coordinate of the GUI.
|
* @return The top coordinate of the GUI.
|
||||||
*/
|
*/
|
||||||
int lambdacontrols_getY();
|
int getY();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the slot at position.
|
* Gets the slot at position.
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
|
||||||
|
*
|
||||||
|
* This file is part of LambdaControls.
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license. For more information,
|
||||||
|
* see the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package me.lambdaurora.lambdacontrols.client.util;
|
||||||
|
|
||||||
|
import net.minecraft.util.hit.BlockHitResult;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents an accessor of the BlockHitResult for the front block placing feature.
|
||||||
|
* <p>
|
||||||
|
* It is implemented by {@link net.minecraft.client.MinecraftClient}.
|
||||||
|
*
|
||||||
|
* @author LambdAurora
|
||||||
|
* @version 1.2.0
|
||||||
|
* @since 1.2.0
|
||||||
|
*/
|
||||||
|
public interface FrontBlockPlaceResultAccessor
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Returns the {@link BlockHitResult} if a block can be placed with the front block placing feature.
|
||||||
|
*
|
||||||
|
* @return If possible a {@link BlockHitResult}, else a null value.
|
||||||
|
*/
|
||||||
|
@Nullable BlockHitResult lambdacontrols_getFrontBlockPlaceResult();
|
||||||
|
}
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
"lambdacontrols.action.pick_block": "Pick Block",
|
"lambdacontrols.action.pick_block": "Pick Block",
|
||||||
"lambdacontrols.action.pickup": "Pickup",
|
"lambdacontrols.action.pickup": "Pickup",
|
||||||
"lambdacontrols.action.pickup_all": "Pickup all",
|
"lambdacontrols.action.pickup_all": "Pickup all",
|
||||||
|
"lambdacontrols.action.place": "Place",
|
||||||
"lambdacontrols.action.player_list": "Player List",
|
"lambdacontrols.action.player_list": "Player List",
|
||||||
"lambdacontrols.action.quick_move": "Quick move",
|
"lambdacontrols.action.quick_move": "Quick move",
|
||||||
"lambdacontrols.action.right": "Right",
|
"lambdacontrols.action.right": "Right",
|
||||||
@@ -79,6 +80,7 @@
|
|||||||
"lambdacontrols.menu.controller_type": "Controller Type",
|
"lambdacontrols.menu.controller_type": "Controller Type",
|
||||||
"lambdacontrols.menu.controls_mode": "Mode",
|
"lambdacontrols.menu.controls_mode": "Mode",
|
||||||
"lambdacontrols.menu.dead_zone": "Dead Zone",
|
"lambdacontrols.menu.dead_zone": "Dead Zone",
|
||||||
|
"lambdacontrols.menu.fast_block_placing": "Fast Block Placing",
|
||||||
"lambdacontrols.menu.fly_drifting": "Fly Drifting",
|
"lambdacontrols.menu.fly_drifting": "Fly Drifting",
|
||||||
"lambdacontrols.menu.fly_drifting_vertical": "Vertical Fly Drifting",
|
"lambdacontrols.menu.fly_drifting_vertical": "Vertical Fly Drifting",
|
||||||
"lambdacontrols.menu.front_block_placing": "Front Block Placing",
|
"lambdacontrols.menu.front_block_placing": "Front Block Placing",
|
||||||
@@ -98,6 +100,8 @@
|
|||||||
"lambdacontrols.menu.title.hud": "HUD Options",
|
"lambdacontrols.menu.title.hud": "HUD Options",
|
||||||
"lambdacontrols.menu.unbound": "Unbound",
|
"lambdacontrols.menu.unbound": "Unbound",
|
||||||
"lambdacontrols.menu.unfocused_input": "Unfocused Input",
|
"lambdacontrols.menu.unfocused_input": "Unfocused Input",
|
||||||
|
"lambdacontrols.menu.virtual_mouse": "Virtual Mouse",
|
||||||
|
"lambdacontrols.menu.virtual_mouse.skin": "Virtual Mouse Skin",
|
||||||
"lambdacontrols.narrator.unbound": "Unbound %s",
|
"lambdacontrols.narrator.unbound": "Unbound %s",
|
||||||
"lambdacontrols.not_bound": "Not bound",
|
"lambdacontrols.not_bound": "Not bound",
|
||||||
"lambdacontrols.tooltip.auto_switch_mode": "If the controls mode should be switched to Controller automatically if one is connected.",
|
"lambdacontrols.tooltip.auto_switch_mode": "If the controls mode should be switched to Controller automatically if one is connected.",
|
||||||
@@ -105,13 +109,19 @@
|
|||||||
"lambdacontrols.tooltip.controller_type": "The controller type to display the correct buttons.",
|
"lambdacontrols.tooltip.controller_type": "The controller type to display the correct buttons.",
|
||||||
"lambdacontrols.tooltip.controls_mode": "The controls mode.",
|
"lambdacontrols.tooltip.controls_mode": "The controls mode.",
|
||||||
"lambdacontrols.tooltip.dead_zone": "The dead zone for the controller's analogue sticks.",
|
"lambdacontrols.tooltip.dead_zone": "The dead zone for the controller's analogue sticks.",
|
||||||
"lambdacontrols.tooltip.fly_drifting": "While flying, enables drifting/inertia.",
|
"lambdacontrols.tooltip.fast_block_placing": "While flying in creative mode, enables fast block placing depending on your speed. §cOn some servers this might be considered as cheating.",
|
||||||
"lambdacontrols.tooltip.fly_drifting_vertical": "While flying, enables vertical drifting/intertia.",
|
"lambdacontrols.tooltip.fly_drifting": "While flying, enables Vanilla drifting/inertia.",
|
||||||
|
"lambdacontrols.tooltip.fly_drifting_vertical": "While flying, enables Vanilla vertical drifting/intertia.",
|
||||||
"lambdacontrols.tooltip.front_block_placing": "Enables front block placing, §cmight be considered cheating on some servers§r.",
|
"lambdacontrols.tooltip.front_block_placing": "Enables front block placing, §cmight be considered cheating on some servers§r.",
|
||||||
"lambdacontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
|
"lambdacontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
|
||||||
"lambdacontrols.tooltip.hud_side": "The position of the HUD.",
|
"lambdacontrols.tooltip.hud_side": "The position of the HUD.",
|
||||||
"lambdacontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
|
"lambdacontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
|
||||||
"lambdacontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.",
|
"lambdacontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.",
|
||||||
"lambdacontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.",
|
"lambdacontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.",
|
||||||
"lambdacontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused."
|
"lambdacontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused.",
|
||||||
|
"lambdacontrols.tooltip.virtual_mouse": "Enable the virtual mouse which is handful in the case of a splitscreen.",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_light": "Default Light",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_dark": "Default Dark",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_light": "Second Light",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_dark": "Second Dark"
|
||||||
}
|
}
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
"lambdacontrols.action.pick_block": "Choisir le bloc",
|
"lambdacontrols.action.pick_block": "Choisir le bloc",
|
||||||
"lambdacontrols.action.pickup": "Prendre",
|
"lambdacontrols.action.pickup": "Prendre",
|
||||||
"lambdacontrols.action.pickup_all": "Prendre tout",
|
"lambdacontrols.action.pickup_all": "Prendre tout",
|
||||||
|
"lambdacontrols.action.place": "Placer",
|
||||||
"lambdacontrols.action.player_list": "Afficher la liste des joueurs",
|
"lambdacontrols.action.player_list": "Afficher la liste des joueurs",
|
||||||
"lambdacontrols.action.quick_move": "Mouvement rapide",
|
"lambdacontrols.action.quick_move": "Mouvement rapide",
|
||||||
"lambdacontrols.action.right": "Aller à droite",
|
"lambdacontrols.action.right": "Aller à droite",
|
||||||
@@ -98,6 +99,8 @@
|
|||||||
"lambdacontrols.menu.title.hud": "Options du HUD",
|
"lambdacontrols.menu.title.hud": "Options du HUD",
|
||||||
"lambdacontrols.menu.unbound": "Délier",
|
"lambdacontrols.menu.unbound": "Délier",
|
||||||
"lambdacontrols.menu.unfocused_input": "Entrée en fond",
|
"lambdacontrols.menu.unfocused_input": "Entrée en fond",
|
||||||
|
"lambdacontrols.menu.virtual_mouse": "Souris virtuelle",
|
||||||
|
"lambdacontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
|
||||||
"lambdacontrols.narrator.unbound": "Délier %s",
|
"lambdacontrols.narrator.unbound": "Délier %s",
|
||||||
"lambdacontrols.not_bound": "Non défini",
|
"lambdacontrols.not_bound": "Non défini",
|
||||||
"lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
|
"lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
|
||||||
@@ -105,13 +108,18 @@
|
|||||||
"lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
|
"lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
|
||||||
"lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
|
"lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
|
||||||
"lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
|
"lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
|
||||||
"lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement.",
|
"lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
|
||||||
"lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical.",
|
"lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
|
||||||
"lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
|
"lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
|
||||||
"lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
|
"lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
|
||||||
"lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
|
"lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
|
||||||
"lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
|
"lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
|
||||||
"lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
|
"lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
|
||||||
"lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
|
"lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
|
||||||
"lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée."
|
"lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
|
||||||
|
"lambdacontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_light": "défaut clair",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_dark": "défaut foncé",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_light": "second clair",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_dark": "second foncé"
|
||||||
}
|
}
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
"lambdacontrols.action.pick_block": "Choisir le bloc",
|
"lambdacontrols.action.pick_block": "Choisir le bloc",
|
||||||
"lambdacontrols.action.pickup": "Prendre",
|
"lambdacontrols.action.pickup": "Prendre",
|
||||||
"lambdacontrols.action.pickup_all": "Prendre tout",
|
"lambdacontrols.action.pickup_all": "Prendre tout",
|
||||||
|
"lambdacontrols.action.place": "Placer",
|
||||||
"lambdacontrols.action.player_list": "Afficher la liste des joueurs",
|
"lambdacontrols.action.player_list": "Afficher la liste des joueurs",
|
||||||
"lambdacontrols.action.quick_move": "Mouvement rapide",
|
"lambdacontrols.action.quick_move": "Mouvement rapide",
|
||||||
"lambdacontrols.action.right": "Aller à droite",
|
"lambdacontrols.action.right": "Aller à droite",
|
||||||
@@ -98,6 +99,8 @@
|
|||||||
"lambdacontrols.menu.title.hud": "Options du HUD",
|
"lambdacontrols.menu.title.hud": "Options du HUD",
|
||||||
"lambdacontrols.menu.unbound": "Délier",
|
"lambdacontrols.menu.unbound": "Délier",
|
||||||
"lambdacontrols.menu.unfocused_input": "Entrée en fond",
|
"lambdacontrols.menu.unfocused_input": "Entrée en fond",
|
||||||
|
"lambdacontrols.menu.virtual_mouse": "Souris virtuelle",
|
||||||
|
"lambdacontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
|
||||||
"lambdacontrols.narrator.unbound": "Délier %s",
|
"lambdacontrols.narrator.unbound": "Délier %s",
|
||||||
"lambdacontrols.not_bound": "Non défini",
|
"lambdacontrols.not_bound": "Non défini",
|
||||||
"lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
|
"lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
|
||||||
@@ -105,13 +108,18 @@
|
|||||||
"lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
|
"lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
|
||||||
"lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
|
"lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
|
||||||
"lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
|
"lambdacontrols.tooltip.dead_zone": "Zone morte des axes de la manette.",
|
||||||
"lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement.",
|
"lambdacontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
|
||||||
"lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical.",
|
"lambdacontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
|
||||||
"lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
|
"lambdacontrols.tooltip.front_block_placing": "Active le placement avant de blocs, §cpeut être considérer comme de la trice sur certains serveurs§r.",
|
||||||
"lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
|
"lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
|
||||||
"lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
|
"lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
|
||||||
"lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
|
"lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
|
||||||
"lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
|
"lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
|
||||||
"lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
|
"lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
|
||||||
"lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée."
|
"lambdacontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
|
||||||
|
"lambdacontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_light": "défaut clair",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.default_dark": "défaut foncé",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_light": "second clair",
|
||||||
|
"lambdacontrols.virtual_mouse.skin.second_dark": "second foncé"
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -13,14 +13,21 @@ auto_switch_mode = false
|
|||||||
|
|
||||||
# Gameplay settings
|
# Gameplay settings
|
||||||
[gameplay]
|
[gameplay]
|
||||||
# Enables front block placing like in Bedrock Edition.
|
# Enables fast block placing like in Bedrock Edition.
|
||||||
front_block_placing = false
|
fast_block_placing = true
|
||||||
# Fly behaviors
|
# Fly behaviors
|
||||||
[gameplay.fly]
|
[gameplay.fly]
|
||||||
# Enables fly drifting.
|
# Enables fly drifting.
|
||||||
drifting = false
|
drifting = false
|
||||||
# Enables vertical fly drifting.
|
# Enables vertical fly drifting.
|
||||||
vertical_drifting = true
|
vertical_drifting = true
|
||||||
|
[gameplay.front_block_placing]
|
||||||
|
# Enables front block placing like in Bedrock Edition.
|
||||||
|
enabled = false
|
||||||
|
# Enables front block placing outline.
|
||||||
|
outline = true
|
||||||
|
# The color in a hexadecimal format of the outline.
|
||||||
|
outline_color = "#ffffff66"
|
||||||
|
|
||||||
# Controller settings
|
# Controller settings
|
||||||
[controller]
|
[controller]
|
||||||
@@ -42,6 +49,10 @@ auto_switch_mode = false
|
|||||||
invert_right_y_axis = false
|
invert_right_y_axis = false
|
||||||
# Allow unfocused input.
|
# Allow unfocused input.
|
||||||
unfocused_input = false
|
unfocused_input = false
|
||||||
|
# Virtual mouse.
|
||||||
|
virtual_mouse = false
|
||||||
|
# Virtual mouse skin
|
||||||
|
virtual_mouse_skin = "default_light"
|
||||||
# Controller controls.
|
# Controller controls.
|
||||||
[controller.controls]
|
[controller.controls]
|
||||||
# Attack control.
|
# Attack control.
|
||||||
@@ -88,10 +99,10 @@ auto_switch_mode = false
|
|||||||
sprint = "9"
|
sprint = "9"
|
||||||
# Swap hands control.
|
# Swap hands control.
|
||||||
swap_hands = "2"
|
swap_hands = "2"
|
||||||
# Switch to left tab control.
|
# Switch to back tab control.
|
||||||
tab_left = "4"
|
tab_back = "4"
|
||||||
# Switch to right tab control.
|
# Switch to next tab control.
|
||||||
tab_right = "5"
|
tab_next = "5"
|
||||||
# Toggle perspective control.
|
# Toggle perspective control.
|
||||||
toggle_perspective = "11+3"
|
toggle_perspective = "11+3"
|
||||||
# Toggle smooth camera control.
|
# Toggle smooth camera control.
|
||||||
|
|||||||
@@ -27,20 +27,25 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"lambdacontrols.mixins.json"
|
"lambdacontrols.mixins.json",
|
||||||
|
"lambdacontrols_compat.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.4.0",
|
"fabricloader": ">=0.4.0",
|
||||||
"fabric": "*",
|
"fabric": "*",
|
||||||
"minecraft": "1.15.x",
|
"minecraft": ">=1.15",
|
||||||
"spruceui": ">=1.3.4"
|
"spruceui": ">=1.3.5"
|
||||||
},
|
},
|
||||||
"recommends": {
|
"recommends": {
|
||||||
"modmenu": ">=1.8.0+build.16",
|
"modmenu": ">=1.9.0",
|
||||||
"okzoomer": ">=1.0.4"
|
"okzoomer": ">=1.0.4"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"flamingo": "*"
|
"flamingo": "*",
|
||||||
|
"roughlyenoughitems": ">=3.4.5"
|
||||||
|
},
|
||||||
|
"breaks": {
|
||||||
|
"modmenu": "<1.9.0"
|
||||||
},
|
},
|
||||||
"custom": {
|
"custom": {
|
||||||
"modmenu:clientsideOnly": true
|
"modmenu:clientsideOnly": true
|
||||||
|
|||||||
@@ -11,11 +11,14 @@
|
|||||||
"ControlsOptionsScreenMixin",
|
"ControlsOptionsScreenMixin",
|
||||||
"CreativeInventoryScreenAccessor",
|
"CreativeInventoryScreenAccessor",
|
||||||
"EntryListWidgetAccessor",
|
"EntryListWidgetAccessor",
|
||||||
|
"GameOptionsMixin",
|
||||||
"GameRendererMixin",
|
"GameRendererMixin",
|
||||||
"KeyBindingMixin",
|
"KeyBindingMixin",
|
||||||
"MinecraftClientMixin",
|
"MinecraftClientMixin",
|
||||||
"MouseMixin",
|
"MouseMixin",
|
||||||
"SettingsScreenMixin"
|
"RecipeBookWidgetAccessor",
|
||||||
|
"SettingsScreenMixin",
|
||||||
|
"WorldRendererMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|||||||
13
fabric/src/main/resources/lambdacontrols_compat.mixins.json
Normal file
13
fabric/src/main/resources/lambdacontrols_compat.mixins.json
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"package": "me.lambdaurora.lambdacontrols.client.compat.mixin",
|
||||||
|
"plugin": "me.lambdaurora.lambdacontrols.client.compat.LambdaControlsMixinPlugin",
|
||||||
|
"compatibilityLevel": "JAVA_8",
|
||||||
|
"client": [
|
||||||
|
"RecipeViewingScreenAccessor",
|
||||||
|
"VillagerRecipeViewingScreenAccessor"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version=1.15.2
|
minecraft_version=1.15.2
|
||||||
yarn_mappings=1.15.2+build.9:v2
|
yarn_mappings=1.15.2+build.14:v2
|
||||||
loader_version=0.7.6+build.180
|
loader_version=0.7.6+build.180
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.1.0
|
mod_version = 1.2.0
|
||||||
maven_group = me.lambdaurora
|
maven_group = me.lambdaurora
|
||||||
archives_base_name = lambdacontrols
|
archives_base_name = lambdacontrols
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||||
fabric_version=0.4.29+build.290-1.15
|
fabric_version=0.4.29+build.290-1.15
|
||||||
spruceui_version=1.3.4
|
spruceui_version=1.3.5
|
||||||
|
modmenu_version=1.10.1+build.30
|
||||||
|
|||||||
Reference in New Issue
Block a user