Make bats glow

2 files changed, 24 insertions, 19 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 577c87e4..127bc601 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -435,7 +435,7 @@ public class SkyblockerConfig implements ConfigData {
         public int mapX = 2;
         public int mapY = 2;
         @ConfigEntry.Gui.Tooltip
-        public boolean starredMobGlow = false;
+        public boolean starredMobGlow = true;
         public boolean solveThreeWeirdos = true;
         @ConfigEntry.Gui.Tooltip
         public boolean blazesolver = true;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/StarredMobGlow.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/StarredMobGlow.java
index 64a28712..f614662b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/StarredMobGlow.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/StarredMobGlow.java
@@ -1,51 +1,56 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
-import java.util.List;
-
 import me.xmrvizzy.skyblocker.utils.Utils;
 import me.xmrvizzy.skyblocker.utils.render.culling.OcclusionCulling;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
+import net.minecraft.entity.passive.BatEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.predicate.entity.EntityPredicates;
 import net.minecraft.util.math.Box;
 
+import java.util.List;
+
 public class StarredMobGlow {
 
 	public static boolean shouldMobGlow(Entity entity) {
 		Box box = entity.getBoundingBox();
-		
+
 		if (Utils.isInDungeons() && !entity.isInvisible() && OcclusionCulling.isVisible(box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ)) {
-			//Minibosses
+			// Minibosses
 			if (entity instanceof PlayerEntity) {
 				switch (entity.getName().getString()) {
-					case "Lost Adventurer": return true;
-					case "Shadow Assassin": return true;
-					case "Diamond Guy": return true;
+					case "Lost Adventurer", "Shadow Assassin", "Diamond Guy" -> {
+						return true;
+					}
 				}
 			}
-			
-			//Regular Mobs
+
+			// Regular Mobs
 			if (!(entity instanceof ArmorStandEntity)) {
 				Box searchBox = box.expand(0, 2, 0);
 				List<ArmorStandEntity> armorStands = entity.getWorld().getEntitiesByClass(ArmorStandEntity.class, searchBox, EntityPredicates.NOT_MOUNTED);
-				
+
 				if (!armorStands.isEmpty() && armorStands.get(0).getName().getString().contains("✯")) return true;
 			}
+
+			// Bats
+			return entity instanceof BatEntity;
 		}
-		
+
 		return false;
 	}
-	
+
 	public static int getGlowColor(Entity entity) {
 		if (entity instanceof PlayerEntity) {
-			switch (entity.getName().getString()) {
-				case "Lost Adventurer": return 0xfee15c;
-				case "Shadow Assassin": return 0x5b2cb2;
-				case "Diamond Guy": return 0x57c2f7;
-			}
+			return switch (entity.getName().getString()) {
+				case "Lost Adventurer" -> 0xfee15c;
+				case "Shadow Assassin" -> 0x5b2cb2;
+				case "Diamond Guy" -> 0x57c2f7;
+				default -> 0xf57738;
+			};
 		}
-		
+
 		return 0xf57738;
 	}
 }