diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index d2f16bc64..d001a9365 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -147,11 +147,8 @@ public enum Mixins { ,"shaders.MixinLocale" ,"shaders.MixinOpenGlHelper" ,"shaders.MixinRender" - ,"shaders.MixinRenderDragon" - ,"shaders.MixinRenderEnderman" ,"shaders.MixinRendererLivingEntity" ,"shaders.MixinRenderGlobal" - ,"shaders.MixinRenderSpider" ,"shaders.MixinTileEntityBeaconRenderer" ) ), diff --git a/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java b/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java index 365b399b9..c41a9954c 100644 --- a/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java +++ b/src/main/java/net/coderbot/iris/pipeline/HandRenderer.java @@ -3,6 +3,7 @@ package net.coderbot.iris.pipeline; import com.gtnewhorizons.angelica.compat.mojang.Camera; import com.gtnewhorizons.angelica.compat.mojang.InteractionHand; import com.gtnewhorizons.angelica.compat.toremove.RenderLayer; +import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.rendering.RenderingState; import net.coderbot.iris.block_rendering.BlockRenderingSettings; import net.irisshaders.iris.api.v0.IrisApi; @@ -119,6 +120,7 @@ public class HandRenderer { mc.entityRenderer.itemRenderer.renderItemInFirstPerson(tickDelta); mc.entityRenderer.disableLightmap(tickDelta); + GLStateManager.defaultBlendFunc(); GL11.glDepthMask(false); GL11.glPopMatrix(); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java deleted file mode 100644 index dc2ed645f..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderDragon.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.shaders; - -import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; -import net.coderbot.iris.layer.GbufferPrograms; -import net.minecraft.client.renderer.entity.RenderDragon; -import net.minecraft.entity.boss.EntityDragon; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderDragon.class) -public class MixinRenderDragon { - @Inject(method = "Lnet/minecraft/client/renderer/entity/RenderDragon;shouldRenderPass(Lnet/minecraft/entity/boss/EntityDragon;IF)I", at = @At(value="RETURN", ordinal = 1)) - private void onShouldRenderPass(EntityDragon entity, int pass, float partialTicks, CallbackInfoReturnable cir) { - GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.ENTITY_EYES); - } -} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderEnderman.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderEnderman.java deleted file mode 100644 index f1fdca2ad..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderEnderman.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.shaders; - -import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; -import net.coderbot.iris.layer.GbufferPrograms; -import net.minecraft.client.renderer.entity.RenderEnderman; -import net.minecraft.entity.monster.EntityEnderman; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderEnderman.class) -public class MixinRenderEnderman { - @Inject(method = "Lnet/minecraft/client/renderer/entity/RenderEnderman;shouldRenderPass(Lnet/minecraft/entity/monster/EntityEnderman;IF)I", at = @At(value="RETURN", ordinal = 1)) - private void onShouldRenderPass(EntityEnderman entity, int pass, float partialTicks, CallbackInfoReturnable cir) { - GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.ENTITY_EYES); - } - -} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderSpider.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderSpider.java deleted file mode 100644 index a4f9751ef..000000000 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderSpider.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gtnewhorizons.angelica.mixins.early.shaders; - -import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition; -import net.coderbot.iris.layer.GbufferPrograms; -import net.minecraft.client.renderer.entity.RenderSpider; -import net.minecraft.entity.monster.EntitySpider; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderSpider.class) -public class MixinRenderSpider { - @Inject(method = "Lnet/minecraft/client/renderer/entity/RenderSpider;shouldRenderPass(Lnet/minecraft/entity/monster/EntitySpider;IF)I", at = @At(value="RETURN", ordinal = 1)) - private void onShouldRenderPass(EntitySpider entity, int pass, float partialTicks, CallbackInfoReturnable cir) { - GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.ENTITY_EYES); - } - -} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java index eea9b076b..7eb510574 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRendererLivingEntity.java @@ -2,18 +2,22 @@ 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.gbuffer_overrides.matching.SpecialCondition; import net.coderbot.iris.layer.GbufferPrograms; import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.RenderDragon; +import net.minecraft.client.renderer.entity.RenderEnderman; +import net.minecraft.client.renderer.entity.RenderSpider; import net.minecraft.client.renderer.entity.RendererLivingEntity; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.Slice; @Mixin(RendererLivingEntity.class) public class MixinRendererLivingEntity { - @WrapOperation( method="doRender", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/entity/RendererLivingEntity;getColorMultiplier(Lnet/minecraft/entity/EntityLivingBase;FF)I") @@ -28,11 +32,21 @@ public class MixinRendererLivingEntity { return j; } - @Inject( - method="Lnet/minecraft/client/renderer/entity/RendererLivingEntity;doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", at=@At(value="INVOKE", - target="Lnet/minecraft/client/renderer/entity/RendererLivingEntity;renderEquippedItems(Lnet/minecraft/entity/EntityLivingBase;F)V", shift=At.Shift.BEFORE) + @WrapOperation( + method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelBase;render(Lnet/minecraft/entity/Entity;FFFFFF)V", ordinal = 0), + slice = @Slice( + from = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;shouldRenderPass(Lnet/minecraft/entity/EntityLivingBase;IF)I") + ) ) - private void iris$teardownSpecialRenderConditions(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { - GbufferPrograms.teardownSpecialRenderCondition(); + private void iris$specialRenderConditionEntityEyes(ModelBase instance, Entity entity, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_, Operation original) { + RendererLivingEntity self = (RendererLivingEntity) (Object) this; + if (self instanceof RenderSpider || self instanceof RenderDragon || self instanceof RenderEnderman) { + GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.ENTITY_EYES); + original.call(instance, entity, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_); + GbufferPrograms.teardownSpecialRenderCondition(); + } else { + original.call(instance, entity, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_); + } } }