From 20ae68aa62cdf3dffb81569051015f1f90229bfa Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Sat, 30 Dec 2023 17:51:29 -0500 Subject: [PATCH] Re-enable lighting after rendering Thaumcraft aspects --- .../gtnewhorizons/angelica/mixins/Mixins.java | 7 ++++++ .../thaumcraft/MixinClientTickEventsFML.java | 22 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/thaumcraft/MixinClientTickEventsFML.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 3a9e0ed8d..a4316d002 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -42,6 +42,13 @@ public enum Mixins { "angelica.debug.MixinSplashProgress" ) ), + + ANGELICA_THAUMCRAFT_COMPAT(new Builder("Angelica Thaumcraft Compat").addTargetedMod(TargetedMod.THAUMCRAFT).setSide(Side.CLIENT) + .setPhase(Phase.EARLY).addMixinClasses( + "angelica.thaumcraft.MixinClientTickEventsFML" + ) + ), + // Not compatible with the lwjgl debug callbacks, so disable if that's enabled ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses( diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/thaumcraft/MixinClientTickEventsFML.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/thaumcraft/MixinClientTickEventsFML.java new file mode 100644 index 000000000..cd843c448 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/thaumcraft/MixinClientTickEventsFML.java @@ -0,0 +1,22 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.thaumcraft; + +import org.lwjgl.opengl.GL11; +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 thaumcraft.client.lib.ClientTickEventsFML; + +@Mixin(ClientTickEventsFML.class) +public class MixinClientTickEventsFML { + + /** + * Thaumcraft disables lighting and only re-enables it if actually drawing an aspect(hovering over an item that + * you can see the aspect for and draws it). This shoves in a lighting re-enable at the end so that it is always + * re-enabled regardless. + */ + @Inject(method = "renderAspectsInGui", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPopAttrib()V"), remap = false) + private void angelica$lightingFix(CallbackInfo ci) { + GL11.glEnable(GL11.GL_LIGHTING); + } +}