chore: Update hurt overlay disabler mixin

[no ci]

Author: My-Name-Is-Jeff

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRendererLivingEntity.java

@@ -20,14 +20,14 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import gg.skytils.skytilsmod.mixins.extensions.ExtensionEntityRenderState;
 import gg.skytils.skytilsmod.mixins.hooks.renderer.RenderBatHookKt;
 import gg.skytils.skytilsmod.mixins.hooks.renderer.RendererLivingEntityHookKt;
 import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.state.BatEntityRenderState;
 import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -41,9 +41,9 @@ private void setColorMultiplier(T entity, float lightBrightness, float partialTi
         RendererLivingEntityHookKt.setColorMultiplier(entity, lightBrightness, partialTickTime, cir);
     }
 
-    @WrapOperation(method = "applyOverlayColor(Lnet/minecraft/entity/LivingEntity;FZ)Z", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/LivingEntity;hurtTime:I", opcode = Opcodes.GETFIELD))
-    private int changeHurtTime(LivingEntity instance, Operation<Integer> original) {
-        return RendererLivingEntityHookKt.replaceHurtTime(instance, original);
+    @WrapOperation(method = "getOverlay", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;hurt:Z"))
+    private static boolean changeHurtState(LivingEntityRenderState instance, Operation<Boolean> original) {
+        return RendererLivingEntityHookKt.replaceHurtState(((ExtensionEntityRenderState) instance).getSkytilsEntity(), original);
     }
 
     @Inject(method = "scale", at = @At("RETURN"))

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/util/MixinUtil.java

@@ -31,10 +31,12 @@
 
 @Mixin(Util.class)
 public abstract class MixinUtil {
-    @Inject(method = "executeTask", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;fatal(Ljava/lang/String;Ljava/lang/Throwable;)V", remap = false), cancellable = true)
-    private static <V> void interceptTaskExceptions(FutureTask<V> task, Logger logger, CallbackInfoReturnable<V> cir) {
-        if (Config.INSTANCE.getPreventLogSpam() && Utils.INSTANCE.getInDungeons()) {
-            cir.setReturnValue(null);
-        }
-    }
+    //#if MC==10809
+    //$$    @Inject(method = "executeTask", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;fatal(Ljava/lang/String;Ljava/lang/Throwable;)V", remap = false), cancellable = true)
+    //$$    private static <V> void interceptTaskExceptions(FutureTask<V> task, Logger logger, CallbackInfoReturnable<V> cir) {
+    //$$        if (Config.INSTANCE.getPreventLogSpam() && Utils.INSTANCE.getInDungeons()) {
+    //$$            cir.setReturnValue(null);
+    //$$        }
+    //$$    }
+    //#endif
 }

mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/RendererLivingEntityHook.kt

@@ -19,7 +19,6 @@ package gg.skytils.skytilsmod.mixins.hooks.renderer
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation
 import gg.skytils.skytilsmod.Skytils
-import gg.skytils.skytilsmod.features.impl.dungeons.DungeonFeatures
 import gg.skytils.skytilsmod.features.impl.dungeons.LividFinder
 import gg.skytils.skytilsmod.features.impl.slayer.SlayerFeatures.slayer
 import gg.skytils.skytilsmod.features.impl.slayer.impl.DemonlordSlayer
@@ -29,9 +28,8 @@ import gg.skytils.skytilsmod.utils.Utils
 import gg.skytils.skytilsmod.utils.graphics.colors.ColorFactory
 import gg.skytils.skytilsmod.utils.withAlpha
 import net.minecraft.entity.Entity
-import net.minecraft.entity.mob.MobEntity
-import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.mob.EndermanEntity
+import net.minecraft.entity.mob.MobEntity
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 
 fun setColorMultiplier(
@@ -70,8 +68,10 @@ fun setColorMultiplier(
     }
 }
 
-fun replaceHurtTime(instance: LivingEntity, original: Operation<Int>): Int {
-    instance as ExtensionEntityLivingBase
-
-    return if (Skytils.config.changeHurtColorOnWitherKingsDragons && instance.skytilsHook.masterDragonType != null) 0 else original.call(instance)
+fun replaceHurtState(
+    entity: Entity,
+    original: Operation<Boolean>
+): Boolean {
+    entity as ExtensionEntityLivingBase
+    return if (Skytils.config.changeHurtColorOnWitherKingsDragons && entity.skytilsHook.masterDragonType != null) false else original.call(instance)
 }