diff --git a/Changelog.txt b/Changelog.txt index f847b9e0a..3929043b3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,13 @@ 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 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 + Version 2.2.028 Fixed stack overflow during ChunkUnloadEvent diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 116e41f0c..acaab2b0d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -444,7 +444,7 @@ public class InventoryListener implements Listener { ItemStack result = event.getRecipe().getResult(); - //TODO: what is the point of this + //TODO: Used for Chimaera Wing, but not sure it is still necessary if (!ItemUtils.isMcMMOItem(result)) { return; } diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index 433651cb2..ddef51fb8 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -578,11 +578,12 @@ public final class ItemUtils { */ public static boolean isWoodcuttingDrop(ItemStack item) { return switch (item.getType().toString()) { - case "ACACIA_LOG", "BIRCH_LOG", "DARK_OAK_LOG", "JUNGLE_LOG", "OAK_LOG", "SPRUCE_LOG", - "STRIPPED_ACACIA_LOG", "STRIPPED_BIRCH_LOG", "STRIPPED_DARK_OAK_LOG", "STRIPPED_JUNGLE_LOG", - "STRIPPED_OAK_LOG", "STRIPPED_SPRUCE_LOG", "STRIPPED_MANGROVE_LOG", "ACACIA_SAPLING", "SPRUCE_SAPLING", - "BIRCH_SAPLING", "DARK_OAK_SAPLING", "JUNGLE_SAPLING", "OAK_SAPLING", "ACACIA_LEAVES", "BIRCH_LEAVES", - "DARK_OAK_LEAVES", "JUNGLE_LEAVES", "OAK_LEAVES", "SPRUCE_LEAVES", "BEE_NEST", "APPLE" -> true; + case "ACACIA_LOG", "BIRCH_LOG", "DARK_OAK_LOG", "PALE_OAK_LOG", "JUNGLE_LOG", "OAK_LOG", "SPRUCE_LOG", + "STRIPPED_ACACIA_LOG", "STRIPPED_BIRCH_LOG", "STRIPPED_DARK_OAK_LOG", "STRIPPED_PALE_OAK_LOG", + "STRIPPED_JUNGLE_LOG", "STRIPPED_OAK_LOG", "STRIPPED_SPRUCE_LOG", "STRIPPED_MANGROVE_LOG", + "ACACIA_SAPLING", "SPRUCE_SAPLING", "BIRCH_SAPLING", "DARK_OAK_SAPLING", "PALE_OAK_SAPLING", + "JUNGLE_SAPLING", "OAK_SAPLING", "ACACIA_LEAVES", "BIRCH_LEAVES", "DARK_OAK_LEAVES", "PALE_OAK_LEAVES", + "JUNGLE_LEAVES", "OAK_LEAVES", "SPRUCE_LEAVES", "BEE_NEST", "APPLE" -> true; default -> false; }; } @@ -597,6 +598,7 @@ public final class ItemUtils { return ItemWeightConfig.getInstance().getMiscItems().contains(item.getType()); } + // TODO: This is used exclusively for Chimaera Wing... should revisit this sometime public static boolean isMcMMOItem(ItemStack item) { if (!item.hasItemMeta()) { return false; diff --git a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java index 7047f6933..56713375f 100644 --- a/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java +++ b/src/main/java/com/gmail/nossr50/util/MaterialMapStore.java @@ -1040,11 +1040,13 @@ public class MaterialMapStore { } private void fillTreeFellerDestructibleWhiteList() { + treeFellerDestructibleWhiteList.add("pale_hanging_moss"); treeFellerDestructibleWhiteList.add("oak_leaves"); treeFellerDestructibleWhiteList.add("cherry_leaves"); treeFellerDestructibleWhiteList.add("acacia_leaves"); treeFellerDestructibleWhiteList.add("birch_leaves"); treeFellerDestructibleWhiteList.add("dark_oak_leaves"); + treeFellerDestructibleWhiteList.add("pale_oak_leaves"); treeFellerDestructibleWhiteList.add("jungle_leaves"); treeFellerDestructibleWhiteList.add("spruce_leaves"); treeFellerDestructibleWhiteList.add("azalea_leaves"); @@ -1102,6 +1104,7 @@ public class MaterialMapStore { abilityBlackList.add("oak_fence_gate"); abilityBlackList.add("acacia_fence_gate"); abilityBlackList.add("dark_oak_fence_gate"); + abilityBlackList.add("pale_oak_fence_gate"); abilityBlackList.add("spruce_fence_gate"); abilityBlackList.add("birch_fence_gate"); abilityBlackList.add("jungle_fence_gate"); @@ -1114,11 +1117,13 @@ public class MaterialMapStore { abilityBlackList.add("birch_button"); abilityBlackList.add("acacia_button"); abilityBlackList.add("dark_oak_button"); + abilityBlackList.add("pale_oak_button"); abilityBlackList.add("jungle_button"); abilityBlackList.add("spruce_button"); abilityBlackList.add("acacia_trapdoor"); abilityBlackList.add("birch_trapdoor"); abilityBlackList.add("dark_oak_trapdoor"); + abilityBlackList.add("pale_oak_trapdoor"); abilityBlackList.add("jungle_trapdoor"); abilityBlackList.add("oak_trapdoor"); abilityBlackList.add("spruce_trapdoor"); @@ -1127,7 +1132,9 @@ public class MaterialMapStore { abilityBlackList.add("birch_sign"); abilityBlackList.add("birch_wall_sign"); abilityBlackList.add("dark_oak_sign"); + abilityBlackList.add("pale_oak_sign"); abilityBlackList.add("dark_oak_wall_sign"); + abilityBlackList.add("pale_oak_wall_sign"); abilityBlackList.add("jungle_sign"); abilityBlackList.add("jungle_wall_sign"); abilityBlackList.add("spruce_sign"); @@ -1148,9 +1155,11 @@ public class MaterialMapStore { abilityBlackList.add("birch_door"); abilityBlackList.add("jungle_door"); abilityBlackList.add("dark_oak_door"); + abilityBlackList.add("pale_oak_door"); abilityBlackList.add("oak_fence"); abilityBlackList.add("acacia_fence"); abilityBlackList.add("dark_oak_fence"); + abilityBlackList.add("pale_oak_fence"); abilityBlackList.add("birch_fence"); abilityBlackList.add("jungle_fence"); abilityBlackList.add("spruce_fence"); @@ -1220,6 +1229,7 @@ public class MaterialMapStore { toolBlackList.add("oak_fence_gate"); toolBlackList.add("acacia_fence_gate"); toolBlackList.add("dark_oak_fence_gate"); + toolBlackList.add("pale_oak_fence_gate"); toolBlackList.add("spruce_fence_gate"); toolBlackList.add("birch_fence_gate"); toolBlackList.add("jungle_fence_gate"); @@ -1232,11 +1242,13 @@ public class MaterialMapStore { toolBlackList.add("birch_button"); toolBlackList.add("acacia_button"); toolBlackList.add("dark_oak_button"); + toolBlackList.add("pale_oak_button"); toolBlackList.add("jungle_button"); toolBlackList.add("spruce_button"); toolBlackList.add("acacia_trapdoor"); toolBlackList.add("birch_trapdoor"); toolBlackList.add("dark_oak_trapdoor"); + toolBlackList.add("pale_oak_trapdoor"); toolBlackList.add("jungle_trapdoor"); toolBlackList.add("oak_trapdoor"); toolBlackList.add("spruce_trapdoor"); @@ -1254,9 +1266,11 @@ public class MaterialMapStore { toolBlackList.add("birch_door"); toolBlackList.add("jungle_door"); toolBlackList.add("dark_oak_door"); + toolBlackList.add("pale_oak_door"); toolBlackList.add("oak_fence"); toolBlackList.add("acacia_fence"); toolBlackList.add("dark_oak_fence"); + toolBlackList.add("pale_oak_fence"); toolBlackList.add("birch_fence"); toolBlackList.add("jungle_fence"); toolBlackList.add("spruce_fence"); @@ -1285,8 +1299,11 @@ public class MaterialMapStore { toolBlackList.add("birch_hanging_sign"); toolBlackList.add("birch_wall_sign"); toolBlackList.add("dark_oak_sign"); + toolBlackList.add("pale_oak_sign"); toolBlackList.add("dark_oak_hanging_sign"); + toolBlackList.add("pale_oak_hanging_sign"); toolBlackList.add("dark_oak_wall_sign"); + toolBlackList.add("pale_oak_wall_sign"); toolBlackList.add("jungle_sign"); toolBlackList.add("jungle_hanging_sign"); toolBlackList.add("jungle_wall_sign"); @@ -1306,7 +1323,9 @@ public class MaterialMapStore { toolBlackList.add("stripped_birch_log"); toolBlackList.add("stripped_birch_wood"); toolBlackList.add("stripped_dark_oak_log"); + toolBlackList.add("stripped_pale_oak_log"); toolBlackList.add("stripped_dark_oak_wood"); + toolBlackList.add("stripped_pale_oak_wood"); toolBlackList.add("stripped_jungle_log"); toolBlackList.add("stripped_jungle_wood"); toolBlackList.add("stripped_oak_log"); @@ -1321,7 +1340,9 @@ public class MaterialMapStore { toolBlackList.add("birch_log"); toolBlackList.add("birch_wood"); toolBlackList.add("dark_oak_log"); + toolBlackList.add("pale_oak_log"); toolBlackList.add("dark_oak_wood"); + toolBlackList.add("pale_oak_wood"); toolBlackList.add("jungle_log"); toolBlackList.add("jungle_wood"); toolBlackList.add("oak_log"); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fdb93cc40..2645f51a3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -626,7 +626,9 @@ Bonus_Drops: Cherry_Wood: true Cherry_Log: true Dark_Oak_Wood: true + Pale_Oak_Wood: true Dark_Oak_Log: true + Pale_Oak_Log: true Oak_Wood: true Oak_Log: true Jungle_Wood: true diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index 54605ef4b..d43c8d17c 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -295,6 +295,7 @@ Experience_Values: Jungle_Log: 100 Acacia_Log: 90 Dark_Oak_Log: 90 + Pale_Oak_Log: 130 Stripped_Oak_Log: 70 Stripped_Cherry_Log: 105 Stripped_Spruce_Log: 80 @@ -302,6 +303,7 @@ Experience_Values: Stripped_Jungle_Log: 100 Stripped_Acacia_Log: 90 Stripped_Dark_Oak_Log: 90 + Stripped_Pale_Oak_Log: 130 Stripped_Oak_Wood: 70 Stripped_Cherry_Wood: 70 Stripped_Spruce_Wood: 80 @@ -309,6 +311,7 @@ Experience_Values: Stripped_Jungle_Wood: 100 Stripped_Acacia_Wood: 90 Stripped_Dark_Oak_Wood: 90 + Stripped_Pale_Oak_Wood: 90 Stripped_Mangrove_Log: 110 Stripped_Crimson_Stem: 50 Stripped_Warped_Stem: 50 @@ -319,6 +322,7 @@ Experience_Values: Jungle_Wood: 70 Acacia_Wood: 70 Dark_Oak_Wood: 70 + Pale_Oak_Wood: 110 Mangrove_Wood: 80 Mangrove_Log: 95 Mangrove_Roots: 10