[Port] Update to 1.21.11 (v2.7.0)

CDAGaming · CDAGaming · commit 212497c907c3 · 2025-11-25T11:35:33.000-06:00
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/DynamicScrollableList.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/DynamicScrollableList.java
@@ -40,7 +40,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.multiplayer.ServerData;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
 import unilib.external.io.github.classgraph.ClassInfo;
 
@@ -197,7 +197,7 @@ public void renderSlotItem(@Nonnull final GuiGraphics matrices, final String ori
         String displayName = getEntryAliases().getOrDefault(originalName, originalName);
         int xOffset = xPos;
 
-        ResourceLocation texture = ResourceUtils.getEmptyResource();
+        Identifier texture = ResourceUtils.getEmptyResource();
         String assetUrl;
 
         if (renderType == RenderType.ServerData) {
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
@@ -51,6 +51,7 @@
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.realms.RealmsScreen;
+import net.minecraft.server.network.EventLoopGroupHolder;
 
 import java.net.UnknownHostException;
 import java.util.List;
@@ -616,7 +617,7 @@ private void pingServer(final ServerData serverData, final Runnable saver, final
         }
         PING_EXECUTOR.submit(() -> {
             try {
-                pinger.pingServer(serverData, saverEvent, callbackEvent);
+                pinger.pingServer(serverData, saverEvent, callbackEvent, EventLoopGroupHolder.remote(CraftPresence.instance.options.useNativeTransport()));
             } catch (UnknownHostException unknownHostException) {
                 serverData.setState(ServerData.State.UNREACHABLE);
                 serverData.motd = Component.literal("§4" + ModUtils.RAW_TRANSLATOR.translate("multiplayer.status.cannot_resolve"));
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/BiomeUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/BiomeUtils.java
@@ -33,7 +33,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.biome.Biome;
 
 import java.util.List;
@@ -129,7 +129,7 @@ public void clearAttributes() {
     @Override
     public void updateData() {
         final Biome newBiome = CraftPresence.world.getBiome(CraftPresence.player.blockPosition()).value();
-        final ResourceLocation newIdentifier = CraftPresence.world.registryAccess().lookupOrThrow(Registries.BIOME).getKey(newBiome);
+        final Identifier newIdentifier = CraftPresence.world.registryAccess().lookupOrThrow(Registries.BIOME).getKey(newBiome);
         final String newBiomeName = newIdentifier != null ? newIdentifier.toString() : "Plains";
 
         final String newBiomeIdentifier = StringUtils.getOrDefault(newBiomeName, MappingUtils.getClassName(newBiome));
@@ -198,8 +198,8 @@ public void updatePresence() {
      *
      * @return The detected Biome Types found
      */
-    private List<ResourceLocation> getBiomeTypes() {
-        List<ResourceLocation> biomeTypes = StringUtils.newArrayList();
+    private List<Identifier> getBiomeTypes() {
+        List<Identifier> biomeTypes = StringUtils.newArrayList();
         Optional<Registry<Biome>> biomeRegistry = CraftPresence.world.registryAccess().lookup(Registries.BIOME);
 
         if (biomeRegistry.isPresent()) {
@@ -208,7 +208,7 @@ private List<ResourceLocation> getBiomeTypes() {
             if (!defaultBiomeTypes.isEmpty()) {
                 for (Holder.Reference<Biome> type : defaultBiomeTypes) {
                     if (type != null) {
-                        biomeTypes.add(type.key().location());
+                        biomeTypes.add(type.key().identifier());
                     }
                 }
             }
@@ -219,7 +219,7 @@ private List<ResourceLocation> getBiomeTypes() {
 
     @Override
     public void getInternalData() {
-        for (ResourceLocation TYPE : getBiomeTypes()) {
+        for (Identifier TYPE : getBiomeTypes()) {
             if (TYPE != null) {
                 String name = StringUtils.formatIdentifier(TYPE.toString(), true, !CraftPresence.CONFIG.advancedSettings.formatWords);
                 if (!DEFAULT_NAMES.contains(name)) {
diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/DimensionUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/DimensionUtils.java
@@ -33,7 +33,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.dimension.DimensionType;
 
@@ -130,7 +130,7 @@ public void clearAttributes() {
     @Override
     public void updateData() {
         final Level newProvider = CraftPresence.world;
-        final ResourceLocation newDimensionType = newProvider.dimension().location();
+        final Identifier newDimensionType = newProvider.dimension().identifier();
         final String newDimensionName = newDimensionType.toString();
 
         final String newDimensionIdentifier = StringUtils.getOrDefault(newDimensionName, MappingUtils.getClassName(newDimensionType));
@@ -199,8 +199,8 @@ public void updatePresence() {
      *
      * @return The detected Dimension Types found
      */
-    private List<ResourceLocation> getDimensionTypes() {
-        List<ResourceLocation> dimensionTypes = StringUtils.newArrayList();
+    private List<Identifier> getDimensionTypes() {
+        List<Identifier> dimensionTypes = StringUtils.newArrayList();
         Optional<Registry<DimensionType>> dimensionRegistry = CraftPresence.world.registryAccess().lookup(Registries.DIMENSION_TYPE);
 
         if (dimensionRegistry.isPresent()) {
@@ -209,7 +209,7 @@ private List<ResourceLocation> getDimensionTypes() {
             if (!defaultDimensionTypes.isEmpty()) {
                 for (Holder.Reference<DimensionType> type : defaultDimensionTypes) {
                     if (type != null) {
-                        dimensionTypes.add(type.key().location());
+                        dimensionTypes.add(type.key().identifier());
                     }
                 }
             }
@@ -220,7 +220,7 @@ private List<ResourceLocation> getDimensionTypes() {
 
     @Override
     public void getInternalData() {
-        for (ResourceLocation TYPE : getDimensionTypes()) {
+        for (Identifier TYPE : getDimensionTypes()) {
             if (TYPE != null) {
                 String dimensionName = StringUtils.getOrDefault(TYPE.toString(), MappingUtils.getClassName(TYPE));
                 String name = StringUtils.formatIdentifier(dimensionName, true, !CraftPresence.CONFIG.advancedSettings.formatWords);
diff --git a/fabric/src/main/resources/pack.mcmeta b/fabric/src/main/resources/pack.mcmeta
@@ -2,6 +2,6 @@
   "pack": {
     "description": "${mod_name} Resources",
     "min_format": [65, 0],
-    "max_format": [69, 0]
+    "max_format": [75, 0]
   }
 }
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -2,6 +2,6 @@
   "pack": {
     "description": "${mod_name} Resources",
     "min_format": [65, 0],
-    "max_format": [69, 0]
+    "max_format": [75, 0]
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -13,8 +13,8 @@ isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.21.10
-mc_protocol=773
+mc_version=1.21.11-pre3
+mc_protocol=774
 display_version=
 # Fabric Info
 fabric_api_version=0.134.1+1.21.10
@@ -35,11 +35,11 @@ neoforge_loader_version_range=[21.9.0-beta,)
 versionId=2.7.0
 deploymentType=Alpha
 versionLabel=Release
-additional_mc_versions=1.21.9
+additional_mc_versions=1.21.11-snapshot
 # Integration Info
 source_java_version=21
 build_java_version=21
-fabric_loader_version=0.17.2
+fabric_loader_version=0.17.3
 ipc_version=0.10.6
 reflect_version=1.5.0
 junixsocket_version=2.10.1
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -2,6 +2,6 @@
   "pack": {
     "description": "${mod_name} Resources",
     "min_format": [65, 0],
-    "max_format": [69, 0]
+    "max_format": [75, 0]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"pack": {`
`3`	`3`	`"description": "${mod_name} Resources",`
`4`	`4`	`"min_format": [65, 0],`
`5`		`- "max_format": [69, 0]`
	`5`	`+ "max_format": [75, 0]`
`6`	`6`	`}`
`7`	`7`	`}`