fixed some silly NPEs. UI works. A bit.

7 files changed, 10 insertions, 112 deletions

diff --git a/src/main/java/kekztech/ItemDistributionNetworkController.java b/src/main/java/kekztech/ItemDistributionNetworkController.java
index bf976898e5..11383845b2 100644
--- a/src/main/java/kekztech/ItemDistributionNetworkController.java
+++ b/src/main/java/kekztech/ItemDistributionNetworkController.java
@@ -1,7 +1,6 @@
 package kekztech;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.UUID;
@@ -34,7 +33,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
 		
 		conduit.setNetwork(new ItemDistributionNetworkController());
 		conduit.getNetwork().addConduit(conduit);
-		
+		/*
 		final TileEntity te = (TileEntity) conduit;
 		final int x = te.xCoord;
 		final int y = te.yCoord;
@@ -87,7 +86,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
 			final ItemDistributionNetworkController r = networkList.getLast();
 			l.appendNetwork(r);
 			networkList.removeLast();
-		}
+		}*/
 		
 	}
 	
@@ -176,6 +175,7 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
 	 */
 	private void addConduit(IConduit conduit) {
 		conduits.add(conduit);
+		conduit.setNetwork(this);
 	}
 	
 	/**
@@ -185,11 +185,9 @@ public class ItemDistributionNetworkController implements Comparable<ItemDistrib
 	 * 			Network to merge with this one.
 	 */
 	private void appendNetwork(ItemDistributionNetworkController network) {
-		
+		for(IConduit conduit : network.conduits) {
+			this.addConduit(conduit);
+		}
 	}
 	
-	private void updateSource() {
-		
-	}
-
 }
diff --git a/src/main/java/reactor/items/CoolantCell.java b/src/main/java/reactor/items/CoolantCell.java
index b166b3fc3d..abfc9ad88f 100644
--- a/src/main/java/reactor/items/CoolantCell.java
+++ b/src/main/java/reactor/items/CoolantCell.java
@@ -1,9 +1,5 @@
 package reactor.items;

 

-import items.MetaItem_ReactorComponent;

-import kekztech.GTRecipe;

-import kekztech.Items;

-

 public class CoolantCell {

 	

 	public static String TYPE = "CoolantCell";

@@ -16,11 +12,4 @@ public class CoolantCell {
 			360000, 360000

 	};

 	

-	public static GTRecipe[] RECIPE = {

-			new GTRecipe().setDuration(1200).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.HeliumCoolantCell360k.getMetaID())),

-			new GTRecipe().setDuration(1200).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaKCoolantCell360k.getMetaID()))

-	};

-	

 }

diff --git a/src/main/java/reactor/items/FuelRod.java b/src/main/java/reactor/items/FuelRod.java
index 9cb697a373..9642412f9d 100644
--- a/src/main/java/reactor/items/FuelRod.java
+++ b/src/main/java/reactor/items/FuelRod.java
@@ -1,9 +1,5 @@
 package reactor.items;

 

-import items.MetaItem_ReactorComponent;

-import kekztech.GTRecipe;

-import kekztech.Items;

-

 public class FuelRod {

 

 	public static final int METAOFFSET = 17;

@@ -79,36 +75,4 @@ public class FuelRod {
 			10, 10, 10

 	};

 	

-	public static final GTRecipe[] RECIPE = {

-			// Uranium Fuel Rod

-			new GTRecipe().setDuration(600).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumFuelRod.getMetaID())),

-			new GTRecipe().setDuration(800).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumDualFuelRod.getMetaID())),

-			new GTRecipe().setDuration(1000).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.UraniumQuadFuelRod.getMetaID())),

-			// Thorium Fuel Rod

-			new GTRecipe().setDuration(600).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumFuelRod.getMetaID())),

-			new GTRecipe().setDuration(800).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumDualFuelRod.getMetaID())),

-			new GTRecipe().setDuration(1000).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.ThoriumQuadFuelRod.getMetaID())),

-			// MOX Fuel Rod

-			new GTRecipe().setDuration(600).setEUPerTick(1920)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXFuelRod.getMetaID())),

-			new GTRecipe().setDuration(800).setEUPerTick(1920)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXDualFuelRod.getMetaID())),

-			new GTRecipe().setDuration(1000).setEUPerTick(1920)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.MOXQuadFuelRod.getMetaID())),

-			// Naquadah Fuel Rod

-			new GTRecipe().setDuration(600).setEUPerTick(7680)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahFuelRod.getMetaID())),

-			new GTRecipe().setDuration(800).setEUPerTick(7680)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahDualFuelRod.getMetaID())),

-			new GTRecipe().setDuration(1000).setEUPerTick(7680)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.NaquadahQuadFuelRod.getMetaID())),

-			// Thorium MOX Fuel Rod

-	};

-	

 }

diff --git a/src/main/java/reactor/items/HeatExchanger.java b/src/main/java/reactor/items/HeatExchanger.java
index 7018f620ec..d85ed325ca 100644
--- a/src/main/java/reactor/items/HeatExchanger.java
+++ b/src/main/java/reactor/items/HeatExchanger.java
@@ -1,12 +1,5 @@
 package reactor.items;

 

-import items.MetaItem_CraftingComponent;

-import items.MetaItem_ReactorComponent;

-import kekztech.GTRecipe;

-import kekztech.Items;

-import net.minecraftforge.fluids.FluidRegistry;

