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

Slight improvement to armour rendering/use the vanilla render layers for armour

Browse source
This commit is contained in:
Sollace 2020-04-19 15:53:22 +02:00
parent 5912483e1f
commit f6b0d35a68
2 changed files with 43 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java
View file

@ -54,8 +54,8 @@ public class PonyStandRenderer extends ArmorStandEntityRenderer {
for (EquipmentSlot i : EquipmentSlot.values()) { for (EquipmentSlot i : EquipmentSlot.values()) {
if (i.getType() == EquipmentSlot.Type.ARMOR) { if (i.getType() == EquipmentSlot.Type.ARMOR) {
ArmourFeature.renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, tickDelta, age, headYaw, headPitch, i, ArmourLayer.INNER); ArmourFeature.renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, age, headYaw, headPitch, i, ArmourLayer.INNER);
ArmourFeature.renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, tickDelta, age, headYaw, headPitch, i, ArmourLayer.OUTER); ArmourFeature.renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, age, headYaw, headPitch, i, ArmourLayer.OUTER);
} }
} }
} else { } else {

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

@ -20,7 +20,6 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterials;
import net.minecraft.item.DyeableArmorItem; import net.minecraft.item.DyeableArmorItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -39,57 +38,64 @@ public class ArmourFeature<T extends LivingEntity, M extends EntityModel<T> & IP
for (EquipmentSlot i : EquipmentSlot.values()) { for (EquipmentSlot i : EquipmentSlot.values()) {
if (i.getType() == EquipmentSlot.Type.ARMOR) { if (i.getType() == EquipmentSlot.Type.ARMOR) {
renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, tickDelta, age, headYaw, headPitch, i, ArmourLayer.INNER); renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, age, headYaw, headPitch, i, ArmourLayer.INNER);
renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, tickDelta, age, headYaw, headPitch, i, ArmourLayer.OUTER); renderArmor(pony, stack, renderContext, lightUv, entity, limbDistance, limbAngle, age, headYaw, headPitch, i, ArmourLayer.OUTER);
} }
} }
} }
@SuppressWarnings("unchecked") public static <T extends LivingEntity, V extends BipedEntityModel<T> & IArmour> void renderArmor(
public static <T extends LivingEntity, V extends BipedEntityModel<T> & IArmour> void renderArmor(ModelWrapper<T, ? extends IPonyModel<T>> pony, MatrixStack stack, VertexConsumerProvider renderContext, int lightUv, T entity, float limbDistance, float limbAngle, float tickDelta, float age, float headYaw, float headPitch, EquipmentSlot armorSlot, ArmourLayer layer) { ModelWrapper<T, ? extends IPonyModel<T>> pony, MatrixStack stack,
VertexConsumerProvider renderContext, int lightUv, T entity,
float limbDistance, float limbAngle,
float age, float headYaw, float headPitch,
EquipmentSlot armorSlot, ArmourLayer layer) {
ItemStack itemstack = entity.getEquippedStack(armorSlot); ItemStack itemstack = entity.getEquippedStack(armorSlot);
if (!itemstack.isEmpty() && itemstack.getItem() instanceof ArmorItem) { if (!itemstack.isEmpty() && itemstack.getItem() instanceof ArmorItem) {
V armour = pony.<V>getArmor().getArmorForLayer(layer); V model = pony.<V>getArmor().getArmorForLayer(layer);
if (armour.prepareToRender(armorSlot, layer)) { if (model.prepareToRender(armorSlot, layer)) {
pony.getBody().copyAttributes(armour); pony.getBody().copyAttributes(model);
armour.setAngles(entity, limbAngle, limbDistance, age, headYaw, headPitch); model.setAngles(entity, limbAngle, limbDistance, age, headYaw, headPitch);
armour.synchroniseAngles(pony.getBody()); model.synchroniseAngles(pony.getBody());
IArmourTextureResolver<T> resolver = armour instanceof IArmourTextureResolver ? (IArmourTextureResolver<T>)armour : (IArmourTextureResolver<T>)DEFAULT; ArmorItem item = (ArmorItem) itemstack.getItem();
Identifier armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, null); float red = 1;
armour.setVariant(resolver.getArmourVariant(layer, armourTexture)); float green = 1;
float blue = 1;
if (item instanceof DyeableArmorItem) {
int color = ((DyeableArmorItem)item).getColor(itemstack);
red = Color.r(color);
green = Color.g(color);
blue = Color.b(color);
}
@SuppressWarnings("unchecked")
IArmourTextureResolver<T> resolver = model instanceof IArmourTextureResolver ? (IArmourTextureResolver<T>)model : (IArmourTextureResolver<T>)DEFAULT;
boolean glint = itemstack.hasEnchantmentGlint(); boolean glint = itemstack.hasEnchantmentGlint();
ArmorItem itemarmor = (ArmorItem) itemstack.getItem(); renderArmourPart(stack, renderContext, lightUv, glint, model, red, green, blue, resolver, layer, resolver.getArmourTexture(entity, itemstack, armorSlot, layer, null));
if (itemarmor.getMaterial() == ArmorMaterials.LEATHER) { if (item instanceof DyeableArmorItem) {
renderArmourPart(stack, renderContext, lightUv, false, model, 1, 1, 1, resolver, layer, resolver.getArmourTexture(entity, itemstack, armorSlot, layer, "overlay"));
float red = 1;
float green = 1;
float blue = 1;
if (itemarmor instanceof DyeableArmorItem) {
int color = ((DyeableArmorItem)itemarmor).getColor(itemstack);
red = Color.r(color);
green = Color.g(color);
blue = Color.b(color);
}
VertexConsumer vertices = ItemRenderer.getArmorVertexConsumer(renderContext, RenderLayer.getEntityCutoutNoCull(armourTexture), false, glint);
armour.render(stack, vertices, lightUv, OverlayTexture.DEFAULT_UV, red, green, blue, 1);
armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, "overlay");
armour.setVariant(resolver.getArmourVariant(layer, armourTexture));
} }
VertexConsumer vertices = ItemRenderer.getArmorVertexConsumer(renderContext, RenderLayer.getEntityCutoutNoCull(armourTexture), false, glint);
armour.render(stack, vertices, lightUv, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1);
} }
} }
} }
private static <T extends LivingEntity, V extends BipedEntityModel<T> & IArmour> void renderArmourPart(
MatrixStack matrices, VertexConsumerProvider provider,
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);
model.setVariant(resolver.getArmourVariant(layer, texture));
model.render(matrices, vertices, light, OverlayTexture.DEFAULT_UV, r, g, b, 1);
}
} }