From 8692c124c088a550336b2988363bffec2ef5565c Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 27 Mar 2020 20:14:50 +0200 Subject: [PATCH] 20w10a -> 20w13b --- gradle.properties | 14 +++++++------- .../minelittlepony/client/hdskins/DummyPony.java | 2 +- .../client/hdskins/DummyPonyRenderer.java | 2 +- .../client/hdskins/GuiSkinsMineLP.java | 4 ++-- .../client/hdskins/MineLPHDSkins.java | 2 +- .../minelittlepony/client/hdskins/PonyPreview.java | 2 +- .../client/model/PonySkullModel.java | 4 ++-- .../client/model/entity/race/SeaponyModel.java | 2 +- .../java/com/minelittlepony/client/pony/Pony.java | 6 +++--- .../blockentity/skull/AbstractPonySkull.java | 2 +- .../client/render/entity/PlayerPonyRenderer.java | 2 +- .../client/render/entity/PonyPiglinRenderer.java | 2 +- .../client/render/entity/PonyRenderer.java | 4 ++-- .../render/entity/feature/PassengerFeature.java | 4 ++-- .../render/entity/npc/IllagerPonyRenderer.java | 2 +- .../client/transform/PonyPosture.java | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 044c4e5b..7d2790b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=20w10a - yarn_mappings=20w10a+build.16:v2 - loader_version=0.7.8+build.187 + # check these on https://modmuss50.me/fabric.html + minecraft_version=20w13b + yarn_mappings=20w13b+build.5:v2 + loader_version=0.7.8+build.189 # Mod Properties group=com.minelittlepony @@ -17,6 +17,6 @@ org.gradle.daemon=false # Dependencies modmenu_version=1.11.+ - kirin_version=1.6-20w10a-SNAPSHOT - hd_skins_version=6.1.4-20w10a-SNAPSHOT - mson_version=1.1.11-20w10a-SNAPSHOT + kirin_version=1.6-20w13b-SNAPSHOT + hd_skins_version=6.1.4-20w13b-SNAPSHOT + mson_version=1.1.11-20w13b-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java index cd326a71..cafbc766 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java @@ -5,7 +5,7 @@ import net.minecraft.entity.EntityType; import com.minelittlepony.hdskins.client.dummy.DummyPlayer; import com.minelittlepony.hdskins.client.dummy.TextureProxy; -import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.hdskins.client.resources.LocalTexture; import com.minelittlepony.model.IRotatedSwimmer; diff --git a/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java index 5df75a3d..8e03aa18 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java @@ -11,7 +11,7 @@ import com.minelittlepony.client.render.entity.feature.GlowingItemFeature; import com.minelittlepony.client.render.entity.feature.ArmourFeature; import com.minelittlepony.client.render.entity.feature.ElytraFeature; import com.minelittlepony.hdskins.client.dummy.DummyPlayerRenderer; -import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.mson.api.ModelKey; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java index 22c9b17f..98ce7c25 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java @@ -5,8 +5,8 @@ import com.minelittlepony.common.client.gui.element.IconicToggle; import com.minelittlepony.common.client.gui.style.Style; import com.minelittlepony.hdskins.client.dummy.PlayerPreview; import com.minelittlepony.hdskins.client.gui.GuiSkins; -import com.minelittlepony.hdskins.skins.SkinServerList; -import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.server.SkinServerList; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.minecraft.MinecraftProfileTexture; diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index aed602e0..9c0e6faf 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -5,7 +5,7 @@ import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.common.event.ClientReadyCallback; import com.minelittlepony.hdskins.client.SkinCacheClearCallback; import com.minelittlepony.hdskins.client.gui.GuiSkins; -import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.mson.api.Mson; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java index c82863ad..a737d5e9 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java @@ -5,7 +5,7 @@ import net.minecraft.util.Identifier; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.hdskins.client.dummy.DummyPlayer; import com.minelittlepony.hdskins.client.dummy.PlayerPreview; -import com.minelittlepony.hdskins.skins.SkinType; +import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/model/PonySkullModel.java b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java index e159eebe..d49f82a2 100644 --- a/src/main/java/com/minelittlepony/client/model/PonySkullModel.java +++ b/src/main/java/com/minelittlepony/client/model/PonySkullModel.java @@ -40,8 +40,8 @@ public class PonySkullModel extends SkullOverlayEntityModel implements MsonModel } @Override - public void render(float poweredTicks, float yaw, float pitch) { - super.render(poweredTicks, yaw, pitch); + public void method_2821(float poweredTicks, float yaw, float pitch) { + super.method_2821(poweredTicks, yaw, pitch); hair.yaw = skull.yaw; hair.pitch = skull.pitch; } diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java index 1ad11ec7..bac39ec2 100644 --- a/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java @@ -84,7 +84,7 @@ public class SeaponyModel extends UnicornModel { rightArm.pitch -= 0.5F; } - if (!entity.isSubmergedInWater() || entity.method_24828()) { + if (!entity.isSubmergedInWater() || entity.isOnGround()) { leftArm.yaw -= 0.5F; rightArm.yaw += 0.5F; } diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java index f9182abb..8c1fa18f 100644 --- a/src/main/java/com/minelittlepony/client/pony/Pony.java +++ b/src/main/java/com/minelittlepony/client/pony/Pony.java @@ -81,12 +81,12 @@ public class Pony implements IPony { * this is to keep Pegasus wings from flapping in odd situations (Hypixel). */ private boolean isOnGround(LivingEntity entity) { - if (entity.method_24828()) { + if (entity.isOnGround()) { return true; } BlockState below = entity.getEntityWorld() - .getBlockState(entity.getSenseCenterPos().down(1)); + .getBlockState(entity.getBlockPos().down(1)); // Check for stairs so we can keep Pegasi from flailing their wings as they descend double offsetAmount = below.getBlock() instanceof StairsBlock ? 1 : 0.05; @@ -108,7 +108,7 @@ public class Pony implements IPony { @Override public boolean isPartiallySubmerged(LivingEntity entity) { return entity.isSubmergedInWater() - || entity.getEntityWorld().getBlockState(entity.getSenseCenterPos()).getMaterial() == Material.WATER; + || entity.getEntityWorld().getBlockState(entity.getBlockPos()).getMaterial() == Material.WATER; } @Override diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java index f6106272..a5c560b6 100644 --- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java @@ -14,7 +14,7 @@ public abstract class AbstractPonySkull implements ISkull { @Override public void setAngles(float angle, float poweredTicks) { - ponyHead.render(poweredTicks, angle, 0); + ponyHead.method_2821(poweredTicks, angle, 0); } @Override 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 9cb4c1b8..4f88a659 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java @@ -83,7 +83,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen @Override public void render(AbstractClientPlayerEntity entity, float entityYaw, float tickDelta, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv) { - shadowSize = manager.getShadowScale(); + shadowRadius = manager.getShadowScale(); super.render(entity, entityYaw, tickDelta, stack, renderContext, lightUv); DebugBoundingBoxRenderer.render(manager.getPony(entity), this, entity, stack, renderContext, tickDelta); diff --git a/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java index 502afd09..3488e371 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PonyPiglinRenderer.java @@ -22,7 +22,7 @@ public class PonyPiglinRenderer extends PonyRenderer.Caster @Override public void scale(T entity, MatrixStack stack, float tickDelta) { - shadowSize = manager.getShadowScale(); + shadowRadius = manager.getShadowScale(); if (entity.isBaby()) { - shadowSize *= 3; // undo vanilla shadow scaling + shadowRadius *= 3; // undo vanilla shadow scaling } if (!entity.hasVehicle()) { 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 c4b50cd4..250761e8 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 @@ -41,8 +41,8 @@ public class PassengerFeature extends PonyR } @Override - protected boolean isFullyVisible(IllusionerEntity entity) { + protected boolean isVisible(IllusionerEntity entity) { return true; } } diff --git a/src/main/java/com/minelittlepony/client/transform/PonyPosture.java b/src/main/java/com/minelittlepony/client/transform/PonyPosture.java index b0ee8681..aece4a3d 100644 --- a/src/main/java/com/minelittlepony/client/transform/PonyPosture.java +++ b/src/main/java/com/minelittlepony/client/transform/PonyPosture.java @@ -21,7 +21,7 @@ public interface PonyPosture { default void apply(T player, IModel model, MatrixStack stack, float yaw, float ticks, int invert) { if (applies(player)) { double motionX = player.getX() - player.prevX; - double motionY = player.method_24828() ? 0 : player.getY() - player.prevY; + double motionY = player.isOnGround() ? 0 : player.getY() - player.prevY; double motionZ = player.getZ() - player.prevZ; transform(model, player, stack, motionX, invert * motionY, motionZ, yaw, ticks);