Feature: Added option to show some features outside SB.

src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java

@@ -124,6 +124,10 @@ public static class WaypointsConfig {
         @ConfigEditorBoolean
         public boolean showPlatformNumber = false;
 
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Make parkour waypoints outside of SkyBlock too.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
     }
 
     @Expose

src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java

@@ -5,13 +5,7 @@
 import at.hannibal2.skyhanni.config.core.config.Position;
 import at.hannibal2.skyhanni.data.GuiEditManager;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.Accordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorButton;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorText;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.annotations.*;
 import io.github.moulberry.moulconfig.observer.Property;
 import org.lwjgl.input.Keyboard;
 
@@ -76,23 +70,41 @@ public static class TextBoxConfig {
         @ConfigEditorText
         public Property<String> text = Property.of("&aYour Text Here\\n&bYour new line here");
 
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show textbox outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
+
         @Expose
         public Position position = new Position(10, 80, false, true);
     }
 
     @Expose
-    @ConfigOption(name = "Real Time", desc = "Display the current computer time, a handy feature when playing in full-screen mode.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean realTime = false;
+    @ConfigOption(name = "Real Time", desc = "")
+    @Accordion
+    public RealTimeConfig realTime = new RealTimeConfig();
 
-    @Expose
-    @ConfigOption(name = "Real Time 12h Format", desc = "Display the current computer time in 12hr Format rather than 24h Format.")
-    @ConfigEditorBoolean
-    public boolean realTimeFormatToggle = false;
+    public static class RealTimeConfig {
 
-    @Expose
-    public Position realTimePosition = new Position(10, 10, false, true);
+        @Expose
+        @ConfigOption(name = "Real Time", desc = "Display the current computer time, a handy feature when playing in full-screen mode.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean enabled = false;
+
+        @Expose
+        @ConfigOption(name = "Real Time 12h Format", desc = "Display the current computer time in 12hr Format rather than 24h Format.")
+        @ConfigEditorBoolean
+        public boolean formatToggle = false;
+
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show the time outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
+
+        @Expose
+        public Position position = new Position(10, 10, false, true);
+    }
 
 
     @Expose
@@ -128,15 +140,27 @@ public static class InGameDateConfig {
         public int RefreshSeconds = 10;
     }
 
-
     @Expose
-    @ConfigOption(name = "TPS Display", desc = "Show the TPS of the current server, like in Soopy.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean tpsDisplay = false;
+    @ConfigOption(name = "TPS Display", desc = "")
+    @Accordion
+    public TpsDisplayConfig tpsDisplay = new TpsDisplayConfig();
 
-    @Expose
-    public Position tpsDisplayPosition = new Position(10, 10, false, true);
+    public static class TpsDisplayConfig {
+
+        @Expose
+        @ConfigOption(name = "TPS Display", desc = "Show the TPS of the current server, like in Soopy.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean enabled = false;
+
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Shows the TPS outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
+
+        @Expose
+        public Position tpsDisplayPosition = new Position(10, 10, false, true);
+    }
 
     @Expose
     @ConfigOption(name = "Config Button", desc = "Add a button to the pause menu to configure SkyHanni.")

src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java

@@ -6,15 +6,7 @@
 import at.hannibal2.skyhanni.features.garden.inventory.GardenPlotIcon;
 import at.hannibal2.skyhanni.utils.LorenzUtils;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.Accordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorButton;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorText;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.annotations.*;
 import io.github.moulberry.moulconfig.observer.Property;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
@@ -782,6 +774,16 @@ public static class EliteFarmingWeightConfig {
         @ConfigOption(name = "Show below 200", desc = "Show the farming weight data even if you are below 200 weight.")
         @ConfigEditorBoolean
         public boolean ignoreLow = false;
+
+        @Expose
+        @ConfigOption(name = "Show outside garden", desc = "Show the farming weight outside of the garden.")
+        @ConfigEditorBoolean
+        public boolean showOutsideGarden = false;
+
+        @Expose
+        @ConfigOption(name = "Show outside SB", desc = "Show the farming weight outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
     }
 
     @Expose
@@ -937,9 +939,14 @@ public static class NextJacobContestConfig {
         public boolean display = true;
 
         @Expose
-        @ConfigOption(name = "Outside Garden", desc = "Show the timer not only in Garden but everywhere in SkyBlock.")
+        @ConfigOption(name = "Show Outside Garden", desc = "Show the timer outside of the Garden")
         @ConfigEditorBoolean
-        public boolean everywhere = false;
+        public boolean showOutsideGarden = false;
+
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show the timer outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
 
         @Expose
         @ConfigOption(name = "In Other Guis", desc = "Mark the current or next Farming Contest crops in other farming GUIs as underlined.")
@@ -1286,9 +1293,14 @@ public static class YawPitchDisplayConfig {
         public boolean showWithoutTool = false;
 
         @Expose
-        @ConfigOption(name = "Show Outside Garden", desc = "The overlay will work outside of the Garden.")
+        @ConfigOption(name = "Show Outside Garden", desc = "Show the overlay outside of the Garden.")
+        @ConfigEditorBoolean
+        public boolean showOutsideGarden = false;
+
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show the overlay outside of SkyBlock.")
         @ConfigEditorBoolean
-        public boolean showEverywhere = false;
+        public boolean showOutsideSB = false;
 
         @Expose
         @ConfigOption(name = "Ignore Timeout", desc = "Ignore the timeout after not moving mouse.")

src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayerConfig.java

@@ -21,4 +21,9 @@ public class MarkedPlayerConfig {
     @ConfigOption(name = "Mark Own Name", desc = "Mark own player name.")
     @ConfigEditorBoolean()
     public Property<Boolean> markOwnName = Property.of(false);
+
+    @Expose
+    @ConfigOption(name = "Mark Outside SB", desc = "Show marked players outside of SkyBlock.")
+    @ConfigEditorBoolean
+    public boolean markOutsideSB = true;
 }

src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java

@@ -3,15 +3,7 @@
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.Accordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorText;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
+import io.github.moulberry.moulconfig.annotations.*;
 import io.github.moulberry.moulconfig.observer.Property;
 import org.lwjgl.input.Keyboard;
 
@@ -445,6 +437,11 @@ public static class QuickModMenuSwitch {
         @ConfigEditorBoolean
         public boolean insidePlayerInventory = false;
 
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show the mod list outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
+
         @Expose
         public Position pos = new Position(-178, 143, false, true);
     }
@@ -488,6 +485,11 @@ public static class FollowingLineConfig {
             @ConfigOption(name = "Behind Blocks", desc = "Show behind blocks.")
             @ConfigEditorBoolean
             public boolean behindBlocks = false;
+
+            @Expose
+            @ConfigOption(name = "Show Outside SB", desc = "Show the line outside of SkyBlock.")
+            @ConfigEditorBoolean
+            public boolean showOutsideSB = false;
         }
     }
 
@@ -539,6 +541,10 @@ public static class HighlightPartyMembers {
         @ConfigEditorColour
         public String outlineColor = "0:245:85:255:85";
 
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Highlight party members outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
     }
 
 
@@ -664,6 +670,27 @@ public static class KickDurationConfig {
         public Position position = new Position(400, 200, 1.3f);
     }
 
+    @Expose
+    @ConfigOption(name = "Movement Speed", desc = "")
+    @Accordion
+    public MovementSpeedConfig movementSpeed = new MovementSpeedConfig();
+
+    public static class MovementSpeedConfig {
+        @Expose
+        @ConfigOption(name = "Movement Speed", desc = "Show the player movement speed in blocks per second.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean enabled = false;
+
+        @Expose
+        @ConfigOption(name = "Show Outside SB", desc = "Show the player movement speed outside of SkyBlock.")
+        @ConfigEditorBoolean
+        public boolean showOutsideSB = false;
+
+        @Expose
+        public Position position = new Position(394, 124, false, true);
+    }
+
     @Expose
     @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.")
     @ConfigEditorBoolean
@@ -715,15 +742,6 @@ public static class KickDurationConfig {
     @FeatureToggle
     public boolean pasteIntoSigns = true;
 
-    @Expose
-    @ConfigOption(name = "Movement Speed", desc = "Show the player movement speed in blocks per second.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean playerMovementSpeed = false;
-
-    @Expose
-    public Position playerMovementSpeedPos = new Position(394, 124, false, true);
-
     @Expose
     @ConfigOption(name = "Pet Candy Used", desc = "Show the number of Pet Candy used on a pet.")
     @ConfigEditorBoolean

src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt

@@ -6,7 +6,6 @@ import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign
 import at.hannibal2.skyhanni.utils.NEUItems
 import net.minecraft.client.Minecraft
@@ -21,7 +20,6 @@ import java.util.UUID
 class GuiEditManager {
     @SubscribeEvent
     fun onKeyClick(event: LorenzKeyPressEvent) {
-        if (!LorenzUtils.inSkyBlock) return
         if (event.keyCode != SkyHanniMod.feature.gui.keyBindOpen) return
         if (isInGui()) return
 

src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt

@@ -33,7 +33,7 @@ class CosmeticFollowingLine {
 
     @SubscribeEvent
     fun onRenderWorld(event: LorenzRenderWorldEvent) {
-        if (!LorenzUtils.inSkyBlock) return
+        if (!LorenzUtils.inSkyBlock && !config.showOutsideSB) return
         if (!config.enabled) return
 
         updateClose(event)
@@ -96,7 +96,7 @@ class CosmeticFollowingLine {
 
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
-        if (!LorenzUtils.inSkyBlock) return
+        if (!LorenzUtils.inSkyBlock && !config.showOutsideSB) return
         if (!config.enabled) return
 
         if (event.isMod(5)) {

src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt

@@ -395,8 +395,8 @@ object GardenNextJacobContest {
         }
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config.display
-            && (GardenAPI.inGarden() || config.everywhere)
+    private fun isEnabled() = (LorenzUtils.inSkyBlock || config.showOutsideSB) && config.display
+            && (GardenAPI.inGarden() || config.showOutsideGarden)
 
     private fun isFetchEnabled() = isEnabled() && config.fetchAutomatically
     private fun isSendEnabled() = isFetchEnabled() && config.shareAutomatically != 2 // 2 = Disabled

src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt

@@ -19,10 +19,10 @@ class GardenYawAndPitch {
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
-        if (!LorenzUtils.inSkyBlock) return
+        if (!LorenzUtils.inSkyBlock && !config.showOutsideSB) return
         if (!config.enabled) return
         if (GardenAPI.hideExtraGuis()) return
-        if (!GardenAPI.inGarden() && !config.showEverywhere) return
+        if (!GardenAPI.inGarden() && !config.showOutsideGarden) return
         if (GardenAPI.toolInHand == null && !config.showWithoutTool) return
 
         val player = Minecraft.getMinecraft().thePlayer

src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt

@@ -136,7 +136,8 @@ class FarmingWeightDisplay {
         }
 
         private fun update() {
-            if (!GardenAPI.inGarden()) return
+            if (!LorenzUtils.inSkyBlock && !config.showOutsideSB) return
+            if (!GardenAPI.inGarden() && !config.showOutsideGarden) return
             if (apiError) {
                 display = errorMessage
                 return
@@ -325,7 +326,8 @@ class FarmingWeightDisplay {
             )
         }
 
-        private fun isEnabled() = GardenAPI.inGarden() && config.display
+        private fun isEnabled() = (LorenzUtils.inSkyBlock || config.showOutsideSB) && (GardenAPI.inGarden() || config.showOutsideGarden) && config.display
+
         private fun isEtaEnabled() = config.overtakeETA
 
         fun addCrop(crop: CropType, addedCounter: Int) {

src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt

@@ -27,7 +27,7 @@ class CustomTextBox {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!config.enabled) return
-        if (!LorenzUtils.inSkyBlock) return
+        if (!LorenzUtils.inSkyBlock && !config.showOutsideSB) return
 
         config.position.renderStrings(display, posLabel = "Custom Text Box")
     }