1.19.3 -> 1.19.2

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.daemon=false
 
 # Fabric Properties
   # check these on https://fabricmc.net/develop
-  minecraft_version=1.19.3
-  yarn_mappings=1.19.3+build.2
-  loader_version=0.14.11
-  fabric_version=0.68.1+1.19.3
+  minecraft_version=1.19.2
+  yarn_mappings=1.19.2+build.28
+  loader_version=0.14.14
+  fabric_version=0.73.2+1.19.2
 
 # Mod Properties
   group=com.minelittlepony
@@ -15,12 +15,12 @@ org.gradle.daemon=false
   description=Mine Little Pony turns players and mobs into ponies. Press F9 ingame to access settings.
 
 # Publishing
-  minecraft_version_range=>=1.19.3-pre1
+  minecraft_version_range=>=1.19.2
   modrinth_loader_type=fabric
   modrinth_project_id=JBjInUXM
 
 # Dependencies
-  modmenu_version=5.0.0-alpha.3
-  kirin_version=1.13.2
-  hd_skins_version=6.7.6
-  mson_version=1.7.1
+  modmenu_version=4.0.6
+  kirin_version=1.13.2+lts
+  hd_skins_version=6.7.6+lts
+  mson_version=1.6.1

src/main/java/com/minelittlepony/api/model/armour/ArmorModelRegistry.java

@@ -1,8 +1,8 @@
 package com.minelittlepony.api.model.armour;
 
 import net.minecraft.item.Item;
-import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 import com.minelittlepony.client.model.ModelType;
 import com.minelittlepony.client.model.armour.PonyArmourModel;
@@ -17,11 +17,11 @@ public interface ArmorModelRegistry {
     static final Map<Identifier, Optional<ModelKey<PonyArmourModel<?>>>> REGISTRY = new HashMap<>();
 
     public static Optional<ModelKey<PonyArmourModel<?>>> getModelKey(Item item, ArmourLayer layer) {
-        Identifier id = Registries.ITEM.getId(item);
+        Identifier id = Registry.ITEM.getId(item);
         if (id.getNamespace().equals("minecraft")) {
             return Optional.empty();
         }
-        return REGISTRY.computeIfAbsent(id.withPath(p -> "models/armor/" + layer.name().toLowerCase() + "_" + p + ".json"), i -> {
+        return REGISTRY.computeIfAbsent(new Identifier(id.getNamespace(), "models/armor/" + layer.name().toLowerCase() + "_" + id.getPath() + ".json"), i -> {
             return Optional.of(Mson.getInstance().registerModel(i, PonyArmourModel::new));
         }).filter(key -> key.getModelData().isPresent());
     }

src/main/java/com/minelittlepony/api/pony/DefaultPonySkinHelper.java

@@ -1,20 +1,28 @@
 package com.minelittlepony.api.pony;
 
+import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.util.Identifier;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.minelittlepony.api.config.PonyLevel;
+import com.minelittlepony.client.MineLittlePony;
+
+import java.util.*;
 
 public final class DefaultPonySkinHelper {
     public static final Identifier STEVE = new Identifier("minelittlepony", "textures/entity/player/wide/steve_pony.png");
-
-    private static final Map<Identifier, Identifier> SKINS = new HashMap<>();
+    @Deprecated
+    public static final Identifier ALEX = new Identifier("minelittlepony", "textures/entity/player/slim/alex_pony.png");
 
     public static Identifier getPonySkin(Identifier original) {
-        return SKINS.computeIfAbsent(original, DefaultPonySkinHelper::computePonySkin);
+        return original.getPath().contains("steve") ? STEVE : ALEX;
     }
 
-    private static Identifier computePonySkin(Identifier original) {
-        return new Identifier("minelittlepony", original.getPath().replace(".png", "_pony.png"));
+    @Deprecated
+    public static Identifier getPonySkin(UUID profileId, boolean slimArms) {
+        if (MineLittlePony.getInstance().getConfig().ponyLevel.get() != PonyLevel.PONIES) {
+            return DefaultSkinHelper.getTexture(profileId);
+        }
+        boolean alex = (profileId.hashCode() & 1) == 1;
+        return new Identifier("minelittlepony", "textures/entity/player/" + (slimArms ? "slim" : "wide") + "/" + (alex ? "alex" : "steve") + "_pony.png");
     }
 }

src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java

@@ -1,5 +1,6 @@
 package com.minelittlepony.client.hdskins;
 
+import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.text.Text;
@@ -40,7 +41,8 @@ public Identifier getDefaultSkin(SkinType type, boolean slim) {
             return DefaultSkinGenerator.generateGreyScale(wearable.getDefaultTexture(), wearable.getDefaultTexture(), getExclusion());
         }
 
-        return super.getDefaultSkin(type, slim);
+        Identifier skin = getBlankSkin(type, slim);
+        return DefaultSkinGenerator.generateGreyScale(type == SkinType.SKIN ? DefaultPonySkinHelper.getPonySkin(profile.getId(), slim) : skin, skin, getExclusion());
     }
 
     @Override

src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java

@@ -19,7 +19,7 @@
 
 @Mixin(ClientPlayerEntity.class)
 abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity implements EquineRenderManager.RegistrationHandler {
-    public MixinClientPlayerEntity() { super(null, null); }
+    public MixinClientPlayerEntity() { super(null, null, null); }
 
     @Nullable
     private IPony pony;

src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java

@@ -595,12 +595,12 @@ public void setVisible(boolean visible) {
     @Override
     public void transform(BodyPart part, MatrixStack stack) {
         if (attributes.isSleeping || attributes.isRiptide) {
-            stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90));
-            stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180));
+            stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90));
+            stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180));
         }
 
         if (part == BodyPart.HEAD) {
-           stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(attributes.motionPitch));
+           stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(attributes.motionPitch));
         }
 
         PonyTransformation.forSize(getSize()).transform(this, part, stack);

