Merge master

mcMMO-Dev · Jan 3, 2024 · 8cc4798 · 8cc4798
2 parents a941a1c + 415e3df
commit 8cc4798
Show file tree

Hide file tree

Showing 6 changed files with 506 additions and 215 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -62,6 +62,16 @@ Version 2.2.000
     New Power Level Command
     This power level command gives you a view of all your current masteries, it also provides a summary of your power level.
 
+Version 2.1.227
+    Fixed bug where some text would not be displayed to players (Adventure dependency update)
+    Repair sound effect from mcMMO can now be adjusted in Minecraft sound options (Thanks MithicSpirit)
+    Korean locale updated (Thanks Pindang2)
+    Simplified Chinese locale updated (Thanks YuanYuanOwO)
+
+    NOTES:
+    For those curious, mcMMO uses Adventure to do a lot of the message sending to players.
+    It typically needs updating when new versions of MC come out, sorry for the delay on my part.
+
 Version 2.1.226
     Added Short_Grass to experience.yml for Herbalism
     Updated Hylian Treasures "Bushes" alias to use short_grass when playing on new Minecraft versions

diff --git a/README.md b/README.md
@@ -11,7 +11,12 @@ Spigot Resource: https://spigot.mcmmo.org
 I plan to post links to our new wiki (its still under development), downloads, and dev blogs there.
 
 ### Builds
-Currently, you can obtain our builds via the Spigot resource page: http://spigot.mcmmo.org
+Currently, you can obtain our builds via the Spigot or Polymart:
+
+
+http://spigot.mcmmo.org
+
+https://polymart.org/resource/mcmmo.727
 
 ### Brief Description
 The goal of mcMMO is to take core Minecraft game mechanics and expand them into an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
@@ -21,26 +26,14 @@ In December 2018, the original author and creator of mcMMO (nossr50) returned an
 #### Project Lead & Founder
 [![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
 
-#### mcMMO Devs
+#### Current mcMMO Devs
 [![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
+
+### Former team members
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
 [![kashike](https://secure.gravatar.com/avatar/b5e86d6d443b957fd5cdee55501f3799.png)](https://github.com/kashike)
 [![electronicboy](https://secure.gravatar.com/avatar/44759c38d311ce09596de6a2d5b88036.png)](https://github.com/electronicboy)
-
-#### Classic Maintainer
 [![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)](https://github.com/t00thpick1)
-
-#### Folia Inquisitors
-[<img src="https://github.com/HSGamer.png" width=80 alt="HSGamer">](https://github.com/HSGamer)
-[<img src="https://github.com/TechnicallyCoded.png" width=80 alt="TechnicallyCoded">](https://github.com/TechnicallyCoded)
-[<img src="https://github.com/Yomamaeatstoes.png" width=80 alt="Yomamaeatstoes">](https://github.com/Yomamaeatstoes)
-[<img src="https://github.com/Rockyers.png" width=80 alt="Rockyers">](https://github.com/Rockyers)
-
-## Former Team Members
-
-### Former Lead & Awesome guy
-[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
-
-### Former team members
 [![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)](https://github.com/bm01)
 [![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)](https://github.com/Glitchfinder)
 [![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)](https://github.com/NuclearW)
@@ -49,20 +42,23 @@ In December 2018, the original author and creator of mcMMO (nossr50) returned an
 [![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)](https://github.com/riking)
 [![TheYeti](https://i.imgur.com/tzFrxdo.png)](https://github.com/TheYeti)
 
-## Compiling
+#### Folia Contributors
+[<img src="https://github.com/HSGamer.png" width=80 alt="HSGamer">](https://github.com/HSGamer)
+[<img src="https://github.com/TechnicallyCoded.png" width=80 alt="TechnicallyCoded">](https://github.com/TechnicallyCoded)
+[<img src="https://github.com/Yomamaeatstoes.png" width=80 alt="Yomamaeatstoes">](https://github.com/Yomamaeatstoes)
+[<img src="https://github.com/Rockyers.png" width=80 alt="Rockyers">](https://github.com/Rockyers)
 
-mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
+## Compiling
 
-The typical command used to build mcMMO is: `mvn clean package install`
+mcMMO uses Maven to manage dependencies, packaging, and shading of necessary classes; Maven is required to compile mcMMO. It is recommended to always use the latest version of maven.
 
-Required Libraries:
-* Spigot
-* JUnit
-* WorldGuard 7
-* bStats Bukkit
+The typical command used to build mcMMO is: `mvn clean install`
 
 https://spigot.mcmmo.org for more up to date information.
 
-Resource Page
+Downloads:
+
+
+https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/
 
-https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/ 
+https://polymart.org/resource/mcmmo.727
diff --git a/pom.xml b/pom.xml
@@ -156,6 +156,7 @@
                             <include>net.kyori:adventure-text-serializer-craftbukkit</include>
                             <include>net.kyori:adventure-text-serializer-gson-legacy-impl</include>
                             <include>net.kyori:adventure-text-serializer-json-legacy-impl</include>
+                            <include>net.kyori:option</include>
                             <include>co.aikar:acf-bukkit</include>
                             <include>com.tcoded:FoliaLib</include>
                         </includes>
@@ -278,62 +279,67 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-bungeecord</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-json</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-json-legacy-impl</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-nbt</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-key</artifactId>
-            <version>4.14.0</version>
+            <version>4.15.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-api</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-facet</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-viaversion</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>option</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>

diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
@@ -21,6 +21,7 @@
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
 import org.bukkit.Material;
+import org.bukkit.SoundCategory;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -55,7 +56,7 @@ public void placedAnvilCheck() {
         }
 
         if (mcMMO.p.getGeneralConfig().getRepairAnvilPlaceSoundsEnabled()) {
-            SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
+            SoundManager.sendCategorizedSound(player, player.getLocation(), SoundType.ANVIL, SoundCategory.BLOCKS);
         }
 
         togglePlacedAnvil();
@@ -158,7 +159,7 @@ public void handleRepair(ItemStack item) {
                 toRemove = possibleMaterial.get().clone();
             }
         }
-        
+
         // Call event
         if (EventUtils.callRepairCheckEvent(player, (short) (startDurability - newDurability), toRemove, item).isCancelled()) {
             return;
@@ -182,8 +183,8 @@ public void handleRepair(ItemStack item) {
 
         // BWONG BWONG BWONG
         if (mcMMO.p.getGeneralConfig().getRepairAnvilUseSoundsEnabled()) {
-            SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
-            SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
+            SoundManager.sendCategorizedSound(player, player.getLocation(), SoundType.ANVIL, SoundCategory.BLOCKS);
+            SoundManager.sendCategorizedSound(player, player.getLocation(), SoundType.ITEM_BREAK, SoundCategory.PLAYERS);
         }
 
         // Repair the item!