From c28c8d164a8af7ff0f9a935468e2b266a9c1be39 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 3 Jun 2021 14:20:00 -0700 Subject: [PATCH] Adding more 1.17 support --- Changelog.txt | 16 ++++++++++++++++ .../com/gmail/nossr50/util/MaterialMapStore.java | 2 ++ src/main/resources/config.yml | 13 +++++++++++++ src/main/resources/experience.yml | 3 +++ 4 files changed, 34 insertions(+) diff --git a/Changelog.txt b/Changelog.txt index 136bbf1b3..13ae5e089 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,5 @@ Version 2.1.197 + This update adds compatibility for new mobs and blocks from 1.17 This build of mcMMO should be more compatible with certain versions of ViaVersion Players are no longer launched from Minecarts when using a Fishing Rod (they are still dismounted) thanks lexikiq Updated Japanese locale (thanks ViaSnake) @@ -15,8 +16,23 @@ Version 2.1.197 Added Medium Amethyst Bud to experience.yml for Mining Added Large Amethyst Bud to experience.yml for Mining Added Amethyst Cluster to experience.yml for Mining + Added Deepslate to experience.yml for Mining + Added Cobbled Deepslate to experience.yml for Mining + Added Amethyst Shard to Bonus Drops for Mining in config.yml + Added Calcite to Bonus Drops for Mining in config.yml + Added Smooth Basalt to Bonus Drops for Mining in config.yml + Added Block_Of_Amethyst to Bonus Drops for Mining in config.yml + Added Budding Amethyst to Bonus Drops for Mining in config.yml + Added Small_Amethyst_Bud to Bonus Drops for Mining in config.yml + Added Medium Amethyst Bud to Bonus Drops for Mining in config.yml + Added Large Amethyst Bud to Bonus Drops for Mining in config.yml + Added Amethyst Cluster to Bonus Drops for Mining in config.yml + Added Deepslate to Bonus Drops for Mining in config.yml + Added Cobbled Deepslate to Bonus Drops for Mining in config.yml + Added Cobbled Deepslate to experience.yml for Smelting NOTES: + You shouldn't need to edit your configs for this update, your configs should update automatically. If you run into any issues with ViaVersion or ViaBackwards, use the latest dev builds for each. Version 2.1.196 diff --git a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java index 15c962407..ed306198f 100644 --- a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java +++ b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java @@ -400,6 +400,8 @@ public class MaterialMapStore { intendedToolPickAxe.add("large_amethyst_bud"); intendedToolPickAxe.add("amethyst_cluster"); intendedToolPickAxe.add("budding_amethyst"); + intendedToolPickAxe.add("deepslate"); + intendedToolPickAxe.add("cobbled_deepslate"); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 563a4dc0c..2c8f1f111 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -513,6 +513,17 @@ Bonus_Drops: Peony: true Lily_Of_The_Valley: true Mining: + Calcite: true + Smooth_Basalt: true + Block_Of_Amethyst: true + Budding_Amethyst: true + Small_Amethyst_Bud: true + Medium_Amethyst_Bud: true + Large_Amethyst_Bud: true + Amethyst_Cluster: true + Amethyst_Shard: true + Deepslate: true + Cobbled_Deepslate: true Gilded_Blackstone: true Crying_Obsidian: true Nether_Bricks: true @@ -589,6 +600,8 @@ Bonus_Drops: Nether_Quartz: true Quartz: true Redstone: true + Deepslate: true + Cobbled_Deepslate: true # # Settings for commands diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index eabc960c0..c7fcfd0a0 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -380,6 +380,8 @@ Experience_Values: Lily_Of_The_Valley: 150 Wither_Rose: 500 Mining: + Deepslate: 30 + Cobbled_Deepslate: 15 Calcite: 400 Smooth_Basalt: 300 Block_Of_Amethyst: 500 @@ -481,6 +483,7 @@ Experience_Values: Nether_Quartz_Ore: 25 Redstone_Ore: 15 Nether_Gold_Ore: 35 + Cobbled_Deepslate: 5 Taming: Animal_Taming: Llama: 1200