src/main/java/com/minelittlepony/client/render/FrustrumCheck.java

@@ -4,7 +4,7 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.Box;
 
-import org.joml.Matrix4f;
+import net.minecraft.util.math.Matrix4f;
 
 import com.minelittlepony.client.PonyBounds;
 

src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java

@@ -20,7 +20,7 @@
 import net.minecraft.util.Arm;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.UseAction;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.Vec3f;
 import net.minecraft.world.World;
 
 public class LevitatingItemRenderer {
@@ -140,8 +140,8 @@ private void setupPerspective(ItemRenderer renderer, LivingEntity entity, ItemSt
                     distanceChange);
 
             if (!handHeldTool) { // bows have to point forwards
-                stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(sign * -60 + floatAmount));
-                stack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(sign * 30 + driftAmount));
+                stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(sign * -60 + floatAmount));
+                stack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(sign * 30 + driftAmount));
             }
         }
     }

src/main/java/com/minelittlepony/client/render/MagicGlow.java

@@ -18,7 +18,7 @@ private MagicGlow(String name, Runnable beginAction, Runnable endAction) {
     }
 
     private static final RenderLayer MAGIC = RenderLayer.of("mlp_magic_glow", VertexFormats.POSITION_COLOR_LIGHT, VertexFormat.DrawMode.QUADS, 256, RenderLayer.MultiPhaseParameters.builder()
-            .program(EYES_PROGRAM)
+            .shader(EYES_SHADER)
             .writeMaskState(COLOR_MASK)
             .depthTest(LEQUAL_DEPTH_TEST)
             .transparency(LIGHTNING_TRANSPARENCY)
@@ -29,7 +29,7 @@ private MagicGlow(String name, Runnable beginAction, Runnable endAction) {
     private static final BiFunction<Identifier, Integer, RenderLayer> TINTED_LAYER = Util.memoize((texture, color) -> {
         return RenderLayer.of("mlp_tint_layer", VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, VertexFormat.DrawMode.QUADS, 256, true, true, RenderLayer.MultiPhaseParameters.builder()
                 .texture(new Colored(texture, color))
-                .program(EYES_PROGRAM)
+                .shader(EYES_SHADER)
                 .writeMaskState(COLOR_MASK)
                 .depthTest(LEQUAL_DEPTH_TEST)
                 .transparency(LIGHTNING_TRANSPARENCY)

src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java

@@ -15,10 +15,9 @@
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.Vec3f;
 
 import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
 
 public class MobSkull implements ISkull {
     private final Identifier texture;
@@ -50,12 +49,12 @@ public boolean bindPony(IPony pony) {
 
     @Override
     public void setAngles(float yaw, float animationProgress) {
-        Vector3f v = new Vector3f(0, -2, 1.99F);
-        v.rotate(RotationAxis.POSITIVE_Y.rotationDegrees(yaw));
+        Vec3f v = new Vec3f(0, -2, 1.99F);
+        v.rotate(Vec3f.POSITIVE_Y.getDegreesQuaternion(yaw));
         ModelPart head = ponyHead.get().getHead();
-        head.pivotX = v.x;
-        head.pivotY = v.y;
-        head.pivotZ = v.z;
+        head.pivotX = v.getX();
+        head.pivotY = v.getY();
+        head.pivotZ = v.getZ();
         ponyHead.get().setVisible(true);
         ponyHead.get().setHeadRotation(animationProgress, yaw, 0);
     }

src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java

@@ -18,11 +18,10 @@
 import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Uuids;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.dynamic.DynamicSerializableUuid;
+import net.minecraft.util.math.Vec3f;
 
 import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
 
 public class PlayerPonySkull implements ISkull {
     private AbstractPonyModel<?> ponyHead;
@@ -46,7 +45,7 @@ public Identifier getSkinResource(@Nullable GameProfile profile) {
                 return skin;
             }
 
-            return DefaultSkinHelper.getTexture(Uuids.getUuidFromProfile(profile));
+            return DefaultSkinHelper.getTexture(DynamicSerializableUuid.getUuidFromProfile(profile));
         }
 
         return DefaultSkinHelper.getTexture();
@@ -65,11 +64,11 @@ public boolean bindPony(IPony pony) {
 
     @Override
     public void setAngles(float yaw, float animationProgress) {
-        Vector3f v = new Vector3f(0, -2, 2);
-        v.rotate(RotationAxis.POSITIVE_Y.rotationDegrees(yaw));
-        ponyHead.getHead().pivotX = v.x;
-        ponyHead.getHead().pivotY = v.y;
-        ponyHead.getHead().pivotZ = v.z;
+        Vec3f v = new Vec3f(0, -2, 2);
+        v.rotate(Vec3f.POSITIVE_Y.getDegreesQuaternion(yaw));
+        ponyHead.getHead().pivotX = v.getX();
+        ponyHead.getHead().pivotY = v.getY();
+        ponyHead.getHead().pivotZ = v.getZ();
         ponyHead.setVisible(true);
         ponyHead.setHeadRotation(animationProgress, yaw, 0);
         deadMau5.get().setHeadRotation(animationProgress, yaw, 0);

src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java

@@ -99,9 +99,9 @@ public void render(AbstractClientPlayerEntity entity, float entityYaw, float tic
             float yaw = MathHelper.lerpAngleDegrees(tickDelta, entity.prevBodyYaw, entity.bodyYaw);
             float l = entity.getWidth() / 2 * manager.getPony(entity).metadata().getSize().getScaleFactor();
 
-            stack.multiply(RotationAxis.NEGATIVE_Y.rotationDegrees(yaw));
+            stack.multiply(Vec3f.NEGATIVE_Y.getDegreesQuaternion(yaw));
             stack.translate(0, 0, -l);
-            stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(yaw));
+            stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(yaw));
         }
     }
 

src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java

@@ -7,7 +7,7 @@
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.Vec3f;
 import net.minecraft.entity.mob.WitchEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Arm;
@@ -27,7 +27,7 @@ protected HeldItemFeature<WitchEntity, WitchPonyModel> createItemHoldingLayer()
             @Override
             protected void preItemRender(WitchEntity entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack) {
                 super.preItemRender(entity, drop, transform, hand, stack);
-                stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(10));
+                stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(10));
             }
         };
     }

src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java

@@ -60,11 +60,11 @@ public void render(MatrixStack stack, VertexConsumerProvider renderContext, int
             float camera = MathHelper.lerp(tickDelta, player.prevStrideDistance, player.strideDistance);
             capeMotionY += MathHelper.sin(MathHelper.lerp(tickDelta, player.prevHorizontalSpeed, player.horizontalSpeed) * 6) * 32 * camera;
 
-            stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(2 + capeMotionX / 12 + capeMotionY));
-            stack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees( diagMotion / 2));
-            stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(-diagMotion / 2));
-            stack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(180));
-            stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90));
+            stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(2 + capeMotionX / 12 + capeMotionY));
+            stack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion( diagMotion / 2));
+            stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(-diagMotion / 2));
+            stack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(180));
+            stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90));
 
             VertexConsumer vertices = renderContext.getBuffer(RenderLayer.getEntitySolid(player.getCapeTexture()));
             model.renderCape(stack, vertices, lightUv, OverlayTexture.DEFAULT_UV);

