add relevant herbalism stuff for next MC update

mcMMO-Dev · Nov 27, 2024 · 02d9780 · 02d9780
1 parent 16d5d9f
commit 02d9780
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,10 +1,15 @@
 Version 2.2.029
     Fixed bug where block checks at world height would throw IndexOutOfBounds exceptions
     Added misc compatability for the "The Garden Awakens" Minecraft Update
-    Added Pale_Oak_Log to experience.yml for Woodcutting
-    Added Pale_Oak_Wood to experience.yml for Woodcutting
-    Added Stripped_Pale_Oak_Log to experience.yml for Woodcutting
-    Added Stripped_Pale_Oak_Wood to experience.yml for Woodcutting
+    Added Eyeblossom to experience.yml for Herbalism xp
+    Added Bonus_Drops.Herbalism.Eyeblossom to config.yml to enable double/triple drops for Eyeblossom
+    Added Pale_Hanging_Moss to experience.yml for Herbalism xp
+    Added Pale_Moss_Block to experience.yml for Herbalism xp
+    Added Pale_Moss_Carpet to experience.yml for Herbalism xp
+    Added Pale_Oak_Log to experience.yml for Woodcutting xp
+    Added Pale_Oak_Wood to experience.yml for Woodcutting xp
+    Added Stripped_Pale_Oak_Log to experience.yml for Woodcutting xp
+    Added Stripped_Pale_Oak_Wood to experience.yml for Woodcutting xp
     Added Bonus_Drops.Woodcutting.Pale_Oak_Wood to config.yml to enable double/triple drops for Pale Oak Wood
     Added Bonus_Drops.Woodcutting.Pale_Oak_Log to config.yml to enable double/triple drops for Pale Oak Log
     Temporarily disabled the party item share functionality until it is fixed or potentially removed (see notes)

diff --git a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
@@ -1018,6 +1018,7 @@ private void fillMultiBlockHangingPlantSet() {
         multiBlockHangingPlant.add("weeping_vines_plant");
         multiBlockHangingPlant.add("twisted_vines_plant");
         multiBlockHangingPlant.add("cave_vines_plant");
+        multiBlockHangingPlant.add("pale_hanging_moss");
     }
 
     private void fillShroomyWhiteList() {

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -483,6 +483,7 @@ Green_Thumb_Replanting_Crops:
 ###
 Bonus_Drops:
     Herbalism:
+        Eyeblossom: true
         Pitcher_Plant: true
         Torchflower: true
         Pink_Petals: true

diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
@@ -330,12 +330,16 @@ Experience_Values:
         Brown_Mushroom_Block: 70
         Mushroom_Stem: 80
     Herbalism:
+        Eyeblossom: 66
         Pitcher_Plant: 160
         Pink_Petals: 10
         Small_Dripleaf: 140
         Big_Dripleaf: 140
         Cave_Vines: 90
         Cave_Vines_Plant: 90
+        Pale_Hanging_Moss: 150
+        Pale_Moss_Block: 10
+        Pale_Moss_Carpet: 10
         Glow_Lichen: 5
         Moss_Block: 150
         Crimson_Roots: 6