Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

1 files changed, 0 insertions, 33 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java
deleted file mode 100644
index 8cf94c69..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/WorldRendererMixin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package me.xmrvizzy.skyblocker.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
-
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.llamalad7.mixinextras.sugar.Share;
-import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
-
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
-import me.xmrvizzy.skyblocker.skyblock.dungeon.StarredMobGlow;
-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;
-	}
-
-	@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;
-	}
-}