src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java

@@ -16,7 +16,7 @@
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.UseAction;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.Vec3f;
 
 public class HeldItemFeature<T extends LivingEntity, M extends EntityModel<T> & IPonyModel<T>> extends AbstractPonyFeature<T, M> {
 
@@ -85,9 +85,9 @@ protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Mode
             }
             if (main == arm) {
                 stack.translate(left * -0.05F, 0.5F, 0.7F);
-                stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-60));
-                stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-90));
-                stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(left * 180));
+                stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-60));
+                stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-90));
+                stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(left * 180));
                 stack.translate(left * -0.2F, 0.125F, -1);
 
                 return;
@@ -98,8 +98,8 @@ protected void preItemRender(T entity, ItemStack drop, ModelTransformation.Mode
             stack.translate(left / 10, -0.2F, -0.5F);
         }
 
-        stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-90));
-        stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(left * 180));
+        stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-90));
+        stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(left * 180));
         stack.translate(left * -0.2F, 0.125F, -1);
     }
 

src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java

@@ -8,12 +8,11 @@
 import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.client.render.entity.model.ParrotEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.RotationAxis;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.passive.ParrotEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Vec3f;
 
 import com.minelittlepony.api.model.BodyPart;
 import com.minelittlepony.client.model.ClientPonyModel;
