Merge pull request #156 from TeamMidnightDust/1.19.3

Backport 1.7.3 to 1.19.2

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
+    id 'fabric-loom' version '1.0-SNAPSHOT'
     id 'java-library'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
@@ -32,7 +32,7 @@ boolean isMCVersionNonRelease() {
 }
 
 String getMCVersionString() {
-    if (isMCVersionNonRelease()) {
+    if (isMCVersionNonRelease() || project.minecraft_version == "1.19.3") {
         return project.minecraft_version
     }
     def version = project.minecraft_version.split('\\.')
@@ -102,7 +102,7 @@ dependencies {
     }
     include 'org.aperlambda:lambdajcommon:1.8.1'
 
-    modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+    modCompileOnlyApi "com.terraformersmc:modmenu:${project.modmenu_version}"
 
     // Compatibility mods
 
@@ -110,15 +110,15 @@ dependencies {
     // modImplementation("maven.modrinth:ok-zoomer:${project.ok_zoomer_version}")
     // modImplementation "io.github.ennuil:LibZoomer:${project.libzoomer_version}"
 
-    modImplementation "io.github.cottonmc:LibGui:${project.libgui_version}"
+    modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}"
-    modImplementation "org.quiltmc:quilt-json5:1.0.0"
+    modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
     modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
-    modImplementation("maven.modrinth:emi:${project.emi_version}")
+    modImplementation "maven.modrinth:emi:${project.emi_version}"
-    modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
+    modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
-    modImplementation "io.github.kosmx:bendy-lib:${project.bendylib_version}"
+    modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
     modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
-    modImplementation "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
+    modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
-    modImplementation "maven.modrinth:bedrockify:${project.bedrockify_version}"
+    modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}"
     // Required for Inventory Tabs
     modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
         exclude(group: "net.fabricmc.fabric-api")

gradle.properties

@@ -3,30 +3,30 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.19.2
+minecraft_version=1.19.3
-yarn_mappings=1.19.2+build.9
+yarn_mappings=1.19.3+build.5
-loader_version=0.14.9
+loader_version=0.14.12
 
 # Mod Properties
-mod_version = 1.7.1
+mod_version = 1.7.3
 maven_group = eu.midnightdust
 archives_base_name = midnightcontrols
 modrinth_id=bXX9h73M
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.60.0+1.19.2
+fabric_version=0.71.0+1.19.3
 sodium_version=mc1.19.2-0.4.4
-spruceui_version=4.0.0+1.19
+spruceui_version=4.1.0+1.19.3
-midnightlib_version=0.6.1
+midnightlib_version=1.1.0-fabric
-modmenu_version=4.0.6
+modmenu_version=5.0.1
 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
-emi_version=0.4.0+1.19
+emi_version=0.5.0+1.19.3
 libgui_version=6.0.0+1.19
 inventorytabs_version=inventorytabs-0.9.beta-1.19.x
 clothconfig_version=7.0.72
-yacl_version=0.1.2
+yacl_version=2.2.0
 bedrockify_version=1.5+mc1.19.1-2
 
 # Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions.

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java

@@ -173,9 +173,9 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
             voxelmapInitDone = true;
         }
         if (lateInitDone) return;
