From a1a101eca437bde3e4eca1af923d9e6b77c546c5 Mon Sep 17 00:00:00 2001 From: Mikecraft1224 Date: Wed, 16 Oct 2024 11:38:52 +0200 Subject: [PATCH 1/4] added AutoJoinSkyblock feature --- .../config/features/misc/MiscConfig.java | 6 ++++++ .../skyhanni/features/misc/AutoJoinSkyblock.kt | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index 0869262959c0..af8592d6ca1d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -129,6 +129,12 @@ public class MiscConfig { @ConfigEditorDraggableList public Property> showOutsideSB = Property.of(new ArrayList<>()); + @Expose + @ConfigOption(name = "Auto join Skyblock", desc = "Automatically join Skyblock when you join Hypixel.") + @ConfigEditorBoolean + @FeatureToggle + public boolean autoJoinSkyblock = true; + @Expose @ConfigOption(name = "Exp Bottles", desc = "Hide all the experience orbs lying on the ground.") @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt new file mode 100644 index 000000000000..7c25750e3a24 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt @@ -0,0 +1,17 @@ +package at.hannibal2.skyhanni.features.misc + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.HypixelJoinEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule +import at.hannibal2.skyhanni.utils.HypixelCommands +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +@SkyHanniModule +object AutoJoinSkyblock { + @SubscribeEvent + fun onHypixelJoin(event: HypixelJoinEvent) { + if (!SkyHanniMod.feature.misc.autoJoinSkyblock) return + + HypixelCommands.skyblock() + } +} From 6dc00daa1124f6175f34b6c1384952bdb0d6e225 Mon Sep 17 00:00:00 2001 From: Mikecraft1224 Date: Wed, 16 Oct 2024 11:55:23 +0200 Subject: [PATCH 2/4] set default to false --- .../at/hannibal2/skyhanni/config/features/misc/MiscConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index af8592d6ca1d..4f4d02ab9232 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -133,7 +133,7 @@ public class MiscConfig { @ConfigOption(name = "Auto join Skyblock", desc = "Automatically join Skyblock when you join Hypixel.") @ConfigEditorBoolean @FeatureToggle - public boolean autoJoinSkyblock = true; + public boolean autoJoinSkyblock = false; @Expose @ConfigOption(name = "Exp Bottles", desc = "Hide all the experience orbs lying on the ground.") From 18c7ae78ee43b50ed925c9d4572037626e7f2bd8 Mon Sep 17 00:00:00 2001 From: Mikecraft1224 Date: Wed, 16 Oct 2024 11:59:14 +0200 Subject: [PATCH 3/4] tweaked feature name --- .../at/hannibal2/skyhanni/config/features/misc/MiscConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index 4f4d02ab9232..f33c98b75bd7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -130,7 +130,7 @@ public class MiscConfig { public Property> showOutsideSB = Property.of(new ArrayList<>()); @Expose - @ConfigOption(name = "Auto join Skyblock", desc = "Automatically join Skyblock when you join Hypixel.") + @ConfigOption(name = "Auto Join Skyblock", desc = "Automatically join Skyblock when you join Hypixel.") @ConfigEditorBoolean @FeatureToggle public boolean autoJoinSkyblock = false; From 414d66eb725a8e8e374a9380169c9f95569f5da3 Mon Sep 17 00:00:00 2001 From: Mikecraft1224 Date: Wed, 16 Oct 2024 17:03:27 +0200 Subject: [PATCH 4/4] Added 1s delay to joining Skyblock --- .../at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt index 7c25750e3a24..a8a2a1d9e955 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AutoJoinSkyblock.kt @@ -3,8 +3,10 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.HypixelJoinEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule +import at.hannibal2.skyhanni.utils.DelayedRun import at.hannibal2.skyhanni.utils.HypixelCommands import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import kotlin.time.Duration.Companion.seconds @SkyHanniModule object AutoJoinSkyblock { @@ -12,6 +14,8 @@ object AutoJoinSkyblock { fun onHypixelJoin(event: HypixelJoinEvent) { if (!SkyHanniMod.feature.misc.autoJoinSkyblock) return - HypixelCommands.skyblock() + DelayedRun.runDelayed(1.seconds) { + HypixelCommands.skyblock() + } } }