diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index a5d2054d..25043fa9 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,13 +1,6 @@ package binnie.core; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; - import binnie.core.gui.IBinnieGUID; -import binnie.core.mod.parser.FieldParser; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.network.IPacketProvider; @@ -16,15 +9,15 @@ import binnie.core.proxy.IProxyCore; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import java.util.ArrayList; +import java.util.List; public abstract class AbstractMod implements IPacketProvider, IInitializable { private SimpleNetworkWrapper wrapper; - private final LinkedHashSet fields; protected final List modules; public AbstractMod() { - fields = new LinkedHashSet<>(); modules = new ArrayList<>(); BinnieCore.registerMod(this); } @@ -65,22 +58,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.preInit(); } - - // TODO what does it mean? - Collections.addAll(fields, getClass().getFields()); - for (Class cls : getClass().getClasses()) { - Collections.addAll(fields, getClass().getFields()); - } - for (IInitializable module : modules) { - Collections.addAll(fields, module.getClass().getFields()); - } - for (Field field4 : fields) { - try { - FieldParser.preInitParse(field4, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } @Override @@ -96,14 +73,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.init(); } - - for (Field field : fields) { - try { - FieldParser.initParse(field, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } @Override @@ -116,14 +85,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.postInit(); } - - for (Field field : fields) { - try { - FieldParser.postInitParse(field, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } protected void addModule(IInitializable init) { diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 41128eec..93e80e9f 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,14 +1,5 @@ package binnie.core; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; - import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -22,8 +13,6 @@ import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ItemFluidContainer; import binnie.core.machines.MachineGroup; import binnie.core.machines.storage.ModuleStorage; -import binnie.core.mod.parser.FieldParser; -import binnie.core.mod.parser.ItemParser; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -45,6 +34,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; @Mod( modid = BinnieCore.CORE_MODID, @@ -110,7 +106,6 @@ public class BinnieCore extends AbstractMod { Item item = new ItemFluidContainer(container); GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); } - FieldParser.parsers.add(new ItemParser()); super.preInit(); } diff --git a/src/main/java/binnie/core/mod/parser/FieldParser.java b/src/main/java/binnie/core/mod/parser/FieldParser.java deleted file mode 100644 index 3e288669..00000000 --- a/src/main/java/binnie/core/mod/parser/FieldParser.java +++ /dev/null @@ -1,52 +0,0 @@ -package binnie.core.mod.parser; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; - -import binnie.core.AbstractMod; - -public abstract class FieldParser { - - public static Collection parsers = new ArrayList<>(); - - public abstract boolean isHandled(Field field, AbstractMod mod); - - public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public static void preInitParse(Field field, AbstractMod mod) - throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.preInit(field, mod); - } - } - } - - public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.init(field, mod); - } - } - } - - public static void postInitParse(Field field, AbstractMod mod) - throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.postInit(field, mod); - } - } - } -} diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java deleted file mode 100644 index 4039e137..00000000 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package binnie.core.mod.parser; - -import binnie.core.item.ItemMisc; -import java.lang.reflect.Field; - -import net.minecraft.item.Item; - -import binnie.core.AbstractMod; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ItemParser extends FieldParser { - - @Override - public boolean isHandled(Field field, AbstractMod mod) { - return Item.class.isAssignableFrom(field.getType()); - } - - @Override - public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - Item item = (Item) field.get(null); - if (item != null && !(item instanceof ItemMisc)) { - GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); - } - } -}