PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 20:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

20w16a -> 20w18a

Browse source
This commit is contained in:
Sollace 2020-04-30 18:11:49 +02:00
parent 215eba0fbe
commit d66df8a78b
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gradle.properties
View file

@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://modmuss50.me/fabric.html
minecraft_version=20w16a minecraft_version=20w18a
yarn_mappings=20w16a+build.3:v2 yarn_mappings=20w18a+build.1:v2
loader_version=0.8.2+build.194 loader_version=0.8.2+build.194
# Mod Properties # Mod Properties
@ -17,6 +17,6 @@ org.gradle.daemon=false
# Dependencies # Dependencies
modmenu_version=1.11.+ modmenu_version=1.11.+
kirin_version=1.6.1-20w16a-SNAPSHOT kirin_version=1.6.4-20w18a-SNAPSHOT
hd_skins_version=6.1.4-20w16a-SNAPSHOT hd_skins_version=6.1.4-20w18a-SNAPSHOT
mson_version=1.1.11-20w16a-SNAPSHOT mson_version=1.1.12-20w18a-SNAPSHOT

9
src/main/java/com/minelittlepony/client/GuiPonySettings.java
View file

@ -2,6 +2,7 @@ package com.minelittlepony.client;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
import com.minelittlepony.client.render.MobRenderers; import com.minelittlepony.client.render.MobRenderers;
@ -149,10 +150,10 @@ public class GuiPonySettings extends GameGui {
} }
@Override @Override
public void render(int mouseX, int mouseY, float partialTicks) { public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
renderBackground(); renderBackground(matrices);
super.render(mouseX, mouseY, partialTicks); super.render(matrices, mouseX, mouseY, partialTicks);
content.render(mouseX, mouseY, partialTicks); content.render(matrices, mouseX, mouseY, partialTicks);
} }
@Override @Override

2
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -643,7 +643,7 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
PonyTransformation.forSize(getSize()).transform(this, part, stack); 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); void accept(MatrixStack stack, VertexConsumer vertices, int overlayUv, int lightUv, float red, float green, float blue, float alpha);
} }
} }

3
src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java
View file

@ -35,6 +35,7 @@ import net.minecraft.client.render.entity.feature.StuckArrowsFeatureRenderer;
import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.render.entity.model.PlayerEntityModel;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.util.math.Vector3f;
import net.minecraft.text.Text;
import net.minecraft.util.Arm; import net.minecraft.util.Arm;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
@ -117,7 +118,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen
} }
@Override @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(); stack.push();
if (entity.isSleeping()) { if (entity.isSleeping()) {

3
src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java
View file

@ -26,6 +26,7 @@ import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.render.entity.model.PlayerEntityModel;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.mob.MobEntity;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import java.util.List; import java.util.List;
@ -103,7 +104,7 @@ public abstract class PonyRenderer<T extends MobEntity, M extends EntityModel<T>
} }
@Override @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.push();
stack.translate(0, manager.getNamePlateYOffset(entity), 0); stack.translate(0, manager.getNamePlateYOffset(entity), 0);
super.renderLabelIfPresent(entity, name, stack, renderContext, maxDistance); super.renderLabelIfPresent(entity, name, stack, renderContext, maxDistance);