Refactor MobGlow

1 files changed, 7 insertions, 11 deletions

diff --git a/src/main/java/de/hysky/skyblocker/mixin/WorldRendererMixin.java b/src/main/java/de/hysky/skyblocker/mixin/WorldRendererMixin.java
index e723c998..78c61416 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/WorldRendererMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/WorldRendererMixin.java
@@ -9,25 +9,21 @@ import com.llamalad7.mixinextras.sugar.Local;
 import com.llamalad7.mixinextras.sugar.Share;
 import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
 
-import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.dungeon.StarredMobGlow;
+import de.hysky.skyblocker.skyblock.dungeon.MobGlow;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
 
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
-
 	@ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;hasOutline(Lnet/minecraft/entity/Entity;)Z"))
-	private boolean skyblocker$shouldStarredMobGlow(boolean original, @Local Entity entity, @Share("isGlowingStarredMob") LocalBooleanRef isGlowingStarredMob) {
-		boolean isAStarredMobThatShouldGlow = SkyblockerConfigManager.get().locations.dungeons.starredMobGlow && StarredMobGlow.shouldMobGlow(entity);
-
-		isGlowingStarredMob.set(isAStarredMobThatShouldGlow);
-
-		return original || isAStarredMobThatShouldGlow;
+	private boolean skyblocker$shouldMobGlow(boolean original, @Local Entity entity, @Share("hasCustomGlow") LocalBooleanRef hasCustomGlow) {
+		boolean shouldGlow = MobGlow.shouldMobGlow(entity);
+		hasCustomGlow.set(shouldGlow);
+		return original || shouldGlow;
 	}
 
 	@ModifyVariable(method = "render", at = @At("STORE"), ordinal = 0)
-	private int skyblocker$modifyGlowColor(int color, @Local Entity entity, @Share("isGlowingStarredMob") LocalBooleanRef isGlowingStarredMob) {
-		return isGlowingStarredMob.get() ? StarredMobGlow.getGlowColor(entity) : color;
+	private int skyblocker$modifyGlowColor(int color, @Local Entity entity, @Share("hasCustomGlow") LocalBooleanRef hasCustomGlow) {
+		return hasCustomGlow.get() ? MobGlow.getGlowColor(entity) : color;
 	}
 }