WIP 1.20.6 support

src/main/resources/experience.yml

@@ -1,13 +1,3 @@
-#
-#  Experience configuration
-#  Last updated on ${project.version}-b${BUILD_NUMBER}
-#
-#  Configure the experience formula and experience settings here.
-#
-#####
-
-
-
 # https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarColor.html
 # These are the only valid colors for Experience Bars, use the exact name found here
 # BLUE, GREEN, PINK, PURPLE, RED, WHITE, YELLOW (As of the time of this update these are the only Bar colors available, this could change in the future so check the BarColor enum to see if it has)
@@ -48,7 +38,7 @@ Fishing_ExploitFix_Options:
     MoveRange: 3
     OverFishLimit: 10
 Experience_Bars:
-    # Turn this to false if you wanna disable XP bars
+    # Turn this to false if you want to disable XP bars
     Enable: true
     Update:
         # XP that you gained from your party but not yourself
@@ -98,6 +88,10 @@ Experience_Bars:
         Enable: true
         Color: YELLOW
         BarStyle: SEGMENTED_6
+    Maces:
+        Enable: true
+        Color: BLUE
+        BarStyle: SEGMENTED_6
     Repair:
         Enable: true
         Color: PURPLE
@@ -170,6 +164,7 @@ Experience_Formula:
 
     # Experience gained will get multiplied by these values. 1.0 by default, 0.5 means half XP gained. This happens right before multiplying the XP by the global multiplier.
     Skill_Multiplier:
+        Maces: 1.0
         Crossbows: 1.0
         Tridents: 1.0
         Swords: 1.0
@@ -217,6 +212,9 @@ Diminished_Returns:
         Repair: 20000
         Fishing: 20000
         Alchemy: 20000
+        Crossbows: 20000
+        Tridents: 20000
+        Maces: 20000
 
     Time_Interval: 10
 

src/main/resources/locale/locale_en_US.properties

@@ -1,3 +1,4 @@
+Placeholder= This value is for any WIP locale entries that will not be displayed to users
 JSON.Rank=Rank
 JSON.DescriptionHeader=Description:
 JSON.JWrapper.Header=Details
@@ -26,6 +27,7 @@ JSON.Salvage=Salvage
 JSON.Swords=Swords
 JSON.Taming=Taming
 JSON.Tridents=Tridents
+JSON.Maces=Maces
 JSON.Unarmed=Unarmed
 JSON.Woodcutting=Woodcutting
 JSON.URL.Website=The official mcMMO Website!
@@ -96,6 +98,7 @@ Overhaul.Name.Smelting=Smelting
 Overhaul.Name.Swords=Swords
 Overhaul.Name.Taming=Taming
 Overhaul.Name.Tridents=Tridents
+Overhaul.Name.Maces=Maces
 Overhaul.Name.Unarmed=Unarmed
 Overhaul.Name.Woodcutting=Woodcutting
 # /mcMMO Command Style Stuff
@@ -122,6 +125,7 @@ XPBar.Smelting=Smelting Lv.&6{0}
 XPBar.Swords=Swords Lv.&6{0}
 XPBar.Taming=Taming Lv.&6{0}
 XPBar.Tridents=Tridents Lv.&6{0}
+XPBar.Maces=Maces Lv.&6{0}
 XPBar.Unarmed=Unarmed Lv.&6{0}
 XPBar.Woodcutting=Woodcutting Lv.&6{0}
 #This is just a preset template that gets used if the 'ExtraDetails' setting is turned on in experience.yml (off by default), you can ignore this template and just edit the strings above
@@ -457,9 +461,6 @@ Tridents.Listener=Tridents:
 Maces.SkillName=MACES
 Maces.Ability.Lower=&7You lower your mace.
 Maces.Ability.Ready=&3You &6ready&3 your Mace.
-Maces.Skills.MaceSmash.Refresh=&aYour &eGiga Smash &aability is refreshed!
-Maces.Skills.MaceSmash.Other.On=&a{0}&2 used &cGiga Smash!
-Maces.SubSkill.GigaSmash.Name=Giga Smash
 Maces.SubSkill.MacesLimitBreak.Name=Maces Limit Break
 Maces.SubSkill.MacesLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether it will boost damage in PVE.
 Maces.SubSkill.MacesLimitBreak.Stat=Limit Break Max DMG

src/main/resources/plugin.yml

@@ -154,6 +154,9 @@ commands:
     salvage:
         description: Detailed mcMMO skill info
         permission: mcmmo.commands.salvage
+    maces:
+        description: Detailed mcMMO skill info
+        permission: mcmmo.commands.maces
     mmopower:
         description: Shows skill mastery and power level info
         permission: mcmmo.commands.mmopower

src/main/resources/skillranks.yml

@@ -443,6 +443,30 @@ Salvage:
             Rank_6: 750
             Rank_7: 850
             Rank_8: 1000
+Maces:
+    TridentsLimitBreak:
+        Standard:
+            Rank_1: 10
+            Rank_2: 20
+            Rank_3: 30
+            Rank_4: 40
+            Rank_5: 50
+            Rank_6: 60
+            Rank_7: 70
+            Rank_8: 80
+            Rank_9: 90
+            Rank_10: 100
+        RetroMode:
+            Rank_1: 100
+            Rank_2: 200
+            Rank_3: 300
+            Rank_4: 400
+            Rank_5: 500
+            Rank_6: 600
+            Rank_7: 700
+            Rank_8: 800
+            Rank_9: 900
+            Rank_10: 1000
 Mining:
     MotherLode:
         Standard: