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

Clean up and simplify a little

Browse source
This commit is contained in:
Sollace 2024-05-04 23:23:57 +01:00
parent bf4a0139fb
commit 4b6fdd4752
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/com/minelittlepony/client/model/armour/ArmourRendererPlugin.java
View file

@ -58,13 +58,13 @@ public interface ArmourRendererPlugin {
@Nullable @Nullable
default VertexConsumer getTrimConsumer(EquipmentSlot slot, VertexConsumerProvider provider, RegistryEntry<ArmorMaterial> material, ArmorTrim trim, ArmourLayer layer) { default VertexConsumer getTrimConsumer(EquipmentSlot slot, VertexConsumerProvider provider, RegistryEntry<ArmorMaterial> material, ArmorTrim trim, ArmourLayer layer) {
@Nullable RenderLayer renderLayer = getTrimLayer(slot, material, trim, layer); @Nullable VertexConsumer buffer = getOptionalBuffer(provider, getTrimLayer(slot, material, trim, layer));
if (renderLayer == null) { if (buffer == null) {
return null; return null;
} }
SpriteAtlasTexture armorTrimsAtlas = MinecraftClient.getInstance().getBakedModelManager().getAtlas(TexturedRenderLayers.ARMOR_TRIMS_ATLAS_TEXTURE); SpriteAtlasTexture armorTrimsAtlas = MinecraftClient.getInstance().getBakedModelManager().getAtlas(TexturedRenderLayers.ARMOR_TRIMS_ATLAS_TEXTURE);
Sprite sprite = armorTrimsAtlas.getSprite(layer == ArmourLayer.INNER ? trim.getLeggingsModelId(material) : trim.getGenericModelId(material)); Sprite sprite = armorTrimsAtlas.getSprite(layer == ArmourLayer.INNER ? trim.getLeggingsModelId(material) : trim.getGenericModelId(material));
return sprite.getTextureSpecificVertexConsumer(provider.getBuffer(renderLayer)); return sprite.getTextureSpecificVertexConsumer(buffer);
} }
@Nullable @Nullable
@ -74,8 +74,7 @@ public interface ArmourRendererPlugin {
@Nullable @Nullable
default VertexConsumer getArmourConsumer(EquipmentSlot slot, VertexConsumerProvider provider, Identifier texture, ArmourLayer layer) { default VertexConsumer getArmourConsumer(EquipmentSlot slot, VertexConsumerProvider provider, Identifier texture, ArmourLayer layer) {
@Nullable RenderLayer renderLayer = getArmourLayer(slot, texture, layer); return getOptionalBuffer(provider, getArmourLayer(slot, texture, layer));
return renderLayer == null ? null : provider.getBuffer(renderLayer);
} }
@Nullable @Nullable
@ -85,8 +84,7 @@ public interface ArmourRendererPlugin {
@Nullable @Nullable
default VertexConsumer getGlintConsumer(EquipmentSlot slot, VertexConsumerProvider provider, ArmourLayer layer) { default VertexConsumer getGlintConsumer(EquipmentSlot slot, VertexConsumerProvider provider, ArmourLayer layer) {
@Nullable RenderLayer renderLayer = getGlintLayer(slot, layer); return getOptionalBuffer(provider, getGlintLayer(slot, layer));
return renderLayer == null ? null : provider.getBuffer(renderLayer);
} }
@Nullable @Nullable
@ -99,8 +97,7 @@ public interface ArmourRendererPlugin {
if (entity.getEquippedStack(EquipmentSlot.CHEST).isOf(Items.ELYTRA)) { if (entity.getEquippedStack(EquipmentSlot.CHEST).isOf(Items.ELYTRA)) {
return null; return null;
} }
@Nullable RenderLayer renderLayer = getCapeLayer(entity, texture); return getOptionalBuffer(provider, getCapeLayer(entity, texture));
return renderLayer == null ? null : provider.getBuffer(renderLayer);
} }
@Nullable @Nullable
@ -110,12 +107,11 @@ public interface ArmourRendererPlugin {
@Nullable @Nullable
default VertexConsumer getElytraConsumer(ItemStack stack, Model model, LivingEntity entity, VertexConsumerProvider provider, Identifier texture) { default VertexConsumer getElytraConsumer(ItemStack stack, Model model, LivingEntity entity, VertexConsumerProvider provider, Identifier texture) {
@Nullable RenderLayer renderLayer = getElytraLayer(entity, texture); return ItemRenderer.getDirectItemGlintConsumer(provider, model.getLayer(texture), false, getGlintAlpha(EquipmentSlot.CHEST, stack) > 0F);
return renderLayer == null ? null : ItemRenderer.getDirectItemGlintConsumer(provider, model.getLayer(texture), false, stack.hasGlint());
} }
@Nullable @Nullable
default RenderLayer getElytraLayer(LivingEntity entity, Identifier texture) { static VertexConsumer getOptionalBuffer(VertexConsumerProvider provider, @Nullable RenderLayer layer) {
return RenderLayer.getEntitySolid(texture); return layer == null ? null : provider.getBuffer(layer);
} }
} }