From ab192ddd2ac705284574e61035ddbfc856e186a0 Mon Sep 17 00:00:00 2001 From: MalTeeez <41554385+MalTeeez@users.noreply.github.com> Date: Sun, 8 Mar 2026 06:07:01 +0100 Subject: [PATCH] Split MixinRenderManager into two for DAPI compat (#1480) --- .../gtnewhorizons/angelica/mixins/Mixins.java | 19 +++++++++++- .../early/shaders/MixinRenderManagerDAPI.java | 31 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManagerDAPI.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index e5aaf749a..7305473eb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -229,7 +229,6 @@ public enum Mixins implements IMixins { , "shaders.MixinRenderGlobal" , "shaders.MixinRenderHorse" , "shaders.MixinRenderItem" - , "shaders.MixinRenderManager" , "shaders.MixinRenderNameTag" , "shaders.MixinRenderPlayerArmor" , "shaders.MixinTileEntityBeaconRenderer" @@ -238,6 +237,24 @@ public enum Mixins implements IMixins { ) ), + IRIS_SHADERS_RENDER_MANAGER(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addExcludedMod(TargetedMod.DRAGON_API) + .addClientMixins( + "shaders.MixinRenderManager" + ) + ), + + IRIS_SHADERS_RENDER_MANAGER_DAPI(new MixinBuilder() + .setPhase(Phase.EARLY) + .setApplyIf(() -> AngelicaConfig.enableIris) + .addRequiredMod(TargetedMod.DRAGON_API) + .addClientMixins( + "shaders.MixinRenderManagerDAPI" + ) + ), + IRIS_RENDERING_NOBACKHAND(new MixinBuilder("Iris Hand Shaders") .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableIris) diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManagerDAPI.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManagerDAPI.java new file mode 100644 index 000000000..4e8ec8513 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManagerDAPI.java @@ -0,0 +1,31 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.EntityIdHelper; +import net.coderbot.iris.uniforms.ItemIdManager; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import org.spongepowered.asm.mixin.Dynamic; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(RenderManager.class) +public class MixinRenderManagerDAPI { + + @Dynamic + @WrapOperation( + method = "func_147939_a(Lnet/minecraft/entity/Entity;DDDFFZ)Z", + at = @At(remap = false, value = "INVOKE", target = "LReika/DragonAPI/Instantiable/Event/Client/EntityRenderEvent;fire(Lnet/minecraft/client/renderer/entity/Render;Lnet/minecraft/entity/Entity;DDDFF)V"), + require = 1 // Require this if DAPI is present, which should be the case when this mixin is applied. + ) + private void iris$wrapDoRenderDragonAPI(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks, Operation original) { + int entityId = EntityIdHelper.getEntityId(entity); + CapturedRenderingState.INSTANCE.setCurrentEntity(entityId); + ItemIdManager.resetItemId(); + original.call(render, entity, x, y, z, entityYaw, partialTicks); + CapturedRenderingState.INSTANCE.setCurrentEntity(-1); + } +}