From 0f6e3c72737e6365d0bd780ddfe0a2c7d95e7846 Mon Sep 17 00:00:00 2001 From: Soper Date: Tue, 25 May 2021 23:29:08 -0400 Subject: [PATCH] added basic tuner recipe --- src/xyz/soper/arty/Artillery.java | 38 +++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/xyz/soper/arty/Artillery.java b/src/xyz/soper/arty/Artillery.java index 85bb9ce..0c5a65b 100644 --- a/src/xyz/soper/arty/Artillery.java +++ b/src/xyz/soper/arty/Artillery.java @@ -12,8 +12,13 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.java.JavaPlugin; import xyz.soper.arty.debug.DebugCommand; import xyz.soper.arty.event.Listener.MortarInteract; +import xyz.soper.arty.item.Mortar; +import xyz.soper.arty.item.MortarTuner; import xyz.soper.arty.item.Shell; +import java.util.ArrayList; +import java.util.List; + public class Artillery extends JavaPlugin { @Override @@ -23,8 +28,8 @@ public class Artillery extends JavaPlugin { ItemStack baseMortar = new ItemStack(Material.BREWING_STAND); ItemMeta baseMortarMeta = baseMortar.getItemMeta(); - assert baseMortarMeta != null; - baseMortarMeta.setDisplayName(ChatColor.GRAY + "Basic Mortar"); + if(baseMortarMeta != null) + baseMortarMeta.setDisplayName(Mortar.BASIC_MORTAR_NAME); baseMortar.setItemMeta(baseMortarMeta); NamespacedKey basicMortarKey = new NamespacedKey(this, "basic_mortar"); @@ -41,8 +46,8 @@ public class Artillery extends JavaPlugin { ItemStack mortar = new ItemStack(Material.BREWING_STAND); ItemMeta mortarMeta = mortar.getItemMeta(); - assert mortarMeta != null; - mortarMeta.setDisplayName(ChatColor.GRAY + "Mortar"); + if(mortarMeta != null) + mortarMeta.setDisplayName(Mortar.NORMAL_MORTAR_NAME); mortar.setItemMeta(mortarMeta); NamespacedKey mortarKey = new NamespacedKey(this, "mortar"); @@ -56,6 +61,31 @@ public class Artillery extends JavaPlugin { Bukkit.addRecipe(mortarRecipe); //END OF NORMAL MORTAR RECIPE + //START OF BASIC MORTAR TUNER RECIPE + ItemStack basicTuner = new ItemStack(Material.LEVER); + ItemMeta basicTunerMeta = basicTuner.getItemMeta(); + + if(basicTunerMeta != null) { + basicTunerMeta.setDisplayName(MortarTuner.BASIC_TUNER_NAME); + List lore = new ArrayList(); + lore.add(ChatColor.GOLD + "Currently unlinked"); + basicTunerMeta.setLore(lore); + } + basicTuner.setItemMeta(basicTunerMeta); + + //TODO: This is the wrong recipe, this is for a normal tuner, not basic. + NamespacedKey basicTunerKey = new NamespacedKey(this, "basic_tuner"); + ShapedRecipe basicTunerRecipe = new ShapedRecipe(basicTunerKey, basicTuner); + basicTunerRecipe.shape(" SI", " TC", "W "); + basicTunerRecipe.setIngredient('S', Material.STRING); + basicTunerRecipe.setIngredient('I', Material.IRON_INGOT); + basicTunerRecipe.setIngredient('T', Material.STICK); + basicTunerRecipe.setIngredient('C', Material.COMPASS); + basicTunerRecipe.setIngredient('W', Material.WHITE_WOOL); + + Bukkit.addRecipe(basicTunerRecipe); + //END OF BASIC MORTAR TUNER RECIPE + //START OF DEBUG SHELL RECIPE NamespacedKey debugShellKey = new NamespacedKey(this, "debug_shell"); ShapelessRecipe debugShellRecipe = new ShapelessRecipe(debugShellKey, new Shell().getShell());