diff --git a/pom.xml b/pom.xml index 1b5bc18..79abfc0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ UNOFFICIAL - 1.8 - 1.8 + 17 + 17 UTF-8 @@ -51,10 +51,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + ${maven.compiler.source} + ${maven.compiler.target} + + org.apache.maven.plugins maven-shade-plugin - 3.2.4 + 3.3.0 @@ -80,13 +89,13 @@ org.projectlombok lombok - 1.18.20 + 1.18.30 org.spigotmc spigot-api - 1.16.5-R0.1-SNAPSHOT + 1.21.4-R0.1-SNAPSHOT provided @@ -100,15 +109,21 @@ com.github.Slimefun Slimefun4 - RC-27 + experimental-SNAPSHOT provided org.bstats bstats-bukkit - 1.8 + 3.1.0 compile + + + org.apache.commons + commons-lang3 + 3.12.0 + diff --git a/src/main/java/io/github/seggan/liquid/Items.java b/src/main/java/io/github/seggan/liquid/Items.java index 790c775..41f1881 100644 --- a/src/main/java/io/github/seggan/liquid/Items.java +++ b/src/main/java/io/github/seggan/liquid/Items.java @@ -13,7 +13,7 @@ private Items() {} public static final ItemGroup CATEGORY = new ItemGroup( new NamespacedKey(Liquid.getInstance(), "liquids"), - new CustomItemStack(Material.LAVA_BUCKET, "&6Liquids") + CustomItemStack.create(Material.LAVA_BUCKET, "&6Liquids") ); public static final SlimefunItemStack MELTER = new SlimefunItemStack( diff --git a/src/main/java/io/github/seggan/liquid/Liquid.java b/src/main/java/io/github/seggan/liquid/Liquid.java index 1b5f215..04f9292 100644 --- a/src/main/java/io/github/seggan/liquid/Liquid.java +++ b/src/main/java/io/github/seggan/liquid/Liquid.java @@ -74,43 +74,43 @@ public void onEnable() { } new Melter(Items.CATEGORY, Items.MELTER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.HEATING_COIL, SlimefunItems.HEATING_COIL, SlimefunItems.HEATING_COIL, - SlimefunItems.HEATING_COIL, SlimefunItems.ELECTRIFIED_CRUCIBLE_3, SlimefunItems.HEATING_COIL, - SlimefunItems.HEATING_COIL, SlimefunItems.HEATING_COIL, SlimefunItems.HEATING_COIL + SlimefunItems.HEATING_COIL.item(), SlimefunItems.HEATING_COIL.item(), SlimefunItems.HEATING_COIL.item(), + SlimefunItems.HEATING_COIL.item(), SlimefunItems.ELECTRIFIED_CRUCIBLE_3.item(), SlimefunItems.HEATING_COIL.item(), + SlimefunItems.HEATING_COIL.item(), SlimefunItems.HEATING_COIL.item(), SlimefunItems.HEATING_COIL.item() }).register(this); new Solidifier(Items.CATEGORY, Items.SOLIDIFIER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.COOLING_UNIT, SlimefunItems.COOLING_UNIT, SlimefunItems.COOLING_UNIT, - SlimefunItems.COOLING_UNIT, SlimefunItems.FREEZER_2, SlimefunItems.COOLING_UNIT, - SlimefunItems.COOLING_UNIT, SlimefunItems.COOLING_UNIT, SlimefunItems.COOLING_UNIT + SlimefunItems.COOLING_UNIT.item(), SlimefunItems.COOLING_UNIT.item(), SlimefunItems.COOLING_UNIT.item(), + SlimefunItems.COOLING_UNIT.item(), SlimefunItems.FREEZER_2.item(), SlimefunItems.COOLING_UNIT.item(), + SlimefunItems.COOLING_UNIT.item(), SlimefunItems.COOLING_UNIT.item(), SlimefunItems.COOLING_UNIT.item() }).register(this); new SpraySolidifier(Items.CATEGORY, Items.SPRAY_SOLIDIFIER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.HEATING_COIL, Items.SOLIDIFIER, SlimefunItems.HEATING_COIL, - new ItemStack(Material.IRON_NUGGET), SlimefunItems.COOLING_UNIT, new ItemStack(Material.IRON_NUGGET), - SlimefunItems.REINFORCED_PLATE, SlimefunItems.REINFORCED_PLATE, SlimefunItems.REINFORCED_PLATE + SlimefunItems.HEATING_COIL.item(), Items.SOLIDIFIER.item(), SlimefunItems.HEATING_COIL.item(), + new ItemStack(Material.IRON_NUGGET), SlimefunItems.COOLING_UNIT.item(), new ItemStack(Material.IRON_NUGGET), + SlimefunItems.REINFORCED_PLATE.item(), SlimefunItems.REINFORCED_PLATE.item(), SlimefunItems.REINFORCED_PLATE.item() }).register(this); new Mixer(Items.CATEGORY, Items.MIXER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.CARBONADO, SlimefunItems.HEATING_COIL, SlimefunItems.CARBONADO, - SlimefunItems.HEATING_COIL, Items.MELTER, SlimefunItems.HEATING_COIL, - SlimefunItems.CARBONADO, SlimefunItems.HEATING_COIL, SlimefunItems.CARBONADO + SlimefunItems.CARBONADO.item(), SlimefunItems.HEATING_COIL.item(), SlimefunItems.CARBONADO.item(), + SlimefunItems.HEATING_COIL.item(), Items.MELTER.item(), SlimefunItems.HEATING_COIL.item(), + SlimefunItems.CARBONADO.item(), SlimefunItems.HEATING_COIL.item(), SlimefunItems.CARBONADO.item() }).register(this); new Centrifuge(Items.CATEGORY, Items.CENTRIFUGE, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.REINFORCED_ALLOY_INGOT, new ItemStack(Material.BOWL), SlimefunItems.REINFORCED_ALLOY_INGOT, - new ItemStack(Material.BOWL), SlimefunItems.ELECTRIC_DUST_WASHER_3, new ItemStack(Material.BOWL), - SlimefunItems.REINFORCED_ALLOY_INGOT, new ItemStack(Material.BOWL), SlimefunItems.REINFORCED_ALLOY_INGOT + SlimefunItems.REINFORCED_ALLOY_INGOT.item(), new ItemStack(Material.BOWL), SlimefunItems.REINFORCED_ALLOY_INGOT.item(), + new ItemStack(Material.BOWL), SlimefunItems.ELECTRIC_DUST_WASHER_3.item(), new ItemStack(Material.BOWL), + SlimefunItems.REINFORCED_ALLOY_INGOT.item(), new ItemStack(Material.BOWL), SlimefunItems.REINFORCED_ALLOY_INGOT.item() }).register(this); new Crystallizer(Items.CATEGORY, Items.CRYSTALLIZER, RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[]{ - SlimefunItems.COOLING_UNIT, new ItemStack(Material.BOWL), SlimefunItems.COOLING_UNIT, - new ItemStack(Material.BOWL), Items.SOLIDIFIER, new ItemStack(Material.BOWL), - SlimefunItems.COOLING_UNIT, new ItemStack(Material.BOWL), SlimefunItems.COOLING_UNIT + SlimefunItems.COOLING_UNIT.item(), new ItemStack(Material.BOWL), SlimefunItems.COOLING_UNIT.item(), + new ItemStack(Material.BOWL), Items.SOLIDIFIER.item(), new ItemStack(Material.BOWL), + SlimefunItems.COOLING_UNIT.item(), new ItemStack(Material.BOWL), SlimefunItems.COOLING_UNIT.item() }).register(this); new SlimefunItem(Items.CATEGORY, Items.SLAG, Solidifier.RECIPE_TYPE, new ItemStack[]{ - LiquidMetal.getLiquids().get(Items.SLAG), null, null, + LiquidMetal.getLiquids().get(Items.SLAG.item()).item(), null, null, null, null, null, null, null, null, }).register(this); @@ -126,7 +126,7 @@ SlimefunItems.COOLING_UNIT, new ItemStack(Material.BOWL), SlimefunItems.COOLING_ metal.register(this); } - RecipeType.GRIND_STONE.register(new ItemStack[]{Items.SLAG}, SlimefunItems.SIFTED_ORE); + RecipeType.GRIND_STONE.register(new ItemStack[]{Items.SLAG.item()}, SlimefunItems.SIFTED_ORE.item()); MixerCategory.INSTANCE.register(this); } diff --git a/src/main/java/io/github/seggan/liquid/Util.java b/src/main/java/io/github/seggan/liquid/Util.java index bf0bb96..8dadf9a 100644 --- a/src/main/java/io/github/seggan/liquid/Util.java +++ b/src/main/java/io/github/seggan/liquid/Util.java @@ -1,6 +1,6 @@ package io.github.seggan.liquid; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import io.github.thebusybiscuit.slimefun4.libraries.dough.items.ItemUtils; import io.github.thebusybiscuit.slimefun4.utils.ChatUtils; import org.bukkit.inventory.ItemStack; @@ -10,8 +10,9 @@ public final class Util { private Util() {} public static String getID(ItemStack stack) { - if (stack instanceof SlimefunItemStack) { - return ((SlimefunItemStack) stack).getItemId(); + SlimefunItem sfItem = SlimefunItem.getByItem(stack); + if (sfItem != null) { + return sfItem.getId(); } else { return ChatUtils.removeColorCodes(ItemUtils.getItemName(stack)) .toUpperCase().replace(" ", "_"); diff --git a/src/main/java/io/github/seggan/liquid/categories/MixerCategory.java b/src/main/java/io/github/seggan/liquid/categories/MixerCategory.java index d592472..aeaa9bd 100644 --- a/src/main/java/io/github/seggan/liquid/categories/MixerCategory.java +++ b/src/main/java/io/github/seggan/liquid/categories/MixerCategory.java @@ -31,7 +31,7 @@ public class MixerCategory extends FlexItemGroup { public MixerCategory() { super(new NamespacedKey(Liquid.getInstance(), "Mixer_recipes_category"), - new CustomItemStack(Items.MIXER.getType(), "&6Mixer Recipes")); + CustomItemStack.create(Items.MIXER.item(), "&6Mixer Recipes")); } @Override @@ -53,9 +53,8 @@ public void open(Player player, PlayerProfile playerProfile, SlimefunGuideMode m menu.setEmptySlotsClickable(false); - menu.addItem(1, new CustomItemStack(ChestMenuUtils.getBackButton(player, "", - ChatColor.GRAY + Slimefun.getLocalization().getMessage(player, "guide.back.guide"))) - ); + menu.addItem(1, ChestMenuUtils.getBackButton(player, "", + ChatColor.GRAY + Slimefun.getLocalization().getMessage(player, "guide.back.guide"))); menu.addMenuClickHandler(1, (pl, slot, item, action) -> { Slimefun.getRegistry().getSlimefunGuide(mode).openMainMenu(playerProfile, 1); @@ -85,9 +84,8 @@ private void displayItem(PlayerProfile p, MachineRecipe r) { menu.addItem(i, ChestMenuUtils.getBackground(), ChestMenuUtils.getEmptyClickHandler()); } - menu.addItem(1, new CustomItemStack(ChestMenuUtils.getBackButton(player, "", - ChatColor.GRAY + Slimefun.getLocalization().getMessage(player, "guide.back.guide"))) - ); + menu.addItem(1, ChestMenuUtils.getBackButton(player, "", + ChatColor.GRAY + Slimefun.getLocalization().getMessage(player, "guide.back.guide"))); menu.addMenuClickHandler(1, (pl, s, is, action) -> { open(player, p, SlimefunGuideMode.SURVIVAL_MODE); return false; diff --git a/src/main/java/io/github/seggan/liquid/machinery/Centrifuge.java b/src/main/java/io/github/seggan/liquid/machinery/Centrifuge.java index 2fdadf8..2d9517e 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/Centrifuge.java +++ b/src/main/java/io/github/seggan/liquid/machinery/Centrifuge.java @@ -32,109 +32,109 @@ protected void registerDefaultRecipes() { registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_4K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_4K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_6K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_6K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_6K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_6K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_8K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_8K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_8K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_8K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_10K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_10K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_10K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_10K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_12K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_12K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_12K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_12K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_14K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_14K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_14K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_14K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_16K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_16K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_16K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_16K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_18K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_18K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_18K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_18K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_20K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_20K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_20K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_20K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_22K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_22K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_22K), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.GOLD_22K.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.GOLD_24K), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.GOLD_24K.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.STEEL_INGOT), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.STEEL_INGOT.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(SlimefunItems.DAMASCUS_STEEL_INGOT), liquids.get(Items.SLAG) + liquids.get(SlimefunItems.DAMASCUS_STEEL_INGOT.item()).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - liquids.get(SlimefunItems.DAMASCUS_STEEL_INGOT), new ItemStack(Material.BUCKET) + liquids.get(SlimefunItems.DAMASCUS_STEEL_INGOT.item()).item(), new ItemStack(Material.BUCKET) }, new ItemStack[]{ - liquids.get(VanillaItems.IRON_INGOT), liquids.get(Items.SLAG) + liquids.get(VanillaItems.IRON_INGOT).item(), liquids.get(Items.SLAG.item()).item() } ); @@ -143,64 +143,64 @@ protected void registerDefaultRecipes() { registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.IRON_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.IRON_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(VanillaItems.IRON_INGOT), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(liquids.get(VanillaItems.IRON_INGOT), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.GOLD_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.GOLD_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(VanillaItems.GOLD_INGOT), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(liquids.get(VanillaItems.GOLD_INGOT), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.LAPIS_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.LAPIS_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(crystals.get(VanillaItems.LAPIS), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(crystals.get(VanillaItems.LAPIS), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.DIAMOND_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.DIAMOND_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(crystals.get(VanillaItems.DIAMOND), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(crystals.get(VanillaItems.DIAMOND), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.EMERALD_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.EMERALD_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(crystals.get(VanillaItems.EMERALD), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(crystals.get(VanillaItems.EMERALD), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.REDSTONE_ORE), new ItemStack(Material.BUCKET, 3) + ores.get(VanillaItems.REDSTONE_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(VanillaItems.REDSTONE), 3), liquids.get(Items.SLAG) + new SlimefunItemStack(liquids.get(VanillaItems.REDSTONE), 3).item(), liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 5, new ItemStack[]{ - ores.get(VanillaItems.NETHERITE_ORE) + ores.get(VanillaItems.NETHERITE_ORE).item(), new ItemStack(Material.BUCKET, 3) }, new ItemStack[]{ - liquids.get(VanillaItems.NETHERITE), liquids.get(Items.SLAG) + liquids.get(VanillaItems.NETHERITE).item(), liquids.get(Items.SLAG.item()).item() } ); } @@ -211,7 +211,7 @@ public List getDisplayRecipes() { List displayRecipes = new ArrayList<>(recipes.size() * 2); for (MachineRecipe recipe : recipes) { - displayRecipes.add(new CustomItemStack( + displayRecipes.add(CustomItemStack.create( recipe.getInput()[0], recipe.getInput()[0].getItemMeta().getDisplayName() + " and buckets (amounts vary)")); // Can't exactly show all 9 items at once displayRecipes.add(recipe.getOutput()[0]); // Main output should be the first item } diff --git a/src/main/java/io/github/seggan/liquid/machinery/Crystallizer.java b/src/main/java/io/github/seggan/liquid/machinery/Crystallizer.java index fbadbfb..8a861c1 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/Crystallizer.java +++ b/src/main/java/io/github/seggan/liquid/machinery/Crystallizer.java @@ -24,7 +24,7 @@ protected void registerDefaultRecipes() { for (SlimefunItemStack liquid : liquids.keySet()) { registerRecipe( 60, - new ItemStack[]{liquid}, + new ItemStack[]{liquid.item()}, new ItemStack[]{liquids.get(liquid), new ItemStack(Material.BUCKET)} ); } diff --git a/src/main/java/io/github/seggan/liquid/machinery/Melter.java b/src/main/java/io/github/seggan/liquid/machinery/Melter.java index d613933..9ddf557 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/Melter.java +++ b/src/main/java/io/github/seggan/liquid/machinery/Melter.java @@ -39,20 +39,20 @@ protected void registerDefaultRecipes() { registerRecipe( 3, new ItemStack[]{new ItemStack(Material.COAL), new ItemStack(Material.BUCKET)}, - new ItemStack[]{liquids.get(SlimefunItems.CARBON)} + new ItemStack[]{liquids.get(SlimefunItems.CARBONADO.item()).item()} ); registerRecipe( 3, new ItemStack[]{new ItemStack(Material.CHARCOAL), new ItemStack(Material.BUCKET)}, - new ItemStack[]{liquids.get(SlimefunItems.CARBON)} + new ItemStack[]{liquids.get(SlimefunItems.CARBONADO.item()).item()} ); for (ItemStack metal : liquids.keySet()) { registerRecipe( 3, new ItemStack[]{metal, new ItemStack(Material.BUCKET)}, - new ItemStack[]{liquids.get(metal)} + new ItemStack[]{liquids.get(metal).item()} ); } BiMap crystals = LiquidMetal.getLiquidCrystals(); @@ -60,7 +60,7 @@ protected void registerDefaultRecipes() { registerRecipe( 3, new ItemStack[]{crystal, new ItemStack(Material.BUCKET)}, - new ItemStack[]{crystals.get(crystal)} + new ItemStack[]{crystals.get(crystal).item()} ); } BiMap ores = LiquidMetal.getLiquidOres(); @@ -68,15 +68,15 @@ protected void registerDefaultRecipes() { registerRecipe( 3, new ItemStack[]{ore, new ItemStack(Material.BUCKET)}, - new ItemStack[]{ores.get(ore)} + new ItemStack[]{ores.get(ore).item()} ); } BiMap dusts = LiquidMetal.getLiquidDusts(); for (SlimefunItemStack dust : dusts.keySet()) { registerRecipe( 3, - new ItemStack[]{dust, new ItemStack(Material.BUCKET)}, - new ItemStack[]{liquids.get(dusts.get(dust))} + new ItemStack[]{dust.item(), new ItemStack(Material.BUCKET)}, + new ItemStack[]{liquids.get(dusts.get(dust)).item()} ); } } diff --git a/src/main/java/io/github/seggan/liquid/machinery/Mixer.java b/src/main/java/io/github/seggan/liquid/machinery/Mixer.java index 6e6e6ef..1e2d200 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/Mixer.java +++ b/src/main/java/io/github/seggan/liquid/machinery/Mixer.java @@ -40,172 +40,172 @@ protected void registerDefaultRecipes() { registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT), - liquids.get(SlimefunItems.ZINC_INGOT), liquids.get(SlimefunItems.STEEL_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item(), + liquids.get(SlimefunItems.ZINC_INGOT.item()).item(), liquids.get(SlimefunItems.STEEL_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.HARDENED_METAL_INGOT), 4) + new SlimefunItemStack(liquids.get(SlimefunItems.HARDENED_METAL_INGOT.item()), 4).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.TIN_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.TIN_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.BRONZE_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.BRONZE_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.ZINC_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.ZINC_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.BRASS_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.BRASS_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.BRONZE_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT) + liquids.get(SlimefunItems.BRONZE_INGOT.item()).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRONZE_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRONZE_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.BRASS_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT) + liquids.get(SlimefunItems.BRASS_INGOT.item()).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRASS_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRASS_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT), - liquids.get(SlimefunItems.TIN_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item(), + liquids.get(SlimefunItems.TIN_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRONZE_INGOT), 3) + new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRONZE_INGOT.item()), 3).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT), - liquids.get(SlimefunItems.ZINC_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item(), + liquids.get(SlimefunItems.ZINC_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRASS_INGOT), 3) + new SlimefunItemStack(liquids.get(SlimefunItems.ALUMINUM_BRASS_INGOT.item()), 3).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.CARBON), liquids.get(VanillaItems.IRON_INGOT) + liquids.get(SlimefunItems.CARBONADO.item()).item(), liquids.get(VanillaItems.IRON_INGOT).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.STEEL_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.STEEL_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.ALUMINUM_INGOT), - liquids.get(SlimefunItems.GOLD_12K), liquids.get(SlimefunItems.HARDENED_METAL_INGOT), - liquids.get(SlimefunItems.LEAD_INGOT), liquids.get(SlimefunItems.STEEL_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT).item(), liquids.get(SlimefunItems.ALUMINUM_INGOT).item(), + liquids.get(SlimefunItems.GOLD_12K.item()).item(), liquids.get(SlimefunItems.HARDENED_METAL_INGOT.item()).item(), + liquids.get(SlimefunItems.LEAD_INGOT.item()).item(), liquids.get(SlimefunItems.STEEL_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.REINFORCED_ALLOY_INGOT), 3), - new SlimefunItemStack(liquids.get(Items.SLAG), 3) + new SlimefunItemStack(liquids.get(SlimefunItems.REINFORCED_ALLOY_INGOT.item()), 3).item(), + new SlimefunItemStack(liquids.get(Items.SLAG.item()), 3).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(SlimefunItems.GOLD_12K), - liquids.get(SlimefunItems.TIN_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(SlimefunItems.GOLD_12K.item()).item(), + liquids.get(SlimefunItems.TIN_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.CORINTHIAN_BRONZE_INGOT), 2), - liquids.get(Items.SLAG) + new SlimefunItemStack(liquids.get(SlimefunItems.CORINTHIAN_BRONZE_INGOT.item()), 2).item(), + liquids.get(Items.SLAG.item()).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.TIN_INGOT), liquids.get(SlimefunItems.LEAD_INGOT) + liquids.get(SlimefunItems.TIN_INGOT.item()).item(), liquids.get(SlimefunItems.LEAD_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.SOLDER_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.SOLDER_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.SILVER_INGOT), liquids.get(SlimefunItems.COPPER_INGOT) + liquids.get(SlimefunItems.SILVER_INGOT.item()).item(), liquids.get(SlimefunItems.COPPER_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.BILLON_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.BILLON_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.SILICON), liquids.get(VanillaItems.IRON_INGOT) + liquids.get(SlimefunItems.SILICON).item(), liquids.get(VanillaItems.IRON_INGOT).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.FERROSILICON), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.FERROSILICON.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.HARDENED_METAL_INGOT), liquids.get(VanillaItems.REDSTONE) + liquids.get(SlimefunItems.HARDENED_METAL_INGOT.item()).item(), liquids.get(VanillaItems.REDSTONE).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.REDSTONE_ALLOY), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.REDSTONE_ALLOY.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COPPER_INGOT), liquids.get(VanillaItems.IRON_INGOT) + liquids.get(SlimefunItems.COPPER_INGOT.item()).item(), liquids.get(VanillaItems.IRON_INGOT).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.NICKEL_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.NICKEL_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.NICKEL_INGOT), liquids.get(VanillaItems.IRON_INGOT) + liquids.get(SlimefunItems.NICKEL_INGOT.item()).item(), liquids.get(VanillaItems.IRON_INGOT).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.COBALT_INGOT), 2) + new SlimefunItemStack(liquids.get(SlimefunItems.COBALT_INGOT.item()), 2).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.COBALT_INGOT), liquids.get(SlimefunItems.NICKEL_INGOT), - liquids.get(SlimefunItems.ALUMINUM_INGOT) + liquids.get(SlimefunItems.COBALT_INGOT.item()).item(), liquids.get(SlimefunItems.NICKEL_INGOT.item()).item(), + liquids.get(SlimefunItems.ALUMINUM_INGOT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(liquids.get(SlimefunItems.MAGNET), 3) + new SlimefunItemStack(liquids.get(SlimefunItems.MAGNESIUM_INGOT.item()), 3).item() } ); registerRecipe( 3, new ItemStack[]{ - liquids.get(SlimefunItems.MAGNESIUM_INGOT), crystals.get(SlimefunItems.SALT) + liquids.get(SlimefunItems.MAGNESIUM_INGOT.item()).item(), crystals.get(SlimefunItems.SALT.item()).item() }, new ItemStack[]{ - new SlimefunItemStack(crystals.get(SlimefunItems.MAGNESIUM_SALT), 2) + new SlimefunItemStack(crystals.get(SlimefunItems.MAGNESIUM_SALT.item()), 2).item() } ); } @@ -216,7 +216,7 @@ public List getDisplayRecipes() { List displayRecipes = new ArrayList<>(recipes.size() * 2); for (MachineRecipe recipe : recipes) { - displayRecipes.add(new CustomItemStack( + displayRecipes.add(CustomItemStack.create( new ItemStack(Material.LAVA_BUCKET, recipe.getInput().length), "&3Multiple Input Recipe")); // Can't exactly show all 9 items at once displayRecipes.add(recipe.getOutput()[0]); // Main output should be the first item diff --git a/src/main/java/io/github/seggan/liquid/machinery/Solidifier.java b/src/main/java/io/github/seggan/liquid/machinery/Solidifier.java index 64b7fd2..f74a097 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/Solidifier.java +++ b/src/main/java/io/github/seggan/liquid/machinery/Solidifier.java @@ -38,7 +38,7 @@ protected void registerDefaultRecipes() { for (SlimefunItemStack liquid : liquids.keySet()) { registerRecipe( 10, - new ItemStack[]{liquid}, + new ItemStack[]{liquid.item()}, new ItemStack[]{liquids.get(liquid), new ItemStack(Material.BUCKET)} ); } diff --git a/src/main/java/io/github/seggan/liquid/machinery/SpraySolidifier.java b/src/main/java/io/github/seggan/liquid/machinery/SpraySolidifier.java index 398b0bf..78fd689 100644 --- a/src/main/java/io/github/seggan/liquid/machinery/SpraySolidifier.java +++ b/src/main/java/io/github/seggan/liquid/machinery/SpraySolidifier.java @@ -23,18 +23,18 @@ protected void registerDefaultRecipes() { BiMap dusts = LiquidMetal.getLiquidDusts().inverse(); BiMap liquids = LiquidMetal.getLiquids(); for (ItemStack solidDust : dusts.keySet()) { - ItemStack solid = liquids.get(solidDust); + ItemStack solid = liquids.get(solidDust).item(); registerRecipe( 2, new ItemStack[]{solid}, - new ItemStack[]{dusts.get(solidDust), new ItemStack(Material.BUCKET)} + new ItemStack[]{dusts.get(solidDust).item(), new ItemStack(Material.BUCKET)} ); } } @Override public ItemStack getProgressBar() { - return SlimefunItems.IRON_DUST; + return SlimefunItems.IRON_DUST.item(); } @Override diff --git a/src/main/java/io/github/seggan/liquid/objects/Fluid.java b/src/main/java/io/github/seggan/liquid/objects/Fluid.java index e8c7dbf..d1b241a 100644 --- a/src/main/java/io/github/seggan/liquid/objects/Fluid.java +++ b/src/main/java/io/github/seggan/liquid/objects/Fluid.java @@ -6,7 +6,7 @@ import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.bukkit.inventory.ItemStack; import lombok.Getter; diff --git a/src/main/java/io/github/seggan/liquid/objects/FluidHolder.java b/src/main/java/io/github/seggan/liquid/objects/FluidHolder.java index b1589bf..25d1087 100644 --- a/src/main/java/io/github/seggan/liquid/objects/FluidHolder.java +++ b/src/main/java/io/github/seggan/liquid/objects/FluidHolder.java @@ -6,7 +6,7 @@ import io.github.thebusybiscuit.slimefun4.utils.NumberUtils; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.Slimefun.api.BlockStorage; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/io/github/seggan/liquid/objects/LContainer.java b/src/main/java/io/github/seggan/liquid/objects/LContainer.java index f738db2..8adba78 100644 --- a/src/main/java/io/github/seggan/liquid/objects/LContainer.java +++ b/src/main/java/io/github/seggan/liquid/objects/LContainer.java @@ -146,7 +146,7 @@ protected void constructMenu(BlockMenuPreset preset) { preset.addItem(i, ChestMenuUtils.getOutputSlotTexture(), ChestMenuUtils.getEmptyClickHandler()); } - preset.addItem(22, new CustomItemStack(Material.BLACK_STAINED_GLASS_PANE, " "), + preset.addItem(22, CustomItemStack.create(Material.BLACK_STAINED_GLASS_PANE, " "), ChestMenuUtils.getEmptyClickHandler()); for (int i : getOutputSlots()) { @@ -319,7 +319,7 @@ protected void tick(Block b) { } progress.put(b, timeleft - 1); } else { - inv.replaceExistingItem(22, new CustomItemStack(Material.BLACK_STAINED_GLASS_PANE, " ")); + inv.replaceExistingItem(22, CustomItemStack.create(Material.BLACK_STAINED_GLASS_PANE, " ")); for (ItemStack output : processing.get(b).getOutput()) { inv.pushItem(output.clone(), getOutputSlots()); diff --git a/src/main/java/io/github/seggan/liquid/objects/LiquidMetal.java b/src/main/java/io/github/seggan/liquid/objects/LiquidMetal.java index 53290ca..d3f61a5 100644 --- a/src/main/java/io/github/seggan/liquid/objects/LiquidMetal.java +++ b/src/main/java/io/github/seggan/liquid/objects/LiquidMetal.java @@ -23,50 +23,50 @@ public class LiquidMetal extends SlimefunItem { private static final HashBiMap MELTED_ORES = HashBiMap.create(); private static final HashBiMap MELTED_DUSTS = HashBiMap.create(); private static final List metals = Arrays.asList( - SlimefunItems.ALUMINUM_BRASS_INGOT, - SlimefunItems.ALUMINUM_BRONZE_INGOT, - SlimefunItems.ALUMINUM_INGOT, - SlimefunItems.DURALUMIN_INGOT, - SlimefunItems.COBALT_INGOT, - SlimefunItems.NICKEL_INGOT, - SlimefunItems.GILDED_IRON, - SlimefunItems.GOLD_4K, - SlimefunItems.GOLD_6K, - SlimefunItems.GOLD_8K, - SlimefunItems.GOLD_10K, - SlimefunItems.GOLD_12K, - SlimefunItems.GOLD_14K, - SlimefunItems.GOLD_16K, - SlimefunItems.GOLD_18K, - SlimefunItems.GOLD_20K, - SlimefunItems.GOLD_22K, - SlimefunItems.GOLD_24K, - SlimefunItems.STEEL_INGOT, - SlimefunItems.DAMASCUS_STEEL_INGOT, - SlimefunItems.COPPER_INGOT, - SlimefunItems.BRASS_INGOT, - SlimefunItems.BRONZE_INGOT, - SlimefunItems.CORINTHIAN_BRONZE_INGOT, - SlimefunItems.HARDENED_METAL_INGOT, - SlimefunItems.REINFORCED_ALLOY_INGOT, - SlimefunItems.REDSTONE_ALLOY, - SlimefunItems.TIN_INGOT, - SlimefunItems.ZINC_INGOT, - SlimefunItems.LEAD_INGOT, - SlimefunItems.SILVER_INGOT, - SlimefunItems.MAGNESIUM_INGOT, - SlimefunItems.CARBON, - SlimefunItems.URANIUM, - SlimefunItems.BOOSTED_URANIUM, - SlimefunItems.NEPTUNIUM, - SlimefunItems.PLUTONIUM, - SlimefunItems.SILICON, - SlimefunItems.FERROSILICON, - SlimefunItems.SOLDER_INGOT, - SlimefunItems.BILLON_INGOT, - SlimefunItems.SULFATE, - SlimefunItems.MAGNET, - Items.SLAG, + SlimefunItems.ALUMINUM_BRASS_INGOT.item(), + SlimefunItems.ALUMINUM_BRONZE_INGOT.item(), + SlimefunItems.ALUMINUM_INGOT.item(), + SlimefunItems.DURALUMIN_INGOT.item(), + SlimefunItems.COBALT_INGOT.item(), + SlimefunItems.NICKEL_INGOT.item(), + SlimefunItems.GILDED_IRON.item(), + SlimefunItems.GOLD_4K.item(), + SlimefunItems.GOLD_6K.item(), + SlimefunItems.GOLD_8K.item(), + SlimefunItems.GOLD_10K.item(), + SlimefunItems.GOLD_12K.item(), + SlimefunItems.GOLD_14K.item(), + SlimefunItems.GOLD_16K.item(), + SlimefunItems.GOLD_18K.item(), + SlimefunItems.GOLD_20K.item(), + SlimefunItems.GOLD_22K.item(), + SlimefunItems.GOLD_24K.item(), + SlimefunItems.STEEL_INGOT.item(), + SlimefunItems.DAMASCUS_STEEL_INGOT.item(), + SlimefunItems.COPPER_INGOT.item(), + SlimefunItems.BRASS_INGOT.item(), + SlimefunItems.BRONZE_INGOT.item(), + SlimefunItems.CORINTHIAN_BRONZE_INGOT.item(), + SlimefunItems.HARDENED_METAL_INGOT.item(), + SlimefunItems.REINFORCED_ALLOY_INGOT.item(), + SlimefunItems.REDSTONE_ALLOY.item(), + SlimefunItems.TIN_INGOT.item(), + SlimefunItems.ZINC_INGOT.item(), + SlimefunItems.LEAD_INGOT.item(), + SlimefunItems.SILVER_INGOT.item(), + SlimefunItems.MAGNESIUM_INGOT.item(), + SlimefunItems.CARBON.item(), + SlimefunItems.URANIUM.item(), + SlimefunItems.BOOSTED_URANIUM.item(), + SlimefunItems.NEPTUNIUM.item(), + SlimefunItems.PLUTONIUM.item(), + SlimefunItems.SILICON.item(), + SlimefunItems.FERROSILICON.item(), + SlimefunItems.SOLDER_INGOT.item(), + SlimefunItems.BILLON_INGOT.item(), + SlimefunItems.SULFATE.item(), + SlimefunItems.MAGNET.item(), + Items.SLAG.item(), VanillaItems.IRON_INGOT, VanillaItems.GOLD_INGOT, VanillaItems.REDSTONE, @@ -76,8 +76,8 @@ public class LiquidMetal extends SlimefunItem { VanillaItems.LAPIS, VanillaItems.DIAMOND, VanillaItems.EMERALD, - SlimefunItems.SALT, - SlimefunItems.MAGNESIUM_SALT + SlimefunItems.SALT.item(), + SlimefunItems.MAGNESIUM_SALT.item() ); private static final List ores = Arrays.asList( @@ -92,13 +92,13 @@ public class LiquidMetal extends SlimefunItem { static { MELTED_DUSTS.put(SlimefunItems.IRON_DUST, VanillaItems.IRON_INGOT); - MELTED_DUSTS.put(SlimefunItems.COPPER_DUST, SlimefunItems.COPPER_INGOT); - MELTED_DUSTS.put(SlimefunItems.ALUMINUM_DUST, SlimefunItems.ALUMINUM_INGOT); + MELTED_DUSTS.put(SlimefunItems.COPPER_DUST, SlimefunItems.COPPER_INGOT.item()); + MELTED_DUSTS.put(SlimefunItems.ALUMINUM_DUST, SlimefunItems.ALUMINUM_INGOT.item()); MELTED_DUSTS.put(SlimefunItems.GOLD_DUST, VanillaItems.GOLD_INGOT); - MELTED_DUSTS.put(SlimefunItems.SILVER_DUST, SlimefunItems.SILVER_INGOT); - MELTED_DUSTS.put(SlimefunItems.LEAD_DUST, SlimefunItems.LEAD_INGOT); - MELTED_DUSTS.put(SlimefunItems.TIN_DUST, SlimefunItems.TIN_INGOT); - MELTED_DUSTS.put(SlimefunItems.MAGNESIUM_DUST, SlimefunItems.MAGNESIUM_INGOT); + MELTED_DUSTS.put(SlimefunItems.SILVER_DUST, SlimefunItems.SILVER_INGOT.item()); + MELTED_DUSTS.put(SlimefunItems.LEAD_DUST, SlimefunItems.LEAD_INGOT.item()); + MELTED_DUSTS.put(SlimefunItems.TIN_DUST, SlimefunItems.TIN_INGOT.item()); + MELTED_DUSTS.put(SlimefunItems.MAGNESIUM_DUST, SlimefunItems.MAGNESIUM_INGOT.item()); } public LiquidMetal(SlimefunItemStack item, ItemStack solid) {