From f31bdb7319b57becdd71bd275095d49c7bcb27bf Mon Sep 17 00:00:00 2001 From: MiguelOlsen Date: Sat, 28 Sep 2024 10:35:32 +0100 Subject: [PATCH 1/2] Added smolSelf secret setting --- .../java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java | 2 ++ .../skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java b/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java index 46d55ea97..6d50d85e6 100644 --- a/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java +++ b/src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java @@ -44,6 +44,7 @@ public class SuperSecretSettings { public static boolean noSychic = false; public static boolean palworld = false; public static boolean sheepifyRebellion = false; + public static boolean smolSelf = false; public static boolean smolPeople = false; public static boolean tryItAndSee = false; public static boolean twilightGiant = false; @@ -114,6 +115,7 @@ public static void setSecrets() { noSychic = settings.contains("nosychic"); palworld = settings.contains("palworld"); sheepifyRebellion = settings.contains("sheepifyRebellion"); + smolSelf = settings.contains("smolself"); smolPeople = settings.contains("smolpeople"); 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..4e672cbe5 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 @@ -50,7 +50,7 @@ class EntityLivingBaseHook(val entity: EntityLivingBase) { } val isSmol by lazy { - Utils.inSkyblock && entity is EntityPlayer && (SuperSecretSettings.smolPeople || isBreefing) + Utils.inSkyblock && (entity is EntityPlayer && (SuperSecretSettings.smolPeople || isBreefing)) || (entity is EntityPlayerSP && SuperSecretSettings.smolSelf) } fun modifyPotionActive(potionId: Int, cir: CallbackInfoReturnable) { From c8b68bbc9ea9a2eb56ed8ddcb9622af44994226c Mon Sep 17 00:00:00 2001 From: Challenge2you <64700834+Challenge2you@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:05:51 +0100 Subject: [PATCH 2/2] Update src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt Co-authored-by: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Signed-off-by: Challenge2you <64700834+Challenge2you@users.noreply.github.com> --- .../skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e672cbe5..2e4123aa5 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 @@ -50,7 +50,7 @@ class EntityLivingBaseHook(val entity: EntityLivingBase) { } val isSmol by lazy { - Utils.inSkyblock && (entity is EntityPlayer && (SuperSecretSettings.smolPeople || isBreefing)) || (entity is EntityPlayerSP && SuperSecretSettings.smolSelf) + Utils.inSkyblock && (entity is EntityPlayer && (SuperSecretSettings.smolPeople || (entity is EntityPlayerSP && SuperSecretSettings.smolSelf) || isBreefing)) } fun modifyPotionActive(potionId: Int, cir: CallbackInfoReturnable) {