[Port] Update to 1.20.6 (v2.5.3)

CDAGaming · Jan 9, 2025 · 444036b · 444036b
1 parent 3cea711
commit 444036b
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 52 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -269,7 +269,7 @@ subprojects {
                     devFallbackNamespace("searge")
                 }
             } else if (usingIntermediary) {
-                devFallbackNamespace("intermediary")
+                devFallbackNamespace("official")
             }
 
             if (shouldDowngrade) {

diff --git a/...rc/main/java/com/gitlab/cdagaming/craftpresence/integrations/discord/ModFunctionsLib.java b/...rc/main/java/com/gitlab/cdagaming/craftpresence/integrations/discord/ModFunctionsLib.java
@@ -27,6 +27,7 @@
 import com.gitlab.cdagaming.craftpresence.core.integrations.discord.DiscordUtils;
 import com.gitlab.cdagaming.craftpresence.core.integrations.discord.FunctionsLib;
 import com.gitlab.cdagaming.unilib.ModUtils;
+import com.gitlab.cdagaming.unilib.utils.ComponentUtils;
 import com.gitlab.cdagaming.unilib.utils.NbtUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import org.meteordev.starscript.Starscript;
@@ -53,7 +54,24 @@ public static Value mcTranslate(DiscordUtils client, Starscript ss, int argCount
     }
 
     public static Value getComponent(DiscordUtils client, Starscript ss, int argCount) {
-        return FunctionsLib.throwUnimplemented(ss);
+        if (argCount < 1 || argCount > 2)
+            ss.error("getComponent() can only be used with 1-2 arguments, got %d.", argCount);
+        Object result;
+
+        String path = null;
+        if (argCount == 2) {
+            path = ss.popString("Second argument to getComponent() needs to be a string.");
+        }
+        Object data = ss.popObject("First argument to getComponent() needs to be a valid DataComponent object.");
+
+        if (!StringUtils.isNullOrEmpty(path)) {
+            result = ComponentUtils.parseComponent(
+                    ComponentUtils.getComponent(data, path)
+            );
+        } else {
+            result = ComponentUtils.getComponentMap(data);
+        }
+        return result != null ? client.toValue(result, true) : Value.null_();
     }
 
     public static Value getNbt(DiscordUtils client, Starscript ss, int argCount) {
@@ -73,7 +91,7 @@ public static Value getNbt(DiscordUtils client, Starscript ss, int argCount) {
         }
 
         if (data == null) {
-            ss.error("First argument to getNbt() needs to be a valid Entity or ItemStack object.");
+            ss.error("First argument to getNbt() needs to be a valid Entity or DataComponent object.");
         }
         args.removeFirst();
 

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java
@@ -608,23 +608,21 @@ private void pingServer(final ServerData serverData, final Runnable saver, final
         final Runnable callbackEvent = callback != null ? callback : () -> {
             // N/A
         };
-        if (!serverData.pinged) {
+        if (serverData.state() == ServerData.State.INITIAL) {
             // Stub Server Data if not pinged
-            serverData.pinged = true;
-            serverData.ping = -2L;
+            serverData.setState(ServerData.State.PINGING);
             serverData.motd = CommonComponents.EMPTY;
             serverData.status = CommonComponents.EMPTY;
         }
         PING_EXECUTOR.submit(() -> {
             try {
-                pinger.pingServer(serverData, saverEvent);
-                callbackEvent.run();
+                pinger.pingServer(serverData, saverEvent, callbackEvent);
             } catch (UnknownHostException unknownHostException) {
-                serverData.ping = -1L;
+                serverData.setState(ServerData.State.UNREACHABLE);
                 serverData.motd = Component.literal("§4" + ModUtils.RAW_TRANSLATOR.translate("multiplayer.status.cannot_resolve"));
                 callbackEvent.run();
             } catch (Exception ex) {
-                serverData.ping = -1L;
+                serverData.setState(ServerData.State.UNREACHABLE);
                 serverData.motd = Component.literal("§4" + ModUtils.RAW_TRANSLATOR.translate("multiplayer.status.cannot_connect"));
                 callbackEvent.run();
             }
@@ -719,7 +717,8 @@ private void joinServer(final ServerData serverData) {
                     CraftPresence.instance,
                     ServerAddress.parseString(serverData.ip),
                     serverData,
-                    false
+                    false,
+                    null
             );
         } catch (Throwable ex) {
             printException(ex);

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -27,6 +27,6 @@
     "fabricloader": "${loader_version_range}",
     "minecraft": "${game_version_range}",
     "unilib": ">=${unilib_min_version}",
-    "java": ">=17"
+    "java": ">=21"
   }
 }
diff --git a/fabric/src/main/resources/pack.mcmeta b/fabric/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 22
+    "pack_format": 32
   }
 }
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 22
+    "pack_format": 32
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -13,38 +13,38 @@ isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.20.4
-mc_protocol=765
+mc_version=1.20.6
+mc_protocol=766
 display_version=
 # Fabric Info
 fabric_loader_version=0.16.9
-fabric_api_version=0.97.2+1.20.4
-fabric_game_version_range=>=1.20.3 <1.20.5
+fabric_api_version=0.100.8+1.20.6
+fabric_game_version_range=>=1.20.5 <1.21
 fabric_loader_version_range=>=0.13.0
 # Quilt Info
 quilt_loader_version=0.26.3
-quilt_api_version=8.0.0-alpha.13+1.20.4
-quilt_fabric_api_version=9.0.0-alpha.8+0.97.0-1.20.4
-quilt_game_version_range=>=1.20.3,<1.20.5
+quilt_api_version=9.0.0-alpha.1+1.20.6
+quilt_fabric_api_version=10.0.0-alpha.3+0.100.4-1.20.6
+quilt_game_version_range=>=1.20.5,<1.21
 quilt_loader_version_range=>=0.19.2
 # Forge Info
-forge_version=49.1.0
-fml_version_range=[49,)
-forge_game_version_range=[1.20.3, 1.20.5)
-forge_loader_version_range=[49.0.0,)
+forge_version=50.1.0
+fml_version_range=[50,)
+forge_game_version_range=[1.20.5, 1.21)
+forge_loader_version_range=[50.0.0,)
 # NeoForge Info
-neoforge_version=237
+neoforge_version=121
 neo_fml_version_range=[1.0,)
-neoforge_game_version_range=[1.20.3, 1.20.5)
-neoforge_loader_version_range=[20.3,)
+neoforge_game_version_range=[1.20.5, 1.21)
+neoforge_loader_version_range=[20.5,)
 # Deployment Info
 versionId=2.5.3
 deploymentType=Release
 versionLabel=Release
-additional_mc_versions=1.20.3
+additional_mc_versions=1.20.5
 # Integration Info
 source_java_version=21
-build_java_version=17
+build_java_version=21
 ipc_version=0.10.2
 reflect_version=1.4.0
 junixsocket_version=2.10.1
@@ -57,4 +57,4 @@ unilib_build_version=1.0.5
 unilib_minimum_version=1.0.1
 # Dependency Info
 modmenu_group=com.terraformersmc
-modmenu_version=9.0.0
+modmenu_version=10.0.0
diff --git a/...orge/src/main/java/com/gitlab/cdagaming/craftpresence/neoforge/CraftPresenceNeoForge.java b/...orge/src/main/java/com/gitlab/cdagaming/craftpresence/neoforge/CraftPresenceNeoForge.java
@@ -28,12 +28,11 @@
 import com.gitlab.cdagaming.craftpresence.config.gui.MainGui;
 import com.gitlab.cdagaming.unilib.core.CoreUtils;
 import io.github.cdagaming.unicore.utils.OSUtils;
-import net.neoforged.fml.IExtensionPoint;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.neoforge.client.ConfigScreenHandler;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 
 /**
  * The Primary Application Class and Utilities
@@ -47,21 +46,9 @@ public class CraftPresenceNeoForge {
      */
     public CraftPresenceNeoForge() {
         try {
-            if (OSUtils.JAVA_SPEC < 1.8f) {
-                throw new UnsupportedOperationException("Incompatible JVM!!! @MOD_NAME@ requires Java 8 or above to work properly!");
-            }
-
-            try {
-                // Workaround: Client-side only fix for Forge Clients
-                // - Reference => https://gitlab.com/CDAGaming/CraftPresence/-/issues/99
-                ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true));
-            } catch (Throwable ignored) {
-                // before forge-1.13.2-25.0.103
-            }
-
             try {
                 // Register The Config GUI Factory, used in Forge for Mod Menu integration
-                ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, parentScreen) -> new MainGui(parentScreen)));
+                ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (mc, parentScreen) -> new MainGui(parentScreen));
             } catch (Throwable ex) {
                 CoreUtils.LOG.error("Failed to register Config GUI Factory for @MOD_NAME@.", ex);
             }