-import util.Util;

-

 public class HeatExchanger {

 	

 	public static String TYPE = "HeatExchanger";

@@ -27,34 +20,4 @@ public class HeatExchanger {
 			4, 8, 32, 128

 	};

 	

-	public static GTRecipe[] RECIPE = {

-			new GTRecipe().setDuration(200).setEUPerTick(120)

-					.addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.CopperHeatPipe.getMetaID(), 4))

-					.addInputItem(Util.getStackofAmountFromOreDict("plateDenseCopper", 1))

-					.addInputFluid(FluidRegistry.getFluidStack("molten.copper", 576))

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1HeatExchanger.getMetaID())),

-			new GTRecipe().setDuration(400).setEUPerTick(480)

-					.addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.SilverHeatPipe.getMetaID(), 4))

-					.addInputItem(Util.getStackofAmountFromOreDict("plateDenseSilver", 1))

-					.addInputFluid(FluidRegistry.getFluidStack("molten.silver", 576))

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2HeatExchanger.getMetaID())),

-			new GTRecipe().setDuration(800).setEUPerTick(7680)

-					.addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.BoronArsenideHeatPipe.getMetaID(), 4))

-					.addInputItem(Util.getStackofAmountFromOreDict("pipeTinyCopper", 4))

-					.addInputItem(Util.getStackofAmountFromOreDict("wireFineSilver", 16))

-					//.addInputItem(new ItemStack(ItemList.Pump_EV.getItem(), 1))

-					.addInputFluid(FluidRegistry.getFluidStack("ic2coolant", 720))

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T3HeatExchanger.getMetaID())),

-			new GTRecipe().setDuration(1600).setEUPerTick(30720)

-					.addInputItem(MetaItem_CraftingComponent.getInstance().getStackOfAmountFromDamage(Items.DiamondHeatPipe.getMetaID(), 4))

-					.addInputItem(Util.getStackofAmountFromOreDict("frameGTHSSE", 1))

-					.addInputItem(Util.getStackofAmountFromOreDict("plateHSSE", 6))

-					.addInputItem(Util.getStackofAmountFromOreDict("screwOsmiridium", 24))

-					.addInputItem(Util.getStackofAmountFromOreDict("pipeTinyEnderium", 4))

-					//.addInputItem(new ItemStack(ItemList.Pump_LuV.getItem(), 1))

-					.addInputFluid(FluidRegistry.getFluidStack("molten.gallium", 1152))

-					.addInputFluid(FluidRegistry.getFluidStack("helium", 10000))

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T4HeatExchanger.getMetaID()))

-	};

-	

 }

diff --git a/src/main/java/reactor/items/HeatVent.java b/src/main/java/reactor/items/HeatVent.java
index b6c48120b4..1ae0388de3 100644
--- a/src/main/java/reactor/items/HeatVent.java
+++ b/src/main/java/reactor/items/HeatVent.java
@@ -1,7 +1,5 @@
 package reactor.items;

 

-import kekztech.GTRecipe;

-

 public class HeatVent {

 	

 	public static final String TYPE = "HeatVent";

@@ -43,8 +41,4 @@ public class HeatVent {
 			10, 20, 80, 160

 	};

 	

-	public static final GTRecipe[] RECIPE = {

-			

-	};

-	

 }

diff --git a/src/main/java/reactor/items/NeutronReflector.java b/src/main/java/reactor/items/NeutronReflector.java
index 9275b860ae..773f34ee49 100644
--- a/src/main/java/reactor/items/NeutronReflector.java
+++ b/src/main/java/reactor/items/NeutronReflector.java
@@ -1,9 +1,5 @@
 package reactor.items;

 

-import items.MetaItem_ReactorComponent;

-import kekztech.GTRecipe;

-import kekztech.Items;

-

 public class NeutronReflector {

 	

 	public static String TYPE = "NeutronReflector";

@@ -16,11 +12,4 @@ public class NeutronReflector {
 			512000, 2147483647

 	};

 	

-	public static GTRecipe[] RECIPE = {

-			new GTRecipe().setDuration(1200).setEUPerTick(480)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T1NeutronReflector.getMetaID())),

-			new GTRecipe().setDuration(4800).setEUPerTick(7680)

-					.addOutputItem(MetaItem_ReactorComponent.getInstance().getStackFromDamage(Items.T2NeutronReflector.getMetaID()))

-	};

-	

 }

diff --git a/src/main/java/tileentities/TE_ItemDistributionNode.java b/src/main/java/tileentities/TE_ItemDistributionNode.java
index 25d7b64680..20b6500598 100644
--- a/src/main/java/tileentities/TE_ItemDistributionNode.java
+++ b/src/main/java/tileentities/TE_ItemDistributionNode.java
@@ -5,16 +5,14 @@ import kekztech.ItemDistributionNetworkController;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.Constants;
 
 public class TE_ItemDistributionNode extends TileEntity implements IConduit, IInventory {
 	
 private ItemDistributionNetworkController network;
 	
 	public TE_ItemDistributionNode() {
+		ItemDistributionNetworkController.placeConduit(this);
 	}
 	
 	@Override
@@ -71,6 +69,9 @@ private ItemDistributionNetworkController network;
 
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemStack) {
+		if(itemStack == null) {
+			return;
+		}
 		if(itemStack.stackSize > getInventoryStackLimit()) {
 			itemStack.stackSize = getInventoryStackLimit();
 		}