-        if (KeyBindingRegistryImplAccessor.getModdedKeyBindings() == null || KeyBindingRegistryImplAccessor.getModdedKeyBindings().isEmpty()) return;
+        if (KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS() == null || KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().isEmpty()) return;
-        for (int i = 0; i < KeyBindingRegistryImplAccessor.getModdedKeyBindings().size(); ++i) {
+        for (int i = 0; i < KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().size(); ++i) {
-            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getModdedKeyBindings().get(i);
+            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().get(i);
             if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
                 category = null;
                 InputManager.streamCategories().forEach(buttonCategory -> {

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java

@@ -41,6 +41,7 @@ public class MidnightControlsConfig extends MidnightConfig {
     // HUD
     @Entry(name = "midnightcontrols.menu.hud_enable") public static boolean hudEnable = true;
     @Entry(name = "midnightcontrols.menu.hud_side") public static HudSide hudSide = HudSide.LEFT;
+    @Entry(name = "midnightcontrols.menu.move_chat") public static boolean moveChat = false;
     // Gameplay
     @Entry(name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
     @Entry(name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
@@ -61,6 +62,7 @@ public class MidnightControlsConfig extends MidnightConfig {
     @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.joystick_as_mouse") public static boolean joystickAsMouse = false;
     @Entry(name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
     @Entry(name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
     @Entry(name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
@@ -350,7 +352,7 @@ public class MidnightControlsConfig extends MidnightConfig {
         else if (controller.contains("xbox") || controller.contains("afterglow")) return ControllerType.XBOX;
         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("dualsense") || controller.contains("ps5")) return ControllerType.DUALSENSE;
         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;

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java

@@ -13,10 +13,7 @@ import com.google.common.collect.ImmutableSet;
 import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget;
 import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
 import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
+import eu.midnightdust.midnightcontrols.client.compat.*;
-import eu.midnightdust.midnightcontrols.client.compat.LibGuiCompat;
-import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
-import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
@@ -695,6 +692,8 @@ public class MidnightInput {
             var childFocused = widget.getFocused();
             if (childFocused != null)
                 return this.handleAButton(screen, childFocused);
+        } else if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleAButton(screen, focused)) {
+            return true;
         }
         return false;
     }
@@ -711,6 +710,10 @@ public class MidnightInput {
             this.actionGuiCooldown = 5;
             return false;
         }
+        if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleLeftRight(screen, right)) {
+            this.actionGuiCooldown = 5;
+            return false;
+        }
         var focused = screen.getFocused();
         if (focused != null)
             if (this.handleRightLeftElement(focused, right))
@@ -858,7 +861,7 @@ public class MidnightInput {
     }
 
     public static boolean isScreenInteractive(@NotNull Screen screen) {
-        return !(screen instanceof HandledScreen || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
+        return !(screen instanceof HandledScreen || MidnightControlsConfig.joystickAsMouse || MidnightControlsConfig.mouseScreens.stream().anyMatch(a -> screen.getClass().toString().contains(a))
                 || (screen instanceof SpruceScreen && ((SpruceScreen) screen).requiresCursor())
                 || MidnightControlsCompat.requireMouseOnScreen(screen));
     }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/EMICompat.java

@@ -1,6 +1,6 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
-import dev.emi.emi.EmiConfig;
+import dev.emi.emi.config.EmiConfig;
 import dev.emi.emi.screen.EmiScreen;
 import dev.emi.emi.screen.EmiScreenManager;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
@@ -14,9 +14,9 @@ import org.lwjgl.glfw.GLFW;
 
 public class EMICompat implements CompatHandler {
     public static boolean handleTabs(boolean direction) {
-        if (isEMIEnabled() && MidnightControlsClient.get().input.actionGuiCooldown == 0 && EmiScreenManager.searchLeft != null && EmiScreenManager.searchRight != null) {
+        if (isEMIEnabled() && MidnightControlsClient.get().input.actionGuiCooldown == 0 && EmiScreenManager.getSearchPanel() != null && EmiScreenManager.getSearchPanel().pageLeft != null && EmiScreenManager.getSearchPanel().pageRight != null) {
-            if (direction) EmiScreenManager.searchRight.onPress();
+            if (direction) EmiScreenManager.getSearchPanel().pageRight.onPress();
-            else EmiScreenManager.searchLeft.onPress();
+            else EmiScreenManager.getSearchPanel().pageLeft.onPress();
             MidnightControlsClient.get().input.actionGuiCooldown = 5;
             return true;
         }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/YACLCompat.java

@@ -0,0 +1,56 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import dev.isxander.yacl.gui.AbstractWidget;
+import dev.isxander.yacl.gui.OptionListWidget;
+import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl.gui.controllers.ControllerWidget;
+import dev.isxander.yacl.gui.controllers.slider.SliderControllerElement;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import org.lwjgl.glfw.GLFW;
+
+public class YACLCompat {
+    public static boolean handleAButton(Screen screen, Element element) {
+        if (element instanceof AbstractWidget abstractWidget) {
+            // imitate ender key press
+            return abstractWidget.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0);
+        }
+        return false;
+    }
+
+    public static boolean handleLeftRight(Screen screen, boolean direction) {
+        if (screen instanceof YACLScreen yaclScreen) {
+            SliderControllerElement focusedSlider = yaclScreen.optionList.children().stream()
+                    .filter(OptionListWidget.OptionEntry.class::isInstance)
+                    .map(entry -> ((OptionListWidget.OptionEntry) entry).widget)
+                    .filter(ControllerWidget.class::isInstance)
+                    .map(ControllerWidget.class::cast)
+                    .filter(SliderControllerElement.class::isInstance)
+                    .map(SliderControllerElement.class::cast)
+                    .filter(ControllerWidget::isHovered)
+                    .findFirst()
+                    .orElse(null);
+
+            if (focusedSlider == null)
+                return false;
+
+            focusedSlider.incrementValue(direction ? 1 : -1);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static boolean handleCategories(Screen screen, boolean direction) {
+        if (screen instanceof YACLScreen yaclScreen) {
+            int categoryIdx = yaclScreen.getCurrentCategoryIdx();
+            if (direction) categoryIdx++; else categoryIdx--;
+            if (categoryIdx < 0) categoryIdx = yaclScreen.config.categories().size() - 1;
+            if (categoryIdx >= yaclScreen.config.categories().size()) categoryIdx = 0;
+
+            yaclScreen.changeCategory(categoryIdx);
+            return true;
+        }
+        return false;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java

@@ -92,9 +92,9 @@ public class ButtonBinding {
             .actions(InputHandlers::handleToggleSprint).onlyInGame().register();
     public static final ButtonBinding SWAP_HANDS = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).onlyInGame().cooldown().register();
     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).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
+            .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null)).cooldown().register();
     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).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
+            .action(InputHandlers.handleHotbar(true)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null)).cooldown().register();
     public static final ButtonBinding PAGE_LEFT = new Builder("page_back").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true))
             .action(InputHandlers.handlePage(false)).filter(InputHandlers::inInventory).cooldown(30).register();
     public static final ButtonBinding PAGE_RIGHT = new Builder("page_next").buttons(axisAsButton(GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true))

src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java

@@ -16,24 +16,27 @@ import eu.midnightdust.midnightcontrols.client.MidnightInput;
 import eu.midnightdust.midnightcontrols.client.compat.InventoryTabsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
+import eu.midnightdust.midnightcontrols.client.compat.YACLCompat;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.RecipeBookWidgetAccessor;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
+import net.fabricmc.fabric.impl.client.itemgroup.CreativeGuiExtensions;
+import net.fabricmc.fabric.impl.client.itemgroup.FabricCreativeGuiComponents;
+import net.fabricmc.fabric.impl.itemgroup.FabricItemGroup;
+import net.fabricmc.fabric.impl.itemgroup.ItemGroupHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.hud.SpectatorHud;
-import net.minecraft.client.gui.hud.spectator.SpectatorMenu;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.*;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
 import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.client.input.Input;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.util.math.MathHelper;
@@ -42,9 +45,9 @@ import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.Comparator;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static org.lwjgl.glfw.GLFW.*;
 import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_2;
@@ -56,9 +59,17 @@ import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_2;
  * @version 1.7.0
  * @since 1.1.0
  */
+@SuppressWarnings("UnstableApiUsage")
 public class InputHandlers {
     private InputHandlers() {
     }
+    private static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
+        return ItemGroupHelper.sortedGroups.stream()
+            .filter(itemGroup -> {
+                if (FabricCreativeGuiComponents.COMMON_GROUPS.contains(itemGroup)) return true;
+                return ((CreativeGuiExtensions)screen).fabric_currentPage() == ((FabricItemGroup)itemGroup).getPage() && itemGroup.shouldDisplay() && (!itemGroup.equals(ItemGroups.OPERATOR) || ItemGroups.operatorEnabled);
+            }).toList();
+    }
 
     public static PressAction handleHotbar(boolean next) {
         return (client, button, value, action) -> {
@@ -85,13 +96,31 @@ public class InputHandlers {
             } else if (client.currentScreen instanceof RingScreen) {
                 MidnightControlsClient.get().ring.cyclePage(next);
             } else if (client.currentScreen instanceof CreativeInventoryScreenAccessor inventory) {
-                int currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
+                ItemGroup currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
-                int nextTab = currentTab + (next ? 1 : -1);
+                int currentColumn = currentTab.getColumn();
-                if (nextTab < 0)
+                ItemGroup.Row currentRow = currentTab.getRow();
-                    nextTab = ItemGroup.GROUPS.length - 1;
+                ItemGroup newTab = null;
-                else if (nextTab >= ItemGroup.GROUPS.length)
+                List<ItemGroup> visibleTabs = getVisibleGroups((CreativeInventoryScreen) client.currentScreen);
-                    nextTab = 0;
+                for (ItemGroup tab : visibleTabs) {
-                inventory.midnightcontrols$setSelectedTab(ItemGroup.GROUPS[nextTab]);
+                    if (tab.getRow().equals(currentRow) && ((newTab == null && ((next && tab.getColumn() > currentColumn) ||
+                            (!next && tab.getColumn() < currentColumn))) || (newTab != null && ((next && tab.getColumn() > currentColumn && tab.getColumn() < newTab.getColumn()) ||
+                            (!next && tab.getColumn() < currentColumn && tab.getColumn() > newTab.getColumn())))))
+                        newTab = tab;
+                }
+                if (newTab == null)
+                    for (ItemGroup tab : visibleTabs) {
+                        if ((tab.getRow().compareTo(currentRow)) != 0 && ((next && newTab == null || next && newTab.getColumn() > tab.getColumn()) || (!next && newTab == null) || (!next && newTab.getColumn() < tab.getColumn())))
+                            newTab = tab;
+                    }
+                if (newTab == null) {
+                    for (ItemGroup tab : visibleTabs) {
+                        if ((next && tab.getRow() == ItemGroup.Row.TOP && tab.getColumn() == 0) ||
+                                !next && tab.getRow() == ItemGroup.Row.BOTTOM && (newTab == null || tab.getColumn() > newTab.getColumn()))
+                            newTab = tab;
+                    }
+                }
+                if (newTab == null || newTab.equals(currentTab)) newTab = ItemGroups.getDefaultTab();
+                inventory.midnightcontrols$setSelectedTab(newTab);
                 return true;
             } else if (client.currentScreen instanceof InventoryScreen || client.currentScreen instanceof CraftingScreen || client.currentScreen instanceof AbstractFurnaceScreen<?>) {
                 RecipeBookWidget recipeBook;
@@ -133,7 +162,10 @@ public class InputHandlers {
                 }
                 return true;
             } else {
-                if (FabricLoader.getInstance().isModLoaded("sodium")) SodiumCompat.handleTabs(client.currentScreen, next);
+                if (FabricLoader.getInstance().isModLoaded("sodium"))
+                    SodiumCompat.handleTabs(client.currentScreen, next);
+                if (FabricLoader.getInstance().isModLoaded("yet-another-config-lib") && YACLCompat.handleCategories(client.currentScreen, next))
+                    return true;
             }
             if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryTabs(client.currentScreen, next);
             return false;
@@ -170,6 +202,7 @@ public class InputHandlers {
                 } catch (Exception ignored) {}
             }
             if (MidnightControlsCompat.isInventoryTabsPresent()) InventoryTabsCompat.handleInventoryPage(client.currentScreen, next);
+
             return false;
         };
     }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java

@@ -38,7 +38,7 @@ import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
-import net.minecraft.util.math.Matrix4f;
+import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
 
 import java.awt.*;
@@ -57,8 +57,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption rotationSpeedOption;
     private final SpruceOption yAxisRotationSpeedOption;
     private final SpruceOption mouseSpeedOption;
+    private final SpruceOption joystickAsMouseOption;
     private final SpruceOption virtualMouseOption;
     private final SpruceOption resetOption;
+    private final SpruceOption advancedConfigOption;
     // Gameplay options
     private final SpruceOption analogMovementOption;
     private final SpruceOption doubleTapToSprintOption;
@@ -75,6 +77,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption virtualMouseSkinOption;
     private final SpruceOption hudEnableOption;
     private final SpruceOption hudSideOption;
+    private final SpruceOption moveChatOption;
     // Controller options
     private final SpruceOption controllerOption =
             new SpruceCyclingOption("midnightcontrols.menu.controller",
@@ -184,12 +187,16 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         this.mouseSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.mouse_speed", 0.0, 150.0, .5f,
                 () -> MidnightControlsConfig.mouseSpeed,
                 value -> MidnightControlsConfig.mouseSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.tooltip.mouse_speed"));
+                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
+        this.joystickAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.joystick_as_mouse",
+                () -> MidnightControlsConfig.joystickAsMouse, value -> MidnightControlsConfig.joystickAsMouse = value,
+                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
         this.resetOption = SpruceSimpleActionOption.reset(btn -> {
             MidnightControlsConfig.reset();
             var client = MinecraftClient.getInstance();
             this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
         });
+        this.advancedConfigOption = SpruceSimpleActionOption.of("midnightcontrols.midnightconfig.title", button -> client.setScreen(MidnightControlsConfig.getScreen(this, "midnightcontrols")));
         // Gameplay options
         this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
                 () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
@@ -232,6 +239,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 amount -> MidnightControlsConfig.hudSide = MidnightControlsConfig.hudSide.next(),
                 option -> option.getDisplayText(MidnightControlsConfig.hudSide.getTranslatedText()),
                 Text.translatable("midnightcontrols.tooltip.hud_side"));
+        this.moveChatOption = new SpruceToggleBooleanOption("midnightcontrols.menu.move_chat", () -> MidnightControlsConfig.moveChat,
+                value -> MidnightControlsConfig.moveChat = value, Text.translatable("midnightcontrols.tooltip.move_chat"));
         // Controller options
         this.toggleControllerProfileOption = new SpruceToggleBooleanOption("midnightcontrols.menu.separate_controller_profile", () -> MidnightControlsConfig.controllerBindingProfiles.containsKey(MidnightControlsConfig.getController().getGuid()), value -> {
             if (value) {
@@ -290,8 +299,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         this.buildTabs();
 
         this.addDrawableChild(this.resetOption.createWidget(Position.of(this.width / 2 - 155, this.height - 29), 150));
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155 + 160, this.height - 29, 150, 20, SpruceTexts.GUI_DONE,
+        this.addDrawableChild(ButtonWidget.builder(SpruceTexts.GUI_DONE, btn -> this.client.setScreen(this.parent))
-                btn -> this.client.setScreen(this.parent)));
+                .dimensions(this.width / 2 - 155 + 160, this.height - 29, 150, 20).build());
     }
 
     public void buildTabs() {
@@ -329,6 +338,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         list.addSingleOptionEntry(this.yAxisRotationSpeedOption);
         list.addSingleOptionEntry(this.mouseSpeedOption);
         list.addSingleOptionEntry(this.virtualMouseOption);
+        list.addSingleOptionEntry(this.joystickAsMouseOption);
+        list.addSingleOptionEntry(this.advancedConfigOption);
         return list;
     }
 
@@ -356,6 +367,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
         list.addSingleOptionEntry(this.hudEnableOption);
         list.addSingleOptionEntry(this.hudSideOption);
+        list.addSingleOptionEntry(this.moveChatOption);
         return list;
     }
 
@@ -437,13 +449,13 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
             RenderSystem.enableBlend();
             RenderSystem.disableTexture();
             RenderSystem.defaultBlendFunc();
-            RenderSystem.setShader(GameRenderer::getPositionColorShader);
+            RenderSystem.setShader(GameRenderer::getPositionColorProgram);
             bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
             bufferBuilder.vertex(matrix, (float)x1, (float)y2, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x2, (float)y2, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x2, (float)y1, 0.0F).color(r, g, b, t).next();
             bufferBuilder.vertex(matrix, (float)x1, (float)y1, 0.0F).color(r, g, b, t).next();
-            BufferRenderer.drawWithShader(bufferBuilder.end());
+            BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
             RenderSystem.enableTexture();
             RenderSystem.disableBlend();
             matrixStack.pop();

src/main/java/eu/midnightdust/midnightcontrols/client/gui/RingScreen.java

@@ -10,7 +10,6 @@
 package eu.midnightdust.midnightcontrols.client.gui;
 
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
 import eu.midnightdust.midnightcontrols.client.ring.RingButtonMode;
 import eu.midnightdust.midnightcontrols.client.ring.RingPage;
 import net.minecraft.client.gui.screen.Screen;
@@ -37,8 +36,8 @@ public class RingScreen extends Screen {
     protected void init() {
         super.init();
         if (mod.ring.getMaxPages() > 1) {
-            this.addDrawableChild(new ButtonWidget(5, 5, 20, 20, Text.of("◀"), button -> this.mod.ring.cyclePage(false)));
+            this.addDrawableChild(ButtonWidget.builder(Text.of("◀"), button -> this.mod.ring.cyclePage(false)).dimensions(5, 5, 20, 20).build());
-            this.addDrawableChild(new ButtonWidget(width - 25, 5, 20, 20, Text.of("▶"), button -> this.mod.ring.cyclePage(true)));
+            this.addDrawableChild(ButtonWidget.builder(Text.of("▶"), button -> this.mod.ring.cyclePage(true)).dimensions(width - 25, 5, 20, 20).build());
         }
     }
 

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ChatScreenMixin.java

@@ -0,0 +1,35 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+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;
+
+@Mixin(ChatScreen.class)
+public abstract class ChatScreenMixin extends Screen {
+    @Shadow protected TextFieldWidget chatField;
+
+    protected ChatScreenMixin(Text title) {
+        super(title);
+    }
+
+    @Inject(at = @At("TAIL"), method = "init")
+    private void midnightcontrols$moveInputField(CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) chatField.setY(4);
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;setTextFieldFocused(Z)V", shift = At.Shift.AFTER))
+    private void midnightcontrols$moveInputFieldBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) matrices.translate(0f, -this.height + 16, 0f);
+    }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", shift = At.Shift.BEFORE))
+    private void midnightcontrols$dontMoveOtherStuff(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) matrices.translate(0f, this.height - 16, 0f);
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java

@@ -38,8 +38,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
     private boolean midnightcontrols$driftingPrevented = false;
 
-    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, @Nullable PlayerPublicKey publicKey) {
+    public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
-        super(world, profile, publicKey);
+        super(world, profile);
     }
 
     @Shadow

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java

@@ -11,16 +11,13 @@ package eu.midnightdust.midnightcontrols.client.mixin;
 
 import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -30,27 +27,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(ControlsOptionsScreen.class)
 public abstract class ControlsOptionsScreenMixin extends GameOptionsScreen {
-    @Unique private final boolean showAlternativeButton = FabricLoader.getInstance().isModLoaded("crawl");
     public ControlsOptionsScreenMixin(Screen parent, GameOptions gameOptions, Text text) {
         super(parent, gameOptions, text);
     }
     @Inject(method = "init", at = @At(value = "INVOKE", ordinal = 1, shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/option/ControlsOptionsScreen;addDrawableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;"))
-    private void addAlternativeControllerButton(CallbackInfo ci) {
+    private void addControllerButton(CallbackInfo ci) {
-        if (showAlternativeButton) {
         this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20,0,0,20, new Identifier("midnightcontrols", "textures/gui/midnightcontrols_button.png"), 32, 64, (button) -> {
             this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
             }, Text.translatable("midnightcontrols.menu.title.controller")));
     }
 }
-    @Inject(method = "init", at = @At(value = "INVOKE", ordinal = 4, shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/option/ControlsOptionsScreen;addDrawableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;"))
-    private void addControllerButton(CallbackInfo ci) {
-        if (!showAlternativeButton) {
-            int i = this.width / 2 - 155;
-            int j = i + 160;
-            int k = this.height / 6 - 12 + 48;
-            this.addDrawableChild(new ButtonWidget(j, k, 150, 20, Text.translatable("midnightcontrols.menu.title.controller").append("..."), (button) -> {
-                this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
-            }));
-        }
-    }
-}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java

@@ -11,6 +11,7 @@ package eu.midnightdust.midnightcontrols.client.mixin;
 
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,8 +30,8 @@ public interface CreativeInventoryScreenAccessor {
      * @return the selected tab index
      */
     @Accessor("selectedTab")
-    static int getSelectedTab() {
+    static ItemGroup getSelectedTab() {
-        return 0;
+        return ItemGroups.getDefaultTab();
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java

@@ -10,8 +10,10 @@ import java.util.List;
 
 @Mixin(value = KeyBindingRegistryImpl.class, remap = false)
 public interface KeyBindingRegistryImplAccessor {
+
     @Accessor @Final
-    static List<KeyBinding> getModdedKeyBindings() {
+    static List<KeyBinding> getMODDED_KEY_BINDINGS() {
         return null;
     }
+
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java

@@ -22,8 +22,8 @@ import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.shape.VoxelShape;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/resources/assets/midnightcontrols/lang/en_us.json

@@ -140,6 +140,7 @@
   "midnightcontrols.menu.hud_side": "HUD Side",
   "midnightcontrols.menu.invert_right_x_axis": "Invert Right X",
   "midnightcontrols.menu.invert_right_y_axis": "Invert Right Y",
+  "midnightcontrols.menu.joystick_as_mouse": "Always use left stick as mouse",
   "midnightcontrols.menu.keyboard_controls": "Keyboard Controls...",
   "midnightcontrols.menu.left_dead_zone": "Left Stick Dead Zone",
   "midnightcontrols.menu.mappings.open_input_str": "Open Mappings File Editor",
@@ -148,6 +149,7 @@
   "midnightcontrols.menu.max_right_x_value": "Right X Axis Max Value",
   "midnightcontrols.menu.max_right_y_value": "Right Y Axis Max Value",
   "midnightcontrols.menu.mouse_speed": "Mouse Speed",
+  "midnightcontrols.menu.move_chat": "Move chat input box to top",
   "midnightcontrols.menu.reacharound.horizontal": "Front Block Placing",
   "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound",
   "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings",
@@ -181,12 +183,14 @@
   "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.joystick_as_mouse": "Make the joystick behave like a mouse in every menu.",
   "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.",
   "midnightcontrols.tooltip.max_right_y_value": "Changes what the mod considers the highest value for the right Y axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
+  "midnightcontrols.tooltip.move_chat": "Moves the chat input field to the top, for better input on devices with on-screen keyboards.",
   "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.",

src/main/resources/assets/midnightcontrols/lang/it_it.json

@@ -0,0 +1,203 @@
+{
+	"midnightcontrols.midnightconfig.title": "Configurazione Avanzata MidnightControls",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Default Chiaro",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Default Scuro",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Chiaro Secondario",
+	"midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Scuro secondario",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Default",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
+	"midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
+	"midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Controller Switch/Wii",
+	"midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Controller Xbox One/Series",
+	"midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Controller Xbox 360",
+	"midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Controller Steam",
+	"midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
+	"midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "Controller OUYA",
+	"midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Controller Numerato",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Tastiera/Mouse",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Controller",
+	"midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (WIP)",
+	"midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Sinistra",
+	"midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Destra",
+	"key.midnightcontrols.look_down": "Guarda in basso",
+	"key.midnightcontrols.look_left": "Guarda a sinistra",
+	"key.midnightcontrols.look_right": "Guarda a destra",
+	"key.midnightcontrols.look_up": "Guarda sopra",
+	"key.midnightcontrols.ring": "Apri Tasti non impostati",
+	"midnightcontrols.action.attack": "Attacca",
+	"midnightcontrols.action.back": "Indietro",
+	"midnightcontrols.action.chat": "Apri Chat",
+	"midnightcontrols.action.controls_ring": "Apri Tasti non impostati",
+	"midnightcontrols.action.debug_screen": "Apri HUD di Debug (F3)",
+	"midnightcontrols.action.drop_item": "Rilascia oggetto",
+	"midnightcontrols.action.exit": "Esci",
+	"midnightcontrols.action.forward": "Avanti",
+	"midnightcontrols.action.hit": "Colpisci",
+	"midnightcontrols.action.hotbar_left": "Hotbar sinistra",
+	"midnightcontrols.action.hotbar_right": "Hotbar destra",
+	"midnightcontrols.action.inventory": "Inventario",
+	"midnightcontrols.action.jump": "Salta",
+	"midnightcontrols.action.left": "Sinistra",
+	"midnightcontrols.action.pause_game": "Pausa il gioco",
+	"midnightcontrols.action.pick_block": "Prendi Blocco",
+	"midnightcontrols.action.pickup": "Raccogli",
+	"midnightcontrols.action.pickup_all": "Raccogli Tutto",
+	"midnightcontrols.action.place": "Piazza",
+	"midnightcontrols.action.player_list": "Lista Giocatori",
+	"midnightcontrols.action.quick_move": "Muovi veloce",
+	"midnightcontrols.action.right": "Destra",
+	"midnightcontrols.action.screenshot": "Fai uno Screenshot",
+	"midnightcontrols.action.slot_up": "Muovi slot sopra",
+	"midnightcontrols.action.slot_down": "Muovi slot sotto",
+	"midnightcontrols.action.slot_left": "Muovi slot a sinistra",
+	"midnightcontrols.action.slot_right": "Muovi slot a destra",
+	"midnightcontrols.action.sneak": "Accovaccia",
+	"midnightcontrols.action.sprint": "Corri",
+	"midnightcontrols.action.swap_hands": "Scambia le mani",
+	"midnightcontrols.action.toggle_perspective": "Cambia la prospettiva",
+	"midnightcontrols.action.toggle_smooth_camera": "Cambia Camera Cinematica",
+	"midnightcontrols.action.page_back": "Pagina precedente",
+	"midnightcontrols.action.page_next": "Pagina Successica",
+	"midnightcontrols.action.tab_back": "Tab Precedente",
+	"midnightcontrols.action.tab_next": "Tab Successiva",
+	"midnightcontrols.action.take": "Prendi Item",
+	"midnightcontrols.action.take_all": "Prendi Stack",
+	"midnightcontrols.action.use": "Usa",
+	"midnightcontrols.action.zoom": "Zoom",
+	"midnightcontrols.action.zoom_in": "Aumenta Zoom",
+	"midnightcontrols.action.zoom_out": "Diminuisci Zoom",
+	"midnightcontrols.action.zoom_reset": "Resetta Zoom",
+	"midnightcontrols.action.emi_page_left": "Pagina Precedente",
+	"midnightcontrols.action.emi_page_right": "Pagina Successiva",
+	"midnightcontrols.category.emi": "EMI",
+	"midnightcontrols.button.a": "A",
+	"midnightcontrols.button.b": "B",
+	"midnightcontrols.button.x": "X",
+	"midnightcontrols.button.y": "Y",
+	"midnightcontrols.button.left_bumper": "Bumper Destro",
+	"midnightcontrols.button.right_bumper": "Bumper Sinistro",
+	"midnightcontrols.button.back": "Indietro",
+	"midnightcontrols.button.start": "Avvia",
+	"midnightcontrols.button.guide": "Guida",
+	"midnightcontrols.button.left_thumb": "Pollice Sinistro",
+	"midnightcontrols.button.right_thumb": "Pollice Destro",
+	"midnightcontrols.button.dpad_up": "DPAD Sopra",
+	"midnightcontrols.button.dpad_right": "DPAD Destra",
+	"midnightcontrols.button.dpad_down": "DPAD Sotto",
+	"midnightcontrols.button.dpad_left": "DPAD Sinistra",
+	"midnightcontrols.button.l4": "L4",
+	"midnightcontrols.button.l5": "L5",
+	"midnightcontrols.button.r4": "R4",
+	"midnightcontrols.button.r5": "L5",
+	"midnightcontrols.axis.left_x+": "Sinistra X+",
+	"midnightcontrols.axis.left_y+": "Sinistra Y+",
+	"midnightcontrols.axis.right_x+": "Destra X+",
+	"midnightcontrols.axis.right_y+": "Destra Y+",
+	"midnightcontrols.axis.left_trigger": "Trigger Sinistro",
+	"midnightcontrols.axis.right_trigger": "Trigger Destro",
+	"midnightcontrols.axis.left_x-": "Sinistra X-",
+	"midnightcontrols.axis.left_y-": "Sinistra Y-",
+	"midnightcontrols.axis.right_x-": "Destra X-",
+	"midnightcontrols.axis.right_y-": "Destra Y-",
+	"midnightcontrols.button.unknown": "Sconosciuto",
+	"midnightcontrols.controller.tutorial.title": "Gioca il gioco con un Controller!",
+	"midnightcontrols.controller.tutorial.description": "Vai a %s -> %s -> %s",
+	"midnightcontrols.controller.connected": "Controller %d connesso.",
+	"midnightcontrols.controller.disconnected": "Controller %d disconnesso",
+	"midnightcontrols.controller.mappings.1": "Per configurare le mappature dei controller, per favore usa %s",
+	"midnightcontrols.controller.mappings.3": "e incolla le mappature nel file editor.",
+	"midnightcontrols.controller.mappings.error": "Errore durante il caricamento delle mappature",
+	"midnightcontrols.controller.mappings.error.write": "Errore durante la scrittura delle mappature su file",
+	"midnightcontrols.controller.mappings.updated": "Aggiornate le mappature!",
+	"midnightcontrols.controller_type.default": "Default",
+	"midnightcontrols.controller_type.dualshock": "DualShock",
+	"midnightcontrols.controller_type.dualsense": "DualSense",
+	"midnightcontrols.controller_type.switch": "Controller Switch/Wii",
+	"midnightcontrols.controller_type.xbox": "Controller Xbox One/Series",
+	"midnightcontrols.controller_type.xbox_360": "Controller Xbox 360",
+	"midnightcontrols.controller_type.steam_controller": "Controller Steam",
+	"midnightcontrols.controller_type.steam_deck": "Steam Deck",
+	"midnightcontrols.controller_type.ouya": "Controller OUYA",
+	"midnightcontrols.controller_type.numbered": "Controller Numerato",
+	"midnightcontrols.controls_mode.default": "Tastiera/Mouse",
+	"midnightcontrols.controls_mode.controller": "Controller",
+	"midnightcontrols.controls_mode.touchscreen": "Touchscreen (WIP)",
+	"midnightcontrols.hud_side.left": "Left",
+	"midnightcontrols.hud_side.right": "Destra",
+	"midnightcontrols.menu.analog_movement": "Movimento Analogo",
+	"midnightcontrols.menu.auto_switch_mode": "Modalità Cambio Automatico",
+	"midnightcontrols.menu.controller": "Controller",
+	"midnightcontrols.menu.controller2": "Controller Secondario",
+	"midnightcontrols.menu.controller_toggle_sneak": "Attiva/Disattiva Accovacciamento su Controller",
+	"midnightcontrols.menu.controller_toggle_sprint": "Attiva/Disattiva Correre su Controller",
+	"midnightcontrols.menu.controller_type": "Tipo di Controller",
+	"midnightcontrols.menu.controls_mode": "Modalità",
+	"midnightcontrols.menu.double_tap_to_sprint": "Doppio Tap per Sprintare",
+	"midnightcontrols.menu.fast_block_placing": "Veloce Piazzamento di Blocchi",
+	"midnightcontrols.menu.fly_drifting": "Drift in Volo",
+	"midnightcontrols.menu.fly_drifting_vertical": "Drift in Volo Verticale",
+	"midnightcontrols.menu.hud_enable": "Attiva HUD",
+	"midnightcontrols.menu.hud_side": "Lato HUD",
+	"midnightcontrols.menu.invert_right_x_axis": "Inverti Destro X",
+	"midnightcontrols.menu.invert_right_y_axis": "Inverti Destro Y",
+	"midnightcontrols.menu.keyboard_controls": "Controlli da Tastiera...",
+	"midnightcontrols.menu.left_dead_zone": "Zona Morta dello Stick Sinistro",
+	"midnightcontrols.menu.mappings.open_input_str": "Apri il File Editor delle Mappature",
+	"midnightcontrols.menu.max_left_x_value": "Asse X Sinistro Massimo Valore",
+	"midnightcontrols.menu.max_left_y_value": "Asse Y Sinistro Massimo Valore",
+	"midnightcontrols.menu.max_right_x_value": "Asse Destro X Massimo Valore",
+	"midnightcontrols.menu.max_right_y_value": "Asse Destro Y Massimo Valore",
+	"midnightcontrols.menu.mouse_speed": "Velocità Mouse",
+	"midnightcontrols.menu.reacharound.horizontal": "Piazza blocchi Davanti",
+	"midnightcontrols.menu.reacharound.vertical": "Reach Verticale",
+	"midnightcontrols.menu.reload_controller_mappings": "Ricarica Mappature del Controller",
+	"midnightcontrols.menu.right_dead_zone": "Zona Morta Stick Destro",
+	"midnightcontrols.menu.rotation_speed": "Velocità di rotazione dell'Asse X",
+	"midnightcontrols.menu.y_axis_rotation_speed": "Velocità di rotazione dell'Asse Y",
+	"midnightcontrols.menu.separate_controller_profile": "Profilo Controller Separato",
+	"midnightcontrols.menu.separator.controller": "Controller",
+	"midnightcontrols.menu.separator.general": "Generale",
+	"midnightcontrols.menu.title": "MidnightControls - Impostazioni",
+	"midnightcontrols.menu.title.controller": "Opzioni Controller",
+	"midnightcontrols.menu.title.controller_controls": "Tasti Controller",
+	"midnightcontrols.menu.title.gameplay": "Opzioni del Gameplay",
+	"midnightcontrols.menu.title.general": "Impostazioni Generali",
+	"midnightcontrols.menu.title.hud": "Opzioni della HUD",
+	"midnightcontrols.menu.title.mappings.string": "Editor di file delle Mappature",
+	"midnightcontrols.menu.title.visual": "Aspetto",
+	"midnightcontrols.menu.unfocused_input": "Input non a fuoco",
+	"midnightcontrols.menu.virtual_mouse": "Mouse Virtuale",
+	"midnightcontrols.menu.virtual_mouse.skin": "Aspetto Mouse Virtuale",
+	"midnightcontrols.narrator.unbound": "Disimpostato %s",
+	"midnightcontrols.not_bound": "Non Impostato",
+	"midnightcontrols.tooltip.analog_movement": "Quando possibile, attiva movimento analogo.",
+	"midnightcontrols.tooltip.auto_switch_mode": "Quando la modalità controlli dovrebbe passare a Controller automaticamente se uno è connesso",
+	"midnightcontrols.tooltip.controller2": "Secondo controller da usare, che permette (per esempio) Supporto dei Joy-Cons.",
+	"midnightcontrols.tooltip.controller_type": "Il tipo di controller che stai usando (usato per mostrare i pulsanti corretti)",
+	"midnightcontrols.tooltip.controls_mode": "Modalita controlli.",
+	"midnightcontrols.tooltip.double_tap_to_sprint": "Attiva quando il tasto \"Cammina Avanti\" fa correre il giocatore con doppio tap velocemente",
+	"midnightcontrols.tooltip.fast_block_placing": "Quando si vola in creativa, attiva il movimento veloce dei blocchi in base alla tua velocità. §cSu alcuni server potrebbe essere considerato un cheat.§r",
+	"midnightcontrols.tooltip.fly_drifting": "Quando si vola, attiva L'inerzia del Vanilla",
+	"midnightcontrols.tooltip.fly_drifting_vertical": "Quando si vola, attiva l'inerzia verticale Vanilla",
+	"midnightcontrols.tooltip.hud_enable": "Attiva gli indicatori dei pulsanti dei controller sullo schermo.",
+	"midnightcontrols.tooltip.hud_side": "La posizione della HUD",
+	"midnightcontrols.tooltip.left_dead_zone": "La zona morta per lo stick sinistro del controller.",
+	"midnightcontrols.tooltip.max_left_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.tooltip.max_left_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.tooltip.max_right_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.tooltip.max_right_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.tooltip.mouse_speed": "La velocità del controller emulato.",
+	"midnightcontrols.tooltip.reacharound.horizontal": "Attiva il piazzare blocchi davanti, Potrebbe essere considerato un cheat su alcuni server.",
+	"midnightcontrols.tooltip.reacharound.vertical": "Attiva il reach verticale, potrebbe essere considerato cheating su alcuni server",
+	"midnightcontrols.tooltip.reload_controller_mappings": "Riavvia il file dlle mappature del controller",
+	"midnightcontrols.tooltip.right_dead_zone": "La zona morta per lo stick destro del controller",
+	"midnightcontrols.tooltip.rotation_speed": "L'asse X della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.tooltip.y_axis_rotation_speed": "L'asse Y della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.tooltip.unfocused_input": "Permette imput dei controller quando la finestra non è messa a fuoco",
+	"midnightcontrols.tooltip.virtual_mouse": "Attiva il mouse virtuale, che può essere utile nello schermo diviso.",
+	"midnightcontrols.virtual_mouse.skin.default_light": "Chiaro Default",
+	"midnightcontrols.virtual_mouse.skin.default_dark": "Scuro Default",
+	"midnightcontrols.virtual_mouse.skin.second_light": "Chiaro Secondario",
+	"midnightcontrols.virtual_mouse.skin.second_dark": "Scuro Secondario",
+	"modmenu.descriptionTranslation.midnightcontrols": "Aggiunge supporto e controlli migliorati in generale. \\nProveniente da LambdaControls, che è stato rimosso."
+}

src/main/resources/fabric.mod.json

@@ -52,8 +52,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.11.3",
-    "fabric": ">=0.36.0",
+    "fabric": ">=0.71.0",
-    "minecraft": ">=1.17",
+    "minecraft": "~1.19.3",
     "spruceui": ">=3.2.0",
     "java": ">=17"
   },

src/main/resources/midnightcontrols.mixins.json

@@ -15,6 +15,7 @@
     "KeyBindingMixin",
     "MinecraftClientMixin",
     "MouseMixin",
+    "ChatScreenMixin",
     "RecipeBookWidgetAccessor",
     "WorldRendererMixin",
     "KeyBindingRegistryImplAccessor",

src/main/resources/resourcepacks/bedrock/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 9,
+    "pack_format": 12,
     "description": "Makes controller tooltips use similar icons to Bedrock Edition"
   }
 }

src/main/resources/resourcepacks/legacy/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 9,
+    "pack_format": 12,
     "description": "Makes controller icons look similar to Legacy Console Edit."
   }
 }