diff --git a/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/...rge/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 22
+    "pack_format": 32
   }
 }
diff --git a/quilt/build.gradle.kts b/quilt/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
     "include"(quiltBase)
 
     // Required for loading translation data
-    val resourceLoader = "org.quiltmc.qsl.core:resource_loader:${"quilt_api_version"()!!}"
+    val resourceLoader = fabricApi.quiltFabricModule("fabric-resource-loader-v0", "quilt_fabric_api_version"()!!)
     "modImplementation"(resourceLoader)
     "include"(resourceLoader)
 
@@ -61,10 +61,7 @@ dependencies {
     }
 
     // Quilt: Replace Fabric APIs with Quilt Equivalents
-    "modImplementation"("org.quiltmc.qsl.core:lifecycle_events:${"quilt_api_version"()!!}")
-    "modImplementation"("org.quiltmc.qsl.gui:screen:${"quilt_api_version"()!!}")
     "modImplementation"(fabricApi.quiltFabricModule("fabric-api-base", "quilt_fabric_api_version"()!!))
-    "modImplementation"(fabricApi.quiltFabricModule("fabric-resource-loader-v0", "quilt_fabric_api_version"()!!))
     "modImplementation"(fabricApi.quiltFabricModule("fabric-screen-api-v1", "quilt_fabric_api_version"()!!))
     "modImplementation"(fabricApi.quiltFabricModule("fabric-key-binding-api-v1", "quilt_fabric_api_version"()!!))
     "modImplementation"(fabricApi.quiltFabricModule("fabric-lifecycle-events-v1", "quilt_fabric_api_version"()!!))

diff --git a/quilt/src/main/resources/pack.mcmeta b/quilt/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 22
+    "pack_format": 32
   }
 }