Customscoreboard

CHANGELOG.md

@@ -18,7 +18,7 @@
 + Added Sea Creature Tracker. - hannibal2
     + Allows to only show single variants, e.g. water or lava or winter.
 
-### Changed
+### Changes
 
 #### Garden Changes
 
@@ -42,6 +42,10 @@
 
 + Odger highlight feature tells in description that it is only useful for users without abiphone. - hannibal2
 
+#### Mining Changes
+
++ Show Powder Tracker immediately after joining the Crystal Hollows. - hannibal2
+
 #### Bingo Changes
 
 + Show the guide text when hovering over the missing bingo goal list. - hannibal2
@@ -50,11 +54,16 @@
 
 + Removed flawless gemstones from sack display. - CalMWolfs
     + Hypixel removed them from sacks.
++ Show a warning in Bestiary Display when Overall Progress is not enabled. - HiZe
 
 #### Dungeon Changes
 
 + Changed the description of the Dungeon Chat Filter feature to be more descriptive. - Wambo
 
+#### Chat Changes
+
++ Hide new Fire Sale message format. - Thunderblade73
+
 #### Misc Changes
 
 + Tia Relay Helper: Suggest /togglemusic. - alexia
@@ -67,8 +76,14 @@
 + Fixed progress to maxed milestone appearing twice in the crop milestone menu when having milestone 20. - Empa
 + Fixed max crop milestone display being too long in the crop milestone menu. - obsidian
 + Fixed Mooshroom Cow Perk counter when farming sugar cane/cactus with Mooshroom Cow. - alexia
-+ Show an error message for the commands /shcropsin and /shcroptime if show money per hour display is not loaded. - hannibal2
++ Show an error message for the commands /shcropsin and /shcroptime if show money per hour display is not loaded. -
+  hannibal2
 + Auto-fixing plots marked as pests when killing all pests without SkyHanni earlier. - hannibal2
++ Fixed error message that nearest pests cannot get removed properly. - hannibal2
+
+#### Mining Fixes
+
++ Fixed an error when showing all elements in Powder Tracker. - hannibal2
 
 #### Rift Fixes
 
@@ -88,10 +103,13 @@
 #### Bingo Fixes
 
 + Fixed detecting bingo profile while visiting other players bingo island. - hannibal2
++ Fixed performance issues with Bingo Minion Craft Helper. - hannibal2
++ Fixed Bingo Minion Craft Helper not detecting crafted tier one minion. - hannibal2
 
 #### Misc Fixes
 
 + Maybe fixed Tia Relay Helper. - Thunderblade73
++ Fixed wording in trackers when the item is newly obtained. - hannibal2
 
 ### Technical Changes
 
@@ -103,7 +121,11 @@
 + Added Dark Auction as IslandType and fixed IslandType detection for dungeons. - j10a1n15
 + Modify instead of blocking trophy fishing and sea creature chat messages. - appable
 + Changed regex in case Hypixel changes color codes for island names in the tab list. - Empa
-+ Extract FirstMinionTier logic from the Bingo Minion Craft Helper to better analyze the performance problems some users have. - hannibal2
++ Extract FirstMinionTier logic from the Bingo Minion Craft Helper to better analyze the performance problems some users
+  have. - hannibal2
++ Moving minion craft helper fully over to neu internal names. - hannibal2
++ Added information about trackers to the Discord FAQ. - j10a1n15
++ Defined the way how dependent PRs should be written in contributing.md. - Thunderblade73
 
 ## Version 0.22
 

CONTRIBUTING.md

@@ -43,6 +43,9 @@ Please use a prefix for the name of the PR (E.g. Feature, Fix, Backend, Change).
 
 You can write in the description of the pr the wording for the changelog as well (optional).
 
