[Port] Update to 1.21.10 (v2.7.0)

CDAGaming · CDAGaming · commit 3dce8f6f1687 · 2025-12-14T14:12:51.000-06:00
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/config/gui/MainGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/config/gui/MainGui.java
@@ -34,6 +34,7 @@
 import com.gitlab.cdagaming.unilib.utils.gui.widgets.ScrollableTextWidget;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.KeyEvent;
 
 public class MainGui extends ConfigurationGui<Config> {
     private final Config INSTANCE, DEFAULTS;
@@ -232,11 +233,11 @@ calc2, getButtonY(currentY),
     }
 
     @Override
-    public boolean keyPressed(int keyCode, int mouseX, int mouseY) {
-        if (isEscapeKey(keyCode) && getCurrentData().hasChanged()) {
+    public boolean keyPressed(KeyEvent keyEvent) {
+        if (isEscapeKey(keyEvent.input()) && getCurrentData().hasChanged()) {
             syncData();
         }
-        return super.keyPressed(keyCode, mouseX, mouseY);
+        return super.keyPressed(keyEvent);
     }
 
     @Override
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/CommandUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/CommandUtils.java
@@ -46,6 +46,7 @@
 import com.gitlab.cdagaming.unilib.impl.TranslationManager;
 import com.gitlab.cdagaming.unilib.utils.GameUtils;
 import com.gitlab.cdagaming.unilib.utils.KeyUtils;
+import com.gitlab.cdagaming.unilib.utils.ResourceUtils;
 import com.gitlab.cdagaming.unilib.utils.gui.RenderUtils;
 import com.gitlab.cdagaming.unilib.utils.gui.integrations.ExtendedScreen;
 import com.jagrosh.discordipc.entities.DiscordBuild;
@@ -479,7 +480,7 @@ public static void registerKeybinds() {
                 "configKeyCode",
                 "key.craftpresence.config_keycode.name",
                 Constants.TRANSLATOR::translate,
-                "key.category.craftpresence.controls",
+                ResourceUtils.getResource(Constants.MOD_ID, "controls"),
                 Constants.TRANSLATOR::translate,
                 CraftPresence.CONFIG.accessibilitySettings.getDefaults().configKeyCode,
                 CraftPresence.CONFIG.accessibilitySettings.configKeyCode,
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java
@@ -280,13 +280,13 @@ public void getInternalData() {
         if (CraftPresence.SERVER.isEnabled()) {
             for (PlayerInfo playerInfo : CraftPresence.SERVER.currentPlayerList) {
                 if (playerInfo != null) {
-                    final String uuidString = playerInfo.getProfile().getId().toString();
+                    final String uuidString = playerInfo.getProfile().id().toString();
                     if (!StringUtils.isNullOrEmpty(uuidString)) {
                         if (!ENTITY_NAMES.contains(uuidString)) {
                             ENTITY_NAMES.add(uuidString);
                         }
                         if (!PLAYER_BINDINGS.containsKey(uuidString)) {
-                            PLAYER_BINDINGS.put(uuidString, playerInfo.getProfile().getName());
+                            PLAYER_BINDINGS.put(uuidString, playerInfo.getProfile().name());
                         }
                     }
                 }
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/CommandsGui.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/impl/CommandsGui.java
@@ -38,6 +38,7 @@
 import com.gitlab.cdagaming.unilib.utils.gui.widgets.TextDisplayWidget;
 import io.github.cdagaming.unicore.utils.FileUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
+import net.minecraft.client.input.KeyEvent;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -488,14 +489,14 @@ private void checkCommands() {
     }
 
     @Override
-    public boolean keyPressed(int keyCode, int mouseX, int mouseY) {
+    public boolean keyPressed(KeyEvent keyEvent) {
         if (!blockInteractions) {
             if (commandInput.isControlFocused()) {
-                if (isEscapeKey(keyCode)) {
+                if (isEscapeKey(keyEvent.input())) {
                     commandInput.setControlFocused(false);
                 } else {
                     if (canAcceptCommand()) {
-                        if (keyCode == getKeyByVersion(15, 258) && !tabCompletions.isEmpty()) { // Tab Key Event
+                        if (keyEvent.input() == getKeyByVersion(15, 258) && !tabCompletions.isEmpty()) { // Tab Key Event
                             if (commandArgs.length > 1 && (filteredCommandArgs[filteredCommandArgs.length - 1].length() > 1 ||
                                     filteredCommandArgs[filteredCommandArgs.length - 1].equalsIgnoreCase("?")
                             )) {
@@ -504,14 +505,14 @@ public boolean keyPressed(int keyCode, int mouseX, int mouseY) {
                                 );
                                 commandInput.setControlMessage(commandString);
                             }
-                        } else if (keyCode == getKeyByVersion(28, 257) || keyCode == getKeyByVersion(156, 335)) { // Enter Key Event
+                        } else if (keyEvent.input() == getKeyByVersion(28, 257) || keyEvent.input() == getKeyByVersion(156, 335)) { // Enter Key Event
                             acceptCommand();
                         }
                     }
-                    return commandInput.keyPressed(keyCode, mouseX, mouseY);
+                    return commandInput.keyPressed(keyEvent);
                 }
             }
-            return super.keyPressed(keyCode, mouseX, mouseY);
+            return super.keyPressed(keyEvent);
         }
         return false;
     }
diff --git a/fabric/src/main/resources/pack.mcmeta b/fabric/src/main/resources/pack.mcmeta
@@ -1,6 +1,7 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 64
+    "min_format": [65, 0],
+    "max_format": [69, 0]
   }
 }
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,7 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 64
+    "min_format": [65, 0],
+    "max_format": [69, 0]
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -13,29 +13,29 @@ isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.21.8
-mc_protocol=772
+mc_version=1.21.10
+mc_protocol=773
 display_version=
 # Fabric Info
-fabric_api_version=0.134.0+1.21.8
-fabric_game_version_range=>=1.21.7 <1.21.9
+fabric_api_version=0.134.1+1.21.10
+fabric_game_version_range=>=1.21.9 <1.21.11
 fabric_loader_version_range=>=0.12.0
 additional_fabric_loaders=quilt
 # Forge Info
-forge_version=58.1.0
-fml_version_range=[57,)
-forge_game_version_range=[1.21.7, 1.21.9)
-forge_loader_version_range=[57.0.0,)
+forge_version=60.0.0
+fml_version_range=[59,)
+forge_game_version_range=[1.21.9, 1.21.11)
+forge_loader_version_range=[59.0.0,)
 # NeoForge Info
-neoforge_version=47
+neoforge_version=0-beta
 neo_fml_version_range=[1.0,)
-neoforge_game_version_range=[1.21.7, 1.21.9)
-neoforge_loader_version_range=[21.7.0-beta,)
+neoforge_game_version_range=[1.21.9, 1.21.11)
+neoforge_loader_version_range=[21.9.0-beta,)
 # Deployment Info
 versionId=2.7.0
 deploymentType=Release
 versionLabel=Release
-additional_mc_versions=1.21.7
+additional_mc_versions=1.21.9
 # Integration Info
 source_java_version=21
 build_java_version=21
diff --git a/neoforge/src/main/java/com/gitlab/cdagaming/craftpresence/neoforge/CraftPresenceNeoForge.java b/neoforge/src/main/java/com/gitlab/cdagaming/craftpresence/neoforge/CraftPresenceNeoForge.java
@@ -46,7 +46,7 @@ public CraftPresenceNeoForge() {
                 throw new UnsupportedOperationException("Incompatible JVM!!! @MOD_NAME@ requires Java 8 or above to work properly!");
             }
 
-            if (FMLEnvironment.dist.isClient()) {
+            if (FMLEnvironment.getDist().isClient()) {
                 ClientExtensions.Setup();
                 new CraftPresence(this::setupIntegrations);
             } else {
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +1,7 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 64
+    "min_format": [65, 0],
+    "max_format": [69, 0]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`import com.gitlab.cdagaming.unilib.utils.gui.widgets.ScrollableTextWidget;`
`35`	`35`	`import io.github.cdagaming.unicore.utils.StringUtils;`
`36`	`36`	`import net.minecraft.client.gui.screens.Screen;`
	`37`	`+import net.minecraft.client.input.KeyEvent;`
`37`	`38`
`38`	`39`	`public class MainGui extends ConfigurationGui<Config> {`
`39`	`40`	`private final Config INSTANCE, DEFAULTS;`
`@@ -232,11 +233,11 @@ calc2, getButtonY(currentY),`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`@Override`
`235`		`- public boolean keyPressed(int keyCode, int mouseX, int mouseY) {`
`236`		`- if (isEscapeKey(keyCode) && getCurrentData().hasChanged()) {`
	`236`	`+ public boolean keyPressed(KeyEvent keyEvent) {`
	`237`	`+ if (isEscapeKey(keyEvent.input()) && getCurrentData().hasChanged()) {`
`237`	`238`	`syncData();`
`238`	`239`	`}`
`239`		`- return super.keyPressed(keyCode, mouseX, mouseY);`
	`240`	`+ return super.keyPressed(keyEvent);`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -280,13 +280,13 @@ public void getInternalData() {`
`280`	`280`	`if (CraftPresence.SERVER.isEnabled()) {`
`281`	`281`	`for (PlayerInfo playerInfo : CraftPresence.SERVER.currentPlayerList) {`
`282`	`282`	`if (playerInfo != null) {`
`283`		`- final String uuidString = playerInfo.getProfile().getId().toString();`
	`283`	`+ final String uuidString = playerInfo.getProfile().id().toString();`
`284`	`284`	`if (!StringUtils.isNullOrEmpty(uuidString)) {`
`285`	`285`	`if (!ENTITY_NAMES.contains(uuidString)) {`
`286`	`286`	`ENTITY_NAMES.add(uuidString);`
`287`	`287`	`}`
`288`	`288`	`if (!PLAYER_BINDINGS.containsKey(uuidString)) {`
`289`		`- PLAYER_BINDINGS.put(uuidString, playerInfo.getProfile().getName());`
	`289`	`+ PLAYER_BINDINGS.put(uuidString, playerInfo.getProfile().name());`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`import com.gitlab.cdagaming.unilib.utils.gui.widgets.TextDisplayWidget;`
`39`	`39`	`import io.github.cdagaming.unicore.utils.FileUtils;`
`40`	`40`	`import io.github.cdagaming.unicore.utils.StringUtils;`
	`41`	`+import net.minecraft.client.input.KeyEvent;`
`41`	`42`
`42`	`43`	`import java.io.BufferedWriter;`
`43`	`44`	`import java.io.File;`
`@@ -488,14 +489,14 @@ private void checkCommands() {`
`488`	`489`	`}`
`489`	`490`
`490`	`491`	`@Override`
`491`		`- public boolean keyPressed(int keyCode, int mouseX, int mouseY) {`
	`492`	`+ public boolean keyPressed(KeyEvent keyEvent) {`
`492`	`493`	`if (!blockInteractions) {`
`493`	`494`	`if (commandInput.isControlFocused()) {`
`494`		`- if (isEscapeKey(keyCode)) {`
	`495`	`+ if (isEscapeKey(keyEvent.input())) {`
`495`	`496`	`commandInput.setControlFocused(false);`
`496`	`497`	`} else {`
`497`	`498`	`if (canAcceptCommand()) {`
`498`		`- if (keyCode == getKeyByVersion(15, 258) && !tabCompletions.isEmpty()) { // Tab Key Event`
	`499`	`+ if (keyEvent.input() == getKeyByVersion(15, 258) && !tabCompletions.isEmpty()) { // Tab Key Event`
`499`	`500`	`if (commandArgs.length > 1 && (filteredCommandArgs[filteredCommandArgs.length - 1].length() > 1 \|\|`
`500`	`501`	`filteredCommandArgs[filteredCommandArgs.length - 1].equalsIgnoreCase("?")`
`501`	`502`	`)) {`
`@@ -504,14 +505,14 @@ public boolean keyPressed(int keyCode, int mouseX, int mouseY) {`
`504`	`505`	`);`
`505`	`506`	`commandInput.setControlMessage(commandString);`
`506`	`507`	`}`
`507`		`- } else if (keyCode == getKeyByVersion(28, 257) \|\| keyCode == getKeyByVersion(156, 335)) { // Enter Key Event`
	`508`	`+ } else if (keyEvent.input() == getKeyByVersion(28, 257) \|\| keyEvent.input() == getKeyByVersion(156, 335)) { // Enter Key Event`
`508`	`509`	`acceptCommand();`
`509`	`510`	`}`
`510`	`511`	`}`
`511`		`- return commandInput.keyPressed(keyCode, mouseX, mouseY);`
	`512`	`+ return commandInput.keyPressed(keyEvent);`
`512`	`513`	`}`
`513`	`514`	`}`
`514`		`- return super.keyPressed(keyCode, mouseX, mouseY);`
	`515`	`+ return super.keyPressed(keyEvent);`
`515`	`516`	`}`
`516`	`517`	`return false;`
`517`	`518`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"pack": {`
`3`	`3`	`"description": "${mod_name} Resources",`
`4`		`- "pack_format": 64`
	`4`	`+ "min_format": [65, 0],`
	`5`	`+ "max_format": [69, 0]`
`5`	`6`	`}`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public CraftPresenceNeoForge() {`
`46`	`46`	`throw new UnsupportedOperationException("Incompatible JVM!!! @MOD_NAME@ requires Java 8 or above to work properly!");`
`47`	`47`	`}`
`48`	`48`
`49`		`- if (FMLEnvironment.dist.isClient()) {`
	`49`	`+ if (FMLEnvironment.getDist().isClient()) {`
`50`	`50`	`ClientExtensions.Setup();`
`51`	`51`	`new CraftPresence(this::setupIntegrations);`
`52`	`52`	`} else {`