Add more support for 1.17 (mining related)

Changelog.txt

@@ -4,10 +4,10 @@ Version 2.1.197
     Players are no longer launched from Minecarts when using a Fishing Rod (they are still dismounted) thanks lexikiq
     Updated Japanese locale (thanks ViaSnake)
     Updated Brazil Portuguese (pt_BR) locale (thanks Paulo Guilherme)
-    Added Goat to experience.yml
+    Added Goat to experience.yml for combat and taming
-    Added Axolotl to experience.yml
+    Added Axolotl to experience.yml for combat and taming
-    Added Glow_Squid to experience.yml
+    Added Glow_Squid to experience.yml for combat and taming
-    Updated Super Breaker to recognize the new mining blocks
+    Updated Super Breaker to recognize the new pick-axe appropriate blocks
 
     Added Calcite to experience.yml for Mining
     Added Smooth Basalt to experience.yml for Mining
@@ -19,6 +19,16 @@ Version 2.1.197
     Added Amethyst Cluster to experience.yml for Mining
     Added Deepslate to experience.yml for Mining
     Added Cobbled Deepslate to experience.yml for Mining
+    Added Copper Ore to experience.yml for Mining
+    Added Deepslate Redstone Ore to experience.yml for Mining
+    Added Deepslate Copper Ore to experience.yml for Mining
+    Added Deepslate Coal Ore to experience.yml for Mining
+    Added Deepslate Diamond Ore to experience.yml for Mining
+    Added Deepslate Emerald Ore to experience.yml for Mining
+    Added Deepslate Iron Ore to experience.yml for Mining
+    Added Deepslate Gold Ore to experience.yml for Mining
+    Added Deepslate Lapis Lazuli Ore to experience.yml for Mining
+    Added Lapis Lazuli Ore to experience.yml for Mining (was missing)
 
     Added Amethyst Shard to Bonus Drops for Mining in config.yml
     Added Calcite to Bonus Drops for Mining in config.yml
@@ -34,14 +44,35 @@ Version 2.1.197
     Added Raw Iron to Bonus Drops for Mining in config.yml
     Added Raw Gold to Bonus Drops for Mining in config.yml
     Added Raw Copper to Bonus Drops for Mining in config.yml
+    Added Copper Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Redstone Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Copper Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Coal Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Diamond Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Emerald Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Iron Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Gold Ore to Bonus Drops for Mining in config.yml
+    Added Deepslate Lapis Lazuli Ore to Bonus Drops for Mining in config.yml
+    Added Lapis Lazuli Ore to Bonus Drops for Mining in config.yml (was missing)
 
     Added Cobbled Deepslate to experience.yml for Smelting
     Added Raw Copper to experience.yml for Smelting
     Added Raw Iron to experience.yml for Smelting
     Added Raw Gold to experience.yml for Smelting
+    Added Copper Ore to experience.yml for Smelting
+    Added Deepslate Redstone Ore to experience.yml for Smelting
+    Added Deepslate Copper Ore to experience.yml for Smelting
+    Added Deepslate Coal Ore to experience.yml for Smelting
+    Added Deepslate Diamond Ore to experience.yml for Smelting
+    Added Deepslate Emerald Ore to experience.yml for Smelting
+    Added Deepslate Iron Ore to experience.yml for Smelting
+    Added Deepslate Gold Ore to experience.yml for Smelting
+    Added Deepslate Lapis Lazuli Ore to experience.yml for Smelting
+    Added Lapis Lazuli Ore to experience.yml for Smelting (was missing)
 
     NOTES:
     You shouldn't need to edit your configs for this update, your configs should update automatically.
+    Expect some patches following this update for Axolotl and other new entities, waiting on the Spigot API to become available
     If you run into any issues with ViaVersion or ViaBackwards, use the latest dev builds for each.
 
 Version 2.1.196

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

