Additional changes

Author: Tellinq

src/main/java/btw/mixces/animatium/mixins/accessor/RenderTypeAccessor.java

@@ -1,3 +1,26 @@
+/**
+ * Animatium
+ * The all-you-could-want legacy animations mod for modern minecraft versions.
+ * Brings back animations from the 1.7/1.8 era and more.
+ * <p>
+ * Copyright (C) 2024-2025 lowercasebtw
+ * Copyright (C) 2024-2025 mixces
+ * Copyright (C) 2024-2025 Contributors to the project retain their copyright
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package btw.mixces.animatium.mixins.accessor;
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;

src/main/java/btw/mixces/animatium/mixins/renderer/MixinGlProgram.java

@@ -28,9 +28,9 @@
 import btw.mixces.animatium.util.RenderUtils;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.opengl.GlProgram;
 import com.mojang.blaze3d.opengl.Uniform;
 import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.blaze3d.opengl.GlProgram;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/btw/mixces/animatium/mixins/renderer/MixinLevelRenderer.java

@@ -169,18 +169,18 @@ private void init(Minecraft minecraft, EntityRenderDispatcher entityRenderDispat
         }
     }
 
-//    @WrapOperation(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch(Lnet/minecraft/client/renderer/RenderType;)V", ordinal = 16))
-//    private void animatium$legacyGlintRendering$endBatch(MultiBufferSource.BufferSource instance, RenderType renderType, Operation<Void> original) {
-//        original.call(instance, renderType);
-//        if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().oldGlintRendering) {
-//            instance.endBatch(LegacyGlintType.ITEM_GLINT_LAYER);
-//            instance.endBatch(LegacyGlintType.ITEM_GLINT_2ND_LAYER);
-//            instance.endBatch(LegacyGlintType.ITEM_GLINT_TRANSLUCENT_LAYER);
-//            instance.endBatch(LegacyGlintType.ITEM_GLINT_TRANSLUCENT_2ND_LAYER);
-//            instance.endBatch(LegacyGlintType.ENTITY_GLINT_LAYER);
-//            instance.endBatch(LegacyGlintType.ENTITY_ARMOR_GLINT_LAYER);
-//        }
-//    }
+    @WrapOperation(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch(Lnet/minecraft/client/renderer/RenderType;)V", ordinal = 16))
+    private void animatium$legacyGlintRendering$endBatch(MultiBufferSource.BufferSource instance, RenderType renderType, Operation<Void> original) {
+        original.call(instance, renderType);
+        if (AnimatiumClient.isEnabled() && AnimatiumConfig.instance().oldGlintRendering) {
+            instance.endBatch(LegacyGlintType.ITEM_GLINT_LAYER);
+            instance.endBatch(LegacyGlintType.ITEM_GLINT_2ND_LAYER);
+            instance.endBatch(LegacyGlintType.ITEM_GLINT_TRANSLUCENT_LAYER);
+            instance.endBatch(LegacyGlintType.ITEM_GLINT_TRANSLUCENT_2ND_LAYER);
+            instance.endBatch(LegacyGlintType.ENTITY_GLINT_LAYER);
+            instance.endBatch(LegacyGlintType.ENTITY_ARMOR_GLINT_LAYER);
+        }
+    }
 
     // TODO/NOTE: The reason we redirect width/height instead of changing the outcome of shouldShowEntityOutlines
     // TODO/NOTE: is that it caused issues with Iris/shaders. As simple as that. Until that is fixed/we find another way

src/main/java/btw/mixces/animatium/mixins/renderer/entity/layer/MixinEquipmentLayerRenderer.java

@@ -26,12 +26,12 @@
 import btw.mixces.animatium.AnimatiumClient;
 import btw.mixces.animatium.config.AnimatiumConfig;
 import btw.mixces.animatium.util.EntityUtils;
-import btw.mixces.animatium.util.RenderUtils;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.opengl.GlConst;
 import com.mojang.blaze3d.opengl.GlStateManager;
+import com.mojang.blaze3d.platform.DepthTestFunction;
 import com.mojang.blaze3d.platform.DestFactor;
 import com.mojang.blaze3d.platform.SourceFactor;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -100,9 +100,9 @@ public abstract class MixinEquipmentLayerRenderer {
                 Minecraft.getInstance().gameRenderer.lightTexture().turnOffLightLayer();
                 GlStateManager._enableBlend();
                 GlStateManager._blendFuncSeparate(GlConst.toGl(SourceFactor.SRC_ALPHA), GlConst.toGl(DestFactor.ONE_MINUS_SRC_ALPHA), GlConst.toGl(SourceFactor.SRC_ALPHA), GlConst.toGl(DestFactor.ONE_MINUS_SRC_ALPHA));
-                GlStateManager._depthFunc(GlConst.GL_EQUAL); // DepthTestFunction.EQUAL_DEPTH_TEST
+                GlStateManager._depthFunc(GlConst.toGl(DepthTestFunction.EQUAL_DEPTH_TEST));
                 original.call(instance, poseStack, vertexConsumer, light, overlay, color);
-                GlStateManager._depthFunc(GlConst.GL_LEQUAL); // DepthTestFunction.LEQUAL_DEPTH_TEST
+                GlStateManager._depthFunc(GlConst.toGl(DepthTestFunction.LEQUAL_DEPTH_TEST));
                 GlStateManager._disableBlend();
                 Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
             }