From 51e238c352c0851b02ca459a21d239fdbd798684 Mon Sep 17 00:00:00 2001 From: Jordan Date: Thu, 15 Jun 2023 10:18:01 +0200 Subject: [PATCH] feat: add new tree types to tree tool and brush (#2286) * feat: add new tree types - implements #2197 * Remove nonsensical test case --------- Co-authored-by: Alexander Brandes --- .../test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java | 1 - .../src/main/java/com/sk89q/worldedit/util/TreeGenerator.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java b/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java index 447f2ec9a..df6b33b7b 100644 --- a/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java +++ b/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java @@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class BukkitWorldTest { - @Test public void testTreeTypeMapping() { for (TreeGenerator.TreeType type : TreeGenerator.TreeType.values()) { assertNotNull(BukkitWorld.toBukkitTreeType(type), "No mapping for: " + type); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java index 7d7d71e75..cf5c05278 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/TreeGenerator.java @@ -165,6 +165,9 @@ public final class TreeGenerator { } //FAWE end }, + MANGROVE("Mangrove tree", "mangrove"), + TALL_MANGROVE("Tall mangrove tree", "tall_mangrove"), + CHERRY("Cherry blossom", "cherry"), RANDOM("Random tree", "rand", "random") { @Override public boolean generate(EditSession editSession, BlockVector3 pos) throws MaxChangedBlocksException {