PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-16 17:44:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build and bump dependencies

Browse source
This commit is contained in:
Sollace 2020-11-10 21:38:05 +02:00
parent 42968a99ff
commit 97f71ffa24
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -19,5 +19,5 @@ org.gradle.daemon=false
# Dependencies # Dependencies
modmenu_version=1.12.+ modmenu_version=1.12.+
kirin_version=1.7-1.16.2 kirin_version=1.7-1.16.2
hd_skins_version=6.3-1.16.2 hd_skins_version=6.3.3-1.16.3
mson_version=1.2.1-1.16-rc1-1.16 mson_version=1.2.1-1.16-rc1-1.16

6
src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java
View file

@ -5,7 +5,7 @@ import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.entity.model.ModelWithHat; import net.minecraft.client.render.entity.model.ModelWithHat;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.MerchantEntity;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerDataContainer;
import net.minecraft.village.VillagerProfession; import net.minecraft.village.VillagerProfession;
@ -88,8 +88,8 @@ public class VillagerPonyModel<T extends LivingEntity & VillagerDataContainer> e
public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) { public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) {
super.setAngles(entity, move, swing, ticks, headYaw, headPitch); super.setAngles(entity, move, swing, ticks, headYaw, headPitch);
boolean isHeadRolling = entity instanceof AbstractTraderEntity boolean isHeadRolling = entity instanceof MerchantEntity
&& ((AbstractTraderEntity)entity).getHeadRollingTimeLeft() > 0; && ((MerchantEntity)entity).getHeadRollingTimeLeft() > 0;
if (isHeadRolling) { if (isHeadRolling) {
float roll = 0.3F * MathHelper.sin(0.45F * ticks); float roll = 0.3F * MathHelper.sin(0.45F * ticks);

2
src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -40,7 +40,7 @@ public class LevitatingItemRenderer {
} }
public static RenderLayer getRenderLayer() { public static RenderLayer getRenderLayer() {
return getRenderLayer(SpriteAtlasTexture.BLOCK_ATLAS_TEX); return getRenderLayer(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE);
} }
/** /**

2
src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java
View file

@ -93,7 +93,7 @@ public class ArmourFeature<T extends LivingEntity, M extends EntityModel<T> & IP
MatrixStack matrices, VertexConsumerProvider provider, MatrixStack matrices, VertexConsumerProvider provider,
int light, boolean glint, V model, float r, float g, float b, IArmourTextureResolver<T> resolver, ArmourLayer layer, Identifier texture) { int light, boolean glint, V model, float r, float g, float b, IArmourTextureResolver<T> resolver, ArmourLayer layer, Identifier texture) {
VertexConsumer vertices = ItemRenderer.getArmorVertexConsumer(provider, RenderLayer.getArmorCutoutNoCull(texture), false, glint); VertexConsumer vertices = ItemRenderer.getArmorGlintConsumer(provider, RenderLayer.getArmorCutoutNoCull(texture), false, glint);
model.setVariant(resolver.getArmourVariant(layer, texture)); model.setVariant(resolver.getArmourVariant(layer, texture));
model.render(matrices, vertices, light, OverlayTexture.DEFAULT_UV, r, g, b, 1); model.render(matrices, vertices, light, OverlayTexture.DEFAULT_UV, r, g, b, 1);

2
src/main/java/com/minelittlepony/client/render/entity/feature/ElytraFeature.java
View file

@ -47,7 +47,7 @@ public class ElytraFeature<T extends LivingEntity, M extends EntityModel<T> & IP
} }
elytra.setAngles(entity, limbDistance, limbAngle, age, headYaw, headPitch); elytra.setAngles(entity, limbDistance, limbAngle, age, headYaw, headPitch);
VertexConsumer vertexConsumer = ItemRenderer.getDirectGlintVertexConsumer(renderContext, modelElytra.getLayer(getElytraTexture(entity)), false, itemstack.hasGlint()); VertexConsumer vertexConsumer = ItemRenderer.getDirectItemGlintConsumer(renderContext, modelElytra.getLayer(getElytraTexture(entity)), false, itemstack.hasGlint());
modelElytra.render(stack, vertexConsumer, lightUv, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); modelElytra.render(stack, vertexConsumer, lightUv, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1);
stack.pop(); stack.pop();