Feature: Custom Scoreboard Lines

src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt

@@ -51,6 +51,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
 import at.hannibal2.skyhanni.features.garden.pests.PestFinder
 import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker
 import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics
+import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomLinesGui
 import at.hannibal2.skyhanni.features.mining.KingTalismanHelper
 import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker
 import at.hannibal2.skyhanni.features.minion.MinionFeatures
@@ -66,6 +67,7 @@ import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui
 import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker
 import at.hannibal2.skyhanni.features.slayer.SlayerProfitTracker
 import at.hannibal2.skyhanni.test.DebugCommand
+import at.hannibal2.skyhanni.test.GraphEditor
 import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
@@ -530,6 +532,10 @@ object Commands {
             "shaddfoundburrowlocationsfromclipboard",
             "Add all ever found burrow locations from clipboard"
         ) { AllBurrowsList.addFromClipboard() }
+        registerCommand(
+            "shgraph",
+            "Enables the graph editor"
+        ) { GraphEditor.commandIn() }
         registerCommand(
             "shtoggleegglocationdebug",
             "Shows Hoppity egg locations with their internal API names and status."
@@ -538,6 +544,7 @@ object Commands {
 
     private fun internalCommands() {
         registerCommand("shaction", "") { ChatClickActionManager.onCommand(it) }
+        registerCommand("shcustomlines", "Opens the config list for modifying custom lines") { openCustomLines() }
     }
 
     private fun shortenedCommands() {
@@ -568,6 +575,15 @@ object Commands {
         }
     }
 
+    @JvmStatic
+    fun openCustomLines() {
+        if (!LorenzUtils.onHypixel) {
+            ChatUtils.userError("You need to join Hypixel to use this feature!")
+        } else {
+            SkyHanniMod.screenToOpen = CustomLinesGui()
+        }
+    }
+
     private fun clearFarmingItems() {
         val storage = GardenAPI.storage?.fortune ?: return
         ChatUtils.chat("clearing farming items")

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

@@ -103,6 +103,10 @@ public class DevConfig {
     @Category(name = "Minecraft Console", desc = "Minecraft Console Settings")
     public MinecraftConsoleConfig minecraftConsoles = new MinecraftConsoleConfig();
 
+    @Expose
+    @Category(name = "Dev Tools", desc = "Tooling for devs")
+    public DevToolConfig devTool = new DevToolConfig();
+
     @Expose
     @Category(name = "Debug Mob", desc = "Every Debug related to the Mob System")
     public DebugMobConfig mobDebug = new DebugMobConfig();

src/main/java/at/hannibal2/skyhanni/config/features/dev/DevToolConfig.java

@@ -0,0 +1,14 @@
+package at.hannibal2.skyhanni.config.features.dev;
+
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.Accordion;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class DevToolConfig {
+
+    @Expose
+    @ConfigOption(name = "Graph Tools", desc = "")
+    @Accordion
+    public GraphConfig graph = new GraphConfig();
+
+}

src/main/java/at/hannibal2/skyhanni/config/features/dev/GraphConfig.java

@@ -0,0 +1,76 @@
+package at.hannibal2.skyhanni.config.features.dev;
+
+import at.hannibal2.skyhanni.config.core.config.Position;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+import org.lwjgl.input.Keyboard;
+
+public class GraphConfig {
+
+    @Expose
+    @ConfigOption(name = "Enabled", desc = "Enables the graphing tool.")
+    @ConfigEditorBoolean
+    public boolean enabled = false;
+
+    @Expose
+    @ConfigOption(name = "Place Key", desc = "Places a new node at the current position. If a node is active automatically connects.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_F)
+    public int placeKey = Keyboard.KEY_F;
+
+    @Expose
+    @ConfigOption(name = "Select Key", desc = "Select the nearest node to be active. Double press to unselect.")
+    @ConfigEditorKeybind(defaultKey = -98) // Middle Mouse
+    public int selectKey = -98;
+
+    @Expose
+    @ConfigOption(name = "Connect Key", desc = "Connects the nearest node with the active node. If the nodes are already connected removes them.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_C)
+    public int connectKey = Keyboard.KEY_C;
+
+    @Expose
+    @ConfigOption(name = "Exit Key", desc = "Exit out of stuff. If nothing active disables the graph editor.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_HOME)
+    public int exitKey = Keyboard.KEY_HOME;
+
+    @Expose
+    @ConfigOption(name = "Edit Key", desc = "While holding the Key edit the position of the active node.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_TAB)
+    public int editKey = Keyboard.KEY_TAB;
+
+    @Expose
+    @ConfigOption(name = "Text Key", desc = "Starts text mode, which allows editing a name of a node.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_T)
+    public int textKey = Keyboard.KEY_T;
+
+    @Expose
+    @ConfigOption(name = "Test Dijkstra", desc = "On Keypress shows the shortest path between the nearest node and the active node.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_G)
+    public int dijkstraKey = Keyboard.KEY_G;
+
+    @Expose
+    @ConfigOption(name = "Save Key", desc = "Saves the current graph to the clipboard.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_O)
+    public int saveKey = Keyboard.KEY_O;
+
+    @Expose
+    @ConfigOption(name = "Load Key", desc = "Loades a graph from clipboard, if valid.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_I)
+    public int loadKey = Keyboard.KEY_I;
+
+    @Expose
+    @ConfigOption(name = "Clear Key", desc = "Clears the graph. Also saves the graph to the clipboard.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_P)
+    public int clearKey = Keyboard.KEY_P;
+
+    @Expose
+    @ConfigOption(name = "Vision Key", desc = "Toggles if the graph should render trough blocks.")
+    @ConfigEditorKeybind(defaultKey = Keyboard.KEY_M)
+    public int throughBlocksKey = Keyboard.KEY_M;
+
+    @Expose
+    @ConfigLink(owner = GraphConfig.class, field = "enabled")
+    public Position infoDisplay = new Position(20, 20);
+}

src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/ChunkedStatsConfig.java

@@ -0,0 +1,32 @@
+package at.hannibal2.skyhanni.config.features.gui.customscoreboard;
+
+import at.hannibal2.skyhanni.features.gui.customscoreboard.ChunkedStats;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChunkedStatsConfig {
+
+    @Expose
+    @ConfigOption(
+        name = "ChunkedStats",
+        desc = "Select the stats you want to display chunked on the scoreboard."
+    )
+    @ConfigEditorDraggableList
+    public List<ChunkedStats> chunkedStats =  new ArrayList<>(ChunkedStats.getEntries());
+
+    @Expose
+    @ConfigOption(
+        name = "Max Stats per Line",
+        desc = "The maximum amount of stats that will be displayed in one line."
+    )
+    @ConfigEditorSlider(
+        minValue = 1,
+        maxValue = 10,
+        minStep = 1)
+    public int maxStatsPerLine = 3;
+}

src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/CustomLinesConfig.java

@@ -0,0 +1,19 @@
+package at.hannibal2.skyhanni.config.features.gui.customscoreboard;
+
+import at.hannibal2.skyhanni.config.commands.Commands;
+import com.google.gson.annotations.Expose;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText;
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;
+
+public class CustomLinesConfig {
+
+    @ConfigOption(name = "Open Custom Lines GUI", desc = "Open the GUI to edit the custom lines")
+    @ConfigEditorButton(buttonText = "Open")
+    public Runnable open = Commands::openCustomLines;
+
+    @Expose
+    @ConfigOption(name = "Custom Line 1", desc = "Custom line 1")
+    @ConfigEditorText
+    public String customLine1 = "";
+}

src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java

@@ -21,6 +21,16 @@ public class DisplayConfig {
     @Accordion
     public ArrowConfig arrow = new ArrowConfig();
 
+    @Expose
+    @ConfigOption(name = "Chunked Stats Options", desc = "")
+    @Accordion
+    public ChunkedStatsConfig chunkedStats = new ChunkedStatsConfig();
+
+    @Expose
+    @ConfigOption(name = "Custom Lines", desc = "")
+    @Accordion
+    public CustomLinesConfig customLines = new CustomLinesConfig();
+
     @Expose
     @ConfigOption(name = "Events Options", desc = "")
     @Accordion
@@ -46,17 +56,16 @@ public class DisplayConfig {
     @Accordion
     public TitleAndFooterConfig titleAndFooter = new TitleAndFooterConfig();
 
-
     @Expose
     @ConfigOption(name = "Hide Vanilla Scoreboard", desc = "Hide the vanilla scoreboard." +
-        "\n§cUsing mods that add their own scoreboard will not be affected by this setting!")
+            "\n§cUsing mods that add their own scoreboard will not be affected by this setting!")
     @ConfigEditorBoolean
     @FeatureToggle
     public Property<Boolean> hideVanillaScoreboard = Property.of(true);
 
     @Expose
     @ConfigOption(name = "Display Numbers First", desc = "Determines whether the number or line name displays first. " +
-        "§eNote: Will not update the preview above!")
+            "§eNote: Will not update the preview above!")
     @ConfigEditorBoolean
     public boolean displayNumbersFirst = false;
 
@@ -97,8 +106,7 @@ public String toString() {
     public int lineSpacing = 10;
 
     @Expose
-    @ConfigOption(name = "Cache Scoreboard on Island Switch",
-        desc = "Will stop the Scoreboard from updating while switching islands.\nRemoves the shaking when loading data.")
+    @ConfigOption(name = "Cache Scoreboard on Island Switch", desc = "Will stop the Scoreboard from updating while switching islands.\nRemoves the shaking when loading data.")
     @ConfigEditorBoolean
     public boolean cacheScoreboardOnIslandSwitch = false;
 }

src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java

@@ -107,11 +107,10 @@ public class InventoryConfig {
     @ConfigOption(name = "Item Number", desc = "Showing the item number as a stack size for these items.")
     @ConfigEditorDraggableList
     public List<ItemNumberEntry> itemNumberAsStackSize = new ArrayList<>(Arrays.asList(
-        NEW_YEAR_CAKE,
-        RANCHERS_BOOTS_SPEED,
-        LARVA_HOOK,
-        VACUUM_GARDEN
-    ));
+            NEW_YEAR_CAKE,
+            RANCHERS_BOOTS_SPEED,
+            LARVA_HOOK,
+            VACUUM_GARDEN));
 
     public enum ItemNumberEntry implements HasLegacyId {
         MASTER_STAR_TIER("§bMaster Star Tier", 0),
@@ -170,11 +169,10 @@ public String toString() {
     public boolean vacuumBagCap = true;
 
     @Expose
-    @ConfigOption(name = "Quick Craft Confirmation",
-        desc = "Require Ctrl+Click to craft items that aren't often quick crafted " +
-        "(e.g. armor, weapons, accessories). " +
-            "Sack items can be crafted normally."
-    )
+    @ConfigOption(name = "Quick Craft Confirmation", desc = "Require Ctrl+Click to craft items that aren't often quick crafted "
+            +
+            "(e.g. armor, weapons, accessories). " +
+            "Sack items can be crafted normally.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean quickCraftingConfirmation = false;
@@ -199,14 +197,16 @@ public String toString() {
 
     @Expose
     @ConfigOption(name = "Missing Tasks", desc = "Highlight missing tasks in the SkyBlock Level Guide inventory.")
-    // TODO move( , "inventory.highlightMissingSkyBlockLevelGuide", "inventory.skyblockGuideConfig.highlightMissingSkyBlockLevelGuide")
+    // TODO move( , "inventory.highlightMissingSkyBlockLevelGuide",
+    // "inventory.skyblockGuideConfig.highlightMissingSkyBlockLevelGuide")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean highlightMissingSkyBlockLevelGuide = true;
 
     @Expose
     @ConfigOption(name = "Power Stone Guide", desc = "Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the items in the Power Stone Guide.")
-    // TODO move( , "inventory.powerStoneGuide", "inventory.skyblockGuideConfig.powerStoneGuide")
+    // TODO move( , "inventory.powerStoneGuide",
+    // "inventory.skyblockGuideConfig.powerStoneGuide")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean powerStoneGuide = true;