diff --git a/build.gradle b/build.gradle index 264e344..7c95d58 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'java-library' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.0.0' diff --git a/gradle.properties b/gradle.properties index 41202f6..59a6b42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ modrinth_id=bXX9h73M fabric_version=0.60.0+1.19.2 sodium_version=mc1.19.2-0.4.4 spruceui_version=4.0.0+1.19 -midnightlib_version=0.6.0 +midnightlib_version=0.6.1 modmenu_version=4.0.6 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric bendylib_version=2.0.+ diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java index 0b21567..7e0058f 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java @@ -54,7 +54,7 @@ public class MidnightControlsConfig extends MidnightConfig { @Entry(name = "midnightcontrols.menu.left_dead_zone") public static double leftDeadZone = 0.25; @Entry(name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false; @Entry(name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false; - @Entry(name = "midnightcontrols.menu.rotation_speed") public static double rotationSpeed = 30.0; //used for x axis, name kept for compatability + @Entry(name = "midnightcontrols.menu.rotation_speed") public static double rotationSpeed = 40.0; //used for x-axis, name kept for compatability @Entry(name = "midnightcontrols.menu.y_axis_rotation_speed") public static double yAxisRotationSpeed = rotationSpeed; @Entry(name = "midnightcontrols.menu.mouse_speed") public static double mouseSpeed = 25.0; @Entry(name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false; @@ -294,7 +294,7 @@ public class MidnightControlsConfig extends MidnightConfig { leftDeadZone = 0.25; invertRightYAxis = false; invertRightXAxis = false; - rotationSpeed = 30.0; + rotationSpeed = 40.0; yAxisRotationSpeed = rotationSpeed; mouseSpeed = 25.0; unfocusedInput = false; @@ -325,8 +325,8 @@ public class MidnightControlsConfig extends MidnightConfig { else if (controller.contains("steam deck")) return ControllerType.STEAM_DECK; else if (controller.contains("steam")) return ControllerType.STEAM_CONTROLLER; else if (controller.contains("dualsense")) return ControllerType.DUALSENSE; - else if (controller.contains("dualshock") || controller.contains("ps4")) return ControllerType.DUALSHOCK; - else if (controller.contains("switch") || controller.contains("joy-con")) return ControllerType.SWITCH; + else if (controller.contains("dualshock") || controller.contains("ps4") || controller.contains("sony")) return ControllerType.DUALSHOCK; + else if (controller.contains("switch") || controller.contains("joy-con") || controller.contains("wii") || controller.contains("nintendo")) return ControllerType.SWITCH; else if (controller.contains("ouya")) return ControllerType.OUYA; else return ControllerType.DEFAULT; } diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java index 458cbf8..32bdb74 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java @@ -189,8 +189,8 @@ public class MidnightInput { return; if (this.targetYaw != 0.f || this.targetPitch != 0.f) { - float rotationYaw = (float) (client.player.prevYaw + (this.targetYaw * 0.2)); - float rotationPitch = (float) (client.player.prevPitch + (this.targetPitch * 0.2)); + float rotationYaw = (float) (client.player.prevYaw + (this.targetYaw * 0.175)); + float rotationPitch = (float) (client.player.prevPitch + (this.targetPitch * 0.175)); client.player.prevYaw = rotationYaw; client.player.prevPitch = MathHelper.clamp(rotationPitch, -90.f, 90.f); client.player.setYaw(rotationYaw); @@ -199,8 +199,19 @@ public class MidnightInput { client.player.getVehicle().onPassengerLookAround(client.player); } client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw); + MidnightControlsCompat.HANDLERS.forEach(handler -> handler.handleCamera(client, targetYaw, targetPitch)); + this.onRender(client); } } + /** + * This method is deprecated and will be removed in future versions + * It is just kept, because the current version of 'Do a Barrel Roll' mixins into this method + * + * @param client the client instance + */ + @Deprecated + public void onRender(@NotNull MinecraftClient client) { + } /** * This method is called when a Screen is opened. @@ -504,21 +515,25 @@ public class MidnightInput { } else if (client.currentScreen != null) { if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && absValue >= deadZone) { float finalValue = value; - client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget) + if (client.currentScreen.children().stream().filter(element -> element instanceof SpruceEntryListWidget) .map(element -> (SpruceEntryListWidget) element) .filter(AbstractSpruceWidget::isFocusedOrHovered) - .anyMatch(element -> { - MidnightControls.get().log(String.valueOf(finalValue)); + .noneMatch(element -> { element.mouseScrolled(0.0, 0.0, -finalValue); return true; - }); - client.currentScreen.children().stream().filter(element -> element instanceof EntryListWidget) + }) + && + client.currentScreen.children().stream().filter(element -> element instanceof EntryListWidget) .map(element -> (EntryListWidget) element) .filter(element -> element.getType().isFocused()) - .anyMatch(element -> { + .noneMatch(element -> { element.mouseScrolled(0.0, 0.0, -finalValue); return true; - }); + })) + { + client.currentScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f)); + } + return; } } diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/CompatHandler.java b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/CompatHandler.java index 04beb0e..ffb367d 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/CompatHandler.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/CompatHandler.java @@ -33,6 +33,13 @@ public interface CompatHandler { */ void handle(@NotNull MidnightControlsClient mod); + /** + * Handles custom camera updates + * + * @param client the Minecraft client instance + */ + default void handleCamera(@NotNull MinecraftClient client, double targetYaw, double targetPitch) {}; + /** * Returns whether the mouse is required on the specified screen. * diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java index aadcd29..7e02be8 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java @@ -42,4 +42,7 @@ public class EMICompat implements CompatHandler { public static boolean isEMIEnabled() { return EmiConfig.enabled; } + public static boolean isSearchBarCentered() { + return EmiConfig.centerSearchBar; + } } diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java index e4945bd..6c38257 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java @@ -52,7 +52,7 @@ public class MidnightControlsHud extends Hud { private String attackAction = ""; private String placeAction = ""; private int ticksDisplayedCrosshair = 0; - private static float scale = 1f; + private static boolean isCrammed = false; public MidnightControlsHud(@NotNull MidnightControlsClient mod) { super(new Identifier(MidnightControlsConstants.NAMESPACE, "hud/button_indicator")); @@ -71,26 +71,23 @@ public class MidnightControlsHud extends Hud { this.dropItemButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.DROP_ITEM); this.attackButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.ATTACK); this.useButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.USE); - if (client.getWindow().getScaleFactor() >= 4) { - scale = 0.75f; - } else scale = 1f; } /** - * Renders the midnightcontrols' HUD. + * Renders the MidnightControls HUD. */ @Override public void render(MatrixStack matrices, float tickDelta) { if (this.client == null) return; if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && this.client.currentScreen == null) { + isCrammed = client.getWindow().getScaledWidth() < 560; int y = bottom(2); matrices.push(); - if (scale != 1f) matrices.scale(scale,scale,scale); - this.renderFirstIcons(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : (int) ((client.getWindow().getScaledWidth() - 2) * (1 / scale)), y); - this.renderSecondIcons(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : (int) ((client.getWindow().getScaledWidth() - 2) * (1 / scale)), y); - this.renderFirstSection(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : (int) ((client.getWindow().getScaledWidth() - 2) * (1 / scale)), y); - this.renderSecondSection(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : (int) ((client.getWindow().getScaledWidth() - 2) * (1 / scale)), y); + this.renderFirstIcons(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y); + this.renderSecondIcons(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y); + this.renderFirstSection(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y); + this.renderSecondSection(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y); matrices.pop(); } @@ -111,8 +108,12 @@ public class MidnightControlsHud extends Hud { public void renderFirstIcons(MatrixStack matrices, int x, int y) { int offset = 2 + this.inventoryWidth + this.inventoryButtonWidth + 4; int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.inventoryButtonWidth; - this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true); - this.drawButton(matrices, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true); + if (!ButtonBinding.INVENTORY.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true); + if (isCrammed) { + offset = 0; + y -= 20; + } + if (!ButtonBinding.SWAP_HANDS.isNotBound()) this.drawButton(matrices, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true); offset = 2 + this.swapHandsWidth + this.dropItemButtonWidth + 4; if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) { currentX += -offset; @@ -120,13 +121,13 @@ public class MidnightControlsHud extends Hud { currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.dropItemButtonWidth; y -= 20; } - this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()); + if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()); } public void renderSecondIcons(MatrixStack matrices, int x, int y) { int offset; int currentX = x; - if (!this.placeAction.isEmpty()) { + if (!this.placeAction.isEmpty() && (!ButtonBinding.USE.isNotBound()) ) { if (MidnightControlsConfig.hudSide == HudSide.LEFT) currentX -= this.useButtonWidth; this.drawButton(matrices, currentX, y, ButtonBinding.USE, true); @@ -142,22 +143,26 @@ public class MidnightControlsHud extends Hud { if (MidnightControlsConfig.hudSide == HudSide.LEFT) currentX -= this.attackButtonWidth; - this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0); + if (!ButtonBinding.ATTACK.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0); } public void renderFirstSection(MatrixStack matrices, int x, int y) { int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth; - this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true); + if (!ButtonBinding.INVENTORY.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true); currentX += MidnightControlsConfig.hudSide == HudSide.LEFT ? this.inventoryWidth + 4 + this.swapHandsButtonWidth + 2 : -this.swapHandsWidth - 2 - this.swapHandsButtonWidth - 4; - this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true); + if (isCrammed) { + currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth; + y -= 20; + } + if (!ButtonBinding.SWAP_HANDS.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true); if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) { currentX += -this.dropItemWidth - 2 - this.dropItemButtonWidth - 4; } else { y -= 20; currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.dropItemButtonWidth + 2 : x - this.dropItemButtonWidth - 2 - this.dropItemWidth; } - this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()); + if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty()); } public void renderSecondSection(MatrixStack matrices, int x, int y) { @@ -178,7 +183,7 @@ public class MidnightControlsHud extends Hud { currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.attackButtonWidth + 2 : -this.attackButtonWidth - 2 - this.attackWidth; - this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0); + if (!ButtonBinding.ATTACK.isNotBound()) this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0); } @Override @@ -254,7 +259,7 @@ public class MidnightControlsHud extends Hud { } private int bottom(int y) { - return (int) ((this.client.getWindow().getScaledHeight() * (1/scale)) - y - MidnightControlsRenderer.ICON_SIZE); + return (this.client.getWindow().getScaledHeight() - y - MidnightControlsRenderer.ICON_SIZE); } private int width(@NotNull ButtonBinding binding) { diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java index 29d1337..825c90c 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java @@ -38,8 +38,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; */ @Mixin(HandledScreen.class) public abstract class HandledScreenMixin implements HandledScreenAccessor { - @Unique private static float scale = 1f; - @Accessor("x") public abstract int getX(); @@ -58,30 +56,26 @@ public abstract class HandledScreenMixin implements HandledScreenAccessor { @Inject(method = "render", at = @At("RETURN")) public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { - if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) { + if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.hudEnable) { var client = MinecraftClient.getInstance(); - if (client.getWindow().getScaleFactor() >= 4) { - scale = 0.75f; - } else scale = 1f; matrices.push(); - if (scale != 1f) matrices.scale(scale,scale,scale); - int x = 2, y = (int) (client.getWindow().getScaledHeight() * (1 / scale) - 2 - MidnightControlsRenderer.ICON_SIZE); + int x = 2, y = client.getWindow().getScaledHeight() - 2 - MidnightControlsRenderer.ICON_SIZE; if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled()) { - x += 40 * (1 / scale); + x += 42; } - x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_A}, "midnightcontrols.action.pickup_all", true, client) + 2; - x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_B}, "midnightcontrols.action.exit", true, client) + 2; + if (!ButtonBinding.TAKE_ALL.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE_ALL,true, client) + 2; + if (!ButtonBinding.EXIT.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.EXIT, true, client) + 2; if (MidnightControlsCompat.isReiPresent()) { x = 2; y -= 24; } - if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled()) { - x = (int) (client.getWindow().getScaledWidth() * (1 / scale) - 55 - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.pickup")) - * (1 / scale) - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.quick_move")) - - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.TAKE) - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.QUICK_MOVE)); + if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled() && EMICompat.isSearchBarCentered()) { + x = client.getWindow().getScaledWidth() - 55 - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.pickup")) + - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.quick_move")) + - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.TAKE) - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.QUICK_MOVE); } - x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_X}, "midnightcontrols.action.pickup", true, client); - MidnightControlsRenderer.drawButtonTip(matrices, x, y, new int[]{GLFW.GLFW_GAMEPAD_BUTTON_Y}, "midnightcontrols.action.quick_move", true, client); + if (!ButtonBinding.TAKE.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE, true, client); + if (!ButtonBinding.QUICK_MOVE.isNotBound()) MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.QUICK_MOVE, true, client); matrices.pop(); } } diff --git a/src/main/resources/assets/midnightcontrols/lang/de_de.json b/src/main/resources/assets/midnightcontrols/lang/de_de.json index 07aaffc..5d32f07 100644 --- a/src/main/resources/assets/midnightcontrols/lang/de_de.json +++ b/src/main/resources/assets/midnightcontrols/lang/de_de.json @@ -4,10 +4,11 @@ "key.midnightcontrols.look_left": "Nach links schauen", "key.midnightcontrols.look_right": "Nach rechts schauen", "key.midnightcontrols.look_up": "Nach oben schauen", - "key.midnightcontrols.ring": "Zeige Steuerungsring", + "key.midnightcontrols.ring": "Öffne Ring mit ungebundenen Aktionen", "midnightcontrols.action.attack": "Angreifen", "midnightcontrols.action.back": "Zurück", "midnightcontrols.action.chat": "Chat öffnen", + "midnightcontrols.action.controls_ring": "Öffne Ring mit ungebundenen Aktionen", "midnightcontrols.action.drop_item": "Item droppen", "midnightcontrols.action.exit": "Schließen", "midnightcontrols.action.forward": "Vorwärts", @@ -40,8 +41,6 @@ "midnightcontrols.action.zoom_in": "Zoom erhöhen", "midnightcontrols.action.zoom_out": "Zoom verringern", "midnightcontrols.action.zoom_reset": "Zoom zurücksetzen", - "midnightcontrols.action.key.emotecraft.fastchoose": "Emote Schnellauswahl", - "midnightcontrols.action.key.emotecraft.stop": "Emote stoppen", "midnightcontrols.button.left_bumper": "Linke Schultertaste", "midnightcontrols.button.right_bumper": "Rechte Schultertaste", "midnightcontrols.button.back": "Zurück", @@ -78,16 +77,11 @@ "midnightcontrols.controller.mappings.error.write": "Fehler beim Schreiben der Controller Mappings.", "midnightcontrols.controller.mappings.updated": "Mappings aktualisiert!", "midnightcontrols.controller_type.default": "Standard", - "midnightcontrols.controller_type.dualshock": "DualShock", - "midnightcontrols.controller_type.switch": "Switch", - "midnightcontrols.controller_type.xbox": "Xbox", - "midnightcontrols.controller_type.steam": "Steam", - "midnightcontrols.controller_type.ouya": "OUYA", "midnightcontrols.controls_mode.default": "Tastatur/Maus", "midnightcontrols.controls_mode.controller": "Controller", "midnightcontrols.controls_mode.touchscreen": "Touchscreen (In Arbeit)", - "midnightcontrols.hud_side.left": "links", - "midnightcontrols.hud_side.right": "rechts", + "midnightcontrols.hud_side.left": "Links", + "midnightcontrols.hud_side.right": "Rechts", "midnightcontrols.menu.analog_movement": "Analoge Bewegung", "midnightcontrols.menu.auto_switch_mode": "Automatischer Wechsel", "midnightcontrols.menu.controller": "Controller", @@ -103,7 +97,7 @@ "midnightcontrols.menu.invert_right_x_axis": "X rechts umkehren", "midnightcontrols.menu.invert_right_y_axis": "Y rechts umkehren", "midnightcontrols.menu.keyboard_controls": "Tastatureinstellungen...", - "midnightcontrols.menu.left_dead_zone": "Linke tote Zone", + "midnightcontrols.menu.left_dead_zone": "Tote Zone des linken Sticks", "midnightcontrols.menu.mappings.open_input_str": "Öffne den Controller-Mapping Editor", "midnightcontrols.menu.max_left_x_value": "Maximalwert Linke X-Achse", "midnightcontrols.menu.max_left_y_value": "Maximalwert Linke Y-Achse", @@ -113,14 +107,14 @@ "midnightcontrols.menu.reacharound.horizontal": "Vorderes Blockplatzieren", "midnightcontrols.menu.reacharound.vertical": "Vertikales Umgreifen", "midnightcontrols.menu.reload_controller_mappings": "Controller-Mappings neuladen", - "midnightcontrols.menu.right_dead_zone": "Rechte tote Zone", + "midnightcontrols.menu.right_dead_zone": "Tote Zone des rechten Sticks", "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit (X-Achse)", "midnightcontrols.menu.y_axis_rotation_speed": "Rotationsgeschwindigkeit (Y-Achse)", "midnightcontrols.menu.separator.controller": "Controller", "midnightcontrols.menu.separator.general": "Generell", "midnightcontrols.menu.title": "MidnightControls - Einstellungen", "midnightcontrols.menu.title.controller": "Controlleroptionen", - "midnightcontrols.menu.title.controller_controls": "Controller Steuerung", + "midnightcontrols.menu.title.controller_controls": "Controller Aktionen", "midnightcontrols.menu.title.gameplay": "Gameplay Optionen", "midnightcontrols.menu.title.general": "Generelle Optionen", "midnightcontrols.menu.title.hud": "HUD Optionen", diff --git a/src/main/resources/assets/midnightcontrols/lang/en_us.json b/src/main/resources/assets/midnightcontrols/lang/en_us.json index 845f27f..b94d302 100644 --- a/src/main/resources/assets/midnightcontrols/lang/en_us.json +++ b/src/main/resources/assets/midnightcontrols/lang/en_us.json @@ -4,7 +4,7 @@ "key.midnightcontrols.look_left": "Look left", "key.midnightcontrols.look_right": "Look right", "key.midnightcontrols.look_up": "Look up", - "key.midnightcontrols.ring": "Show controls ring", + "key.midnightcontrols.ring": "Open Unbound Keybind Ring", "midnightcontrols.action.attack": "Attack", "midnightcontrols.action.back": "Back", "midnightcontrols.action.chat": "Open Chat", @@ -93,17 +93,17 @@ "midnightcontrols.controller_type.default": "Default", "midnightcontrols.controller_type.dualshock": "DualShock", "midnightcontrols.controller_type.dualsense": "DualSense", - "midnightcontrols.controller_type.switch": "Switch", - "midnightcontrols.controller_type.xbox": "Xbox", - "midnightcontrols.controller_type.xbox_360": "Xbox 360", + "midnightcontrols.controller_type.switch": "Switch/Wii Controller", + "midnightcontrols.controller_type.xbox": "Xbox One/Series Controller", + "midnightcontrols.controller_type.xbox_360": "Xbox 360 Controller", "midnightcontrols.controller_type.steam_controller": "Steam Controller", "midnightcontrols.controller_type.steam_deck": "Steam Deck", - "midnightcontrols.controller_type.ouya": "OUYA", + "midnightcontrols.controller_type.ouya": "OUYA Controller", "midnightcontrols.controls_mode.default": "Keyboard/Mouse", "midnightcontrols.controls_mode.controller": "Controller", "midnightcontrols.controls_mode.touchscreen": "Touchscreen (WIP)", - "midnightcontrols.hud_side.left": "left", - "midnightcontrols.hud_side.right": "right", + "midnightcontrols.hud_side.left": "Left", + "midnightcontrols.hud_side.right": "Right", "midnightcontrols.menu.analog_movement": "Analog Movement", "midnightcontrols.menu.auto_switch_mode": "Auto Switch Mode", "midnightcontrols.menu.controller": "Controller", @@ -119,7 +119,7 @@ "midnightcontrols.menu.invert_right_x_axis": "Invert Right X", "midnightcontrols.menu.invert_right_y_axis": "Invert Right Y", "midnightcontrols.menu.keyboard_controls": "Keyboard Controls...", - "midnightcontrols.menu.left_dead_zone": "Left Dead Zone", + "midnightcontrols.menu.left_dead_zone": "Left Stick Dead Zone", "midnightcontrols.menu.mappings.open_input_str": "Open Mappings File Editor", "midnightcontrols.menu.max_left_x_value": "Left X Axis Max Value", "midnightcontrols.menu.max_left_y_value": "Left Y Axis Max Value", @@ -129,14 +129,14 @@ "midnightcontrols.menu.reacharound.horizontal": "Front Block Placing", "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound", "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings", - "midnightcontrols.menu.right_dead_zone": "Right Dead Zone", + "midnightcontrols.menu.right_dead_zone": "Right Stick Dead Zone", "midnightcontrols.menu.rotation_speed": "X Axis Rotation Speed", "midnightcontrols.menu.y_axis_rotation_speed": "Y Axis Rotation Speed", "midnightcontrols.menu.separator.controller": "Controller", "midnightcontrols.menu.separator.general": "General", "midnightcontrols.menu.title": "MidnightControls - Settings", "midnightcontrols.menu.title.controller": "Controller Options", - "midnightcontrols.menu.title.controller_controls": "Controller Controls", + "midnightcontrols.menu.title.controller_controls": "Controller Bindings", "midnightcontrols.menu.title.gameplay": "Gameplay Options", "midnightcontrols.menu.title.general": "General Options", "midnightcontrols.menu.title.hud": "HUD Options", @@ -147,18 +147,18 @@ "midnightcontrols.menu.virtual_mouse.skin": "Virtual Mouse Skin", "midnightcontrols.narrator.unbound": "Unbound %s", "midnightcontrols.not_bound": "Not bound", - "midnightcontrols.tooltip.analog_movement": "Enables analog movement when possible.", - "midnightcontrols.tooltip.auto_switch_mode": "If the controls mode should be switched to Controller automatically if one is connected.", - "midnightcontrols.tooltip.controller2": "Second controller to use, which allows Joy-Cons support for example.", - "midnightcontrols.tooltip.controller_type": "The controller type to display the correct buttons.", + "midnightcontrols.tooltip.analog_movement": "When possible, enables analog movement.", + "midnightcontrols.tooltip.auto_switch_mode": "Whether the controls mode should be switched to Controller automatically if one is connected.", + "midnightcontrols.tooltip.controller2": "Second controller to use, which allows (for example) Joy-Cons support.", + "midnightcontrols.tooltip.controller_type": "The controller type you're using (needed to display the correct buttons)", "midnightcontrols.tooltip.controls_mode": "The controls mode.", - "midnightcontrols.tooltip.double_tap_to_sprint": "Toggles whether the Walk Forwards key makes the player sprint when quickly double-tapped", + "midnightcontrols.tooltip.double_tap_to_sprint": "Toggles whether the Walk Forwards key makes the player sprint when double-tapped quickly", "midnightcontrols.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.", "midnightcontrols.tooltip.fly_drifting": "While flying, enables Vanilla drifting/inertia.", "midnightcontrols.tooltip.fly_drifting_vertical": "While flying, enables Vanilla vertical drifting/intertia.", "midnightcontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.", "midnightcontrols.tooltip.hud_side": "The position of the HUD.", - "midnightcontrols.tooltip.left_dead_zone": "The dead zone for the controller's left analogue stick.", + "midnightcontrols.tooltip.left_dead_zone": "The dead zone for the controller's left analog stick.", "midnightcontrols.tooltip.max_left_x_value": "Changes what the mod considers the highest value for the left X axis. Useful if your axis does not use the full range and seems slow.", "midnightcontrols.tooltip.max_left_y_value": "Changes what the mod considers the highest value for the left Y axis. Useful if your axis does not use the full range and seems slow.", "midnightcontrols.tooltip.max_right_x_value": "Changes what the mod considers the highest value for the right X axis. Useful if your axis does not use the full range and seems slow.", @@ -167,11 +167,11 @@ "midnightcontrols.tooltip.reacharound.horizontal": "Enables front block placing, §cmight be considered cheating on some servers§r.", "midnightcontrols.tooltip.reacharound.vertical": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.", - "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analogue stick.", - "midnightcontrols.tooltip.rotation_speed": "The camera X Axis rotation speed in controller mode.", - "midnightcontrols.tooltip.y_axis_rotation_speed": "The camera Y Axis rotation speed in controller mode.", - "midnightcontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused.", - "midnightcontrols.tooltip.virtual_mouse": "Enable the virtual mouse which is handful in the case of a splitscreen.", + "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analog stick.", + "midnightcontrols.tooltip.rotation_speed": "The camera's X Axis rotation speed in controller mode.", + "midnightcontrols.tooltip.y_axis_rotation_speed": "The camera's Y Axis rotation speed in controller mode.", + "midnightcontrols.tooltip.unfocused_input": "Allows controller input when the window is not focused.", + "midnightcontrols.tooltip.virtual_mouse": "Enables the virtual mouse, which is useful during splitscreen.", "midnightcontrols.virtual_mouse.skin.default_light": "Default Light", "midnightcontrols.virtual_mouse.skin.default_dark": "Default Dark", "midnightcontrols.virtual_mouse.skin.second_light": "Second Light", diff --git a/src/main/resources/resourcepacks/bedrock/assets/midnightcontrols/textures/gui/controller_buttons.png b/src/main/resources/resourcepacks/bedrock/assets/midnightcontrols/textures/gui/controller_buttons.png index 1f9ebd2..086df70 100644 Binary files a/src/main/resources/resourcepacks/bedrock/assets/midnightcontrols/textures/gui/controller_buttons.png and b/src/main/resources/resourcepacks/bedrock/assets/midnightcontrols/textures/gui/controller_buttons.png differ diff --git a/src/main/resources/resourcepacks/bedrock/pack.mcmeta b/src/main/resources/resourcepacks/bedrock/pack.mcmeta index 9915cb1..776b2b6 100644 --- a/src/main/resources/resourcepacks/bedrock/pack.mcmeta +++ b/src/main/resources/resourcepacks/bedrock/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 9, - "description": "Makes the controller buttons look like from Bedrock Edition" + "description": "Makes controller tooltips use similar icons to Bedrock Edition" } } diff --git a/src/main/resources/resourcepacks/legacy/assets/midnightcontrols/textures/gui/controller_buttons.png b/src/main/resources/resourcepacks/legacy/assets/midnightcontrols/textures/gui/controller_buttons.png index 50a9c22..7c1902a 100644 Binary files a/src/main/resources/resourcepacks/legacy/assets/midnightcontrols/textures/gui/controller_buttons.png and b/src/main/resources/resourcepacks/legacy/assets/midnightcontrols/textures/gui/controller_buttons.png differ diff --git a/src/main/resources/resourcepacks/legacy/pack.mcmeta b/src/main/resources/resourcepacks/legacy/pack.mcmeta index bc7a032..7ec8688 100644 --- a/src/main/resources/resourcepacks/legacy/pack.mcmeta +++ b/src/main/resources/resourcepacks/legacy/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 9, - "description": "Makes the controller buttons look like from Console Edition" + "description": "Makes controller icons look similar to Legacy Console Edit." } }