Fix Mixin crash on older versions, add tests. Fix #282

Author: tr7zw

src/main/java/dev/tr7zw/skinlayers/mixin/EMFModelPartMixin.java

@@ -34,21 +34,21 @@ public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int light
         }
     }
     //? } else {
-
-    // @Inject(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V", at = @At(value = "HEAD"), cancellable = true)
-    // public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int light, int overlay, float red, float green, float blue, float alpha,
-    //         CallbackInfo ci) {
-    //     if (isVisible() && getInjectedMesh() != null) {
-    //         poseStack.pushPose();
-    //         prepareTranslateAndRotate(poseStack);
-    //         getOffsetProvider().applyOffset(poseStack, getInjectedMesh());
-    //         getInjectedMesh().render((ModelPart)(Object)this, poseStack, vertexConsumer, light, overlay, red, green, blue, alpha);
-    //         poseStack.popPose();
-    //         ci.cancel();
-    //     }
-    // }
-    //
-    //? }
+    /*
+     @Inject(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFF)V", at = @At(value = "HEAD"), cancellable = true)
+     public void render(PoseStack poseStack, VertexConsumer vertexConsumer, int light, int overlay, float red, float green, float blue, float alpha,
+             CallbackInfo ci) {
+         if (isVisible() && getInjectedMesh() != null) {
+             poseStack.pushPose();
+             prepareTranslateAndRotate(poseStack);
+             getOffsetProvider().applyOffset(poseStack, getInjectedMesh());
+             getInjectedMesh().render((ModelPart)(Object)this, poseStack, vertexConsumer, light, overlay, red, green, blue, alpha);
+             poseStack.popPose();
+             ci.cancel();
+         }
+     }
+    
+    *///? }
 
 }
 //? } else {

src/main/java/dev/tr7zw/skinlayers/mixin/SkullBlockEntityRendererMixin.java

@@ -134,9 +134,9 @@ private static SkullModelBase.State submitSkull(SkullModelBase.State state) {
         @Inject(method = "render", at = @At("HEAD"))
         public void render(SkullBlockEntity skullBlockEntity, float f, PoseStack poseStack,
                 MultiBufferSource multiBufferSource, int i, int j,
-                //#if MC >= 12105
+                //?if >= 1.21.5 {
                 Vec3 vec3,
-                //#endif
+                //? }
                 CallbackInfo info) {
             Vec3 camera = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
             if (!SkinLayersModBase.config.enableSkulls)

src/test/java/dev/tr7zw/tests/MixinTests.java

@@ -0,0 +1,67 @@
+//? if >= 1.18.0 {
+
+package dev.tr7zw.tests;
+
+import com.mojang.blaze3d.platform.*;
+import net.minecraft.*;
+import net.minecraft.client.model.*;
+import net.minecraft.client.model.geom.*;
+//? if >= 1.21.11 {
+
+import net.minecraft.client.model.object.skull.*;
+import net.minecraft.client.model.player.*;
+//? } else {
+/*
+import net.minecraft.client.model.*;
+*///? }
+import net.minecraft.client.renderer.*;
+import net.minecraft.client.renderer.blockentity.*;
+import net.minecraft.client.renderer.entity.*;
+import net.minecraft.client.renderer.entity.layers.*;
+import net.minecraft.server.*;
+import net.minecraft.world.level.block.entity.*;
+import org.junit.jupiter.api.*;
+import org.objenesis.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MixinTests {
+
+    @BeforeAll
+    public static void setup() {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+    }
+
+    @Test
+    void testMixins() {
+        Objenesis objenesis = new ObjenesisStd();
+        //? if >= 1.21.6 {
+
+        objenesis.newInstance(net.minecraft.client.renderer.special.PlayerHeadSpecialRenderer.class);
+        //? } else if >= 1.21.4 {
+        /*
+        objenesis.newInstance(net.minecraft.client.renderer.special.SkullSpecialRenderer.class);
+        *///? } else {
+        /*
+        objenesis.newInstance(net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer.class);
+        *///? }
+        objenesis.newInstance(CustomHeadLayer.class);
+        objenesis.newInstance(Deadmau5EarsLayer.class);
+        objenesis.newInstance(ModelPart.class);
+        objenesis.newInstance(NativeImage.class);
+        objenesis.newInstance(PlayerModel.class);
+        objenesis.newInstance(SkullBlockEntity.class);
+        objenesis.newInstance(SkullBlockRenderer.class);
+        objenesis.newInstance(SkullModel.class);
+        //? if >= 1.21.9 {
+
+        objenesis.newInstance(net.minecraft.client.renderer.entity.player.AvatarRenderer.class);
+        //? } else {
+        /*
+        objenesis.newInstance(net.minecraft.client.renderer.entity.player.PlayerRenderer.class);
+        *///? }
+    }
+
+}
+//? }