From 19aa734705e3bf66867b5927750233ef7627f06f Mon Sep 17 00:00:00 2001
From: benjilmao <benjilmao@benjilmao>
Date: Tue, 6 May 2025 01:18:57 +0100
Subject: [PATCH 1/2] Added smolMe and made the smolpeople work on players only

---
 .../skytilsmod/utils/SuperSecretSettings.java      |  2 ++
 .../mixins/hooks/entity/EntityLivingBaseHook.kt    | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java b/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java
index fa009209a..902e25751 100644
--- a/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java
+++ b/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java
@@ -45,6 +45,7 @@ public class SuperSecretSettings {
     public static boolean palworld = false;
     public static boolean sheepifyRebellion = false;
     public static boolean smolPeople = false;
+    public static boolean smolMe = false;
     public static boolean tryItAndSee = false;
     public static boolean twilightGiant = false;
 
@@ -115,6 +116,7 @@ public static void setSecrets() {
         palworld = settings.contains("palworld");
         sheepifyRebellion = settings.contains("sheepifyRebellion");
         smolPeople = settings.contains("smolpeople");
+        smolMe = settings.contains("smolme");
         tryItAndSee = settings.contains("tryItAndSee");
         twilightGiant = settings.contains("twilightGiant");
     }
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
index 52770fdab..969f7a8ba 100644
--- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
+++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
@@ -43,14 +43,20 @@ class EntityLivingBaseHook(val entity: EntityLivingBase) {
             overrideDisplayName = s
     }
 
+    private fun isNPC(): Boolean {
+        if (entity !is EntityPlayer) return true
+
+        return entity.hasCustomName() ||
+                entity.displayName.unformattedText.contains("♲") ||
+                entity.uniqueID.version() != 4
+    }
+
     val isBreefing by lazy {
-        entity.name == "Breefing" && (SuperSecretSettings.breefingDog || Random.nextInt(
-            100
-        ) < 3)
+        entity.name == "Breefing" && (SuperSecretSettings.breefingDog || Random.nextInt(100) < 3)
     }
 
     val isSmol by lazy {
-        Utils.inSkyblock && entity is EntityPlayer && (SuperSecretSettings.smolPeople || isBreefing)
+        Utils.inSkyblock && entity is EntityPlayer && (SuperSecretSettings.smolPeople || (entity is EntityPlayerSP && SuperSecretSettings.smolMe) || isBreefing ) && !isNPC()
     }
 
     fun modifyPotionActive(potionId: Int, cir: CallbackInfoReturnable<Boolean>) {

From 48c0e1b25bd8b152ee2f35391b4d10dc2d1b26bd Mon Sep 17 00:00:00 2001
From: benjilmao <benjilmao@benjilmao>
Date: Tue, 6 May 2025 23:12:59 +0100
Subject: [PATCH 2/2] Simplifying isSmol check by removing useless npc checks

---
 .../mixins/hooks/entity/EntityLivingBaseHook.kt        | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
index 969f7a8ba..ccd288a1e 100644
--- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
+++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
@@ -43,20 +43,12 @@ class EntityLivingBaseHook(val entity: EntityLivingBase) {
             overrideDisplayName = s
     }
 
-    private fun isNPC(): Boolean {
-        if (entity !is EntityPlayer) return true
-
-        return entity.hasCustomName() ||
-                entity.displayName.unformattedText.contains("♲") ||
-                entity.uniqueID.version() != 4
-    }
-
     val isBreefing by lazy {
         entity.name == "Breefing" && (SuperSecretSettings.breefingDog || Random.nextInt(100) < 3)
     }
 
     val isSmol by lazy {
-        Utils.inSkyblock && entity is EntityPlayer && (SuperSecretSettings.smolPeople || (entity is EntityPlayerSP && SuperSecretSettings.smolMe) || isBreefing ) && !isNPC()
+        Utils.inSkyblock && entity is EntityPlayer && ((entity is EntityPlayerSP && SuperSecretSettings.smolMe) || (SuperSecretSettings.smolPeople && entity.uniqueID.version() == 4) || isBreefing)
     }
 
     fun modifyPotionActive(potionId: Int, cir: CallbackInfoReturnable<Boolean>) {