diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 76b0ee96..4de1d0bc 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,15 +1,5 @@ package binnie.botany; -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent; - import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; @@ -20,7 +10,6 @@ import binnie.botany.ceramic.BlockCeramicPatterned; import binnie.botany.ceramic.BlockStained; import binnie.botany.core.BotanyCore; import binnie.botany.core.BotanyGUI; -import binnie.botany.core.ModuleCore; import binnie.botany.flower.BlockFlower; import binnie.botany.flower.ItemFlower; import binnie.botany.flower.ItemInsulatedTube; @@ -53,6 +42,15 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent; @Mod(modid = "Botany", name = "Botany", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class Botany extends AbstractMod { @@ -96,7 +94,6 @@ public class Botany extends AbstractMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - addModule(new ModuleCore()); addModule(new ModuleGenetics()); addModule(new ModuleGardening()); preInit(); diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java deleted file mode 100644 index 7d1dc53c..00000000 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ /dev/null @@ -1,21 +0,0 @@ -package binnie.botany.core; - -import binnie.core.IInitializable; - -public class ModuleCore implements IInitializable { - - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } -} diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 01fb049c..c9431825 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -16,7 +16,6 @@ import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; -import binnie.core.item.ItemGenesis; import binnie.core.item.ModuleItems; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ItemFluidContainer; @@ -30,7 +29,6 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; -import binnie.genetics.item.ItemFieldKit; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -66,8 +64,6 @@ public class BinnieCore extends AbstractMod { public static int multipassRenderID; private static final List modList = new ArrayList<>(); public static MachineGroup packageCompartment; - public static ItemGenesis genesis; - public static ItemFieldKit fieldKit; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/binnie/core/IInitializable.java b/src/main/java/binnie/core/IInitializable.java index 03e7b013..5adeaf1c 100644 --- a/src/main/java/binnie/core/IInitializable.java +++ b/src/main/java/binnie/core/IInitializable.java @@ -2,9 +2,9 @@ package binnie.core; public interface IInitializable { - void preInit(); + default void preInit() {} - void init(); + default void init() {} - void postInit(); + default void postInit() {} } diff --git a/src/main/java/binnie/core/ManagerBase.java b/src/main/java/binnie/core/ManagerBase.java index 9a598b9f..6b39f416 100644 --- a/src/main/java/binnie/core/ManagerBase.java +++ b/src/main/java/binnie/core/ManagerBase.java @@ -7,19 +7,4 @@ public abstract class ManagerBase implements IInitializable { public ManagerBase() { Binnie.Managers.add(this); } - - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } } diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 00fd92c2..d60adb7e 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -1,5 +1,6 @@ package binnie.core.craftgui; +import binnie.core.item.BinnieItems; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -225,7 +226,7 @@ public class WindowFieldKit extends Window { super.onWindowInventoryChanged(); if (isServer()) { ItemStack kit = getPlayer().getHeldItem(); - if (kit == null || !kit.getItem().equals(BinnieCore.fieldKit)) { + if (kit == null || !kit.getItem().equals(BinnieItems.fieldKit)) { return; } diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index 3ed496da..65c7dd60 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -4,12 +4,6 @@ import binnie.core.IInitializable; public class ModuleCraftGUI implements IInitializable { - @Override - public void preInit() {} - - @Override - public void init() {} - @Override public void postInit() { for (GUIIcon icon : GUIIcon.values()) { diff --git a/src/main/java/binnie/core/item/BinnieItems.java b/src/main/java/binnie/core/item/BinnieItems.java new file mode 100644 index 00000000..e7db3f95 --- /dev/null +++ b/src/main/java/binnie/core/item/BinnieItems.java @@ -0,0 +1,8 @@ +package binnie.core.item; + +import binnie.genetics.item.ItemFieldKit; + +public class BinnieItems { + public static ItemGenesis genesis; + public static ItemFieldKit fieldKit; +} diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index bcc771c4..296a6c77 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -12,7 +12,6 @@ import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; import binnie.botany.network.PacketID; -import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.network.packet.MessageNBT; import binnie.genetics.item.ItemFieldKit; @@ -23,19 +22,18 @@ public class ModuleItems implements IInitializable { @Override public void preInit() { - BinnieCore.fieldKit = new ItemFieldKit(); - BinnieCore.genesis = new ItemGenesis(); + BinnieItems.fieldKit = new ItemFieldKit(); + BinnieItems.genesis = new ItemGenesis(); } @Override public void init() { - // ignored } @Override public void postInit() { GameRegistry.addRecipe( - new ItemStack(BinnieCore.fieldKit, 1, 63), + new ItemStack(BinnieItems.fieldKit, 1, 63), "g ", " is", " pi", @@ -57,7 +55,7 @@ public class ModuleItems implements IInitializable { EntityPlayer player = event.entityPlayer; if (player != null && player.getHeldItem() != null - && player.getHeldItem().getItem() == BinnieCore.fieldKit + && player.getHeldItem().getItem() == BinnieItems.fieldKit && player.isSneaking()) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (!(tile instanceof TileEntityFlower tileFlower)) { diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/src/main/java/binnie/core/machines/storage/ModuleStorage.java index e5a13347..36576cf8 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -23,11 +23,6 @@ public class ModuleStorage implements IInitializable { BinnieCore.packageCompartment.setCreativeTab(CreativeTabs.tabBlock); } - @Override - public void init() { - // ignored - } - @Override public void postInit() { String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "ingotIron" : "gearIron"; diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index aa4e3949..014e2bba 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -44,19 +44,4 @@ public class BinnieModProxy implements IBinnieModProxy { public IIcon getIcon(IIconRegister register, String string) { return BinnieCore.proxy.getIcon(register, mod.getModID(), string); } - - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } } diff --git a/src/main/java/binnie/core/triggers/ModuleTrigger.java b/src/main/java/binnie/core/triggers/ModuleTrigger.java index 8e88de70..cbbb7f50 100644 --- a/src/main/java/binnie/core/triggers/ModuleTrigger.java +++ b/src/main/java/binnie/core/triggers/ModuleTrigger.java @@ -6,11 +6,6 @@ import buildcraft.api.statements.StatementManager; public class ModuleTrigger implements IInitializable { - @Override - public void preInit() { - // ignored - } - @Override public void init() { BinnieAction.actionPauseProcess = new BinnieAction( @@ -80,8 +75,4 @@ public class ModuleTrigger implements IInitializable { StatementManager.registerTriggerProvider(new TriggerProvider()); } - @Override - public void postInit() { - // ignored - } } diff --git a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java index 394d98d5..d836f066 100644 --- a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java +++ b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java @@ -10,14 +10,4 @@ public class ModuleLiquids implements IInitializable { public void preInit() { Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee); } - - @Override - public void init() { - // ignored - } - - @Override - public void postInit() { - // ignored - } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 7dec990d..e1c347e3 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -98,11 +98,6 @@ public class ModuleCarpentry implements IInitializable { .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); } - @Override - public void init() { - // ignored - } - @Override public void postInit() { for (EnumDesign design : EnumDesign.values()) { diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 4822f4f2..c3fc63cf 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -20,16 +20,6 @@ import forestry.api.arboriculture.IAlleleTreeSpecies; public class ModuleCore implements IInitializable { - @Override - public void preInit() { - // ignored - } - - @Override - public void init() { - // ignored - } - @Override public void postInit() { if (!BinnieCore.proxy.isDebug()) { diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 39ce1114..a9ae4842 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -32,11 +32,6 @@ public class ModuleGenetics implements IInitializable { } } - @Override - public void init() { - // ignored - } - @Override public void postInit() { ExtraTreeSpecies.init(); diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index f0971a08..27183391 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -25,11 +25,6 @@ public class ModuleMachine implements IInitializable { ExtraTrees.blockMachine = machineGroup.getBlock(); } - @Override - public void init() { - // ignore - } - @Override public void postInit() { GameRegistry.addRecipe( diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 0232cf30..89d67983 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -7,6 +7,7 @@ import static binnie.genetics.item.GeneticsItems.registry; import binnie.botany.Botany; import binnie.core.BinnieCore; +import binnie.core.item.BinnieItems; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; @@ -134,7 +135,7 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til validSelections.add(analyst); validSelections.add(registry); validSelections.add(masterRegistry); - validSelections.add(BinnieCore.genesis); + validSelections.add(BinnieItems.genesis); if (stack == null && validSelections.contains(player.getHeldItem().getItem())) { stack = player.getHeldItem().copy();