From ac5c577ed6d060f320fb80ef875d47f2a4086653 Mon Sep 17 00:00:00 2001 From: "George J. Economou II" <35174543+NuclearDonut47@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:59:46 -0500 Subject: [PATCH] feat: a way to get the cooked boar meat that was already in the resourcepack --- build.gradle.kts | 2 +- .../crafting/FurnaceRecipesListener.java | 119 +++++++++--------- 2 files changed, 64 insertions(+), 57 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4b3d053..c449096 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } group = "me.ShermansWorld" -version = "1.23.1" +version = "1.24.0" description = "" val mainPackage = "${project.group}.${rootProject.name}" diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/crafting/FurnaceRecipesListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/crafting/FurnaceRecipesListener.java index a6da403..80dfb1e 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/crafting/FurnaceRecipesListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/crafting/FurnaceRecipesListener.java @@ -10,92 +10,99 @@ public class FurnaceRecipesListener implements Listener { @EventHandler - public void cookedSharkMeat(FurnaceSmeltEvent e) { + public void cookedMeats(FurnaceSmeltEvent event) { + if (!event.getSource().getItemMeta().hasCustomModelData()) return; - if (!(e.getSource().getType() == Material.COD)) - return; + ItemStack cookedMeat = null; - if (!e.getSource().getItemMeta().hasCustomModelData()) - return; + if (event.getSource().getType() == Material.COD) + cookedMeat = cookedCods(event.getSource()); - if (!(e.getSource().getItemMeta().getCustomModelData() == 2800)) - return; + if (event.getSource().getType() == Material.MUTTON) + cookedMeat = cookedMuttons(event.getSource()); - ItemStack cooked = new ItemStack(Material.COOKED_COD); - ItemMeta meta = cooked.getItemMeta(); + if (event.getSource().getType() == Material.BEEF) + cookedMeat = cookedBeefs(event.getSource()); - meta.displayName(ColorParser.of("Cooked Shark Meat").build()); - meta.setCustomModelData(2800); + if (event.getSource().getType() == Material.PORKCHOP) + cookedMeat = cookedPorks(event.getSource()); - cooked.setItemMeta(meta); + if (cookedMeat == null) return; - e.setResult(cooked); + event.setResult(cookedMeat); } - @EventHandler - public void cookedVenison(FurnaceSmeltEvent e) { + private ItemStack cookedCods(ItemStack cooking) { + String substituteName = null; + int substituteCustomModelData = 0; - if (!(e.getSource().getType() == Material.MUTTON)) - return; + if (cooking.getItemMeta().getCustomModelData() == 2800) { + substituteName = "Cooked Shark Meat"; + substituteCustomModelData = 2800; + } - if (!e.getSource().getItemMeta().hasCustomModelData()) - return; + if (cooking.getItemMeta().getCustomModelData() == 2801) { + substituteName = "Cooked Calamari"; + substituteCustomModelData = 2801; + } - if (!(e.getSource().getItemMeta().getCustomModelData() == 2800)) - return; + if (substituteName == null) return null; - ItemStack cooked = new ItemStack(Material.COOKED_MUTTON); - ItemMeta meta = cooked.getItemMeta(); + return makeCooked(Material.COOKED_COD, substituteName, substituteCustomModelData); + } - meta.displayName(ColorParser.of("Cooked Venison").build()); - meta.setCustomModelData(2800); + private ItemStack cookedMuttons(ItemStack cooking) { + String substituteName = null; + int substituteCustomModelData = 0; - cooked.setItemMeta(meta); + if (cooking.getItemMeta().getCustomModelData() == 2800) { + substituteName = "Cooked Venison"; + substituteCustomModelData = 2800; + } - e.setResult(cooked); - } + if (substituteName == null) return null; - @EventHandler - public static void cookedElephantMeat(FurnaceSmeltEvent e) { - if (!(e.getSource().getType() == Material.BEEF)) - return; + return makeCooked(Material.COOKED_MUTTON, substituteName, substituteCustomModelData); + } - if (!e.getSource().getItemMeta().hasCustomModelData()) - return; + private ItemStack cookedBeefs(ItemStack cooking) { + String substituteName = null; + int substituteCustomModelData = 0; - if (!(e.getSource().getItemMeta().getCustomModelData() == 2800)) - return; + if (cooking.getItemMeta().getCustomModelData() == 2800) { + substituteName = "Cooked Elephant Meat"; + substituteCustomModelData = 2800; + } - ItemStack cooked = new ItemStack(Material.COOKED_BEEF); - ItemMeta meta = cooked.getItemMeta(); + if (substituteName == null) return null; - meta.displayName(ColorParser.of("Cooked Elephant Meat").build()); - meta.setCustomModelData(2800); + return makeCooked(Material.COOKED_BEEF, substituteName, substituteCustomModelData); + } - cooked.setItemMeta(meta); + private ItemStack cookedPorks(ItemStack cooking) { + String substituteName = null; + int substituteCustomModelData = 0; - e.setResult(cooked); - } + if (cooking.getItemMeta().getCustomModelData() == 2800) { + substituteName = "Cooked Boar Meat"; + substituteCustomModelData = 2800; + } - @EventHandler - public static void cookedCalamari(FurnaceSmeltEvent e) { - if (!(e.getSource().getType() == Material.COD)) - return; + if (substituteName == null) return null; - if (!e.getSource().getItemMeta().hasCustomModelData()) - return; + return makeCooked(Material.COOKED_PORKCHOP, substituteName, substituteCustomModelData); + } - if (!(e.getSource().getItemMeta().getCustomModelData() == 2801)) - return; + private ItemStack makeCooked(Material material, String name, int customModelData) { + ItemStack cooked = new ItemStack(material); - ItemStack cooked = new ItemStack(Material.COOKED_COD); ItemMeta meta = cooked.getItemMeta(); - meta.displayName(ColorParser.of("Cooked Calamari").build()); - meta.setCustomModelData(2801); + meta.displayName(ColorParser.of(name).build()); + meta.setCustomModelData(customModelData); cooked.setItemMeta(meta); - e.setResult(cooked); + return cooked; } -} +} \ No newline at end of file