2.1.226

mcMMO-Dev · Dec 17, 2023 · dd04ee4 · dd04ee4
1 parent 9e1f5b4
commit dd04ee4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 8 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,7 @@
+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
+    Fixed dirt_path and grass_block not being correctly whitelisted as
 Version 2.1.225
     Fixed text from mcMMO not being sent or displayed to the player
     Updated Adventure dependencies

diff --git 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.1.226-SNAPSHOT</version>
+    <version>2.1.226</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
@@ -342,7 +342,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/gmail/nossr50/commands/McImportCommand.java b/src/main/java/com/gmail/nossr50/commands/McImportCommand.java
@@ -204,7 +204,7 @@ private HashMap<String, ArrayList<String>> getConfigSectionsBlocks(String modNam
             else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
                 skillName = "Woodcutting";
             }
-            else if (materialName.contains("GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
+            else if (materialName.contains("GRASS") || materialName.contains("SHORT_GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
                 skillName = "Herbalism";
             }
             else if (materialName.contains("DIRT") || materialName.contains("SAND")) {

diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
@@ -4,6 +4,7 @@
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.datatypes.treasure.HylianTreasure;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.LogUtils;
 import com.gmail.nossr50.util.text.StringUtils;
 import org.bukkit.ChatColor;
@@ -228,7 +229,7 @@ private void loadTreasures(String type) {
                     for (String dropper : dropList) {
                         if (dropper.equals("Bushes")) {
                             AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.FERN), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.TALL_GRASS), hylianTreasure);
+                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(BlockUtils.getShortGrass()), hylianTreasure);
                             for (Material species : Tag.SAPLINGS.getValues())
                                 AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(species), hylianTreasure);
 

diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
@@ -22,6 +22,9 @@
 
 public final class BlockUtils {
 
+    public static final String SHORT_GRASS = "SHORT_GRASS";
+    public static final String GRASS = "GRASS";
+
     private BlockUtils() {
     }
 
@@ -38,6 +41,21 @@ public static void markDropsAsBonus(BlockState blockState, boolean triple) {
             blockState.setMetadata(MetadataConstants.METADATA_KEY_BONUS_DROPS, new BonusDropMeta(1, mcMMO.p));
     }
 
+    /**
+     * Util method for compatibility across Minecraft versions, grabs the {@link Material} enum for short_grass
+     *
+     * @return the {@link Material} enum for short_grass
+     */
+    public static Material getShortGrass() {
+        if (Material.getMaterial(SHORT_GRASS) != null) {
+            return Material.getMaterial(SHORT_GRASS);
+        } else if (Material.getMaterial(GRASS) != null) {
+            return Material.getMaterial(GRASS);
+        } else {
+            throw new UnsupportedOperationException("Unable to find short grass material");
+        }
+    }
+
     /**
      * Set up the state for a block to be seen as unnatural and cleanup any unwanted metadata from the block
      * @param block target block

diff --git a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
@@ -996,8 +996,8 @@ private void fillMultiBlockHangingPlantSet() {
     private void fillShroomyWhiteList()
     {
         canMakeShroomyWhiteList.add("dirt");
-        canMakeShroomyWhiteList.add("grass");
-        canMakeShroomyWhiteList.add("grass_path");
+        canMakeShroomyWhiteList.add("grass_block");
+        canMakeShroomyWhiteList.add("dirt_path");
     }
 
     private void fillBlockCrackerWhiteList()
@@ -1010,8 +1010,8 @@ private void fillBlockCrackerWhiteList()
     private void fillHerbalismAbilityBlackList()
     {
         herbalismAbilityBlackList.add("dirt");
-        herbalismAbilityBlackList.add("grass");
-        herbalismAbilityBlackList.add("grass_path");
+        herbalismAbilityBlackList.add("grass_block");
+        herbalismAbilityBlackList.add("dirt_path");
         herbalismAbilityBlackList.add("farmland");
     }
 

diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
@@ -393,6 +393,7 @@ Experience_Values:
         Rose_Bush: 50
         Fern: 10
         Grass: 10
+        Short_Grass: 10
         Sugar_Cane: 30
         Sunflower: 50
         Tall_Grass: 50