Add Hypixel mod API support; improve safety checks for game modes

Author: KdGaming0

build.gradle

@@ -26,6 +26,9 @@ repositories {
     maven {
         url 'https://maven.wispforest.io/releases/'
     }
+    maven {
+        url 'https://repo.hypixel.net/repository/Hypixel/'
+    }
 }
 
 dependencies {
@@ -41,6 +44,9 @@ dependencies {
     modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
     modImplementation "io.wispforest:owo-lib:${project.owo_version}"
 
+    modImplementation 'net.hypixel:mod-api:1.0.1'
+    include 'net.hypixel:mod-api:1.0.1'
+
     implementation 'com.google.code.gson:gson:2.10.1'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.21.5
 yarn_mappings=1.21.5+build.1
-loader_version=0.16.14
+loader_version=0.17.1
 # Mod Properties
 mod_version=2.0.0+1.21.5
-maven_group=com.github
+maven_group=com.github.kd_gaming1
 archives_base_name=scaleme
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.127.1+1.21.5
+fabric_version=0.128.1+1.21.5
 midnightlib_version = 1.7.3+1.21.4-fabric
 modmenu_version = 14.0.0-rc.2
 owo_version=0.12.21+1.21.5

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

@@ -8,31 +8,54 @@
 
 public class HypixelDetector {
 
+    public static String currentMode = null;
+    public static String currentMap = null;
+    public static String currentServerName = null;
+    public static String serverType = null;
+
     public static boolean isSafeGameMode() {
         MinecraftClient client = MinecraftClient.getInstance();
 
         // Check if on Hypixel using server brand
-        if (client.getNetworkHandler() == null) return true; // Not on a server, safe
+        if (client.getNetworkHandler() == null) return false; // Not on a server, safe
         String brand = client.getNetworkHandler().getBrand();
-        if (brand == null || !brand.toLowerCase().contains("hypixel")) return true; // Not Hypixel, safe
+        if (brand == null || !brand.toLowerCase().contains("hypixel")) return false; // Not Hypixel, safe
 
         // Get scoreboard title
-        if (client.world == null) return true; // Safe default for Hypixel
+        if (client.world == null) return false; // Safe default for Hypixel
         Scoreboard scoreboard = client.world.getScoreboard();
-        if (scoreboard == null) return true; // Safe default for Hypixel
+        if (scoreboard == null) return false; // Safe default for Hypixel
 
         ScoreboardObjective objective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR);
-        if (objective == null) return true; // Safe default for Hypixel
+        if (objective == null) return false; // Safe default for Hypixel
 
         Text scoreboardTitle = objective.getDisplayName();
         String title = stripColors(scoreboardTitle.getString()).toUpperCase();
 
         // Return true if in safe modes
-        return title.startsWith("SKYBLOCK") ||
-                title.startsWith("LOBBY") ||
-                title.startsWith("LIMBO") ||
-                title.startsWith("HOUSING") ||
-                title.startsWith("PROTOTYPE");
+        return !title.startsWith("SKYBLOCK") &&
+                !title.startsWith("LOBBY") &&
+                !title.startsWith("LIMBO") &&
+                !title.startsWith("HOUSING") &&
+                !title.startsWith("PROTOTYPE");
+    }
+
+    /**
+     * Checks if the player is in a Hypixel dungeon or catacombs.
+     * This method uses the current mode, map, and server name to determine if the player is in dungeons.
+     *
+     * @return true if the player is in dungeons, false otherwise.
+     */
+    public static boolean isInDungeons() {
+        if (!"SKYBLOCK".equalsIgnoreCase(serverType)) return true;
+
+        String mode = currentMode != null ? currentMode.toLowerCase() : "";
+        String map = currentMap != null ? currentMap.toLowerCase() : "";
+        String server = currentServerName != null ? currentServerName.toLowerCase() : "";
+
+        return !mode.contains("dungeon") && !mode.contains("catacombs")
+                && !map.contains("dungeon") && !map.contains("catacombs") && !map.contains("floor")
+                && !server.contains("dungeon") && !server.contains("catacombs");
     }
 
     private static String stripColors(String text) {

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

@@ -75,7 +75,7 @@ public static void tick() {
 
     /** Returns the current scale for a player. O(1) lookup. */
     public static float getCurrentScale(UUID playerUUID) {
-        if (!HypixelDetector.isSafeGameMode()) return 1.0f; // Disable scaling if not safe game mode
+        if (HypixelDetector.isSafeGameMode()) return 1.0f; // Disable scaling if not safe game mode
         if (playerUUID == null) return 1.0f;
 
         Float cached = currentScales.get(playerUUID);

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

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

src/main/resources/fabric.mod.json

@@ -6,7 +6,7 @@
   "description": "Client-side player model scaling for Minecraft",
   "authors": ["Kd_Gaming1"],
   "contact": {},
-  "license": "All-Rights-Reserved",
+  "license": "PolyForm Shield License 1.0.0",
   "icon": "assets/scaleme/icon.png",
   "environment": "client",
   "entrypoints": {
@@ -26,5 +26,8 @@
     "minecraft": "${minecraft_version}",
     "midnightlib": ">=1.6.0",
     "owo": ">=${owo_version}"
+  },
+  "suggests": {
+    "hypixel-mod-api": "*"
   }
 }