From ef6a39ebb93b8caed69656ee3a79027b122a816c Mon Sep 17 00:00:00 2001 From: Deftu Date: Wed, 25 Dec 2024 17:21:09 +0200 Subject: [PATCH] Fix (on 1.12.2) and rename RenderLivingEntityEvent Mixin --- versions/mappings/forge-1.12.2-1.8.9.txt | 2 ++ ...gEntityMixin.java => Mixin_RenderLivingEntityEvent.java} | 6 +++++- versions/src/main/resources/mixins.oneconfig.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) rename versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/{RendererLivingEntityMixin.java => Mixin_RenderLivingEntityEvent.java} (94%) diff --git a/versions/mappings/forge-1.12.2-1.8.9.txt b/versions/mappings/forge-1.12.2-1.8.9.txt index 08aa0dfd3..3576d0f43 100644 --- a/versions/mappings/forge-1.12.2-1.8.9.txt +++ b/versions/mappings/forge-1.12.2-1.8.9.txt @@ -13,4 +13,6 @@ net.minecraft.util.SoundCategory net.minecraft.client.audio.SoundCategory net.minecraft.util.text.ITextComponent net.minecraft.util.IChatComponent net.minecraft.util.text.TextFormatting net.minecraft.util.EnumChatFormatting +net.minecraft.client.renderer.entity.RenderLiving net.minecraft.client.renderer.entity.RendererLivingEntity + org.objectweb.asm.commons.ClassRemapper org.objectweb.asm.commons.RemappingClassAdapter diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/RendererLivingEntityMixin.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_RenderLivingEntityEvent.java similarity index 94% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/RendererLivingEntityMixin.java rename to versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_RenderLivingEntityEvent.java index 0563645d4..1c08db023 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/RendererLivingEntityMixin.java +++ b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_RenderLivingEntityEvent.java @@ -23,7 +23,7 @@ //#else @Mixin(RendererLivingEntity.class) //#endif -public class RendererLivingEntityMixin { +public class Mixin_RenderLivingEntityEvent { @Inject( //#if MC >= 1.17.1 @@ -34,6 +34,8 @@ public class RendererLivingEntityMixin { //#endif //#elseif MC >= 1.16.5 //$$ method = "render(Lnet/minecraft/entity/LivingEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V", + //#elseif MC >= 1.12.2 + //$$ method = "doRender(Lnet/minecraft/entity/EntityLiving;DDDFF)V", //#else method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", //#endif @@ -87,6 +89,8 @@ private void onPreEntityRenderCallback( //#endif //#elseif MC >= 1.16.5 //$$ method = "render(Lnet/minecraft/entity/LivingEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V", + //#elseif MC >= 1.12.2 + //$$ method = "doRender(Lnet/minecraft/entity/EntityLiving;DDDFF)V", //#else method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", //#endif diff --git a/versions/src/main/resources/mixins.oneconfig.json b/versions/src/main/resources/mixins.oneconfig.json index e22b5d237..347c49692 100644 --- a/versions/src/main/resources/mixins.oneconfig.json +++ b/versions/src/main/resources/mixins.oneconfig.json @@ -19,7 +19,7 @@ "ShaderGroupAccessor", "SoundManagerMixin", "EntityRendererMixin", - "RendererLivingEntityMixin", + "Mixin_RenderLivingEntityEvent", "WorldClientMixin", "SoundManagerMixin", "compat.OptifineConfigMixin",