Merge branch 'beta' into chroma-ignore-chat

FEATURES.md

@@ -224,6 +224,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Display the Hypixel timer until the fishing hook can be pulled out of the water/lava, only bigger and on your
       screen.
 + Alerts when the player catches a Legendary Sea Creature. - Cad
++ **Fishing Bait Warnings.** - cimbraien
+    + Option to warn when no bait is used.
+    + Option to warn when used bait is changed.
+
 </details>
 <details open><summary>
 
@@ -484,6 +488,13 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highlights Visitors outside the Garden.
 + Block Interacting with Visitors. - nea
     + Blocks you from interacting with / unlocking Visitors to allow for Dedication Cycling.
++ Wrong crop milestone step detection. - hannibal2
+    + When opening the crop milestone menu, a chat message is sent if Hypixel's crops per milestone level data is
+      different from SkyHanni's.
+    + You can use this to share your hypixel data with SkyHanni via the discord.
+    + This will allow us to fix the crop milestone features quicker, as we currently do not have accurate data for this.
+    + If you don't want to share anything, you can disable the chat message in the config with /sh copy milestone data.
+
 </details>
 <details open><summary>
 
@@ -630,6 +641,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Quest Item Helper. (Crimson Isle) - NetheriteMiner
     + When you open the fetch item quest in the town board, it shows a clickable chat message that will grab the items
       needed from the sacks.
++ Crimson Isle **Pablo NPC Helper**. - NetheriteMiner
+    + Similar to Quest Item Helper, shows a clickable message that grabs the flower needed from sacks.
 + Red Scoreboard Numbers - Hides the red numbers in the scoreboard sidebar on the right side of the screen.
 + **Tia Relay Waypoint** - Show the next Relay waypoint for Tia The Fairy, where maintenance for the abiphone network
   needs to be done.

README.md

@@ -1,3 +1,5 @@
+
+
 <h1 align = "center">
 	SkyHanni: Mod for Hypixel SkyBlock
 </h1>
