Enhance HypixelDetector with dungeon detection and NPC scaling safety checks

Author: KdGaming0

src/main/java/com/github/kd_gaming1/scaleme/client/util/HypixelDetector.java

@@ -1,48 +1,120 @@
 package com.github.kd_gaming1.scaleme.client.util;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.scoreboard.Scoreboard;
-import net.minecraft.scoreboard.ScoreboardObjective;
-import net.minecraft.scoreboard.ScoreboardDisplaySlot;
-import net.minecraft.text.Text;
+import net.minecraft.scoreboard.*;
+
+import java.util.Collection;
 
 public class HypixelDetector {
 
     /**
-     * Checks if the player is in a safe game mode on Hypixel.
-     * Safe modes are defined as not being in competitive modes like SkyBlock, Lobby, Limbo, Housing, or Prototype.
+     * Checks if the player is in a "safe" game mode on Hypixel.
+     * Safe modes exclude competitive/gameplay areas like SkyBlock, Lobby, Limbo, Housing, Prototype, and the Hypixel logo screen.
      *
      * @return true if in a safe game mode, false otherwise.
      */
     public static boolean isSafeGameMode() {
         MinecraftClient client = MinecraftClient.getInstance();
 
-        // Check if on Hypixel using server brand
-        if (client.getNetworkHandler() == null) return false; // Not on a server, safe
+        // Not connected to a server
+        if (client.getNetworkHandler() == null) return false;
+
+        // Must be Hypixel
         String brand = client.getNetworkHandler().getBrand();
-        if (brand == null || !brand.toLowerCase().contains("hypixel")) return false; // Not Hypixel, safe
+        if (brand == null || !brand.toLowerCase().contains("hypixel")) return false;
 
-        // Get scoreboard title
-        if (client.world == null) return false; // Safe default for Hypixel
-        Scoreboard scoreboard = client.world.getScoreboard();
-        if (scoreboard == null) return false; // Safe default for Hypixel
+        if (client.world == null) return false;
 
+        Scoreboard scoreboard = client.world.getScoreboard();
         ScoreboardObjective objective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR);
-        if (objective == null) return false; // Safe default for Hypixel
+        if (objective == null) return false;
 
-        Text scoreboardTitle = objective.getDisplayName();
-        String title = stripColors(scoreboardTitle.getString()).toUpperCase();
+        String title = stripColors(objective.getDisplayName().getString()).toUpperCase();
 
-        // Return true if in safe modes
+        System.out.println(("update"));
+        // Return true if NOT in any of these game modes
         return !title.startsWith("SKYBLOCK") &&
                 !title.startsWith("LOBBY") &&
                 !title.startsWith("LIMBO") &&
                 !title.startsWith("HOUSING") &&
-                !title.startsWith("PROTOTYPE");
+                !title.startsWith("PROTOTYPE") &&
+                !title.startsWith("HYPIXEL");
+    }
+
+    /**
+     * Checks if the current mode is safe for NPC scaling.
+     * This means not being in a safe game mode and being inside a dungeon.
+     */
+    public static boolean isSafeForNPCScaling() {
+        return !isSafeGameMode() && isInDungeon();
     }
 
+    /**
+     * Detects if the player is currently inside a Hypixel dungeon by scanning the scoreboard.
+     * Looks for a line starting with "CLEARED:".
+     */
+    public static boolean isInDungeon() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client.world == null) return false;
+
+        Scoreboard scoreboard = client.world.getScoreboard();
+        ScoreboardObjective objective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR);
+        if (objective == null) return false;
+
+        Collection<ScoreboardEntry> entries = scoreboard.getScoreboardEntries(objective);
+
+        for (ScoreboardEntry entry : entries) {
+            String owner = entry.owner();
+            Team team = scoreboard.getScoreHolderTeam(owner);
+
+            // Build the full line with prefix/suffix
+            StringBuilder sb = new StringBuilder();
+            if (team != null) sb.append(team.getPrefix().getString());
+            sb.append(owner);
+            if (team != null) sb.append(team.getSuffix().getString());
+
+            String rawLine = sb.toString();
+
+            // Strip colors, normalize spaces, uppercase
+            String noColors;
+            try {
+                noColors = stripColors(rawLine);
+            } catch (Throwable t) {
+                noColors = rawLine.replaceAll("(?i)\\u00A7[0-9A-FK-OR]", "");
+            }
+
+            String line = noColors
+                    .replace('\u00A0', ' ')  // NBSP -> space
+                    .replaceAll("\\s+", " ") // collapse whitespace
+                    .trim()
+                    .toUpperCase();
+
+            // Primary and fallback check
+            if (line.startsWith("CLEARED:") || line.contains("CLEARED:")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Debug helper for printing character code points.
+     * Only enable this when diagnosing scoreboard parsing issues.
+     */
+    @SuppressWarnings("unused")
+    private static void printCodePoints(String name, String s) {
+        StringBuilder out = new StringBuilder();
+        out.append(name).append(": ");
+        for (int i = 0; i < s.length(); i++) {
+            out.append(String.format("[%c U+%04X] ", s.charAt(i), (int) s.charAt(i)));
+        }
+        System.out.println(out);
+    }
+
+    /**
+     * Strips Minecraft formatting codes (§ followed by any character).
+     */
     private static String stripColors(String text) {
-        // Remove Minecraft color codes (§ followed by any character)
         return text.replaceAll("§.", "");
     }
-}
+}

src/main/java/com/github/kd_gaming1/scaleme/client/util/ScaleManager.java

@@ -34,14 +34,14 @@ public static float getCurrentScale(UUID playerUUID) {
     /** Returns NPC scale with safety check including dungeons detection. */
     public static float getNpcScale() {
         // Only apply scaling when it's safe (not in competitive modes or dungeons)
-        if (HypixelDetector.isSafeGameMode()) return 1.0f;
+        if (HypixelDetector.isSafeGameMode() || HypixelDetector.isSafeForNPCScaling()) return 1.0f;
         return ScaleMeConfig.npcPlayerScale;
     }
 
     /** Returns Villager NPC scale with safety check including dungeons detection. */
     public static float getVillagerNpcScale() {
         // Only apply scaling when it's safe (not in competitive modes or dungeons)
-        if (HypixelDetector.isSafeGameMode()) return 1.0f;
+        if (HypixelDetector.isSafeGameMode() || HypixelDetector.isSafeForNPCScaling()) return 1.0f;
         return ScaleMeConfig.villagerNpcScale;
     }
 }