From 9ca7e060759b686a438a3f33f90a2ec88ea82058 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 8 Dec 2022 01:53:59 +0000 Subject: [PATCH] 1.19.2 -> 1.19.3 (1.20) --- gradle.properties | 18 ++++++++--------- .../api/model/armour/ArmourRegistry.java | 8 +++----- .../api/model/armour/IArmour.java | 5 +++-- .../minelittlepony/client/MineLittlePony.java | 2 +- .../client/hdskins/DummyPony.java | 9 ++++----- .../client/hdskins/MineLPHDSkins.java | 5 +---- .../client/hdskins/PonyPreview.java | 20 ++++++++++--------- .../client/mixin/MixinClientPlayerEntity.java | 2 +- .../client/model/AbstractPonyModel.java | 10 ++++------ .../client/model/ClientPonyModel.java | 9 ++++----- .../client/render/FrustrumCheck.java | 3 ++- .../client/render/LevitatingItemRenderer.java | 6 +++--- .../client/render/MagicGlow.java | 4 ++-- .../render/blockentity/skull/MobSkull.java | 13 ++++++------ .../blockentity/skull/PlayerPonySkull.java | 17 ++++++++-------- .../render/entity/PlayerPonyRenderer.java | 7 +++---- .../client/render/entity/WitchRenderer.java | 4 ++-- .../feature/AbstractClothingFeature.java | 2 +- .../render/entity/feature/CapeFeature.java | 13 ++++++------ .../entity/feature/HeldItemFeature.java | 12 +++++------ .../entity/feature/PassengerFeature.java | 7 ++++--- .../render/entity/feature/SkullFeature.java | 4 ++-- .../render/entity/npc/NpcClothingFeature.java | 14 ++++++------- .../client/transform/PostureElytra.java | 4 ++-- .../client/transform/PostureFlight.java | 6 +++--- 25 files changed, 100 insertions(+), 104 deletions(-) diff --git a/gradle.properties b/gradle.properties index b19cb718..91212977 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.19.2 - yarn_mappings=1.19.2+build.3 - loader_version=0.14.9 - fabric_version=0.59.0+1.19.2 + minecraft_version=1.19.3-pre2 + yarn_mappings=1.19.3-pre2+build.1 + loader_version=0.14.10 + fabric_version=0.67.1+1.19.3 # 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 + minecraft_version_range=>=1.19.3-pre1 modrinth_loader_type=fabric modrinth_project_id=JBjInUXM # Dependencies - modmenu_version=4.0.6 - kirin_version=1.12.0 - hd_skins_version=6.6.0 - mson_version=1.6.1 + modmenu_version=5.0.0-alpha.3 + kirin_version=1.13.0-beta.1 + hd_skins_version=6.7.0-beta.1 + mson_version=1.7.0-beta.1 diff --git a/src/main/java/com/minelittlepony/api/model/armour/ArmourRegistry.java b/src/main/java/com/minelittlepony/api/model/armour/ArmourRegistry.java index 6898b8e3..7b5db3df 100644 --- a/src/main/java/com/minelittlepony/api/model/armour/ArmourRegistry.java +++ b/src/main/java/com/minelittlepony/api/model/armour/ArmourRegistry.java @@ -1,19 +1,17 @@ package com.minelittlepony.api.model.armour; import net.minecraft.item.ItemStack; +import net.minecraft.registry.*; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.util.registry.SimpleRegistry; import com.mojang.serialization.Lifecycle; public final class ArmourRegistry { private ArmourRegistry() {} - static final Registry> REGISTRY = new SimpleRegistry<>(RegistryKey.ofRegistry(new Identifier("minelittlepony", "armour")), Lifecycle.stable(), null); + static final Registry> REGISTRY = new SimpleRegistry<>(RegistryKey.ofRegistry(new Identifier("minelittlepony", "armour")), Lifecycle.stable()); @SuppressWarnings("unchecked") public static IArmour getArmour(ItemStack stack, IArmour fallback) { - return (IArmour)REGISTRY.getOrEmpty(Registry.ITEM.getId(stack.getItem())).orElse(fallback); + return (IArmour)REGISTRY.getOrEmpty(Registries.ITEM.getId(stack.getItem())).orElse(fallback); } } diff --git a/src/main/java/com/minelittlepony/api/model/armour/IArmour.java b/src/main/java/com/minelittlepony/api/model/armour/IArmour.java index 4bdcbb4c..6864cf3a 100644 --- a/src/main/java/com/minelittlepony/api/model/armour/IArmour.java +++ b/src/main/java/com/minelittlepony/api/model/armour/IArmour.java @@ -1,7 +1,8 @@ package com.minelittlepony.api.model.armour; import net.minecraft.item.Item; -import net.minecraft.util.registry.Registry; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import org.jetbrains.annotations.Nullable; @@ -22,7 +23,7 @@ public interface IArmour extends IModelWrapper { * Only one registration per item allowed. */ public static IArmour register(IArmour armour, Item item) { - return Registry.register(ArmourRegistry.REGISTRY, Registry.ITEM.getId(item), armour); + return Registry.register(ArmourRegistry.REGISTRY, Registries.ITEM.getId(item), armour); } /** diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java index de6f9ba1..dfebcc3b 100644 --- a/src/main/java/com/minelittlepony/client/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -130,7 +130,7 @@ public class MineLittlePony implements ClientModInitializer { .setTextureSize(16, 16) .setSize(16, 16)) .setTooltip("minelp.options.title", 0, 10); - button.y = screen.height - y; // ModMenu + button.setY(screen.height - y); // ModMenu } } } diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java index b6c6168c..e1863a89 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java @@ -7,15 +7,14 @@ import com.minelittlepony.api.pony.IPonyManager; import com.minelittlepony.client.IPreviewModel; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.pony.Pony; -import com.minelittlepony.hdskins.client.dummy.DummyPlayer; -import com.minelittlepony.hdskins.client.dummy.TextureProxy; +import com.minelittlepony.hdskins.client.dummy.*; /** * Dummy model used for the skin uploading screen. */ class DummyPony extends DummyPlayer implements IPreviewModel, ModelAttributes.Swimmer, IPonyManager.ForcedPony, Pony.RegistrationHandler { - public DummyPony(ClientWorld world, TextureProxy textures) { + public DummyPony(ClientWorld world, PlayerSkins textures) { super(world, textures); } @@ -26,12 +25,12 @@ class DummyPony extends DummyPlayer implements IPreviewModel, ModelAttributes.Sw @Override public boolean isSubmergedInWater() { - return getTextures().getSkinType() == MineLPHDSkins.seaponySkinType || super.isSubmergedInWater(); + return getTextures().getPosture().getActiveSkinType() == MineLPHDSkins.seaponySkinType || super.isSubmergedInWater(); } @Override public String getModel() { - if (getTextures().getSkinType() == MineLPHDSkins.seaponySkinType) { + if (getTextures().getPosture().getActiveSkinType() == MineLPHDSkins.seaponySkinType) { return getTextures().usesThinSkin() ? "slimseapony" : "seapony"; } return MineLittlePony.getInstance().getManager() diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index 285bf42b..89918ce8 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -10,7 +10,6 @@ import com.minelittlepony.hdskins.client.SkinCacheClearCallback; import com.minelittlepony.hdskins.client.ducks.ClientPlayerInfo; import com.minelittlepony.hdskins.client.dummy.DummyPlayer; import com.minelittlepony.hdskins.client.gui.GuiSkins; -import com.minelittlepony.hdskins.client.resources.LocalTexture; import com.minelittlepony.hdskins.mixin.client.MixinClientPlayer; import com.minelittlepony.hdskins.profile.SkinType; @@ -65,9 +64,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { @Override public Identifier getSeaponySkin(EquineRenderManager> manager, AbstractClientPlayerEntity player) { if (player instanceof DummyPlayer) { - LocalTexture tex = ((DummyPlayer)player).getTextures().get(seaponySkinType); - Identifier id = tex.getId(); - return id == null ? tex.getDefault() : id; + return ((DummyPlayer)player).getTextures().get(seaponySkinType).getId(); } else { ClientPlayerInfo info = (ClientPlayerInfo)((MixinClientPlayer)player).getBackingClientData(); Identifier tex = info.getSkins().getSkin(seaponySkinType); diff --git a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java index c0f2cff9..ed9d1c13 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java @@ -5,16 +5,18 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + import com.minelittlepony.api.pony.IPonyData; import com.minelittlepony.api.pony.TriggerPixelType; import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.hdskins.client.dummy.DummyPlayer; -import com.minelittlepony.hdskins.client.dummy.PlayerPreview; -import com.minelittlepony.hdskins.client.dummy.TextureProxy; +import com.minelittlepony.common.client.gui.dimension.Bounds; +import com.minelittlepony.hdskins.client.dummy.*; import com.minelittlepony.hdskins.profile.SkinType; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; import java.util.stream.Collectors; class PonyPreview extends PlayerPreview { @@ -23,7 +25,7 @@ class PonyPreview extends PlayerPreview { public static final Identifier NO_SKIN_SEAPONY = new Identifier("minelittlepony", "textures/mob/noskin_seapony.png"); @Override - protected DummyPlayer createEntity(ClientWorld world, TextureProxy textures) { + protected DummyPlayer createEntity(ClientWorld world, PlayerSkins textures) { return new DummyPony(world, textures); } @@ -53,15 +55,15 @@ class PonyPreview extends PlayerPreview { @Override public void renderWorldAndPlayer(Optional thePlayer, - int frameLeft, int frameRight, int frameBottom, int frameTop, - float xPos, float yPos, int horizon, int mouseX, int mouseY, int ticks, float partialTick, float scale, - MatrixStack matrices) { - super.renderWorldAndPlayer(thePlayer, frameLeft, frameRight, frameBottom, frameTop, xPos, yPos, horizon, mouseX, mouseY, ticks, partialTick, scale, matrices); + Bounds frame, + int horizon, int mouseX, int mouseY, int ticks, float partialTick, float scale, + MatrixStack matrices, @Nullable Consumer postAction) { + super.renderWorldAndPlayer(thePlayer, frame, horizon, mouseX, mouseY, ticks, partialTick, scale, matrices, postAction); thePlayer.ifPresent(p -> { IPonyData data = MineLittlePony.getInstance().getManager().getPony(p).getMetadata(); int[] index = new int[1]; data.getTriggerPixels().forEach((key, value) -> { - drawLegendBlock(matrices, index[0]++, frameLeft, frameTop, mouseX, mouseY, key, value); + drawLegendBlock(matrices, index[0]++, frame.left, frame.top, mouseX, mouseY, key, value); }); }); } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java index ee52e2d9..d09341e1 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ClientPlayerEntity.class) abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity implements Pony.RegistrationHandler { - public MixinClientPlayerEntity() { super(null, null, null); } + public MixinClientPlayerEntity() { super(null, null); } private Pony pony; diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 6700072b..ac38d9d6 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -12,12 +12,10 @@ import com.minelittlepony.mson.util.PartUtil; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; - import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.util.Arm; -import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.*; /** * Foundation class for all types of ponies. @@ -621,12 +619,12 @@ public abstract class AbstractPonyModel extends ClientPo @Override public void transform(BodyPart part, MatrixStack stack) { if (attributes.isSleeping || attributes.isRiptide) { - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90)); - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180)); } if (part == BodyPart.HEAD) { - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(attributes.motionPitch)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(attributes.motionPitch)); } PonyTransformation.forSize(getSize()).transform(this, part, stack); diff --git a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java index c53ff94e..f90c3f6b 100644 --- a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java @@ -1,8 +1,7 @@ package com.minelittlepony.client.model; import net.minecraft.client.model.ModelPart; -import net.minecraft.client.render.entity.model.BipedEntityModel; -import net.minecraft.client.render.entity.model.ModelWithHat; +import net.minecraft.client.render.entity.model.*; import net.minecraft.entity.LivingEntity; import net.minecraft.util.Arm; import net.minecraft.util.Hand; @@ -64,7 +63,7 @@ public abstract class ClientPonyModel extends MsonPlayer @Override public void copyAttributes(BipedEntityModel other) { - setAttributes(other); + copyStateTo(other); } @Override @@ -116,8 +115,8 @@ public abstract class ClientPonyModel extends MsonPlayer * Copies this model's attributes into the passed model. */ @Override - public void setAttributes(BipedEntityModel model) { - super.setAttributes(model); + public void copyStateTo(EntityModel model) { + super.copyStateTo(model); if (model instanceof ClientPonyModel) { ((ClientPonyModel)model).attributes = attributes; diff --git a/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java b/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java index c493f721..df319722 100644 --- a/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java +++ b/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java @@ -3,7 +3,8 @@ package com.minelittlepony.client.render; import net.minecraft.client.render.Frustum; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.Box; -import net.minecraft.util.math.Matrix4f; + +import org.joml.Matrix4f; import com.minelittlepony.api.pony.IPony; diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index afd29ed2..0102fc44 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -13,7 +13,6 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -21,6 +20,7 @@ import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.Arm; import net.minecraft.util.Identifier; import net.minecraft.util.UseAction; +import net.minecraft.util.math.RotationAxis; import net.minecraft.world.World; public class LevitatingItemRenderer { @@ -140,8 +140,8 @@ public class LevitatingItemRenderer { distanceChange); if (!handHeldTool) { // bows have to point forwards - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(sign * -60 + floatAmount)); - stack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(sign * 30 + driftAmount)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(sign * -60 + floatAmount)); + stack.multiply(RotationAxis.POSITIVE_Z.rotationDegrees(sign * 30 + driftAmount)); } } } diff --git a/src/main/java/com/minelittlepony/client/render/MagicGlow.java b/src/main/java/com/minelittlepony/client/render/MagicGlow.java index f33290ee..da2f4550 100644 --- a/src/main/java/com/minelittlepony/client/render/MagicGlow.java +++ b/src/main/java/com/minelittlepony/client/render/MagicGlow.java @@ -18,7 +18,7 @@ public abstract class MagicGlow extends RenderPhase { } private static final RenderLayer MAGIC = RenderLayer.of("mlp_magic_glow", VertexFormats.POSITION_COLOR_LIGHT, VertexFormat.DrawMode.QUADS, 256, RenderLayer.MultiPhaseParameters.builder() - .shader(EYES_SHADER) + .program(EYES_PROGRAM) .writeMaskState(COLOR_MASK) .depthTest(LEQUAL_DEPTH_TEST) .transparency(LIGHTNING_TRANSPARENCY) @@ -29,7 +29,7 @@ public abstract class MagicGlow extends RenderPhase { private static final BiFunction 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)) - .shader(EYES_SHADER) + .program(EYES_PROGRAM) .writeMaskState(COLOR_MASK) .depthTest(LEQUAL_DEPTH_TEST) .transparency(LIGHTNING_TRANSPARENCY) diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java index 05593abc..66264360 100644 --- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java @@ -15,9 +15,10 @@ import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -import net.minecraft.util.math.Vec3f; +import net.minecraft.util.math.RotationAxis; import org.jetbrains.annotations.Nullable; +import org.joml.Vector3f; public class MobSkull implements ISkull { private final Identifier texture; @@ -49,12 +50,12 @@ public class MobSkull implements ISkull { @Override public void setAngles(float yaw, float animationProgress) { - Vec3f v = new Vec3f(0, -2, 1.99F); - v.rotate(Vec3f.POSITIVE_Y.getDegreesQuaternion(yaw)); + Vector3f v = new Vector3f(0, -2, 1.99F); + v.rotate(RotationAxis.POSITIVE_Y.rotationDegrees(yaw)); ModelPart head = ponyHead.get().getHead(); - head.pivotX = v.getX(); - head.pivotY = v.getY(); - head.pivotZ = v.getZ(); + head.pivotX = v.x; + head.pivotY = v.y; + head.pivotZ = v.z; ponyHead.get().setVisible(true); ponyHead.get().setHeadRotation(animationProgress, yaw, 0); } 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 1aad9bf3..5dad6661 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 @@ -18,10 +18,11 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.DefaultSkinHelper; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -import net.minecraft.util.dynamic.DynamicSerializableUuid; -import net.minecraft.util.math.Vec3f; +import net.minecraft.util.Uuids; +import net.minecraft.util.math.RotationAxis; import org.jetbrains.annotations.Nullable; +import org.joml.Vector3f; public class PlayerPonySkull implements ISkull { private AbstractPonyModel ponyHead; @@ -45,7 +46,7 @@ public class PlayerPonySkull implements ISkull { return skin; } - return DefaultSkinHelper.getTexture(DynamicSerializableUuid.getUuidFromProfile(profile)); + return DefaultSkinHelper.getTexture(Uuids.getUuidFromProfile(profile)); } return DefaultSkinHelper.getTexture(); @@ -64,11 +65,11 @@ public class PlayerPonySkull implements ISkull { @Override public void setAngles(float yaw, float animationProgress) { - 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(); + 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; ponyHead.setVisible(true); ponyHead.setHeadRotation(animationProgress, yaw, 0); } 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 a904463f..5bd55b85 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java @@ -34,11 +34,10 @@ import net.minecraft.client.render.entity.PlayerEntityRenderer; import net.minecraft.client.render.entity.feature.*; import net.minecraft.client.render.entity.model.*; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; import net.minecraft.text.Text; import net.minecraft.util.Arm; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.*; public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRenderContext> { @@ -102,9 +101,9 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen float yaw = MathHelper.lerpAngleDegrees(tickDelta, entity.prevBodyYaw, entity.bodyYaw); float l = entity.getWidth() / 2 * manager.getPony(entity).getMetadata().getSize().getScaleFactor(); - stack.multiply(Vec3f.NEGATIVE_Y.getDegreesQuaternion(yaw)); + stack.multiply(RotationAxis.NEGATIVE_Y.rotationDegrees(yaw)); stack.translate(0, 0, -l); - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(yaw)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(yaw)); } } diff --git a/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java index c39bcdf6..89f16b16 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/WitchRenderer.java @@ -7,7 +7,7 @@ import com.minelittlepony.client.render.entity.feature.HeldItemFeature; 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.Vec3f; +import net.minecraft.util.math.RotationAxis; import net.minecraft.entity.mob.WitchEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Arm; @@ -27,7 +27,7 @@ public class WitchRenderer extends PonyRenderer { @Override protected void preItemRender(WitchEntity entity, ItemStack drop, ModelTransformation.Mode transform, Arm hand, MatrixStack stack) { super.preItemRender(entity, drop, transform, hand, stack); - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(10)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(10)); } }; } diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractClothingFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractClothingFeature.java index 08d60662..4713d17b 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractClothingFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractClothingFeature.java @@ -26,7 +26,7 @@ public abstract class AbstractClothingFeature> extends AbstractPonyFeature { @@ -61,11 +60,11 @@ public class CapeFeature> float camera = MathHelper.lerp(tickDelta, player.prevStrideDistance, player.strideDistance); capeMotionY += MathHelper.sin(MathHelper.lerp(tickDelta, player.prevHorizontalSpeed, player.horizontalSpeed) * 6) * 32 * camera; - 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)); + 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)); VertexConsumer vertices = renderContext.getBuffer(RenderLayer.getEntitySolid(player.getCapeTexture())); model.renderCape(stack, vertices, lightUv, OverlayTexture.DEFAULT_UV); diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java index 63d77496..a3a56b48 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/HeldItemFeature.java @@ -11,12 +11,12 @@ import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.ModelWithArms; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Arm; import net.minecraft.util.Hand; import net.minecraft.util.UseAction; +import net.minecraft.util.math.RotationAxis; public class HeldItemFeature & IPonyModel> extends AbstractPonyFeature { @@ -85,9 +85,9 @@ public class HeldItemFeature & } if (main == arm) { stack.translate(left * -0.05F, 0.5F, 0.7F); - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-60)); - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-90)); - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(left * 180)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-60)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-90)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(left * 180)); stack.translate(left * -0.2F, 0.125F, -1); return; @@ -98,8 +98,8 @@ public class HeldItemFeature & stack.translate(left / 10, -0.2F, -0.5F); } - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(-90)); - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(left * 180)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(-90)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(left * 180)); stack.translate(left * -0.2F, 0.125F, -1); } diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java index 9323983d..4d15a550 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java @@ -8,8 +8,9 @@ import net.minecraft.client.render.entity.ParrotEntityRenderer; 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.Vec3f; +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; @@ -42,7 +43,7 @@ public class PassengerFeature getShoulderParrot(NbtCompound tag) { return EntityType.get(tag.getString("id")) .filter(p -> p == EntityType.PARROT) - .map(type -> ParrotEntityRenderer.TEXTURES[tag.getInt("Variant")]); + .map(type -> ParrotEntityRenderer.getTexture(ParrotEntity.Variant.byIndex(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) { @@ -54,7 +55,7 @@ public class PassengerFeature & IPo } private void renderBlock(MatrixStack stack, VertexConsumerProvider renderContext, T entity, ItemStack itemstack, int lightUv) { - stack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180)); + stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180)); stack.scale(0.625F, -0.625F, -0.625F); stack.translate(0, 0.6F, -0.21F); diff --git a/src/main/java/com/minelittlepony/client/render/entity/npc/NpcClothingFeature.java b/src/main/java/com/minelittlepony/client/render/entity/npc/NpcClothingFeature.java index abeb2c15..c4564c80 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/npc/NpcClothingFeature.java +++ b/src/main/java/com/minelittlepony/client/render/entity/npc/NpcClothingFeature.java @@ -9,10 +9,10 @@ import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.ModelWithHat; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.registry.Registry; import net.minecraft.village.VillagerData; import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; @@ -49,7 +49,7 @@ class NpcClothingFeature< public static Identifier getClothingTexture(VillagerDataContainer entity, String entityType) { VillagerProfession profession = entity.getVillagerData().getProfession(); - return createTexture("minelittlepony", entityType, "profession", Registry.VILLAGER_PROFESSION.getId(profession)); + return createTexture("minelittlepony", entityType, "profession", Registries.VILLAGER_PROFESSION.getId(profession)); } public static Identifier createTexture(String namespace, String entityType, String category, Identifier profession) { @@ -59,7 +59,7 @@ class NpcClothingFeature< public Identifier createTexture(VillagerDataContainer entity, String category) { VillagerProfession profession = entity.getVillagerData().getProfession(); - return createTexture(category, Registry.VILLAGER_PROFESSION.getId(profession)); + return createTexture(category, Registries.VILLAGER_PROFESSION.getId(profession)); } public Identifier createTexture(String category, Identifier identifier) { @@ -76,7 +76,7 @@ class NpcClothingFeature< M entityModel = getContextModel(); if (entity.isBaby() || data.getProfession() == VillagerProfession.NONE) { - Identifier typeSkin = createTexture("type", Registry.VILLAGER_TYPE.getId(data.getType())); + Identifier typeSkin = createTexture("type", Registries.VILLAGER_TYPE.getId(data.getType())); renderModel(entityModel, typeSkin, matrixStack, provider, i, entity, 1, 1, 1); } else { @@ -89,8 +89,8 @@ class NpcClothingFeature< VillagerProfession profession = data.getProfession(); int level = MathHelper.clamp(data.getLevel(), 1, LEVEL_TO_ID.size()); - Identifier typeId = Registry.VILLAGER_TYPE.getId(type); - Identifier profId = Registry.VILLAGER_PROFESSION.getId(profession); + Identifier typeId = Registries.VILLAGER_TYPE.getId(type); + Identifier profId = Registries.VILLAGER_PROFESSION.getId(profession); Identifier key = new Identifier("minelittlepony", (typeId + "/" + profId + "/" + level).replace(':', '_')); @@ -105,7 +105,7 @@ class NpcClothingFeature< List skins = new ArrayList<>(); skins.add(createTexture("type", typeId)); - skins.add(createTexture("profession", Registry.VILLAGER_PROFESSION.getId(profession))); + skins.add(createTexture("profession", Registries.VILLAGER_PROFESSION.getId(profession))); if (profession != VillagerProfession.NITWIT) { skins.add(createTexture("profession_level", LEVEL_TO_ID.get(level))); } diff --git a/src/main/java/com/minelittlepony/client/transform/PostureElytra.java b/src/main/java/com/minelittlepony/client/transform/PostureElytra.java index fe492f7a..0d68aa30 100644 --- a/src/main/java/com/minelittlepony/client/transform/PostureElytra.java +++ b/src/main/java/com/minelittlepony/client/transform/PostureElytra.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.transform; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; +import net.minecraft.util.math.RotationAxis; import com.minelittlepony.api.model.IModel; @@ -10,7 +10,7 @@ import net.minecraft.entity.LivingEntity; public class PostureElytra implements PonyPosture { @Override public void transform(IModel model, LivingEntity entity, MatrixStack stack, double motionX, double motionY, double motionZ, float yaw, float ticks) { - stack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(90)); + stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90)); stack.translate(0, model.getAttributes().isCrouching ? 0.2F : -1, 0); } } diff --git a/src/main/java/com/minelittlepony/client/transform/PostureFlight.java b/src/main/java/com/minelittlepony/client/transform/PostureFlight.java index c3661523..4cf6c0ed 100644 --- a/src/main/java/com/minelittlepony/client/transform/PostureFlight.java +++ b/src/main/java/com/minelittlepony/client/transform/PostureFlight.java @@ -5,7 +5,7 @@ import com.minelittlepony.common.util.animation.MotionCompositor; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.Vec3f; +import net.minecraft.util.math.RotationAxis; import net.minecraft.entity.LivingEntity; public class PostureFlight extends MotionCompositor implements PonyPosture { @@ -22,7 +22,7 @@ public class PostureFlight extends MotionCompositor implements PonyPosture