@@ -24,4 +26,6 @@ For bug reports, feature requests, and other feedback, please visit
 our [Discord](https://discord.gg/skyhanni-997079228510117908).
 
 If you are interested in the technical side of SkyHanni, read
-the [Contributing Guide](https://github.com/hannibal002/SkyHanni/blob/beta/CONTRIBUTING.md).
+the [Contributing Guide](https://github.com/hannibal002/SkyHanni/blob/beta/CONTRIBUTING.md).
+
+*Check out some other really cool 1.8.9 mods [here](https://sbmw.ca/mod-lists/skyblock-mod-list/)*

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.21.Beta.18"
+version = "0.21.1"
 
 // Toolchains:
 java {
@@ -81,7 +81,7 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-alpha22:all") {
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -93,7 +93,7 @@ dependencies {
     shadowImpl("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
 
 //    testImplementation(kotlin("test"))
-    testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-alpha22:all") {
+    testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -188,7 +188,7 @@ tasks.shadowJar {
         }
     }
     exclude("META-INF/versions/**")
-
+    mergeServiceFiles()
     relocate("io.github.moulberry.moulconfig", "at.hannibal2.skyhanni.deps.moulconfig")
     relocate("moe.nea.libautoupdate", "at.hannibal2.skyhanni.deps.libautoupdate")
 }

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 libautoupdate = "1.0.3"
-moulconfig = "1.3.0"
+moulconfig = "2.4.3"
 
 [libraries]
-moulconfig = { module = "org.notenoughupdates.moulconfig:MoulConfig", version.ref = "moulconfig" }
+moulconfig = { module = "org.notenoughupdates.moulconfig:legacy", version.ref = "moulconfig" }
 libautoupdate = { module = "moe.nea:libautoupdate", version.ref = "libautoupdate" }

src/main/java/SkyHanniInstallerFrame.java

@@ -166,8 +166,8 @@ private JLabel getPictureLabel() {
                 margin = 5;
 
                 BufferedImage myPicture = ImageIO.read(Objects.requireNonNull(getClass()
-                        .getClassLoader()
-                        .getResourceAsStream("assets/skyhanni/logo.png"), "Logo not found."));
+                    .getClassLoader()
+                    .getResourceAsStream("assets/skyhanni/logo.png"), "Logo not found."));
                 Image scaled = myPicture.getScaledInstance(w - margin * 2, h - margin, Image.SCALE_SMOOTH);
                 logo = new JLabel(new ImageIcon(scaled));
                 logo.setName("Logo");
@@ -222,8 +222,8 @@ private JTextArea getTextArea() {
                 descriptionText.setOpaque(false);
                 descriptionText.setPreferredSize(new Dimension(w - margin * 2, h - margin));
                 descriptionText.setText(
-                        "This installer will copy SkyHanni into your forge mods folder for you, and replace any old versions that already exist. " +
-                                "Close this if you prefer to do this yourself!");
+                    "This installer will copy SkyHanni into your forge mods folder for you, and replace any old versions that already exist. " +
+                        "Close this if you prefer to do this yourself!");
                 descriptionText.setWrapStyleWord(true);
 
                 y += h;
@@ -251,7 +251,7 @@ private JTextArea getForgeTextArea() {
                 forgeDescriptionText.setOpaque(false);
                 forgeDescriptionText.setPreferredSize(new Dimension(w - margin * 2, h - margin));
                 forgeDescriptionText.setText(
-                        "However, you still need to install Forge client in order to be able to run this mod. Click here to visit the download page for Forge 1.8.9!");
+                    "However, you still need to install Forge client in order to be able to run this mod. Click here to visit the download page for Forge 1.8.9!");
                 forgeDescriptionText.setForeground(Color.BLUE.darker());
                 forgeDescriptionText.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                 forgeDescriptionText.setWrapStyleWord(true);
@@ -315,8 +315,8 @@ private JButton getButtonFolder() {
 
             try {
                 BufferedImage myPicture = ImageIO.read(Objects.requireNonNull(getClass()
-                        .getClassLoader()
-                        .getResourceAsStream("assets/skyhanni/folder.png"), "Folder icon not found."));
+                    .getClassLoader()
+                    .getResourceAsStream("assets/skyhanni/folder.png"), "Folder icon not found."));
                 Image scaled = myPicture.getScaledInstance(w - 8, h - 6, Image.SCALE_SMOOTH);
                 buttonChooseFolder = new JButton(new ImageIcon(scaled));
                 buttonChooseFolder.setName("ButtonFolder");
@@ -430,7 +430,7 @@ public void mouseClicked(MouseEvent e) {
         if (e.getSource() == getForgeTextArea()) {
             try {
                 Desktop.getDesktop().browse(new URI(
-                        "http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
+                    "http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
             } catch (IOException | URISyntaxException ex) {
                 showErrorPopup(ex);
             }
@@ -519,10 +519,10 @@ private boolean findSkyHanniAndDelete(File[] files) {
                             } catch (Exception ex) {
                                 ex.printStackTrace();
                                 showErrorMessage("Was not able to delete the other SkyHanni files found in your mods folder!" +
-                                        System.lineSeparator() +
-                                        "Please make sure that your minecraft is currently closed and try again, or feel" +
-                                        System.lineSeparator() +
-                                        "free to open your mods folder and delete those files manually.");
+                                    System.lineSeparator() +
+                                    "Please make sure that your minecraft is currently closed and try again, or feel" +
+                                    System.lineSeparator() +
+                                    "free to open your mods folder and delete those files manually.");
                                 return true;
                             }
                             continue;
@@ -667,10 +667,10 @@ private String getModIDFromInputStream(InputStream inputStream) {
     private File getThisFile() {
         try {
             return new File(SkyHanniInstallerFrame.class
-                    .getProtectionDomain()
-                    .getCodeSource()
-                    .getLocation()
-                    .toURI());
+                .getProtectionDomain()
+                .getCodeSource()
+                .getLocation()
+                .toURI());
         } catch (URISyntaxException ex) {
             showErrorPopup(ex);
         }
@@ -700,4 +700,4 @@ public enum OperatingSystem {
         MACOS,
         UNKNOWN
     }
-}
+}