mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 20:52:22 +00:00
Stop suppressing exceptions that may be important
This commit is contained in:
1 parent
163abc377e
commit
7c048de845
33 files changed
+111
-186
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user