diff --git a/gradle.properties b/gradle.properties index 4054b291..d20e1fa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.2-rc1 - yarn_mappings=1.20.2-rc1+build.2 - loader_version=0.14.22 - fabric_version=0.88.5+1.20.2 + minecraft_version=1.20.2 + yarn_mappings=1.20.2+build.4 + loader_version=0.15.1 + fabric_version=0.91.1+1.20.2 # Mod Properties group=com.minelittlepony @@ -20,7 +20,7 @@ org.gradle.daemon=false modrinth_project_id=JBjInUXM # Dependencies - modmenu_version=8.0.0-beta.1 + modmenu_version=8.0.0 kirin_version=1.16.0+1.20.2 hd_skins_version=6.11.0+1.20.2 mson_version=1.9.1 diff --git a/src/main/java/com/minelittlepony/api/pony/DefaultPonySkinHelper.java b/src/main/java/com/minelittlepony/api/pony/DefaultPonySkinHelper.java index 432f4bb2..052bc52f 100644 --- a/src/main/java/com/minelittlepony/api/pony/DefaultPonySkinHelper.java +++ b/src/main/java/com/minelittlepony/api/pony/DefaultPonySkinHelper.java @@ -30,7 +30,7 @@ public final class DefaultPonySkinHelper { } public static String getModelType(UUID id) { - SkinTextures textures = DefaultSkinHelper.getTexture(id); + SkinTextures textures = DefaultSkinHelper.getSkinTextures(id); return getModelType(Pony.getManager().getPony(textures.texture(), id).race(), textures.model()); } diff --git a/src/main/java/com/minelittlepony/client/PonyManagerImpl.java b/src/main/java/com/minelittlepony/client/PonyManagerImpl.java index d859c77e..46e86892 100644 --- a/src/main/java/com/minelittlepony/client/PonyManagerImpl.java +++ b/src/main/java/com/minelittlepony/client/PonyManagerImpl.java @@ -79,16 +79,16 @@ public class PonyManagerImpl implements PonyManager, SimpleSynchronousResourceRe @Override public Pony getBackgroundPony(@Nullable UUID uuid) { if (config.ponyLevel.get() == PonyLevel.PONIES) { - return loadPony(MineLittlePony.getInstance().getVariatedTextures().get(VariatedTextureSupplier.BACKGROUND_PONIES_POOL, uuid).orElse(DefaultSkinHelper.getTexture(uuid).texture()), true); + return loadPony(MineLittlePony.getInstance().getVariatedTextures().get(VariatedTextureSupplier.BACKGROUND_PONIES_POOL, uuid).orElse(DefaultSkinHelper.getSkinTextures(uuid).texture()), true); } - return loadPony(DefaultSkinHelper.getTexture(uuid).texture(), true); + return loadPony(DefaultSkinHelper.getSkinTextures(uuid).texture(), true); } @Nullable private Identifier getSkin(LivingEntity entity) { if (entity instanceof PlayerEntity player) { if (player.getGameProfile() != null && player instanceof AbstractClientPlayerEntity clientPlayer) { - return clientPlayer.method_52814().texture(); + return clientPlayer.getSkinTextures().texture(); } } else { if (MineLittlePony.getInstance().getRenderDispatcher().getPonyRenderer(entity) != null) { diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java index 8e3ab7fa..1f7f49cb 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java @@ -26,7 +26,7 @@ abstract class MixinDefaultSkinHelper { } } - @Inject(method = "getTexture(Ljava/util/UUID;)Lnet/minecraft/client/util/SkinTextures;", + @Inject(method = "getSkinTextures(Ljava/util/UUID;)Lnet/minecraft/client/util/SkinTextures;", at = @At("RETURN"), cancellable = true) private static void onGetTexture(UUID uuid, CallbackInfoReturnable cir) { diff --git a/src/main/java/com/minelittlepony/client/render/PonyRenderDispatcher.java b/src/main/java/com/minelittlepony/client/render/PonyRenderDispatcher.java index 5220859b..312649cb 100644 --- a/src/main/java/com/minelittlepony/client/render/PonyRenderDispatcher.java +++ b/src/main/java/com/minelittlepony/client/render/PonyRenderDispatcher.java @@ -46,7 +46,7 @@ public class PonyRenderDispatcher { player -> { return !Pony.getManager().getPony(player).race().isHuman() && PonyPosture.hasSeaponyForm(player) - && player.method_52814().model() == armShape; + && player.getSkinTextures().model() == armShape; }, context -> new AquaticPlayerPonyRenderer(context, armShape == SkinTextures.Model.SLIM) ); @@ -55,7 +55,7 @@ public class PonyRenderDispatcher { player -> { return !Pony.getManager().getPony(player).race().isHuman() && PonyPosture.hasNirikForm(player) - && player.method_52814().model() == armShape; + && player.getSkinTextures().model() == armShape; }, context -> new FormChangingPlayerPonyRenderer(context, armShape == SkinTextures.Model.SLIM, DefaultPonySkinHelper.NIRIK_SKIN_TYPE_ID, PonyPosture::isNirikModifier) ); @@ -64,7 +64,7 @@ public class PonyRenderDispatcher { player -> { return !Pony.getManager().getPony(player).race().isHuman() && !PonyPosture.hasSeaponyForm(player) && !PonyPosture.hasNirikForm(player) - && player.method_52814().model() == armShape; + && player.getSkinTextures().model() == armShape; }, context -> new PlayerPonyRenderer(context, armShape == SkinTextures.Model.SLIM) ); diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java index be373fdb..5b069d18 100644 --- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java @@ -45,7 +45,7 @@ public class PlayerPonySkull implements ISkull { return skin; } - return DefaultSkinHelper.getTexture(profile).texture(); + return DefaultSkinHelper.getSkinTextures(profile).texture(); } return DefaultSkinHelper.getTexture(); diff --git a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java index 13f08556..ce251bc4 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java @@ -150,7 +150,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements PonyRend stack.translate(reflect * 0.1F, -0.54F, 0); Identifier texture = getTexture(player); - Identifier playerSkin = player.method_52814().texture(); + Identifier playerSkin = player.getSkinTextures().texture(); VertexConsumerProvider interceptedContext = layer -> { return renderContext.getBuffer(RenderLayerUtil .getTexture(layer) diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java index 9aac7f8c..942443db 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java @@ -26,7 +26,7 @@ public class CapeFeature> M model = getModelWrapper().body(); if (!player.isInvisible() - && player.isPartVisible(PlayerModelPart.CAPE) && player.method_52814().capeTexture() != null + && player.isPartVisible(PlayerModelPart.CAPE) && player.getSkinTextures().capeTexture() != null && player.getEquippedStack(EquipmentSlot.CHEST).getItem() != Items.ELYTRA) { stack.push(); @@ -64,7 +64,7 @@ public class CapeFeature> stack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(180)); stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90)); - VertexConsumer vertices = renderContext.getBuffer(RenderLayer.getEntitySolid(player.method_52814().capeTexture())); + VertexConsumer vertices = renderContext.getBuffer(RenderLayer.getEntitySolid(player.getSkinTextures().capeTexture())); model.renderCape(stack, vertices, lightUv, OverlayTexture.DEFAULT_UV); stack.pop(); } diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java index 2b30505a..410d90c4 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/DJPon3Feature.java @@ -36,7 +36,7 @@ public class DJPon3Feature & Po protected Identifier getElytraTexture(T entity) { if (entity instanceof AbstractClientPlayerEntity player) { - SkinTextures textures = player.method_52814(); + SkinTextures textures = player.getSkinTextures(); if (textures.elytraTexture() != null) { return textures.elytraTexture();