From 2a33890e1cbd90c95e64718dbafca871df887f48 Mon Sep 17 00:00:00 2001 From: sovdee <10354869+sovdeeth@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:51:21 -0500 Subject: [PATCH 1/2] add missing tree types, add test to catch future missing types --- .../ch/njol/skript/bukkitutil/ItemUtils.java | 10 ++++++++++ .../MissingTreeSaplingMapEntriesTest.java | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/test/java/org/skriptlang/skript/test/tests/regression/MissingTreeSaplingMapEntriesTest.java diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java index e447300d6ef..06b73c4a1bb 100644 --- a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java +++ b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java @@ -312,6 +312,16 @@ public static boolean isAir(Material type) { // cherry if (Skript.isRunningMinecraft(1, 19, 4)) TREE_TO_SAPLING_MAP.put(TreeType.CHERRY, Material.CHERRY_SAPLING); + + // mega pine (2x2 spruce tree with minimal leaves at top) + if (Skript.isRunningMinecraft(1, 20,5)) + TREE_TO_SAPLING_MAP.put(TreeType.MEGA_PINE, Material.SPRUCE_SAPLING); + + // pale oak + if (Skript.isRunningMinecraft(1, 21, 3)) { + TREE_TO_SAPLING_MAP.put(TreeType.PALE_OAK, Material.PALE_OAK_SAPLING); + TREE_TO_SAPLING_MAP.put(TreeType.PALE_OAK_CREAKING, Material.PALE_OAK_SAPLING); + } } public static Material getTreeSapling(TreeType treeType) { diff --git a/src/test/java/org/skriptlang/skript/test/tests/regression/MissingTreeSaplingMapEntriesTest.java b/src/test/java/org/skriptlang/skript/test/tests/regression/MissingTreeSaplingMapEntriesTest.java new file mode 100644 index 00000000000..371c03a48ba --- /dev/null +++ b/src/test/java/org/skriptlang/skript/test/tests/regression/MissingTreeSaplingMapEntriesTest.java @@ -0,0 +1,17 @@ +package org.skriptlang.skript.test.tests.regression; + +import ch.njol.skript.bukkitutil.ItemUtils; +import org.bukkit.TreeType; +import org.junit.Assert; +import org.junit.Test; + +public class MissingTreeSaplingMapEntriesTest { + + @Test + public void test() { + for (TreeType type : TreeType.values()) { + Assert.assertNotNull("Tree type " + type + " has no mapped sapling in ItemUtils#getTreeSapling().", ItemUtils.getTreeSapling(type)); + } + } + +} From 3e5db6f3e7fa5c51719ed557800bd7ac787b79de Mon Sep 17 00:00:00 2001 From: Moderocky Date: Sat, 30 Nov 2024 14:12:12 +0000 Subject: [PATCH 2/2] Update src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com> --- src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java index 06b73c4a1bb..2af432ce6d3 100644 --- a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java +++ b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java @@ -314,7 +314,7 @@ public static boolean isAir(Material type) { TREE_TO_SAPLING_MAP.put(TreeType.CHERRY, Material.CHERRY_SAPLING); // mega pine (2x2 spruce tree with minimal leaves at top) - if (Skript.isRunningMinecraft(1, 20,5)) + if (Skript.isRunningMinecraft(1, 20, 5)) TREE_TO_SAPLING_MAP.put(TreeType.MEGA_PINE, Material.SPRUCE_SAPLING); // pale oak