Add in new 1.19 stuff and tweak treasures.yml

Changelog.txt

@@ -1,3 +1,33 @@
+Version 2.1.213
+    Updated various mechanics to recognize and understand the new blocks
+    Added 'Packed_Mud' to mining xp
+    Added 'Mud_Bricks' to mining xp
+    Added 'Reinforced_Deepslate' to mining xp
+    Added 'Mud' to excavation xp
+    Added 'Muddy Mangrove Roots' to excavation xp
+    Added 'Mangrove_Roots' to woodcutting xp
+    Added 'Stripped_Mangrove_Log' to woodcutting xp
+    Added 'Stripped_Crimson_Stem' to woodcutting xp
+    Added 'Stripped_Warped_Stem' to woodcutting xp
+    Added 'Allay' to combat experience
+    Added 'Frog' to combat experience and taming experience
+    Added 'Tadpole' to combat experience
+    Added 'Warden' to combat experience
+
+    Changes to excavation treasures (requires manual editing or regenerating the config)
+        Added Mud as a block which can drop various treasures (see notes)
+        Added Muddy_Mangrove_Roots as a block which can drop various treasures (see notes)
+        Added Stick as a new excavation drop, which drops from mud and muddy mangrove roots (see notes)
+        Added Potato as a new excavation drop, which drops from mud and dirt (see notes)
+        Added Feather as a new excavation drop, which drops from mud (see notes)
+        Added Spyglass as a new excavation drop, which drops rarely from mud and dirt (see notes)
+        Added Trident as a new excavation drop, which drops somewhat rarely from mud, muddy mangrove roots, and clay (see notes)
+        Added Heart of the Sea as a new excavation drop, which drops very rarely from mud and requires a very high excavation level to appear
+
+    NOTES:
+    To get the new excavation drop list, the easiest way is to delete treasures.yml and mcMMO will regenerate it with the newest version
+    I'll likely be tweaking the treasures list in the near future, leave feedback on discord if you have suggestions
+
 Version 2.1.212
     An herbalism exploit has been patched (thanks WhatsTheBadNews)
     Added 'ExploitFix.Combat.XPCeiling.Enabled' to experience.yml

src/main/java/com/gmail/nossr50/util/MaterialMapStore.java