@@ -206,16 +206,29 @@ public class MaterialMapStore {
         ores.add("gold_ore");
         ores.add("iron_ore");
         ores.add("lapis_ore");
+        ores.add("lapis_lazuli_ore");
         ores.add("redstone_ore");
         ores.add("emerald_ore");
         ores.add("ancient_debris");
         ores.add("nether_gold_ore");
         ores.add("gilded_blackstone");
+
+        //1.17 Mining Ore Blocks
+        ores.add("deepslate_redstone_ore");
+        ores.add("deepslate_copper_ore");
+        ores.add("deepslate_coal_ore");
+        ores.add("deepslate_diamond_ore");
+        ores.add("deepslate_emerald_ore");
+        ores.add("deepslate_iron_ore");
+        ores.add("deepslate_gold_ore");
+        ores.add("deepslate_lapis_lazuli_ore");
+        ores.add("copper_ore");
     }
 
     private void fillIntendedTools() {
         intendedToolPickAxe.addAll(ores);
 
+        intendedToolPickAxe.add("lapis_lazuli_ore");
         intendedToolPickAxe.add("ice");
         intendedToolPickAxe.add("packed_ice");
         intendedToolPickAxe.add("blue_ice");
@@ -391,7 +404,7 @@ public class MaterialMapStore {
         intendedToolPickAxe.add("waxed_cut_copper_stairs");
         intendedToolPickAxe.add("waxed_lightly_weathered_cut_copper_stairs");
 
-        //1.17
+        //1.17 Mining (non-ores)
         intendedToolPickAxe.add("calcite");
         intendedToolPickAxe.add("smooth_basalt");
         intendedToolPickAxe.add("block_of_amethyst");
@@ -402,7 +415,6 @@ public class MaterialMapStore {
         intendedToolPickAxe.add("budding_amethyst");
         intendedToolPickAxe.add("deepslate");
         intendedToolPickAxe.add("cobbled_deepslate");
-
     }
 
     private void fillArmors() {

src/main/resources/config.yml

@@ -513,6 +513,16 @@ Bonus_Drops:
         Peony: true
         Lily_Of_The_Valley: true
     Mining:
+        Deepslate_Redstone_Ore: true
+        Deepslate_Copper_Ore: true
+        Deepslate_Coal_Ore: true
+        Deepslate_Diamond_Ore: true
+        Deepslate_Emerald_Ore: true
+        Deepslate_Iron_Ore: true
+        Deepslate_Gold_Ore: true
+        Deepslate_Lapis_Lazuli_Ore: true
+        Lapis_Lazuli_Ore: true
+        Copper_Ore: true
         Calcite: true
         Smooth_Basalt: true
         Block_Of_Amethyst: true

src/main/resources/experience.yml

@@ -380,6 +380,8 @@ Experience_Values:
         Lily_Of_The_Valley: 150
         Wither_Rose: 500
     Mining:
+        Copper_Ore: 1400
+        Deepslate_Copper_Ore: 1900
         Deepslate: 30
         Cobbled_Deepslate: 15
         Calcite: 400
@@ -405,8 +407,11 @@ Experience_Values:
         Fire_Coral_Block: 90
         Horn_Coral_Block: 125
         Coal_Ore: 400
+        Deepslate_Coal_Ore: 700
         Diamond_Ore: 2400
+        Deepslate_Diamond_Ore: 3600
         Emerald_Ore: 1000
+        Deepslate_Emerald_Ore: 1700
         End_Bricks: 50
         Chiseled_Nether_Bricks: 50
         Cracked_Nether_Bricks: 50
@@ -415,11 +420,15 @@ Experience_Values:
         End_Stone: 15
         Glowstone: 15
         Gold_Ore: 1300
+        Deepslate_Gold_Ore: 1900
         Nether_Gold_Ore: 1300
         Gilded_Blackstone: 200
         Terracotta: 30
         Iron_Ore: 900
+        Deepslate_Iron_Ore: 1300
         Lapis_Ore: 800
+        Lapis_Lazuli_Ore: 800
+        Deepslate_Lapis_Lazuli_Ore: 1400
         Mossy_Cobblestone: 30
         Netherrack: 15
         Obsidian: 150
@@ -427,6 +436,7 @@ Experience_Values:
         Blue_Ice: 15
         Nether_Quartz_Ore: 300
         Redstone_Ore: 600
+        Deepslate_Redstone_Ore: 900
         Sandstone: 30
         Black_Terracotta: 50
         Blue_Terracotta: 50
@@ -474,6 +484,15 @@ Experience_Values:
         Other: 1.5
     Smelting:
         Raw_Copper: 75
+        Deepslate_Redstone_Ore: 30
+        Deepslate_Copper_Ore: 100
+        Deepslate_Coal_Ore: 20
+        Deepslate_Diamond_Ore: 140
+        Deepslate_Emerald_Ore: 110
+        Deepslate_Iron_Ore: 40
+        Deepslate_Gold_Ore: 50
+        Deepslate_Lapis_Lazuli_Ore: 60
+        Copper_Ore: 75
         Ancient_Debris: 200
         Coal_Ore: 10
         Diamond_Ore: 75
@@ -482,6 +501,7 @@ Experience_Values:
         Raw_Gold: 35
         Iron_Ore: 25
         Raw_Iron: 25
+        Lapis_Lazuli_Ore: 40
         Lapis_Ore: 40
         Nether_Quartz_Ore: 25
         Redstone_Ore: 15