From 684583c19b32b6563a6843329daba3d7aa1e3e05 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 3 Aug 2024 11:45:50 -0700
Subject: [PATCH] remove msg about in development skills

---
 Changelog.txt                                               | 6 ++++++
 pom.xml                                                     | 2 +-
 .../com/gmail/nossr50/commands/skills/CrossbowsCommand.java | 2 --
 .../com/gmail/nossr50/commands/skills/MacesCommand.java     | 2 --
 .../com/gmail/nossr50/commands/skills/TridentsCommand.java  | 1 -
 .../gmail/nossr50/config/skills/salvage/SalvageConfig.java  | 6 +++++-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 78c9e1142..739016d50 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,9 @@
+Version 2.2.019
+    Maces, Crossbows, and Tridents skill commands don't warn you that they are work in progress anymore.
+
+    NOTES:
+    Maces, Crossbows, and Tridents are still in development, the change to remove that info from the skill command was to reduce the visual noise.
+    I think at this point users will get it, they are still going to have changes, you don't need to see that message everytime you use the skill command.
 Version 2.2.018
     Fixed a probability bug where certain skills would max out in chance to succeed well before they were supposed to (such as Dodge)
     Blast Mining will no longer drop mob spawners (see notes)
diff --git a/pom.xml b/pom.xml
index 8d13c9e10..d67a3afdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.018</version>
+    <version>2.2.019-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
index e5f78ac91..9377e595a 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
@@ -59,8 +59,6 @@ public class CrossbowsCommand extends SkillCommand {
                     String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, CROSSBOWS_CROSSBOWS_LIMIT_BREAK, 1000))));
         }
 
-        messages.add(ChatColor.GRAY + "The Crossbows skill is a work in progress and is still being developed, feedback would be appreciated in the mcMMO discord server.");
-
         return messages;
     }
 
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java
index 71c553fc9..813497dfe 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MacesCommand.java
@@ -65,8 +65,6 @@ public class MacesCommand extends SkillCommand {
                     String.valueOf(mmoPlayer.getMacesManager().getCrushDamage())));
         }
 
-        messages.add(ChatColor.GRAY + "The Maces skill is a work in progress and is still being developed," +
-                " feedback would be appreciated in the mcMMO discord server.");
         return messages;
     }
 
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
index 21d37eb7e..fe1130c7a 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
@@ -41,7 +41,6 @@ public class TridentsCommand extends SkillCommand {
                     String.valueOf(mmoPlayer.getTridentsManager().impaleDamageBonus())));
         }
 
-        messages.add(ChatColor.GRAY + "The Tridents skill is a work in progress and is still being developed, feedback would be appreciated in the mcMMO discord server.");
         return messages;
     }
 
diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
index fdcdee3f7..dfafa2358 100644
--- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
@@ -18,6 +18,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
+import static com.gmail.nossr50.util.skills.SkillUtils.getRepairAndSalvageQuantities;
+
 public class SalvageConfig extends BukkitConfig {
     private final HashSet<String> notSupported;
     private Set<Salvageable> salvageables;
@@ -143,7 +145,9 @@ public class SalvageConfig extends BukkitConfig {
             }
 
             // Maximum Quantity
-            int maximumQuantity = (itemMaterial != null ? SkillUtils.getRepairAndSalvageQuantities(itemMaterial, salvageMaterial) : config.getInt("Salvageables." + key + ".MaximumQuantity", 1));
+            int maximumQuantity = itemMaterial != null
+                    ? getRepairAndSalvageQuantities(itemMaterial, salvageMaterial)
+                    : config.getInt("Salvageables." + key + ".MaximumQuantity", 1);
 
             if (maximumQuantity <= 0 && itemMaterial != null) {
                 maximumQuantity = config.getInt("Salvageables." + key + ".MaximumQuantity", 1);