diff --git a/gradle.properties b/gradle.properties index c1bbdea7..602e8da8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,5 +19,5 @@ org.gradle.daemon=false # Dependencies modmenu_version=1.12.+ kirin_version=1.7-1.16.2 - hd_skins_version=6.3-1.16.2 + hd_skins_version=6.3.3-1.16.3 mson_version=1.2.1-1.16-rc1-1.16 diff --git a/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java index 7dedaba9..e320460e 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java @@ -5,7 +5,7 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.ModelWithHat; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.util.math.MathHelper; import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; @@ -88,8 +88,8 @@ public class VillagerPonyModel e public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) { super.setAngles(entity, move, swing, ticks, headYaw, headPitch); - boolean isHeadRolling = entity instanceof AbstractTraderEntity - && ((AbstractTraderEntity)entity).getHeadRollingTimeLeft() > 0; + boolean isHeadRolling = entity instanceof MerchantEntity + && ((MerchantEntity)entity).getHeadRollingTimeLeft() > 0; if (isHeadRolling) { float roll = 0.3F * MathHelper.sin(0.45F * ticks); diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index 757c4aa9..bb71eb33 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -40,7 +40,7 @@ public class LevitatingItemRenderer { } public static RenderLayer getRenderLayer() { - return getRenderLayer(SpriteAtlasTexture.BLOCK_ATLAS_TEX); + return getRenderLayer(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE); } /** diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java index 7fa52749..8e944510 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java @@ -93,7 +93,7 @@ public class ArmourFeature & IP MatrixStack matrices, VertexConsumerProvider provider, int light, boolean glint, V model, float r, float g, float b, IArmourTextureResolver resolver, ArmourLayer layer, Identifier texture) { - VertexConsumer vertices = ItemRenderer.getArmorVertexConsumer(provider, RenderLayer.getArmorCutoutNoCull(texture), false, glint); + VertexConsumer vertices = ItemRenderer.getArmorGlintConsumer(provider, RenderLayer.getArmorCutoutNoCull(texture), false, glint); model.setVariant(resolver.getArmourVariant(layer, texture)); model.render(matrices, vertices, light, OverlayTexture.DEFAULT_UV, r, g, b, 1); diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/ElytraFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/ElytraFeature.java index d2661c1e..4edb8262 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/ElytraFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/ElytraFeature.java @@ -47,7 +47,7 @@ public class ElytraFeature & IP } elytra.setAngles(entity, limbDistance, limbAngle, age, headYaw, headPitch); - VertexConsumer vertexConsumer = ItemRenderer.getDirectGlintVertexConsumer(renderContext, modelElytra.getLayer(getElytraTexture(entity)), false, itemstack.hasGlint()); + VertexConsumer vertexConsumer = ItemRenderer.getDirectItemGlintConsumer(renderContext, modelElytra.getLayer(getElytraTexture(entity)), false, itemstack.hasGlint()); modelElytra.render(stack, vertexConsumer, lightUv, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); stack.pop();