Fix enchantment glint not rendering on cone armor

Author: Juuxel

common/src/main/java/juuxel/adorn/client/renderer/ConeEntityRenderer.java

@@ -9,22 +9,19 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.TexturedRenderLayers;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.BlockModelRenderer;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.BakedModelManager;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.util.Identifier;
 
 import java.util.Optional;
 
@@ -42,7 +39,7 @@ public ConeEntityRenderer(EntityRendererFactory.Context context) {
     public void render(ConeEntityRenderState state, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
         matrices.push();
         matrices.translate(-0.5f, 0, -0.5f);
-        renderCone(modelManager, state.variant, matrices, vertexConsumers, light, VertexConsumerFactory.ENTITY);
+        renderCone(modelManager, state.variant, matrices, vertexConsumers, light, false);
         matrices.pop();
         super.render(state, matrices, vertexConsumers, light);
     }
@@ -58,10 +55,10 @@ public void updateRenderState(ConeEntity entity, ConeEntityRenderState state, fl
         state.variant = getEffectiveVariant(entity.getRegistryManager(), entity.getVariant()).orElse(ConeVariant.Keys.ORANGE);
     }
 
-    private static void renderCone(BakedModelManager modelManager, RegistryKey<ConeVariant> variant, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, VertexConsumerFactory vertexConsumerFactory) {
+    private static void renderCone(BakedModelManager modelManager, RegistryKey<ConeVariant> variant, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, boolean glint) {
         var model = ModelBridge.get().getModel(modelManager, CustomModelKeys.CONES.getEager(variant));
         var matrix = matrices.peek();
-        var vertexConsumer = vertexConsumerFactory.createVertexConsumer(vertexConsumers, SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE);
+        var vertexConsumer = ItemRenderer.getItemGlintConsumer(vertexConsumers, TexturedRenderLayers.getEntitySolid(), false, glint);
         BlockModelRenderer.render(matrix, vertexConsumer, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV);
     }
 
@@ -71,15 +68,15 @@ public static void renderOnHead(MatrixStack matrices, VertexConsumerProvider ver
         var registryManager = client.world.getRegistryManager();
         var variant = getEffectiveVariant(registryManager, stack).orElse(ConeVariant.Keys.ORANGE);
 
-        var vertexConsumerFactory = stack.hasGlint() ? VertexConsumerFactory.ARMOR_WITH_GLINT : VertexConsumerFactory.ARMOR_WITHOUT_GLINT;
         var modelManager = client.getBakedModelManager();
         matrices.push();
         contextModel.getRootPart().applyTransform(matrices);
         contextModel.getHead().applyTransform(matrices);
         float headSize = getHeadHeight(matrices, contextModel);
-        matrices.translate(SIZE * 0.5f, -headSize, SIZE * 0.5f);
-        matrices.scale(-SIZE, -SIZE, -SIZE);
-        renderCone(modelManager, variant, matrices, vertexConsumers, light, vertexConsumerFactory);
+        matrices.scale(-1, -1, 1);
+        matrices.translate(-SIZE * 0.5f, headSize, -SIZE * 0.5f);
+        matrices.scale(SIZE, SIZE, SIZE);
+        renderCone(modelManager, variant, matrices, vertexConsumers, light, stack.hasGlint());
         matrices.pop();
     }
 
@@ -117,14 +114,4 @@ public void accept(MatrixStack.Entry matrix, String path, int index, ModelPart.C
             if (headHeight == 0) headHeight = (cuboid.maxY - cuboid.minY) / 16f;
         }
     }
-
-    @FunctionalInterface
-    private interface VertexConsumerFactory {
-        VertexConsumerFactory ENTITY = (vertexConsumers, texture) -> vertexConsumers.getBuffer(RenderLayer.getEntityCutout(texture));
-        VertexConsumerFactory ARMOR_WITHOUT_GLINT = (vertexConsumers, texture) -> vertexConsumers.getBuffer(RenderLayer.getArmorCutoutNoCull(texture));
-        // TODO: Figure out why the glint doesn't render
-        VertexConsumerFactory ARMOR_WITH_GLINT = (vertexConsumers, texture) -> ItemRenderer.getArmorGlintConsumer(vertexConsumers, RenderLayer.getArmorCutoutNoCull(texture), true);
-
-        VertexConsumer createVertexConsumer(VertexConsumerProvider vertexConsumers, Identifier texture);
-    }
 }