diff --git a/gradle.properties b/gradle.properties index 3377141e..32f735f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.14.2 - # probably best not to auto-update this - yarn_mappings=1.14.2+build.2 - loader_version=0.4.8+ + minecraft_version=1.14.3 + # probably best not to auto-update this + yarn_mappings=1.14.3+build.1 + loader_version=0.4.8+ # Mod Properties group=com.minelittlepony @@ -18,5 +18,5 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ - kirin_version=1.14.2-1.0.1-SNAPSHOT - hd_skins_version=1.14.2-5.0.1-SNAPSHOT + kirin_version=1.14.3-1.1.0-SNAPSHOT + hd_skins_version=1.14.3-5.1.0-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/MineLPClient.java b/src/main/java/com/minelittlepony/client/MineLPClient.java index 2b44c408..ac25048d 100644 --- a/src/main/java/com/minelittlepony/client/MineLPClient.java +++ b/src/main/java/com/minelittlepony/client/MineLPClient.java @@ -9,16 +9,16 @@ import com.minelittlepony.common.client.IModUtilities; import com.minelittlepony.settings.JsonConfig; import com.minelittlepony.settings.PonyConfig; -import net.minecraft.ChatFormat; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.util.InputUtil; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resource.ReloadableResourceManager; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Style; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; import net.minecraft.util.SystemUtil; import org.lwjgl.glfw.GLFW; @@ -82,11 +82,11 @@ public class MineLPClient extends MineLittlePony { if (InputUtil.isKeyPressed(handle, GLFW.GLFW_KEY_F3) && InputUtil.isKeyPressed(handle, GLFW.GLFW_KEY_M)) { if (!reloadingModels) { minecraft.inGameHud.getChatHud().addMessage( - (new TextComponent("")).append( - new TranslatableComponent("debug.prefix") - .setStyle(new Style().setColor(ChatFormat.YELLOW).setBold(true))) + new LiteralText("").append( + new TranslatableText("debug.prefix") + .setStyle(new Style().setColor(Formatting.YELLOW).setBold(true))) .append(" ") - .append(new TranslatableComponent("minelp.debug.reload_models.message"))); + .append(new TranslatableText("minelp.debug.reload_models.message"))); reloadingModels = true; modelUpdateCounter++; diff --git a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java index 92328a3d..898c8d73 100644 --- a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.gui; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.text.LiteralText; import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; @@ -39,7 +39,7 @@ public class GuiPonySettings extends GameGui { private final boolean hiddenOptions; public GuiPonySettings() { - super(new TranslatableComponent(OPTIONS_PREFIX + "title")); + super(new LiteralText(OPTIONS_PREFIX + "title")); config = MineLittlePony.getInstance().getConfig(); diff --git a/src/main/java/com/minelittlepony/client/mixin/IResizeable.java b/src/main/java/com/minelittlepony/client/mixin/IResizeable.java index f0c89469..dbf2911d 100644 --- a/src/main/java/com/minelittlepony/client/mixin/IResizeable.java +++ b/src/main/java/com/minelittlepony/client/mixin/IResizeable.java @@ -1,16 +1,16 @@ package com.minelittlepony.client.mixin; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntitySize; +import net.minecraft.entity.EntityDimensions; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(Entity.class) public interface IResizeable { - @Accessor("size") - EntitySize getCurrentSize(); + @Accessor("dimensions") + EntityDimensions getCurrentSize(); - @Accessor("size") - void setCurrentSize(EntitySize size); + @Accessor("dimensions") + void setCurrentSize(EntityDimensions size); } diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java index b53ab913..31daf3c3 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java @@ -13,13 +13,7 @@ import net.minecraft.client.render.Camera; @Mixin(Camera.class) public abstract class MixinCamera { - - // cameraDistance; - // float field_18721; - // prevCameraDistance; - // float field_18722; - - @Inject(method = "method_19318(D)D", + @Inject(method = "clipToSpace(D)D", at = @At("RETURN"), cancellable = true) private void redirectCameraDistance(double initial, CallbackInfoReturnable info) { diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java b/src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java index 688d70a8..e784bc7e 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java @@ -9,7 +9,7 @@ import com.minelittlepony.MineLittlePony; import com.minelittlepony.pony.IPony; import net.minecraft.entity.EntityPose; -import net.minecraft.entity.EntitySize; +import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -18,10 +18,10 @@ public abstract class MixinPlayerEntity extends LivingEntity { private MixinPlayerEntity() {super(null, null);} - @Inject(method = "getActiveEyeHeight(Lnet/minecraft/entity/EntityPose;Lnet/minecraft/entity/EntitySize;)F", + @Inject(method = "getActiveEyeHeight(Lnet/minecraft/entity/EntityPose;Lnet/minecraft/entity/EntityDimensions;)F", at = @At("RETURN"), cancellable = true) - protected void redirectGetActiveEyeHeight(EntityPose pose, EntitySize size, CallbackInfoReturnable info) { + protected void redirectGetActiveEyeHeight(EntityPose pose, EntityDimensions size, CallbackInfoReturnable info) { float value = info.getReturnValueF(); IPony pony = MineLittlePony.getInstance().getManager().getPony((PlayerEntity)(Object)this); diff --git a/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java b/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java index 228146e7..8eba1304 100644 --- a/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java +++ b/src/main/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java @@ -6,12 +6,12 @@ public class ModelDeadMau5Ears extends SkullEntityModel { public ModelDeadMau5Ears() { super(24, 0, 64, 64); - field_3564.boxes.clear(); - field_3564.addBox(-9, -13, -1, 6, 6, 1, 0); - field_3564.addBox(3, -13, -1, 6, 6, 1, 0); + skull.boxes.clear(); + skull.addBox(-9, -13, -1, 6, 6, 1, 0); + skull.addBox(3, -13, -1, 6, 6, 1, 0); } public void setVisible(boolean show) { - field_3564.field_3664 = !show; + skull.field_3664 = !show; } } diff --git a/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java b/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java index 1787a58b..3df2218d 100644 --- a/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java +++ b/src/main/java/com/minelittlepony/client/model/components/ModelPonyHead.java @@ -36,7 +36,7 @@ public class ModelPonyHead extends SkullOverlayEntityModel implements ICapitated @Override public Cuboid getHead() { - return field_3564; + return skull; } @Override @@ -45,13 +45,13 @@ public class ModelPonyHead extends SkullOverlayEntityModel implements ICapitated } @Override - public void setRotationAngles(float move, float swing, float ticks, float headYaw, float headPitch, float scale) { + public void render(float move, float swing, float ticks, float headYaw, float headPitch, float scale) { snout.isHidden = metadata.getRace().isHuman(); ears.field_3664 = snout.isHidden; snout.setGender(metadata.getGender()); - super.setRotationAngles(move, swing, ticks, headYaw, headPitch, scale); + super.render(move, swing, ticks, headYaw, headPitch, scale); if (metadata.hasMagic()) { getHead().applyTransform(scale); diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java index ac071c75..e9f6ce22 100644 --- a/src/main/java/com/minelittlepony/client/pony/Pony.java +++ b/src/main/java/com/minelittlepony/client/pony/Pony.java @@ -27,7 +27,7 @@ import net.minecraft.item.ArmorItem; import net.minecraft.item.ItemStack; import net.minecraft.resource.Resource; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BoundingBox; +import net.minecraft.util.math.Box; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -240,14 +240,14 @@ public class Pony implements IPony { } @Override - public BoundingBox getComputedBoundingBox(LivingEntity entity) { + public Box getComputedBoundingBox(LivingEntity entity) { float scale = getMetadata().getSize().getScaleFactor() + 0.1F; Vec3d pos = getAbsoluteRidingOffset(entity); float width = entity.getWidth() * scale; - return new BoundingBox( + return new Box( - width, (entity.getHeight() * scale), -width, width, 0, width).offset(pos); } diff --git a/src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java b/src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java index bba3ff9a..6bf9d2e0 100644 --- a/src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.render; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.WorldRenderer; import net.minecraft.entity.LivingEntity; -import net.minecraft.util.math.BoundingBox; +import net.minecraft.util.math.Box; import com.minelittlepony.pony.IPony; @@ -23,7 +23,7 @@ public class DebugBoundingBoxRenderer { return; } - BoundingBox boundingBox = pony.getComputedBoundingBox(entity); + Box boundingBox = pony.getComputedBoundingBox(entity); enableBlend(); blendFuncSeparate(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); diff --git a/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java b/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java index f44ad3e8..a9f5a9ee 100644 --- a/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java +++ b/src/main/java/com/minelittlepony/client/render/FrustrumCheck.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render; import net.minecraft.client.render.VisibleRegion; import net.minecraft.entity.LivingEntity; -import net.minecraft.util.math.BoundingBox; +import net.minecraft.util.math.Box; import com.minelittlepony.pony.IPony; @@ -25,10 +25,10 @@ public class FrustrumCheck implements VisibleRegion { } @Override - public boolean intersects(BoundingBox bounds) { + public boolean intersects(Box bounds) { IPony pony = renderer.getPony(entity); - BoundingBox boundingBox = pony.getComputedBoundingBox(entity); + Box boundingBox = pony.getComputedBoundingBox(entity); return vanilla.intersects(boundingBox); } diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java index d0da966c..492e97cc 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java @@ -11,7 +11,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.GuardianEntityRenderer; -import net.minecraft.entity.EntitySize; +import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.mob.ElderGuardianEntity; import net.minecraft.entity.mob.GuardianEntity; import net.minecraft.util.Identifier; @@ -54,10 +54,10 @@ public class RenderPonyGuardian extends GuardianEntityRenderer { @Override public void render(GuardianEntity entity, double x, double y, double z, float entityYaw, float partialTicks) { IResizeable resize = (IResizeable)entity; - EntitySize origin = resize.getCurrentSize(); + EntityDimensions origin = resize.getCurrentSize(); // aligns the beam to their horns - resize.setCurrentSize(EntitySize.resizeable(origin.width, entity instanceof ElderGuardianEntity ? 6 : 3)); + resize.setCurrentSize(EntityDimensions.changing(origin.width, entity instanceof ElderGuardianEntity ? 6 : 3)); super.render(entity, x, y, z, entityYaw, partialTicks); diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java index b605e493..5a476fa0 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java +++ b/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java @@ -30,7 +30,7 @@ public class LayerDJPon3Head