From 591160a45fb8aafea9efcd9ecda9678bd8b14ef3 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 30 Aug 2019 22:41:58 +0200 Subject: [PATCH] Removed more empty methods --- .../abstractItems/AContainer.java | 11 +++++----- .../machines/ElectricSmeltery.java | 4 ---- .../Slimefun/Setup/SlimefunSetup.java | 22 ++----------------- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index 95b980b5a..e956bfc40 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -55,10 +55,6 @@ public abstract class AContainer extends SlimefunItem { constructMenu(this); } - @Override - public void newInstance(BlockMenu menu, Block b) { - } - @Override public boolean canOpen(Block b, Player p) { return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true); @@ -83,6 +79,7 @@ public abstract class AContainer extends SlimefunItem { inv.replaceExistingItem(slot, null); } } + for (int slot : getOutputSlots()) { if (inv.getItemInSlot(slot) != null) { b.getWorld().dropItemNaturally(b.getLocation(), inv.getItemInSlot(slot)); @@ -90,6 +87,7 @@ public abstract class AContainer extends SlimefunItem { } } } + progress.remove(b); processing.remove(b); return true; @@ -137,11 +135,14 @@ public abstract class AContainer extends SlimefunItem { public abstract String getInventoryTitle(); public abstract ItemStack getProgressBar(); - public abstract void registerDefaultRecipes(); public abstract int getEnergyConsumption(); public abstract int getSpeed(); public abstract String getMachineIdentifier(); + public void registerDefaultRecipes() { + // Override this method to register your machine recipes + } + public int[] getInputSlots() { return new int[] {19, 20}; } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java index 9d38414e2..8a3ede903 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricSmeltery.java @@ -51,10 +51,6 @@ public abstract class ElectricSmeltery extends AContainer { constructMenu(this); } - @Override - public void newInstance(BlockMenu menu, Block b) { - } - @Override public boolean canOpen(Block b, Player p) { return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 19c353058..0b0d09c18 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -2633,11 +2633,7 @@ public final class SlimefunSetup { new AContainer(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_ORE_GRINDER, "ELECTRIC_ORE_GRINDER", RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {null, new ItemStack(Material.DIAMOND_PICKAXE), null, SlimefunItems.GILDED_IRON, SlimefunItems.HEATING_COIL, SlimefunItems.GILDED_IRON, SlimefunItems.GILDED_IRON, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.GILDED_IRON}) { - - @Override - public void registerDefaultRecipes() { - } - + @Override public ItemStack getProgressBar() { return new ItemStack(Material.STONE_PICKAXE); @@ -2668,10 +2664,6 @@ public final class SlimefunSetup { new AContainer(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_ORE_GRINDER_2, "ELECTRIC_ORE_GRINDER_2", RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {null, new ItemStack(Material.DIAMOND_PICKAXE), null, SlimefunItems.HEATING_COIL, SlimefunItems.ELECTRIC_ORE_GRINDER, SlimefunItems.HEATING_COIL, SlimefunItems.GILDED_IRON, SlimefunItems.BLISTERING_INGOT_3, SlimefunItems.GILDED_IRON}) { - @Override - public void registerDefaultRecipes() { - } - @Override public ItemStack getProgressBar() { return new ItemStack(Material.DIAMOND_PICKAXE); @@ -2762,8 +2754,6 @@ public final class SlimefunSetup { registerRecipe(3, new ItemStack[]{SlimefunItems.SILVER_INGOT}, new ItemStack[]{SlimefunItems.SILVER_DUST}); registerRecipe(3, new ItemStack[]{SlimefunItems.TIN_INGOT}, new ItemStack[]{SlimefunItems.TIN_DUST}); registerRecipe(3, new ItemStack[]{SlimefunItems.ZINC_INGOT}, new ItemStack[]{SlimefunItems.ZINC_DUST}); - - } @Override @@ -4298,10 +4288,6 @@ public final class SlimefunSetup { new ElectricSmeltery(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_SMELTERY, "ELECTRIC_SMELTERY", RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {new ItemStack(Material.NETHER_BRICKS), SlimefunItems.ELECTRIC_MOTOR, new ItemStack(Material.NETHER_BRICKS), SlimefunItems.HEATING_COIL, SlimefunItems.ELECTRIC_INGOT_FACTORY, SlimefunItems.HEATING_COIL, SlimefunItems.GILDED_IRON, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.GILDED_IRON}) { - @Override - public void registerDefaultRecipes() { - } - @Override public int getEnergyConsumption() { return 10; @@ -4316,11 +4302,7 @@ public final class SlimefunSetup { new ElectricSmeltery(Categories.ELECTRICITY, SlimefunItems.ELECTRIC_SMELTERY_2, "ELECTRIC_SMELTERY_2", RecipeType.ENHANCED_CRAFTING_TABLE, new ItemStack[] {SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.POWER_CRYSTAL, SlimefunItems.DAMASCUS_STEEL_INGOT, SlimefunItems.HEATING_COIL, SlimefunItems.ELECTRIC_SMELTERY, SlimefunItems.HEATING_COIL, SlimefunItems.GILDED_IRON, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.GILDED_IRON}) { - - @Override - public void registerDefaultRecipes() { - } - + @Override public int getEnergyConsumption() { return 20;