+If your PR relies on another PR, please include this information at the beginning of the description. Consider using a
+format like "- #821" to illustrate the dependency.
+
 ## Coding Styles and Conventions
 
 - Follow the [Hypixel Rules](https://hypixel.net/rules).

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.4"
+version = "0.23.Beta.5"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt

@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.config.Features
 import at.hannibal2.skyhanni.config.SackData
 import at.hannibal2.skyhanni.config.commands.Commands.init
 import at.hannibal2.skyhanni.data.ActionBarStatsData
+import at.hannibal2.skyhanni.data.BitsAPI
 import at.hannibal2.skyhanni.data.BlockData
 import at.hannibal2.skyhanni.data.ChatManager
 import at.hannibal2.skyhanni.data.CropAccessoryData
@@ -26,13 +27,15 @@ import at.hannibal2.skyhanni.data.ItemClickData
 import at.hannibal2.skyhanni.data.ItemRenderBackground
 import at.hannibal2.skyhanni.data.ItemTipHelper
 import at.hannibal2.skyhanni.data.LocationFixData
-import at.hannibal2.skyhanni.data.MayorElection
+import at.hannibal2.skyhanni.data.MaxwellAPI
+import at.hannibal2.skyhanni.data.MayorAPI
 import at.hannibal2.skyhanni.data.MinecraftData
 import at.hannibal2.skyhanni.data.OtherInventoryData
 import at.hannibal2.skyhanni.data.OwnInventoryData
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.PurseAPI
+import at.hannibal2.skyhanni.data.QuiverAPI
 import at.hannibal2.skyhanni.data.RenderData
 import at.hannibal2.skyhanni.data.SackAPI
 import at.hannibal2.skyhanni.data.ScoreboardData
@@ -257,6 +260,8 @@ import at.hannibal2.skyhanni.features.misc.TpsCounter
 import at.hannibal2.skyhanni.features.misc.compacttablist.AdvancedPlayerList
 import at.hannibal2.skyhanni.features.misc.compacttablist.TabListReader
 import at.hannibal2.skyhanni.features.misc.compacttablist.TabListRenderer
+import at.hannibal2.skyhanni.features.misc.customscoreboard.CustomScoreboard
+import at.hannibal2.skyhanni.features.misc.customscoreboard.ScoreboardPattern
 import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager
 import at.hannibal2.skyhanni.features.misc.items.AuctionHouseCopyUnderbidPrice
 import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
@@ -340,6 +345,7 @@ import at.hannibal2.skyhanni.utils.EntityOutlineRenderer
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging
 import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded
+import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.TabListData
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPatternManager
 import kotlinx.coroutines.CoroutineName
@@ -363,7 +369,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.4",
+    version = "0.23.Beta.5",
 )
 class SkyHanniMod {
     @Mod.EventHandler
@@ -403,7 +409,6 @@ class SkyHanniMod {
         loadModule(GuiEditManager())
         loadModule(UpdateManager)
         loadModule(CropAccessoryData())
-        loadModule(MayorElection())
         loadModule(GardenComposterUpgradesData())
         loadModule(ActionBarStatsData)
         loadModule(GardenCropMilestoneInventory())
@@ -420,6 +425,8 @@ class SkyHanniMod {
         loadModule(BingoCardReader())
         loadModule(GardenBestCropTime())
         loadModule(TrackerManager)
+        loadModule(SkyBlockItemModifierUtils)
+        loadModule(ScoreboardPattern)
 
         // APIs
         loadModule(BazaarApi())
@@ -432,11 +439,15 @@ class SkyHanniMod {
         loadModule(PartyAPI)
         loadModule(GuildAPI)
         loadModule(SlayerAPI)
-        loadModule(PurseAPI())
+        loadModule(PurseAPI)
         loadModule(RiftAPI)
         loadModule(SackAPI)
         loadModule(BingoAPI)
         loadModule(FishingAPI)
+        loadModule(MaxwellAPI)
+        loadModule(QuiverAPI)
+        loadModule(BitsAPI)
+        loadModule(MayorAPI)
 
         // features
         loadModule(BazaarOrderHelper())
@@ -682,6 +693,7 @@ class SkyHanniMod {
         loadModule(DungeonFinderFeatures())
         loadModule(PabloHelper())
         loadModule(FishingBaitWarnings())
+        loadModule(CustomScoreboard())
         loadModule(RepoPatternManager)
         loadModule(PestSpawn())
         loadModule(PestSpawnTimer)

src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt

@@ -9,7 +9,7 @@ import com.google.gson.JsonPrimitive
 
 object ConfigUpdaterMigrator {
     val logger = LorenzLogger("ConfigMigration")
-    const val CONFIG_VERSION = 18
+    const val CONFIG_VERSION = 22
     fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? {
         if (chain.isEmpty()) return this
         if (this !is JsonObject) return null

src/main/java/at/hannibal2/skyhanni/config/Storage.java

@@ -1,5 +1,8 @@
 package at.hannibal2.skyhanni.config;
 
+import at.hannibal2.skyhanni.data.FameRank;
+import at.hannibal2.skyhanni.data.MaxwellPowers;
+import at.hannibal2.skyhanni.data.QuiverArrowType;
 import at.hannibal2.skyhanni.data.model.ComposterUpgrade;
 import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal;
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker;
@@ -118,6 +121,42 @@ public static class ProfileSpecific {
         @Expose
         public String currentPet = "";
 
+        @Expose
+        public MaxwellPowerStorage maxwell = new MaxwellPowerStorage();
+
+        public static class MaxwellPowerStorage {
+            @Expose
+            public MaxwellPowers currentPower = null;
+
+            @Expose
+            public int magicalPower = -1;
+        }
+
+        @Expose
+        public ArrowsStorage arrows = new ArrowsStorage();
+
+        public static class ArrowsStorage {
+            @Expose
+            public QuiverArrowType currentArrow = null;
+
+            @Expose
+            public Map<QuiverArrowType, Float> arrowAmount = new HashMap<>();
+        }
+
+        @Expose
+        public BitsStorage bits = new BitsStorage();
+
+        public static class BitsStorage {
+            @Expose
+            public int bits = -1;
+
+            @Expose
+            public FameRank currentFameRank = null;
+
+            @Expose
+            public int bitsToClaim = -1;
+        }
+
         @Expose
         public Map<LorenzVec, MinionConfig> minions = new HashMap<>();
 

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

@@ -51,6 +51,7 @@ import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
 import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
 import at.hannibal2.skyhanni.test.TestBingo
+import at.hannibal2.skyhanni.test.command.CopyActionBar
 import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyItemCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
@@ -375,6 +376,10 @@ object Commands {
             "shconfigmanagerreset",
             "Reloads the config manager and rendering processors of MoulConfig. This §cWILL RESET §7your config, but also updating the java config files (names, description, orderings and stuff)."
         ) { SkyHanniDebugsAndTests.configManagerResetCommand(it) }
+        registerCommand(
+            "shcopyactionbar",
+            "Copies the actionbar to the clipboard"
+        ) { CopyActionBar.command(it) }
         registerCommand(
             "readcropmilestonefromclipboard",
             "Read crop milestone from clipboard. This helps fixing wrong crop milestone data"

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

@@ -44,6 +44,11 @@ public class DevConfig {
     @ConfigEditorBoolean
     public boolean worldEdit = false;
 
+    @Expose
+    @ConfigOption(name = "Bow Sound distance", desc = "The distance in blocks where the sound of shooting a bow will be used for the QuiverAPI.")
+    @ConfigEditorSlider(minValue = 0, maxValue = 50, minStep = 1)
+    public int bowSoundDistance = 5;
+
     @ConfigOption(name = "Parkour Waypoints", desc = "")
     @Accordion
     @Expose

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

@@ -2,9 +2,11 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
+import at.hannibal2.skyhanni.config.features.gui.customscoreboard.CustomScoreboardConfig;
 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.Category;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorButton;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind;
@@ -28,6 +30,11 @@ public class GUIConfig {
     @ConfigEditorSlider(minValue = 0.1F, maxValue = 10, minStep = 0.05F)
     public float globalScale = 1F;
 
+
+    @Expose
+    @Category(name = "Custom Scoreboard", desc = "Custom Scoreboard Settings")
+    public CustomScoreboardConfig customScoreboard = new CustomScoreboardConfig();
+
     @Expose
     @ConfigOption(name = "Modify Visual Words", desc = "")
     @Accordion

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

@@ -0,0 +1,17 @@
+package at.hannibal2.skyhanni.config.features.gui.customscoreboard;
+
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class AlignmentConfig {
+    @Expose
+    @ConfigOption(name = "Align to the right", desc = "Align the scoreboard to the right side of the screen.")
+    @ConfigEditorBoolean
+    public boolean alignRight = false;
+
+    @Expose
+    @ConfigOption(name = "Align to the center vertically", desc = "Align the scoreboard to the center of the screen vertically.")
+    @ConfigEditorBoolean
+    public boolean alignCenterVertically = false;
+}

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

@@ -0,0 +1,41 @@
+package at.hannibal2.skyhanni.config.features.gui.customscoreboard;
+
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class BackgroundConfig {
+    @Expose
+    @ConfigOption(
+        name = "Enabled",
+        desc = "Show a background behind the scoreboard."
+    )
+    @ConfigEditorBoolean
+    public boolean enabled = true;
+
+    @Expose
+    @ConfigOption(
+        name = "Background Color",
+        desc = "The color of the background."
+    )
+    @ConfigEditorColour
+    public String color = "0:102:0:0:0";
+
+    @Expose
+    @ConfigOption(
+        name = "Use Custom Background Image",
+        desc = "Put that image into a resource pack, using the path \"skyhanni/scoreboard.png\"."
+    )
+    @ConfigEditorBoolean
+    public boolean useCustomBackgroundImage = false;
+
+    @Expose
+    @ConfigOption(
+        name = "Custom Background",
+        desc = "Add an image named \"scoreboard.png\" to your texture pack at \"\\assets\\skyhanni\\scoreboard.png.\" Activate the texture pack in Minecraft, then reload the game."
+    )
+    @ConfigEditorInfoText
+    public String useless;
+}