From d414db1c0b3bfd9b8e637855116f32d7fbde56a8 Mon Sep 17 00:00:00 2001 From: Intelli Date: Wed, 12 Jul 2023 15:58:47 -0600 Subject: [PATCH] Added item mapping for torchflower seeds --- .../net/coreprotect/bukkit/BukkitAdapter.java | 21 ++++++++++++++++ .../coreprotect/bukkit/BukkitInterface.java | 2 ++ .../net/coreprotect/bukkit/Bukkit_v1_20.java | 24 +++++++++++++++++++ .../java/net/coreprotect/utility/Util.java | 17 +------------ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java index 4a9b9c8..2117c7a 100644 --- a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java +++ b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java @@ -180,4 +180,25 @@ public class BukkitAdapter implements BukkitInterface { return 0; } + @Override + public Material getPlantSeeds(Material material) { + switch (material) { + case WHEAT: + material = Material.WHEAT_SEEDS; + break; + case PUMPKIN_STEM: + material = Material.PUMPKIN_SEEDS; + break; + case MELON_STEM: + material = Material.MELON_SEEDS; + break; + case BEETROOTS: + material = Material.BEETROOT_SEEDS; + break; + default: + } + + return material; + } + } diff --git a/src/main/java/net/coreprotect/bukkit/BukkitInterface.java b/src/main/java/net/coreprotect/bukkit/BukkitInterface.java index 110013c..29c922f 100644 --- a/src/main/java/net/coreprotect/bukkit/BukkitInterface.java +++ b/src/main/java/net/coreprotect/bukkit/BukkitInterface.java @@ -61,4 +61,6 @@ public interface BukkitInterface { public int getColor(Sign sign, boolean isFront); + public Material getPlantSeeds(Material material); + } diff --git a/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java b/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java index f672ff9..56ceb0a 100644 --- a/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java +++ b/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java @@ -68,4 +68,28 @@ public class Bukkit_v1_20 extends Bukkit_v1_19 implements BukkitInterface { return sign.isWaxed(); } + @Override + public Material getPlantSeeds(Material material) { + switch (material) { + case WHEAT: + material = Material.WHEAT_SEEDS; + break; + case PUMPKIN_STEM: + material = Material.PUMPKIN_SEEDS; + break; + case MELON_STEM: + material = Material.MELON_SEEDS; + break; + case BEETROOTS: + material = Material.BEETROOT_SEEDS; + break; + case TORCHFLOWER_CROP: + material = Material.TORCHFLOWER_SEEDS; + break; + default: + } + + return material; + } + } diff --git a/src/main/java/net/coreprotect/utility/Util.java b/src/main/java/net/coreprotect/utility/Util.java index 3897a6d..9f668e3 100755 --- a/src/main/java/net/coreprotect/utility/Util.java +++ b/src/main/java/net/coreprotect/utility/Util.java @@ -1207,22 +1207,7 @@ public class Util extends Queue { return material; } - switch (material) { - case WHEAT: - material = Material.WHEAT_SEEDS; - break; - case PUMPKIN_STEM: - material = Material.PUMPKIN_SEEDS; - break; - case MELON_STEM: - material = Material.MELON_SEEDS; - break; - case BEETROOTS: - material = Material.BEETROOT_SEEDS; - break; - default: - } - + material = BukkitAdapter.ADAPTER.getPlantSeeds(material); if (material.name().contains("WALL_")) { material = Material.valueOf(material.name().replace("WALL_", "")); }