Stop suppressing exceptions that may be important

This commit is contained in:
mezz committed 2017-01-24 01:19:28 -08:00
1 parent 163abc377e
commit 7c048de845
33 files changed
+111 -186

No files matched your search

-2
View File
@@ -2,7 +2,6 @@ package binnie;
import binnie.core.ManagerBase;
import binnie.core.genetics.ManagerGenetics;
import binnie.core.item.ManagerItem;
import binnie.core.language.ManagerLanguage;
import binnie.core.liquid.ManagerLiquid;
import binnie.core.machines.ManagerMachine;
@@ -19,6 +18,5 @@ public final class Binnie {
public static final ManagerConfig Configuration = new ManagerConfig();
public static final ManagerLiquid Liquid = new ManagerLiquid();
public static final ManagerMachine Machine = new ManagerMachine();
public static final ManagerItem Item = new ManagerItem();
public static final ManagerResource Resource = new ManagerResource();
}
@@ -1,6 +1,5 @@
package binnie.botany.gardening;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumAcidity;
@@ -27,6 +26,8 @@ import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.block.ItemMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.item.IItemMiscProvider;
import binnie.core.item.ItemMisc;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@@ -75,7 +76,7 @@ public class ModuleGardening implements IInitializable {
Botany.proxy.registerItem(Botany.trowelDiamond);
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
Botany.proxy.registerItem(Botany.trowelGold);
Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance);
Botany.misc = new ItemMisc(CreativeTabBotany.instance, (IItemMiscProvider[]) BotanyItems.values());
Botany.proxy.registerItem(Botany.misc);
Botany.pigment = new ItemPigment();
Botany.proxy.registerItem(Botany.pigment);
+6 -9
View File
@@ -149,16 +149,13 @@ public final class BinnieCore extends AbstractMod {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) {
try {
final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
final NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
} catch (Exception ex) {
final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
final NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
}
//TODO RENDERING
@@ -171,18 +171,15 @@ public class ManagerGenetics extends ManagerBase {
final TreeSet<IAllele> alleles = new TreeSet<>(new ComparatorAllele());
for (final IIndividual individual : root.getIndividualTemplates()) {
final IGenome genome = individual.getGenome();
try {
final IAllele a1 = genome.getActiveAllele(chromosome);
final IAllele a2 = genome.getInactiveAllele(chromosome);
if (chromosome.getAlleleClass().isInstance(a1)) {
alleles.add(a1);
}
if (!chromosome.getAlleleClass().isInstance(a2)) {
continue;
}
alleles.add(a2);
} catch (Exception ex) {
final IAllele a1 = genome.getActiveAllele(chromosome);
final IAllele a2 = genome.getInactiveAllele(chromosome);
if (chromosome.getAlleleClass().isInstance(a1)) {
alleles.add(a1);
}
if (!chromosome.getAlleleClass().isInstance(a2)) {
continue;
}
alleles.add(a2);
}
system.addExtraAlleles(chromosome, alleles);
if (alleles.size() == 0) {
@@ -16,7 +16,7 @@ public enum BinnieCoreGUI implements IBinnieGUID {
FieldKit,
Genesis;
public Window getWindow(final EntityPlayer player, final IInventory object, final Side side) throws Exception {
public Window getWindow(final EntityPlayer player, final IInventory object, final Side side) {
switch (this) {
case Compartment: {
return new WindowCompartment(player, object, side);
@@ -35,17 +35,12 @@ public enum BinnieCoreGUI implements IBinnieGUID {
@Override
public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
Window window = null;
final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
IInventory object = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
}
try {
window = this.getWindow(player, object, side);
} catch (Exception e) {
e.printStackTrace();
}
return window;
return this.getWindow(player, object, side);
}
}
+9 -13
View File
@@ -8,16 +8,13 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
import java.util.List;
public class ItemMisc extends ItemCore {
private IItemMiscProvider[] items;
public ItemMisc() {
super("misc");
}
protected ItemMisc(final CreativeTabs tab, final IItemMiscProvider[] items) {
public ItemMisc(final CreativeTabs tab, final IItemMiscProvider[] items) {
super("misc");
this.setCreativeTab(tab);
this.setHasSubtypes(true);
@@ -27,14 +24,15 @@ public class ItemMisc extends ItemCore {
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, List par3List) {
public void getSubItems(@Nonnull final Item itemIn, final CreativeTabs creativeTabs, List<ItemStack> subItems) {
for (IItemMiscProvider item : this.items) {
if (item.isActive()) {
par3List.add(this.getStack(item, 1));
subItems.add(this.getStack(item, 1));
}
}
}
@Nonnull
private IItemMiscProvider getItem(int damage) {
return (damage >= this.items.length) ? this.items[0] : this.items[damage];
}
@@ -48,9 +46,7 @@ public class ItemMisc extends ItemCore {
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
IItemMiscProvider item = this.getItem(stack.getItemDamage());
if (item != null) {
item.addInformation(tooltip);
}
item.addInformation(tooltip);
}
@SideOnly(Side.CLIENT)
@@ -59,12 +55,12 @@ public class ItemMisc extends ItemCore {
for (IItemMiscProvider type : items) {
manager.registerItemModel(item, type.ordinal(), "misc/" + type.getModelPath());
}
}
@Nonnull
@Override
public String getItemStackDisplayName(final ItemStack stack) {
public String getItemStackDisplayName(@Nonnull final ItemStack stack) {
IItemMiscProvider item = this.getItem(stack.getItemDamage());
return (item != null) ? item.getName(stack) : "null";
return item.getName(stack);
}
}
@@ -1,9 +0,0 @@
package binnie.core.item;
import net.minecraft.creativetab.CreativeTabs;
public class ManagerItem {
public ItemMisc registerMiscItems(final IItemMiscProvider[] items, final CreativeTabs tab) {
return new ItemMisc(tab, items);
}
}
@@ -6,6 +6,7 @@ import binnie.core.BinnieCore;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -36,7 +37,7 @@ public class MachineGroup {
pack.assignMetadata(type.ordinal());
pack.setActive(type.isActive());
this.addPackage(pack);
} catch (Exception e) {
} catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException("Failed to create machine package " + type.toString(), e);
}
}
@@ -79,7 +79,9 @@ public class ManagerMachine extends ManagerBase {
@Override
public void postInit() {
BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
// TODO fix rendering
Object rendererMachine = null; // BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine");
BinnieCore.proxy.registerTileEntity(TileEntityMachine.class, "binnie.tile.machine", rendererMachine);
}
public Class<?>[] getComponentInterfaces(final Class<? extends MachineComponent> clss) {
@@ -6,6 +6,7 @@ import net.minecraftforge.common.config.Configuration;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -28,26 +29,26 @@ public class ManagerConfig extends ManagerBase {
}
public void loadConfiguration(final Class<?> cls, final AbstractMod mod) {
try {
final String filename = cls.getAnnotation(ConfigFile.class).filename();
final BinnieConfiguration config = new BinnieConfiguration(filename, mod);
config.load();
for (final Field field : cls.getFields()) {
if (field.isAnnotationPresent(ConfigProperty.class)) {
final ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class);
for (final Annotation annotation : field.getAnnotations()) {
if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) {
final Class<?> propertyClass = annotation.annotationType().getAnnotation(ConfigProperty.Type.class).propertyClass();
final String filename = cls.getAnnotation(ConfigFile.class).filename();
final BinnieConfiguration config = new BinnieConfiguration(filename, mod);
config.load();
for (final Field field : cls.getFields()) {
if (field.isAnnotationPresent(ConfigProperty.class)) {
final ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class);
for (final Annotation annotation : field.getAnnotations()) {
if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) {
final Class<?> propertyClass = annotation.annotationType().getAnnotation(ConfigProperty.Type.class).propertyClass();
try {
final PropertyBase property = (PropertyBase) propertyClass.getConstructor(Field.class, BinnieConfiguration.class, ConfigProperty.class, annotation.annotationType()).newInstance(field, config, propertyAnnot, annotation.annotationType().cast(annotation));
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
e.printStackTrace();
}
}
}
}
config.save();
this.configurations.put(cls, config);
} catch (Exception e) {
e.printStackTrace();
}
config.save();
this.configurations.put(cls, config);
}
public void addItemID(final Integer configValue, final String configKey, final BinnieConfiguration configFile) {
@@ -1,7 +1,6 @@
package binnie.core.models;
import com.google.common.collect.ImmutableMap;
import forestry.api.core.ForestryAPI;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
@@ -24,6 +23,7 @@ import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.IRegistry;
import net.minecraft.world.IBlockAccess;
@@ -139,7 +139,7 @@ public class ModelManager implements IModelManager {
@Override
public ModelResourceLocation getModelLocation(String modID, String identifier) {
return new ModelResourceLocation(modID + ":" + identifier, "inventory");
return new ModelResourceLocation(new ResourceLocation(modID, identifier), "inventory");
}
@SideOnly(Side.CLIENT)
@@ -4,6 +4,7 @@ import binnie.Constants;
import binnie.core.models.ModelManager;
import binnie.core.resource.BinnieResource;
import binnie.craftgui.resource.minecraft.CraftGUIResourceManager;
import com.google.common.base.Throwables;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -162,7 +163,8 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy
if (rendererClass != null) {
object = rendererClass.newInstance();
}
} catch (Exception ex) {
} catch (IllegalAccessException | InstantiationException | ClassNotFoundException e) {
throw Throwables.propagate(e);
}
return object;
}
@@ -2,7 +2,6 @@ package binnie.craftgui.genetics.machine;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlPlayerInventory;
@@ -25,10 +24,6 @@ public class WindowAcclimatiser extends WindowMachine {
public static final int[] slotAcclimatiser = new int[]{5, 6, 7};
public static final int[] slotDone = new int[]{8, 9, 10, 11};
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowAcclimatiser(player, inventory, side);
}
public WindowAcclimatiser(final EntityPlayer player, final IInventory inventory, final Side side) {
super(280, 198, player, inventory, side);
}
@@ -4,7 +4,6 @@ import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.MinecraftGUI;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -28,10 +27,6 @@ public class WindowAnalyser extends WindowMachine {
static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
static Texture Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowAnalyser(player, inventory, side);
}
public WindowAnalyser(final EntityPlayer player, final IInventory inventory, final Side side) {
super(220, 210, player, inventory, side);
}
@@ -16,7 +16,6 @@ import binnie.craftgui.events.EventHandler;
import binnie.craftgui.events.EventTextEdit;
import binnie.craftgui.events.EventValueChanged;
import binnie.craftgui.minecraft.MinecraftGUI;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlPlayerInventory;
import binnie.craftgui.minecraft.control.ControlTabIcon;
import binnie.craftgui.window.Panel;
@@ -58,8 +57,8 @@ public class WindowGeneBank extends WindowMachine {
}
}
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowGeneBank(player, inventory, side, false);
public WindowGeneBank(final EntityPlayer player, final IInventory inventory, final Side side) {
this(player, inventory, side, false);
}
public WindowGeneBank(final EntityPlayer player, final IInventory inventory, final Side side, final boolean isNEI) {
@@ -1,12 +1,11 @@
package binnie.craftgui.genetics.machine;
import binnie.craftgui.minecraft.Window;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraftforge.fml.relauncher.Side;
public class WindowGeneBankNEI {
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowGeneBank(player, inventory, side, true);
public class WindowGeneBankNEI extends WindowGeneBank {
public WindowGeneBankNEI(final EntityPlayer player, final IInventory inventory, final Side side) {
super(player, inventory, side, true);
}
}
@@ -3,7 +3,6 @@ package binnie.craftgui.genetics.machine;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -24,13 +23,7 @@ import net.minecraftforge.fml.relauncher.Side;
public class WindowGenepool extends WindowMachine {
static Texture ProgressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
;
static Texture Progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture());
;
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowGenepool(player, inventory, side);
}
public WindowGenepool(final EntityPlayer player, final IInventory inventory, final Side side) {
super(280, 198, player, inventory, side);
@@ -3,7 +3,6 @@ package binnie.craftgui.genetics.machine;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -25,10 +24,6 @@ public class WindowIncubator extends WindowMachine {
static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess);
static Texture Progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess);
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowIncubator(player, inventory, side);
}
public WindowIncubator(final EntityPlayer player, final IInventory inventory, final Side side) {
super(228, 196, player, inventory, side);
}
@@ -5,7 +5,6 @@ import binnie.craftgui.core.geometry.CraftGUIUtil;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.core.geometry.TextJustification;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -27,10 +26,6 @@ public class WindowInoculator extends WindowMachine {
static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowInoculator(player, inventory, side);
}
public WindowInoculator(final EntityPlayer player, final IInventory inventory, final Side side) {
super(266, 240, player, inventory, side);
}
@@ -3,7 +3,6 @@ package binnie.craftgui.genetics.machine;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -26,10 +25,6 @@ public class WindowIsolator extends WindowMachine {
static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
static Texture Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture());
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowIsolator(player, inventory, side);
}
public WindowIsolator(final EntityPlayer player, final IInventory inventory, final Side side) {
super(330, 208, player, inventory, side);
}
@@ -3,7 +3,6 @@ package binnie.craftgui.genetics.machine;
import binnie.core.AbstractMod;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -26,10 +25,6 @@ public class WindowPolymeriser extends WindowMachine {
static Texture ProgressBase = new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture());
static Texture Progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture());
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowPolymeriser(player, inventory, side);
}
public WindowPolymeriser(final EntityPlayer player, final IInventory inventory, final Side side) {
super(278, 212, player, inventory, side);
}
@@ -7,7 +7,6 @@ import binnie.craftgui.core.geometry.IArea;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.core.geometry.TextJustification;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -31,10 +30,6 @@ public class WindowSequencer extends WindowMachine {
static Texture Progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture());
ControlText slotText;
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowSequencer(player, inventory, side);
}
public WindowSequencer(final EntityPlayer player, final IInventory inventory, final Side side) {
super(226, 224, player, inventory, side);
}
@@ -5,7 +5,6 @@ import binnie.craftgui.core.geometry.CraftGUIUtil;
import binnie.craftgui.core.geometry.Position;
import binnie.craftgui.core.geometry.TextJustification;
import binnie.craftgui.minecraft.GUIIcon;
import binnie.craftgui.minecraft.Window;
import binnie.craftgui.minecraft.control.ControlEnergyBar;
import binnie.craftgui.minecraft.control.ControlErrorState;
import binnie.craftgui.minecraft.control.ControlIconDisplay;
@@ -26,10 +25,6 @@ public class WindowSplicer extends WindowMachine {
static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture());
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowSplicer(player, inventory, side);
}
public WindowSplicer(final EntityPlayer player, final IInventory inventory, final Side side) {
super(280, 240, player, inventory, side);
}
@@ -1,14 +1,15 @@
package binnie.extrabees.core;
import binnie.Binnie;
import binnie.core.IInitializable;
import binnie.core.item.IItemMiscProvider;
import binnie.core.item.ItemMisc;
import binnie.extrabees.ExtraBees;
import forestry.api.core.Tabs;
public class ModuleCore implements IInitializable {
@Override
public void preInit() {
ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, (IItemMiscProvider[]) ExtraBeeItems.values());
ExtraBees.proxy.registerItem(ExtraBees.itemMisc);
}
@@ -6,6 +6,7 @@ import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.FruitPod;
import binnie.extratrees.config.ConfigurationMain;
import binnie.extratrees.item.Food;
import com.google.common.base.Throwables;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IFruitProvider;
@@ -26,7 +27,6 @@ import net.minecraft.world.World;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
@@ -301,7 +301,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF
modifiersField.setInt(f, f.getModifiers() & 0xFFFFFFEF);
f.set(prov, familyCitrus);
} catch (Exception e) {
e.printStackTrace();
throw Throwables.propagate(e);
}
}
for (final IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) {
@@ -4,6 +4,8 @@ import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.item.IItemMiscProvider;
import binnie.core.item.ItemMisc;
import binnie.core.liquid.ItemFluidContainer;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.EnumExtraTreeLog;
@@ -25,7 +27,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
public class ModuleItems implements IInitializable {
@Override
public void preInit() {
ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture);
ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, (IItemMiscProvider[]) ExtraTreeItems.values());
ExtraTrees.proxy.registerItem(ExtraTrees.itemMisc);
ExtraTrees.itemDictionary = new ItemDictionary();
@@ -1,5 +1,6 @@
package binnie.extratrees.machines;
import com.google.common.base.Throwables;
import forestry.core.render.TankRenderInfo;
import net.minecraft.util.EnumFacing;
@@ -19,7 +20,7 @@ public class MachineRendererForestry {
MachineRendererForestry.renderMethod.setAccessible(true);
MachineRendererForestry.instances.put(file, instance);
} catch (Exception ex) {
// ex.printStackTrace();
throw Throwables.propagate(ex);
}
}
@@ -30,7 +31,7 @@ public class MachineRendererForestry {
try {
MachineRendererForestry.renderMethod.invoke(MachineRendererForestry.instances.get(name), TankRenderInfo.EMPTY, TankRenderInfo.EMPTY, EnumFacing.UP, x, y, z);
} catch (Exception ex) {
// ex.printStackTrace();
throw Throwables.propagate(ex);
}
}
@@ -19,7 +19,9 @@ public class ModuleMachine implements IInitializable {
final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values());
machineGroup.setCreativeTab(Tabs.tabArboriculture);
ExtraTrees.blockMachine = machineGroup.getBlock();
BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
// TODO fix rendering
Object rendererMachine = null;// BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine");
BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", rendererMachine);
}
@Override
@@ -21,71 +21,47 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import java.lang.reflect.Constructor;
import javax.annotation.Nullable;
public enum GeneticsGUI implements IBinnieGUID {
Genepool(WindowGenepool.class),
Isolator(WindowIsolator.class),
Sequencer(WindowSequencer.class),
Replicator(WindowPolymeriser.class),
Inoculator(WindowInoculator.class),
GeneBank(WindowGeneBank.class),
Analyser(WindowAnalyser.class),
Incubator(WindowIncubator.class),
Database(WindowGeneBank.class),
DatabaseNEI(WindowGeneBankNEI.class),
Acclimatiser(WindowAcclimatiser.class),
Splicer(WindowSplicer.class),
Analyst,
Registry,
MasterRegistry;
Genepool(WindowGenepool::new),
Isolator(WindowIsolator::new),
Sequencer(WindowSequencer::new),
Replicator(WindowPolymeriser::new),
Inoculator(WindowInoculator::new),
GeneBank(WindowGeneBank::new),
Analyser(WindowAnalyser::new),
Incubator(WindowIncubator::new),
Database(WindowGeneBank::new),
DatabaseNEI(WindowGeneBankNEI::new),
Acclimatiser(WindowAcclimatiser::new),
Splicer(WindowSplicer::new),
Analyst(WindowAnalyst.create(false, false)),
Registry(WindowAnalyst.create(true, false)),
MasterRegistry(WindowAnalyst.create(true, true));
Class<? extends Window> windowClass;
private final WindowFactory windowFactory;
GeneticsGUI() {
public interface WindowFactory {
Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side);
}
GeneticsGUI(final Class window) {
this.windowClass = window;
GeneticsGUI(final WindowFactory windowFactory) {
this.windowFactory = windowFactory;
}
public Window getWindow(final EntityPlayer player, final IInventory object, final Side side) throws Exception {
switch (this) {
case Analyst: {
return new WindowAnalyst(player, null, side, false, false);
}
case MasterRegistry: {
return new WindowAnalyst(player, null, side, true, true);
}
case Registry: {
return new WindowAnalyst(player, null, side, true, false);
}
default: {
final Constructor constr = this.windowClass.getConstructor(EntityPlayer.class, IInventory.class, Side.class);
return (Window) constr.newInstance(player, object, side);
}
}
public Window getWindow(final EntityPlayer player, @Nullable final IInventory object, final Side side) {
return this.windowFactory.create(player, object, side);
}
@Override
public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) {
Window window = null;
final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z));
IInventory object = null;
if (tileEntity instanceof IInventory) {
object = (IInventory) tileEntity;
}
try {
if (this == GeneticsGUI.Database || this == GeneticsGUI.GeneBank) {
window = WindowGeneBank.create(player, object, side);
} else if (this == GeneticsGUI.DatabaseNEI) {
window = WindowGeneBankNEI.create(player, object, side);
} else {
window = this.getWindow(player, object, side);
}
} catch (Exception e) {
e.printStackTrace();
}
return window;
return getWindow(player, object, side);
}
}
@@ -1,6 +1,7 @@
package binnie.genetics.genetics;
import binnie.core.genetics.BreedingSystem;
import com.google.common.base.Throwables;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleFloat;
import forestry.api.genetics.IAlleleInteger;
@@ -38,6 +39,7 @@ public class GeneticEngineeringSystem {
this.chromosomeMap.get(chromosome).add(a2);
}
} catch (Exception ex) {
throw Throwables.propagate(ex);
}
}
}
@@ -7,6 +7,7 @@ import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.geometry.IArea;
import binnie.craftgui.core.geometry.IPoint;
import binnie.craftgui.minecraft.control.ControlItemDisplay;
import com.google.common.base.Throwables;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleFruit;
import forestry.api.arboriculture.ITree;
@@ -48,7 +49,7 @@ public class AnalystPageFruit extends AnalystPageProduce {
Collections.addAll(products, (ItemStack[]) f.get(pod));
}
} catch (Exception e) {
e.printStackTrace();
throw Throwables.propagate(e);
}
if (products.size() > 0) {
new ControlTextCentered(this, y, "Natural Fruit").setColour(this.getColour());
@@ -117,6 +118,7 @@ public class AnalystPageFruit extends AnalystPageProduce {
Collections.addAll(stacks, (ItemStack[]) field.get(pod2));
}
} catch (Exception ex) {
throw Throwables.propagate(ex);
}
}
}
@@ -28,6 +28,7 @@ import binnie.craftgui.minecraft.control.ControlSlot;
import binnie.craftgui.resource.minecraft.CraftGUITexture;
import binnie.craftgui.window.Panel;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsGUI;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.machine.ModuleMachine;
import binnie.genetics.machine.analyser.Analyser;
@@ -62,6 +63,10 @@ public class WindowAnalyst extends Window {
IIndividual current;
BreedingSystem currentSystem;
public static GeneticsGUI.WindowFactory create(final boolean database, final boolean master) {
return (player, inventory, side) -> new WindowAnalyst(player, inventory, side, database, master);
}
public WindowAnalyst(final EntityPlayer player, final IInventory inventory, final Side side, final boolean database, final boolean master) {
super(312.0f, 230.0f, player, inventory, side);
this.baseWidget = null;
@@ -5,6 +5,8 @@ import binnie.botany.Botany;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.item.IItemMiscProvider;
import binnie.core.item.ItemMisc;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.resource.BinnieIcon;
import binnie.extrabees.ExtraBees;
@@ -42,7 +44,7 @@ public class ModuleItem implements IInitializable {
Genetics.itemSerum = new ItemSerum();
Genetics.itemSerumArray = new ItemSerumArray();
Genetics.itemSequencer = new ItemSequence();
Genetics.setItemGenetics(Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance));
Genetics.setItemGenetics(new ItemMisc(CreativeTabGenetics.instance, (IItemMiscProvider[]) GeneticsItems.values()));
Genetics.proxy.registerItem(Genetics.itemSerum);
Genetics.proxy.registerItem(Genetics.itemSerumArray);
Genetics.proxy.registerItem(Genetics.itemSequencer);