From 445b6a3e688ff8d035c0d81385b32be2bfc0dc10 Mon Sep 17 00:00:00 2001 From: Matthew William Noel Date: Tue, 13 Feb 2024 12:57:44 -0800 Subject: [PATCH] Partially fix entity shaders (#294) * Partially fix entity shaders --- .../gtnewhorizons/angelica/mixins/Mixins.java | 1 + .../early/shaders/MixinRenderManager.java | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 3e73f9aad..f0b58f88f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -136,6 +136,7 @@ public enum Mixins { ,"shaders.MixinOpenGlHelper" ,"shaders.MixinRender" ,"shaders.MixinRenderGlobal" + ,"shaders.MixinRenderManager" ) ), diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java new file mode 100644 index 000000000..377b3383c --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderManager.java @@ -0,0 +1,30 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import net.coderbot.iris.layer.GbufferPrograms; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(RenderManager.class) +public class MixinRenderManager { + + @Unique + private static final String DO_RENDER = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V"; + + @Inject(method = "func_147939_a", at = @At(value = "INVOKE", target = DO_RENDER)) + private void iris$onRenderEntityPre(Entity entity, double x, double y, double z, float yaw, float partialTicks, boolean rebuild, CallbackInfoReturnable cir) { + CapturedRenderingState.INSTANCE.setCurrentEntity(entity.getEntityId()); + GbufferPrograms.beginEntities(); + } + + @Inject(method = "func_147939_a", at = @At(value = "INVOKE", target = DO_RENDER, shift = At.Shift.AFTER)) + private void iris$onRenderEntityPost(Entity entity, double x, double y, double z, float yaw, float partialTicks, boolean rebuild, CallbackInfoReturnable cir) { + CapturedRenderingState.INSTANCE.setCurrentEntity(-1); + GbufferPrograms.endEntities(); + } +}