@@ -237,6 +237,9 @@ public class MaterialMapStore {
         intendedToolPickAxe.addAll(ores);
 
         intendedToolPickAxe.add("lapis_lazuli_ore");
+        intendedToolPickAxe.add("packed_mud");
+        intendedToolPickAxe.add("mud_bricks");
+        intendedToolPickAxe.add("reinforced_deepslate");
         intendedToolPickAxe.add("ice");
         intendedToolPickAxe.add("packed_ice");
         intendedToolPickAxe.add("blue_ice");
@@ -1021,6 +1024,8 @@ public class MaterialMapStore {
         treeFellerDestructibleWhiteList.add("spruce_leaves");
         treeFellerDestructibleWhiteList.add("azalea_leaves");
         treeFellerDestructibleWhiteList.add("flowering_azalea_leaves");
+        treeFellerDestructibleWhiteList.add("mangrove_leaves");
+        treeFellerDestructibleWhiteList.add("mangrove_roots");
         treeFellerDestructibleWhiteList.add("nether_wart_block");
         treeFellerDestructibleWhiteList.add("warped_wart_block");
         treeFellerDestructibleWhiteList.add("brown_mushroom_block");
@@ -1166,8 +1171,6 @@ public class MaterialMapStore {
     
     private void fillToolBlackList()
     {
-        //TODO: Add anvils / missing logs
-        //TODO: Reorganize this list, can we also dynamically populate some of this?
         toolBlackList.add("black_bed");
         toolBlackList.add("blue_bed");
         toolBlackList.add("brown_bed");
@@ -1276,6 +1279,9 @@ public class MaterialMapStore {
         toolBlackList.add("stripped_oak_wood");
         toolBlackList.add("stripped_spruce_log");
         toolBlackList.add("stripped_spruce_wood");
+        toolBlackList.add("mangrove_wood");
+        toolBlackList.add("mangrove_log");
+        toolBlackList.add("stripped_mangrove_log");
         toolBlackList.add("acacia_log");
         toolBlackList.add("acacia_wood");
         toolBlackList.add("birch_log");

src/main/resources/experience.yml

@@ -264,6 +264,8 @@ Experience_Values:
         Snow_Block: 40
         Soul_Sand: 40
         Soul_Soil: 40
+        Mud: 80
+        Muddy_Mangrove_Roots: 90
     Woodcutting:
         Crimson_Hyphae: 50
         Stripped_Crimson_Hyphae: 50
@@ -292,12 +294,17 @@ Experience_Values:
         Stripped_Jungle_Wood: 100
         Stripped_Acacia_Wood: 90
         Stripped_Dark_Oak_Wood: 90
+        Stripped_Mangrove_Log: 110
+        Stripped_Crimson_Stem: 50
+        Stripped_Warped_Stem: 50
         Oak_Wood: 70
         Spruce_Wood: 70
         Birch_Wood: 70
         Jungle_Wood: 70
         Acacia_Wood: 70
         Dark_Oak_Wood: 70
+        Mangrove_Wood: 80
+        Mangrove_Roots: 10
         Red_Mushroom_Block: 70
         Brown_Mushroom_Block: 70
         Mushroom_Stem: 80
@@ -394,6 +401,7 @@ Experience_Values:
         Lily_Of_The_Valley: 150
         Wither_Rose: 500
     Mining:
+        Reinforced_Deepslate: 500
         Tuff: 10
         Copper_Ore: 1400
         Deepslate_Copper_Ore: 1900
@@ -486,6 +494,8 @@ Experience_Values:
         Purpur_Pillar: 250
         Purpur_Slab: 150
         Purpur_Stairs: 250
+        Packed_Mud: 30
+        Mud_Bricks: 40
     Repair:
         Base: 1000.0
         Wood: 0.6
@@ -539,6 +549,7 @@ Experience_Values:
             Bee: 100
             Goat: 250
             Axolotl: 600
+            Frog: 900
     Combat:
         Multiplier:
             Animals: 1.0
@@ -611,3 +622,7 @@ Experience_Values:
             Goat: 1.5
             Axolotl: 1.75
             Glow_Squid: 1.5
+            Allay: 0.2
+            Frog: 1.7
+            Warden: 6.0
+            Tadpole: 0.2

src/main/resources/treasures.yml

@@ -2,6 +2,54 @@
 #  Settings for Excavation's Archaeology
 ###
 Excavation:
+    HEART_OF_THE_SEA:
+        Amount: 1
+        XP: 9999
+        Drop_Chance: 0.01
+        Level_Requirement:
+            Standard_Mode: 90
+            Retro_Mode: 900
+        Drops_From: [Mud]
+    POTATO:
+        Amount: 1
+        XP: 50
+        Drop_Chance: 3.0
+        Level_Requirement:
+            Standard_Mode: 10
+            Retro_Mode: 100
+        Drops_From: [Dirt, Mud]
+    SPYGLASS:
+        Amount: 1
+        XP: 500
+        Drop_Chance: 0.1
+        Level_Requirement:
+            Standard_Mode: 7
+            Retro_Mode: 70
+        Drops_From: [Mud, Dirt]
+    STICK:
+        Amount: 2
+        XP: 50
+        Drop_Chance: 2.0
+        Level_Requirement:
+            Standard_Mode: 1
+            Retro_Mode: 10
+        Drops_From: [Mud, Muddy_Mangrove_Roots]
+    FEATHER:
+        Amount: 3
+        XP: 100
+        Drop_Chance: 1.0
+        Level_Requirement:
+            Standard_Mode: 5
+            Retro_Mode: 50
+        Drops_From: [Mud]
+    TRIDENT:
+        Amount: 1
+        XP: 100
+        Drop_Chance: 0.02
+        Level_Requirement:
+            Standard_Mode: 40
+            Retro_Mode: 400
+        Drops_From: [ Mud, Clay, Muddy_Mangrove_Roots ]
     CAKE:
         Amount: 1
         XP: 3000
@@ -25,7 +73,7 @@ Excavation:
         Level_Requirement:
             Standard_Mode: 20
             Retro_Mode: 200
-        Drops_From: [Gravel]
+        Drops_From: [Gravel, Mud]
     APPLE:
         Amount: 1
         XP: 100
@@ -65,7 +113,7 @@ Excavation:
         Level_Requirement:
             Standard_Mode: 50
             Retro_Mode: 500
-        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium]
+        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium, Mud]
     BROWN_MUSHROOM:
         Amount: 1
         XP: 80
@@ -73,7 +121,7 @@ Excavation:
         Level_Requirement:
             Standard_Mode: 50
             Retro_Mode: 500
-        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium]
+        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium, Mud]
     EGG:
         Amount: 1
         XP: 100
@@ -145,7 +193,7 @@ Excavation:
         Level_Requirement:
             Standard_Mode: 35
             Retro_Mode: 350
-        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand, Soul_Soil]
+        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand, Soul_Soil, Mud]
     COCOA_BEANS:
         Amount: 1
         XP: 100
@@ -153,7 +201,7 @@ Excavation:
         Level_Requirement:
             Standard_Mode: 35
             Retro_Mode: 350
-        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium]
+        Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Mycelium, Mud]
     QUARTZ:
         Amount: 1
         XP: 100
@@ -170,6 +218,7 @@ Excavation:
             Standard_Mode: 25
             Retro_Mode: 250
         Drops_From: [Dirt, Coarse_Dirt, Podzol, Grass_Block, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand, Soul_Soil]
+
 #
 #  Settings for Hylian Luck
 #  If you are in retro mode, Level_Requirement is multiplied by 10.