Remove ItemParser

This commit is contained in:
mezz committed 2017-01-23 23:40:13 -08:00
1 parent 159dc804a2
commit 89edfaa7c7
8 files changed
+16 -110

No files matched your search

@@ -2,7 +2,6 @@ package binnie.core;
import binnie.Binnie;
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;
@@ -13,19 +12,14 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
public abstract class AbstractMod implements IPacketProvider, IInitializable {
private SimpleNetworkWrapper wrapper;
private LinkedHashSet<Field> fields;
protected List<IInitializable> modules;
public AbstractMod() {
this.fields = new LinkedHashSet<>();
this.modules = new ArrayList<>();
BinnieCore.registerMod(this);
MinecraftForge.EVENT_BUS.register(this);
@@ -77,20 +71,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
for (final IInitializable module : this.modules) {
module.preInit();
}
Collections.addAll(this.fields, this.getClass().getFields());
for (final Class cls : this.getClass().getClasses()) {
Collections.addAll(this.fields, this.getClass().getFields());
}
for (final IInitializable module : this.modules) {
Collections.addAll(this.fields, module.getClass().getFields());
}
for (final Field field4 : this.fields) {
try {
FieldParser.preInitParse(field4, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
getProxy().registerModels();
}
@@ -105,13 +85,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
for (final IInitializable module : this.modules) {
module.init();
}
for (final Field field : this.fields) {
try {
FieldParser.initParse(field, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
getProxy().registerItemAndBlockColors();
}
@@ -124,13 +97,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
for (final IInitializable module : this.modules) {
module.postInit();
}
for (final Field field : this.fields) {
try {
FieldParser.postInitParse(field, this);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
protected final void addModule(final IInitializable init) {
@@ -15,8 +15,6 @@ import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage;
import binnie.core.mod.config.ConfigurationMain;
import binnie.core.mod.config.ConfigurationMods;
import binnie.core.mod.parser.FieldParser;
import binnie.core.mod.parser.ItemParser;
import binnie.core.models.ModelManager;
import binnie.core.network.BinnieCorePacketID;
import binnie.core.network.BinniePacketHandler;
@@ -75,8 +73,6 @@ public final class BinnieCore extends AbstractMod {
final Item item = new ItemFluidContainer(container);
BinnieCore.proxy.registerItem(item);
}
//TODO REMOVE ITEMPARSER
FieldParser.parsers.add(new ItemParser());
this.preInit();
}
@@ -24,7 +24,9 @@ public class ModuleItems implements IInitializable {
@Override
public void preInit() {
BinnieCore.fieldKit = new ItemFieldKit();
BinnieCore.proxy.registerItem(BinnieCore.fieldKit);
BinnieCore.genesis = new ItemGenesis();
BinnieCore.proxy.registerItem(BinnieCore.genesis);
}
@Override
@@ -1,47 +0,0 @@
package binnie.core.mod.parser;
import binnie.core.AbstractMod;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
public abstract class FieldParser {
public static Collection<FieldParser> parsers = new ArrayList<>();
;
public abstract boolean isHandled(final Field p0, final AbstractMod p1);
public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
}
public void init(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
}
public void postInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
}
public static void preInitParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
for (final FieldParser parser : FieldParser.parsers) {
if (parser.isHandled(field, mod)) {
parser.preInit(field, mod);
}
}
}
public static void initParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
for (final FieldParser parser : FieldParser.parsers) {
if (parser.isHandled(field, mod)) {
parser.init(field, mod);
}
}
}
public static void postInitParse(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
for (final FieldParser parser : FieldParser.parsers) {
if (parser.isHandled(field, mod)) {
parser.postInit(field, mod);
}
}
}
}
@@ -1,21 +0,0 @@
package binnie.core.mod.parser;
import binnie.core.AbstractMod;
import net.minecraft.item.Item;
import java.lang.reflect.Field;
public class ItemParser extends FieldParser {
@Override
public boolean isHandled(final Field field, final AbstractMod mod) {
return Item.class.isAssignableFrom(field.getType());
}
@Override
public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException {
final Item item = (Item) field.get(null);
if (item != null) {
mod.getProxy().registerItem(item);
}
}
}
@@ -1,7 +1,5 @@
package binnie.core.proxy;
import javax.annotation.Nonnull;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
@@ -16,8 +14,11 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.fml.common.registry.GameRegistry;
import javax.annotation.Nonnull;
public class BinnieModProxy implements IBinnieModProxy {
private AbstractMod mod;
@@ -31,7 +32,8 @@ public class BinnieModProxy implements IBinnieModProxy {
@Override
public Item registerItem(Item item) {
return GameRegistry.register(item);
ForgeRegistries.ITEMS.register(item);
return item;
}
@Override
@@ -37,6 +37,7 @@ public class ModuleAlcohol implements IInitializable {
ModuleAlcohol.liquid = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "liquids/liquid");
//ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID();
ExtraTrees.drink = new ItemDrink();
ExtraTrees.proxy.registerItem(ExtraTrees.drink);
//BinnieCore.proxy.registerCustomItemRenderer(ExtraTrees.drink, new CocktailRenderer());
Binnie.Liquid.createLiquids(Juice.values(), ItemFluidContainer.LiquidJuice);
Binnie.Liquid.createLiquids(Alcohol.values(), ItemFluidContainer.LiquidAlcohol);
@@ -26,16 +26,23 @@ public class ModuleItems implements IInitializable {
@Override
public void preInit() {
ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture);
ExtraTrees.proxy.registerItem(ExtraTrees.itemMisc);
ExtraTrees.itemDictionary = new ItemDictionary();
ExtraTrees.proxy.registerItem(ExtraTrees.itemDictionary);
if (BinnieCore.isLepidopteryActive()) {
ExtraTrees.itemDictionaryLepi = new ItemMothDatabase();
ExtraTrees.proxy.registerItem(ExtraTrees.itemDictionaryLepi);
}
Binnie.Liquid.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree);
ExtraTrees.itemFood = new ItemETFood();
ExtraTrees.proxy.registerItem(ExtraTrees.itemFood);
ExtraTrees.itemHammer = new ItemHammer(false);
ExtraTrees.proxy.registerItem(ExtraTrees.itemHammer);
ExtraTrees.itemDurableHammer = new ItemHammer(true);
ExtraTrees.proxy.registerItem(ExtraTrees.itemDurableHammer);
}
@Override