@@ -43,7 +42,7 @@ public void render(MatrixStack stack, VertexConsumerProvider renderContext, int
     private Optional<Identifier> getShoulderParrot(NbtCompound tag) {
         return EntityType.get(tag.getString("id"))
                 .filter(p -> p == EntityType.PARROT)
-                .map(type -> ParrotEntityRenderer.getTexture(ParrotEntity.Variant.byIndex(tag.getInt("Variant"))));
+                .map(type -> ParrotEntityRenderer.TEXTURES[tag.getInt("Variant")]);
     }
 
     private void renderShoulderParrot(MatrixStack stack, VertexConsumerProvider renderContext, int light, T entity, float limbDistance, float limbAngle, float headYaw, float headPitch, Identifier texture, int sigma) {
@@ -55,7 +54,7 @@ private void renderShoulderParrot(MatrixStack stack, VertexConsumerProvider rend
                sigma * 0.25,
                entity.isInSneakingPose() ? -0.9 : -1.2,
                0.45);
-       stack.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(sigma * -5));
+       stack.multiply(Vec3f.NEGATIVE_Z.getDegreesQuaternion(sigma * -5));
 
        VertexConsumer buffer = renderContext.getBuffer(model.getLayer(texture));
        model.poseOnShoulder(stack, buffer, light, OverlayTexture.DEFAULT_UV, limbDistance, limbAngle, headYaw, headPitch, entity.age);

src/main/java/com/minelittlepony/client/render/entity/feature/SkullFeature.java

@@ -19,7 +19,7 @@
 import net.minecraft.client.render.entity.model.EntityModelLoader;
 import net.minecraft.client.render.model.json.ModelTransformation;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.RotationAxis;
+import net.minecraft.util.math.Vec3f;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ArmorItem;
@@ -71,7 +71,7 @@ public void render(MatrixStack stack, VertexConsumerProvider renderContext, int
     }
 
     private void renderBlock(MatrixStack stack, VertexConsumerProvider renderContext, T entity, ItemStack itemstack, int lightUv) {
-        stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180));
+        stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180));
         stack.scale(0.625F, -0.625F, -0.625F);
         stack.translate(0, 0.6F, -0.21F);