Implement Mr. Cat's suggestions

SkyblockerMod · Aug 1, 2024 · 87fcbf9 · 87fcbf9
1 parent bdd5cb5
commit 87fcbf9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java
@@ -2,8 +2,6 @@
 
 import java.util.function.Supplier;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
@@ -32,18 +30,17 @@ static void init() {
 
 	private static void updateIndicator() {
 		if (Utils.isInKuudra() && SkyblockerConfigManager.get().crimsonIsle.kuudra.dangerWarning && CLIENT.player != null && CLIENT.world != null) {
-			BlockPos under = CLIENT.player.getBlockPos().down();
-			BlockPos under2 = CLIENT.player.getBlockPos().down(2);
-			BlockPos under3 = CLIENT.player.getBlockPos().down(3);
-			BlockPos under4 = CLIENT.player.getBlockPos().down(4);
-			BlockPos under5 = CLIENT.player.getBlockPos().down(5);
+			for (int i = 1; i <= 5; i++) {
+				BlockPos under = CLIENT.player.getBlockPos().down(i);
+				Title title = getDangerTitle(under);
 
-			Title title = ObjectUtils.firstNonNull(getDangerTitle(under), getDangerTitle(under2), getDangerTitle(under3), getDangerTitle(under4), getDangerTitle(under5));
+				if (title != null) {
+					RenderHelper.displayInTitleContainerAndPlaySound(title);
 
-			if (title != null) {
-				RenderHelper.displayInTitleContainerAndPlaySound(title);
-			} else {
-				TitleContainer.removeTitle(TITLE);
+					return;
+				} else if (i == 5) { //Prevent removing the title prematurely
+					TitleContainer.removeTitle(TITLE);
+				}
 			}
 		}
 	}

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java
@@ -6,7 +6,9 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
-public class Kuudra {
+public class Kuudra { 
+	public static final int KUUDRA_MAGMA_CUBE_SIZE = 30;
+
 	static KuudraPhase phase = KuudraPhase.OTHER;
 
 	public static void init() {

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.Streams;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
-import de.hysky.skyblocker.skyblock.crimson.kuudra.KuudraGlow;
+import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra;
 import de.hysky.skyblocker.skyblock.dungeon.LividColor;
 import de.hysky.skyblocker.skyblock.end.TheEnd;
 import de.hysky.skyblocker.utils.ItemUtils;
@@ -70,7 +70,7 @@ public static boolean shouldMobGlow(Entity entity) {
 				case ZombieEntity zombie when Utils.isInCrimson() && DojoManager.inArena -> DojoManager.shouldGlow(getArmorStandName(zombie));
 
 				//Kuudra
-				case MagmaCubeEntity magmaCube when Utils.isInKuudra() -> KuudraGlow.shouldGlow(magmaCube, name);
+				case MagmaCubeEntity magmaCube when Utils.isInKuudra() -> SkyblockerConfigManager.get().crimsonIsle.kuudra.kuudraGlow && magmaCube.getSize() == Kuudra.KUUDRA_MAGMA_CUBE_SIZE;
 
 				default -> false;
 			};