From 668cc0e4a333602e3c64ad5cd7f93c598669d34e Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 2 Apr 2023 19:53:13 -0700
Subject: [PATCH] Add support for upcoming Cherry trees

---
 Changelog.txt                                              | 5 +++++
 src/main/java/com/gmail/nossr50/util/MaterialMapStore.java | 3 +++
 src/main/resources/experience.yml                          | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 469039924..94a53d562 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,10 @@
 Version 2.1.219
+    Added support for various things from Minecraft 1.20
     Fixed double drop issue with Beetroots
+    Added 'Cherry_Log' to woodcutting experience in experience.yml
+    Added 'Cherry_Wood' to woodcutting experience in experience.yml
+    Added 'Stripped_Cherry_Log' to woodcutting experience in experience.yml
+    Added 'Stripped_Cherry_Wood' to woodcutting experience in experience.yml
     Added 'Skills.Mining.BlastMining.Bonus_Drops.Enabled' to advanced.yml to enable/disable bonus drops from Blast Mining
 
 Version 2.1.218
diff --git a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
index 446372101..400b95b00 100644
--- a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
+++ b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
@@ -1017,6 +1017,7 @@ public class MaterialMapStore {
     private void fillTreeFellerDestructibleWhiteList()
     {
         treeFellerDestructibleWhiteList.add("oak_leaves");
+        treeFellerDestructibleWhiteList.add("cherry_leaves");
         treeFellerDestructibleWhiteList.add("acacia_leaves");
         treeFellerDestructibleWhiteList.add("birch_leaves");
         treeFellerDestructibleWhiteList.add("dark_oak_leaves");
@@ -1267,6 +1268,8 @@ public class MaterialMapStore {
         toolBlackList.add("spruce_wall_sign");
         toolBlackList.add("oak_sign");
         toolBlackList.add("oak_wall_sign");
+        toolBlackList.add("stripped_cherry_log");
+        toolBlackList.add("stripped_cherry_wood");
         toolBlackList.add("stripped_acacia_log");
         toolBlackList.add("stripped_acacia_wood");
         toolBlackList.add("stripped_birch_log");
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index f1bde0450..31414a8c6 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -277,18 +277,21 @@ Experience_Values:
         Crimson_Stem: 35
         Warped_Stem: 35
         Oak_Log: 70
+        Cherry_Log: 105
         Spruce_Log: 80
         Birch_Log: 90
         Jungle_Log: 100
         Acacia_Log: 90
         Dark_Oak_Log: 90
         Stripped_Oak_Log: 70
+        Stripped_Cherry_Log: 105
         Stripped_Spruce_Log: 80
         Stripped_Birch_Log: 90
         Stripped_Jungle_Log: 100
         Stripped_Acacia_Log: 90
         Stripped_Dark_Oak_Log: 90
         Stripped_Oak_Wood: 70
+        Stripped_Cherry_Wood: 70
         Stripped_Spruce_Wood: 80
         Stripped_Birch_Wood: 90
         Stripped_Jungle_Wood: 100
@@ -298,6 +301,7 @@ Experience_Values:
         Stripped_Crimson_Stem: 50
         Stripped_Warped_Stem: 50
         Oak_Wood: 70
+        Cherry_Wood: 105
         Spruce_Wood: 70
         Birch_Wood: 70
         Jungle_Wood: 70