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 index aab5ab73f..0735076ba 100644 --- 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 @@ -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, 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 index 8f43179e5..01648d101 100644 --- 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 @@ -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 getBiomeTypes() { List biomeTypes = StringUtils.newArrayList(); - Optional> biomeRegistry = CraftPresence.world.registryAccess().lookup(Registries.BIOME); + Optional> biomeRegistry = CraftPresence.world.registryAccess().lookup(Registries.BIOME); if (biomeRegistry.isPresent()) { List> defaultBiomeTypes = StringUtils.newArrayList(biomeRegistry.get().listElements().toList()); 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 index 922db638b..808981ea5 100644 --- 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 @@ -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 getDimensionTypes() { List dimensionTypes = StringUtils.newArrayList(); - Optional> dimensionRegistry = CraftPresence.world.registryAccess().lookup(Registries.DIMENSION_TYPE); + Optional> dimensionRegistry = CraftPresence.world.registryAccess().lookup(Registries.DIMENSION_TYPE); if (dimensionRegistry.isPresent()) { List> defaultDimensionTypes = StringUtils.newArrayList(dimensionRegistry.get().listElements().toList()); diff --git a/fabric/src/main/resources/pack.mcmeta b/fabric/src/main/resources/pack.mcmeta index bd2077f57..8a0f07955 100644 --- 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": 34 + "pack_format": 42 } } diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta index bd2077f57..8a0f07955 100644 --- 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": 34 + "pack_format": 42 } } diff --git a/gradle.properties b/gradle.properties index 1505fb50a..c5bbc1de8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ isJarMod=false # Mapping Info mc_mappings= mc_mappings_type=mojmap -mc_version=1.21.1 -mc_protocol=767 +mc_version=1.21.2-rc1 +mc_protocol=768 display_version= # Fabric Info fabric_loader_version=0.16.5 @@ -41,7 +41,7 @@ neoforge_loader_version_range=[21.0.0-beta,) versionId=2.5.1 deploymentType=Alpha versionLabel=Release -additional_mc_versions=1.21 +additional_mc_versions=1.21.2-snapshot # Integration Info source_java_version=21 build_java_version=21 diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta index bd2077f57..8a0f07955 100644 --- 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": 34 + "pack_format": 42 } } diff --git a/quilt/src/main/resources/pack.mcmeta b/quilt/src/main/resources/pack.mcmeta index bd2077f57..8a0f07955 100644 --- 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": 34 + "pack_format": 42 } }