Skip to content

Added a working smolMe option and made smolpeople work on players only #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Added a working smolMe option and made smolpeople work on players only #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19aa734
Added smolMe and made the smolpeople work on players only
May 6, 2025
48c0e1b
Simplifying isSmol check by removing useless npc checks
May 6, 2025
6957609
Merge branch 'Skytils:dev' into dev
benjilmao May 11, 2025
bdbbeb7
Merge branch 'dev' into dev
benjilmao May 17, 2025
101f783
Merge branch 'dev' into dev
benjilmao Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/gg/skytils/skytilsmod/utils/SuperSecretSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider adding a comment here explaining what smolMe does. This will help others understand the purpose of this setting.

public static boolean tryItAndSee = false;
public static boolean twilightGiant = false;

Expand Down Expand Up @@ -115,6 +116,7 @@ public static void setSecrets() {
palworld = settings.contains("palworld");
sheepifyRebellion = settings.contains("sheepifyRebellion");
smolPeople = settings.contains("smolpeople");
smolMe = settings.contains("smolme");
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot May 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Consider adding a comment here explaining what smolMe does. This will help others understand the purpose of this setting.

tryItAndSee = settings.contains("tryItAndSee");
twilightGiant = settings.contains("twilightGiant");
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/entity/EntityLivingBaseHook.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ class EntityLivingBaseHook(val entity: EntityLivingBase) {
}

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 && ((entity is EntityPlayerSP && SuperSecretSettings.smolMe) || (SuperSecretSettings.smolPeople && entity.uniqueID.version() == 4) || isBreefing)
}

fun modifyPotionActive(potionId: Int, cir: CallbackInfoReturnable<Boolean>) {
Expand Down