mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 05:02:34 +00:00
Yeet reflective item parsing (#75)
This commit is contained in:
1 parent
1d0568388a
commit
6ba66123eb
48 files changed
+191
-196
No files matched your search
@@ -1,13 +1,9 @@
|
||||
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;
|
||||
@@ -20,11 +16,9 @@ import cpw.mods.fml.relauncher.Side;
|
||||
public abstract class AbstractMod implements IPacketProvider, IInitializable {
|
||||
|
||||
private SimpleNetworkWrapper wrapper;
|
||||
private final LinkedHashSet<Field> fields;
|
||||
protected final List<IInitializable> modules;
|
||||
|
||||
public AbstractMod() {
|
||||
fields = new LinkedHashSet<>();
|
||||
modules = new ArrayList<>();
|
||||
BinnieCore.registerMod(this);
|
||||
}
|
||||
@@ -65,22 +59,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 +74,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 +86,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) {
|
||||
|
||||
@@ -22,8 +22,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;
|
||||
@@ -110,7 +108,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();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -25,6 +27,8 @@ public class ItemGenesis extends Item {
|
||||
setCreativeTab(Tabs.tabApiculture);
|
||||
setUnlocalizedName("genesis");
|
||||
setMaxStackSize(1);
|
||||
|
||||
registerItem(this, getUnlocalizedName().substring(5));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import static cpw.mods.fml.common.registry.GameRegistry.registerItem;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -16,11 +18,13 @@ public class ItemMisc extends Item {
|
||||
|
||||
private final IItemMisc[] items;
|
||||
|
||||
protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) {
|
||||
public ItemMisc(CreativeTabs tab, IItemMisc[] items) {
|
||||
setCreativeTab(tab);
|
||||
setHasSubtypes(true);
|
||||
setUnlocalizedName("misc");
|
||||
items = items2;
|
||||
this.items = items;
|
||||
|
||||
registerItem(this, getUnlocalizedName().substring(5));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package binnie.core.item;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
||||
public class ManagerItem {
|
||||
|
||||
public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) {
|
||||
return new ItemMisc(tab, items);
|
||||
}
|
||||
}
|
||||
@@ -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<FieldParser> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package binnie.core.mod.parser;
|
||||
|
||||
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) {
|
||||
GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user