port to 1.19

Common/src/main/java/com/blamejared/controlling/client/FancyCheckbox.java

@@ -8,7 +8,6 @@ import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
@@ -49,9 +48,9 @@ public class FancyCheckbox extends AbstractButton {
         elementOutput.add(NarratedElementType.TITLE, this.createNarrationMessage());
         if(this.active) {
             if(this.isFocused()) {
-                elementOutput.add(NarratedElementType.USAGE, new TranslatableComponent("narration.checkbox.usage.focused"));
+                elementOutput.add(NarratedElementType.USAGE, Component.translatable("narration.checkbox.usage.focused"));
             } else {
-                elementOutput.add(NarratedElementType.USAGE, new TranslatableComponent("narration.checkbox.usage.hovered"));
+                elementOutput.add(NarratedElementType.USAGE, Component.translatable("narration.checkbox.usage.hovered"));
             }
         }
         

Common/src/main/java/com/blamejared/controlling/client/FreeKeysList.java

@@ -10,7 +10,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.controls.KeyBindsScreen;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -142,7 +142,7 @@ public class FreeKeysList extends CustomList {
         @Override
         public void render(PoseStack stack, int slotIndex, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovered, float partialTicks) {
             
-            drawCenteredString(stack, mc.font, new TranslatableComponent("options.availableKeys"), (Objects.requireNonNull(mc.screen).width / 2 - this.text.length() / 2), (y + height - 9 - 1), 16777215);
+            drawCenteredString(stack, mc.font, Component.translatable("options.availableKeys"), (Objects.requireNonNull(mc.screen).width / 2 - this.text.length() / 2), (y + height - 9 - 1), 16777215);
         }
         
     }

Common/src/main/java/com/blamejared/controlling/client/NewKeyBindsList.java

@@ -19,11 +19,11 @@ import net.minecraft.client.gui.screens.controls.KeyBindsScreen;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.util.Mth;
 import org.apache.commons.lang3.ArrayUtils;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -79,8 +79,7 @@ public class NewKeyBindsList extends CustomList {
         Entry entry = this.getEntryAtPos(mouseY);
         if(entry instanceof KeyEntry keyEntry) {
             
-            controlsScreen.renderTooltip(matrixStack, new TranslatableComponent(keyEntry.getKeybinding()
-                    .getCategory()), mouseX, mouseY);
+            controlsScreen.renderTooltip(matrixStack, Component.translatable(keyEntry.getKeybinding().getCategory()), mouseX, mouseY);
         }
     }
     
@@ -170,16 +169,16 @@ public class NewKeyBindsList extends CustomList {
             
             this.keybinding = name;
             this.keyDesc = I18n.get(name.getName());
-            this.btnChangeKeyBinding = new Button(0, 0, 75 + 20, 20, new TextComponent(this.keyDesc), (btn) -> NewKeyBindsList.this.controlsScreen.selectedKey = name) {
+            this.btnChangeKeyBinding = new Button(0, 0, 75 + 20, 20, Component.literal(this.keyDesc), (btn) -> NewKeyBindsList.this.controlsScreen.selectedKey = name) {
                 
                 @Override
                 protected MutableComponent createNarrationMessage() {
                     
-                    return name.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", NewKeyBindsList.KeyEntry.this.keyDesc) : new TranslatableComponent("narrator.controls.bound", NewKeyBindsList.KeyEntry.this.keyDesc, super.createNarrationMessage());
+                    return name.isUnbound() ? Component.translatable("narrator.controls.unbound", NewKeyBindsList.KeyEntry.this.keyDesc) : Component.translatable("narrator.controls.bound", NewKeyBindsList.KeyEntry.this.keyDesc, super.createNarrationMessage());
                 }
                 
             };
-            this.btnResetKeyBinding = new Button(0, 0, 50, 20, new TranslatableComponent("controls.reset"), (btn) -> {
+            this.btnResetKeyBinding = new Button(0, 0, 50, 20, Component.translatable("controls.reset"), (btn) -> {
                 Services.PLATFORM.setToDefault(minecraft.options, name);
                 KeyMapping.resetMapping();
             }) {
@@ -187,7 +186,7 @@ public class NewKeyBindsList extends CustomList {
                 @Override
                 protected MutableComponent createNarrationMessage() {
                     
-                    return new TranslatableComponent("narrator.controls.reset", NewKeyBindsList.KeyEntry.this.keyDesc);
+                    return Component.translatable("narrator.controls.reset", NewKeyBindsList.KeyEntry.this.keyDesc);
                 }
             };
         }
@@ -222,7 +221,7 @@ public class NewKeyBindsList extends CustomList {
             }
             Component message = this.btnChangeKeyBinding.getMessage();
             if(flag) {
-                this.btnChangeKeyBinding.setMessage(new TextComponent(ChatFormatting.WHITE + "> " + ChatFormatting.YELLOW + message.getString() + ChatFormatting.WHITE + " <"));
+                this.btnChangeKeyBinding.setMessage(Component.literal(ChatFormatting.WHITE + "> " + ChatFormatting.YELLOW + message.getString() + ChatFormatting.WHITE + " <"));
             } else if(flag1) {
                 this.btnChangeKeyBinding.setMessage(message.copy()
                         .withStyle(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));

Common/src/main/java/com/blamejared/controlling/client/NewKeyBindsScreen.java

@@ -21,10 +21,9 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.controls.KeyBindsList;
 import net.minecraft.client.gui.screens.controls.KeyBindsScreen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import org.lwjgl.glfw.GLFW;
 
+import java.awt.*;
 import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -69,18 +68,18 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
         this.setKeyBindsList(this.customKeyList);
         this.addWidget(getKeyBindsList());
         this.setFocused(getKeyBindsList());
-        this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, new TranslatableComponent("gui.done"), (btn) -> Objects.requireNonNull(this.minecraft)
+        this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, Component.translatable("gui.done"), (btn) -> Objects.requireNonNull(this.minecraft)
                 .setScreen(this.lastScreen)));
         
-        this.buttonReset = this.addRenderableWidget(new Button(this.width / 2 - 155, this.height - 29, 74, 20, new TranslatableComponent("controls.resetAll"), (btn) -> {
+        this.buttonReset = this.addRenderableWidget(new Button(this.width / 2 - 155, this.height - 29, 74, 20, Component.translatable("controls.resetAll"), (btn) -> {
             
             if(!confirmingReset) {
                 confirmingReset = true;
-                btn.setMessage(new TranslatableComponent("options.confirmReset"));
+                btn.setMessage(Component.translatable("options.confirmReset"));
                 return;
             }
             confirmingReset = false;
-            btn.setMessage(new TranslatableComponent("controls.resetAll"));
+            btn.setMessage(Component.translatable("controls.resetAll"));
             for(KeyMapping keybinding : Objects.requireNonNull(minecraft).options.keyMappings) {
                 Services.PLATFORM.setToDefault(minecraft.options, keybinding);
                 KeyMapping.resetMapping();
@@ -88,48 +87,48 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
             
             KeyMapping.releaseAll();
         }));
-        this.buttonNone = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160 + 76, this.height - 29 - 24, 150 / 2, 20, new TranslatableComponent("options.showNone"), (btn) -> {
+        this.buttonNone = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160 + 76, this.height - 29 - 24, 150 / 2, 20, Component.translatable("options.showNone"), (btn) -> {
             if(displayMode == DisplayMode.NONE) {
-                buttonNone.setMessage(new TranslatableComponent("options.showNone"));
+                buttonNone.setMessage(Component.translatable("options.showNone"));
                 displayMode = DisplayMode.ALL;
             } else {
                 displayMode = DisplayMode.NONE;
-                buttonNone.setMessage(new TranslatableComponent("options.showAll"));
-                buttonConflicting.setMessage(new TranslatableComponent("options.showConflicts"));
+                buttonNone.setMessage(Component.translatable("options.showAll"));
+                buttonConflicting.setMessage(Component.translatable("options.showConflicts"));
             }
             filterKeys();
         }));
-        this.buttonConflicting = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29 - 24, 150 / 2, 20, new TranslatableComponent("options.showConflicts"), (btn) -> {
+        this.buttonConflicting = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29 - 24, 150 / 2, 20, Component.translatable("options.showConflicts"), (btn) -> {
             if(displayMode == DisplayMode.CONFLICTING) {
-                buttonConflicting.setMessage(new TranslatableComponent("options.showConflicts"));
+                buttonConflicting.setMessage(Component.translatable("options.showConflicts"));
                 displayMode = DisplayMode.ALL;
             } else {
                 displayMode = DisplayMode.CONFLICTING;
-                buttonConflicting.setMessage(new TranslatableComponent("options.showAll"));
-                buttonNone.setMessage(new TranslatableComponent("options.showNone"));
+                buttonConflicting.setMessage(Component.translatable("options.showAll"));
+                buttonNone.setMessage(Component.translatable("options.showNone"));
             }
             filterKeys();
         }));
-        search = new EditBox(font, this.width / 2 - 154, this.height - 29 - 23, 148, 18, TextComponent.EMPTY);
+        search = new EditBox(font, this.width / 2 - 154, this.height - 29 - 23, 148, 18, Component.empty());
         addWidget(search);
-        this.buttonKey = this.addRenderableWidget(new FancyCheckbox(this.width / 2 - (155 / 2), this.height - 29 - 37, 11, 11, new TranslatableComponent("options.key"), false, btn -> {
+        this.buttonKey = this.addRenderableWidget(new FancyCheckbox(this.width / 2 - (155 / 2), this.height - 29 - 37, 11, 11, Component.translatable("options.key"), false, btn -> {
             buttonCat.selected(false);
             searchType = btn.selected() ? SearchType.KEY : SearchType.NAME;
             filterKeys();
         }));
-        this.buttonCat = this.addRenderableWidget(new FancyCheckbox(this.width / 2 - (155 / 2), this.height - 29 - 50, 11, 11, new TranslatableComponent("options.category"), false, btn -> {
+        this.buttonCat = this.addRenderableWidget(new FancyCheckbox(this.width / 2 - (155 / 2), this.height - 29 - 50, 11, 11, Component.translatable("options.category"), false, btn -> {
             buttonKey.selected(false);
             searchType = btn.selected() ? SearchType.CATEGORY : SearchType.NAME;
             filterKeys();
         }));
         sortOrder = SortOrder.NONE;
-        Button buttonSort = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160 + 76, this.height - 29 - 24 - 24, 150 / 2, 20, new TranslatableComponent("options.sort").append(": " + sortOrder.getName()), (btn) -> {
+        Button buttonSort = this.addRenderableWidget(new Button(this.width / 2 - 155 + 160 + 76, this.height - 29 - 24 - 24, 150 / 2, 20, Component.translatable("options.sort").append(": " + sortOrder.getName()), (btn) -> {
             sortOrder = sortOrder.cycle();
-            btn.setMessage(new TranslatableComponent("options.sort").append(": " + sortOrder.getName()));
+            btn.setMessage(Component.translatable("options.sort").append(": " + sortOrder.getName()));
             filterKeys();
         }));
         
-        this.addRenderableWidget(new Button(this.width / 2 - 155 + 76, this.height - 29, 74, 20, new TranslatableComponent("options.toggleFree"), (btn) -> {
+        this.addRenderableWidget(new Button(this.width / 2 - 155 + 76, this.height - 29, 74, 20, Component.translatable("options.toggleFree"), (btn) -> {
             this.removeWidget(getKeyBindsList());
             if(showFree) {
                 buttonSort.active = true;
@@ -189,7 +188,7 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
                 case NAME -> displayMode.getPredicate()
                         .and(keyEntry -> keyEntry.getKeyDesc().toLowerCase().contains(lastSearch.toLowerCase()));
                 case CATEGORY -> displayMode.getPredicate()
-                        .and(keyEntry -> new TranslatableComponent(keyEntry.getKeybinding().getCategory()).getString()
+                        .and(keyEntry -> Component.translatable(keyEntry.getKeybinding().getCategory()).getString()
                                 .toLowerCase()
                                 .contains(lastSearch.toLowerCase()));
                 case KEY -> displayMode.getPredicate()
@@ -281,11 +280,11 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
         this.buttonReset.active = flag;
         if(!flag) {
             confirmingReset = false;
-            buttonReset.setMessage(new TranslatableComponent("controls.resetAll"));
+            buttonReset.setMessage(Component.translatable("controls.resetAll"));
         }
         
         
-        Component text = new TranslatableComponent("options.search");
+        Component text = Component.translatable("options.search");
         font.draw(stack, text, this.width / 2f - (155 / 2f) - (font.width(text.getString())) - 5, this.height - 29 - 42, 16777215);
         
         for(Widget widget : getScreenAccess().controlling$getRenderables()) {

Fabric/build.gradle.kts

@@ -4,7 +4,7 @@ import net.darkhax.curseforgegradle.Constants as CFG_Constants
 
 plugins {
     `maven-publish`
-    id("fabric-loom") version "0.10-SNAPSHOT"
+    id("fabric-loom") version "0.12-SNAPSHOT"
     id("com.blamejared.modtemplate")
     id("net.darkhax.curseforgegradle") version ("1.0.8")
 }

Fabric/src/main/resources/fabric.mod.json

@@ -17,9 +17,9 @@
   "entrypoints": {
   },
   "depends": {
-    "fabricloader": ">=0.12",
+    "fabricloader": ">=0.14",
     "java": ">=17",
-    "minecraft": "1.18.x"
+    "minecraft": "1.19.x"
   },
   "recommends": {
     "fabric": "*"

Forge/build.gradle.kts

@@ -42,7 +42,7 @@ mixin {
 }
 
 minecraft {
-    mappings("parchment", "2021.12.19-1.18.1")
+    mappings("official", "1.19")
 
     runs {
         create("client") {

Forge/src/main/resources/META-INF/mods.toml

@@ -1,11 +1,11 @@
 modLoader="javafml"
-loaderVersion="[40,)"
+loaderVersion="[41,)"
 issueTrackerURL="https://github.com/jaredlll08/Controlling/issues"
 license="MIT"
 
 [[mods]]
 modId="controlling"
-updateJSONURL="https://updates.blamejared.com/get?n=controlling&gv=1.18.2"
+updateJSONURL="https://updates.blamejared.com/get?n=controlling&gv=1.19"
 version="${file.jarVersion}"
 displayName="Controlling"
 displayURL="https://minecraft.curseforge.com/projects/controlling"
@@ -18,12 +18,12 @@ itemIcon="minecraft:compass"
   [[dependencies.controlling]]
 	modId="forge"
 	mandatory=true
-	versionRange="[40,)"
+	versionRange="[41,)"
 	ordering="NONE"
 	side="CLIENT"
   [[dependencies.controlling]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.18.2,)"
+    versionRange="[1.19,)"
     ordering="NONE"
     side="CLIENT"

gradle.properties

@@ -1,14 +1,14 @@
 # Project
-modVersion=9.0
+modVersion=10.0
 group=com.blamejared.controlling
 modJavaVersion=17
 # Common
-minecraftVersion=1.18.2
+minecraftVersion=1.19
 # Forge
-forgeVersion=40.0.1
+forgeVersion=41.0.1
 # Fabric
-fabricVersion=0.47.8+1.18.2
-fabricLoaderVersion=0.13.3
+fabricVersion=0.55.2+1.19
+fabricLoaderVersion=0.14.6
 # Mod options
 modName=Controlling
 modAuthor=Jared