[Port] Update to 1.21.3 (v2.5.3)

common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/DynamicScrollableList.java

@@ -290,7 +290,7 @@ matrices, getFontRenderer(), xOffset, yPos + 4, stack,
         if (renderType.canRenderImage() && !ImageUtils.isTextureNull(texture)) {
             final double yOffset = yPos + 4.5;
             final double size = 32;
-            RenderUtils.drawTexture(getGameInstance(),
+            RenderUtils.drawTexture(getGameInstance(), getCurrentMatrix(),
                     xOffset, xOffset + size, yOffset, yOffset + size,
                     0.0D,
                     0.0D, 1.0D,

common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/BiomeUtils.java

@@ -31,7 +31,7 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
@@ -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().registryOrThrow(Registries.BIOME).getKey(newBiome);
+        final ResourceLocation 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));
@@ -200,7 +200,7 @@ public void updatePresence() {
      */
     private List<ResourceLocation> getBiomeTypes() {
         List<ResourceLocation> biomeTypes = StringUtils.newArrayList();
-        Optional<HolderLookup.RegistryLookup<Biome>> biomeRegistry = CraftPresence.world.registryAccess().lookup(Registries.BIOME);
+        Optional<Registry<Biome>> biomeRegistry = CraftPresence.world.registryAccess().lookup(Registries.BIOME);
 
         if (biomeRegistry.isPresent()) {
             List<Holder.Reference<Biome>> defaultBiomeTypes = StringUtils.newArrayList(biomeRegistry.get().listElements().toList());

common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/world/DimensionUtils.java

@@ -31,7 +31,7 @@
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
+import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
@@ -201,7 +201,7 @@ public void updatePresence() {
      */
     private List<ResourceLocation> getDimensionTypes() {
         List<ResourceLocation> dimensionTypes = StringUtils.newArrayList();
-        Optional<HolderLookup.RegistryLookup<DimensionType>> dimensionRegistry = CraftPresence.world.registryAccess().lookup(Registries.DIMENSION_TYPE);
+        Optional<Registry<DimensionType>> dimensionRegistry = CraftPresence.world.registryAccess().lookup(Registries.DIMENSION_TYPE);
 
         if (dimensionRegistry.isPresent()) {
             List<Holder.Reference<DimensionType>> defaultDimensionTypes = StringUtils.newArrayList(dimensionRegistry.get().listElements().toList());

fabric/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 34
+    "pack_format": 42
   }
 }

forge/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 34
+    "pack_format": 42
   }
 }

gradle.properties

@@ -6,42 +6,42 @@ org.gradle.daemon=false
 mod_name=CraftPresence
 mod_id=craftpresence
 group=com.gitlab.cdagaming
-enabled_platforms=fabric,forge,quilt,neoforge
+enabled_platforms=fabric,forge,neoforge
 # Critical Info
 isLegacy=false
 isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.21.1
-mc_protocol=767
+mc_version=1.21.3
+mc_protocol=768
 display_version=
 # Fabric Info
 fabric_loader_version=0.16.9
-fabric_api_version=0.114.0+1.21.1
-fabric_game_version_range=>=1.21 <1.21.2
+fabric_api_version=0.114.0+1.21.3
+fabric_game_version_range=>=1.21.2 <1.21.4
 fabric_loader_version_range=>=0.13.0
 # Quilt Info
 quilt_loader_version=0.26.3
 quilt_api_version=10.0.0-alpha.2+1.21.1
 quilt_fabric_api_version=11.0.0-alpha.3+0.102.0-1.21
-quilt_game_version_range=>=1.21,<1.21.2
+quilt_game_version_range=>=1.21.2,<1.21.4
 quilt_loader_version_range=>=0.19.2
 # Forge Info
-forge_version=52.0.40
-fml_version_range=[51,)
-forge_game_version_range=[1.21, 1.21.2)
-forge_loader_version_range=[51.0.0,)
+forge_version=53.0.37
+fml_version_range=[53,)
+forge_game_version_range=[1.21.2, 1.21.4)
+forge_loader_version_range=[53.0.0,)
 # NeoForge Info
-neoforge_version=93
+neoforge_version=58
 neo_fml_version_range=[1.0,)
-neoforge_game_version_range=[1.21, 1.21.2)
-neoforge_loader_version_range=[21.0.0-beta,)
+neoforge_game_version_range=[1.21.2, 1.21.4)
+neoforge_loader_version_range=[21.2.0-beta,)
 # Deployment Info
 versionId=2.5.3
 deploymentType=Release
 versionLabel=Release
-additional_mc_versions=1.21
+additional_mc_versions=1.21.2
 # Integration Info
 source_java_version=21
 build_java_version=21
@@ -57,4 +57,4 @@ unilib_build_version=1.0.5
 unilib_minimum_version=1.0.2
 # Dependency Info
 modmenu_group=com.terraformersmc
-modmenu_version=11.0.3
+modmenu_version=12.0.0

neoforge/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 34
+    "pack_format": 42
   }
 }

quilt/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 34
+    "pack_format": 42
   }
 }