From d66df8a78b6d1680467fa1a600f643517e947d36 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 30 Apr 2020 18:11:49 +0200 Subject: [PATCH] 20w16a -> 20w18a --- gradle.properties | 12 ++++++------ .../com/minelittlepony/client/GuiPonySettings.java | 9 +++++---- .../client/model/AbstractPonyModel.java | 2 +- .../client/render/entity/PlayerPonyRenderer.java | 3 ++- .../client/render/entity/PonyRenderer.java | 3 ++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 624e2189..e8c108f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=20w16a - yarn_mappings=20w16a+build.3:v2 + # check these on https://modmuss50.me/fabric.html + minecraft_version=20w18a + yarn_mappings=20w18a+build.1:v2 loader_version=0.8.2+build.194 # Mod Properties @@ -17,6 +17,6 @@ org.gradle.daemon=false # Dependencies modmenu_version=1.11.+ - kirin_version=1.6.1-20w16a-SNAPSHOT - hd_skins_version=6.1.4-20w16a-SNAPSHOT - mson_version=1.1.11-20w16a-SNAPSHOT + kirin_version=1.6.4-20w18a-SNAPSHOT + hd_skins_version=6.1.4-20w18a-SNAPSHOT + mson_version=1.1.12-20w18a-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/client/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/GuiPonySettings.java index fe46a25c..a08d2e5f 100644 --- a/src/main/java/com/minelittlepony/client/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/GuiPonySettings.java @@ -2,6 +2,7 @@ package com.minelittlepony.client; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import com.minelittlepony.client.render.MobRenderers; @@ -149,10 +150,10 @@ public class GuiPonySettings extends GameGui { } @Override - public void render(int mouseX, int mouseY, float partialTicks) { - renderBackground(); - super.render(mouseX, mouseY, partialTicks); - content.render(mouseX, mouseY, partialTicks); + public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { + renderBackground(matrices); + super.render(matrices, mouseX, mouseY, partialTicks); + content.render(matrices, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 1c90bf32..ea961060 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -643,7 +643,7 @@ public abstract class AbstractPonyModel extends ClientPo PonyTransformation.forSize(getSize()).transform(this, part, stack); } - interface RenderStage { + protected interface RenderStage { void accept(MatrixStack stack, VertexConsumer vertices, int overlayUv, int lightUv, float red, float green, float blue, float alpha); } } 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 5539718e..de51faa8 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java @@ -35,6 +35,7 @@ import net.minecraft.client.render.entity.feature.StuckArrowsFeatureRenderer; import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; +import net.minecraft.text.Text; import net.minecraft.util.Arm; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -117,7 +118,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen } @Override - protected void renderLabelIfPresent(AbstractClientPlayerEntity entity, String name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { + protected void renderLabelIfPresent(AbstractClientPlayerEntity entity, Text name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { stack.push(); if (entity.isSleeping()) { diff --git a/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java index ad9bf5b9..f4b80f3d 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java @@ -26,6 +26,7 @@ import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.MobEntity; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; import java.util.List; @@ -103,7 +104,7 @@ public abstract class PonyRenderer } @Override - protected void renderLabelIfPresent(T entity, String name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { + protected void renderLabelIfPresent(T entity, Text name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { stack.push(); stack.translate(0, manager.getNamePlateYOffset(entity), 0); super.renderLabelIfPresent(entity, name, stack, renderContext, maxDistance);