Gave Multi Hatch a shaped crafting recipe after many failed attempts with assembling machines. Began adding Item Distribution Network code.

4 files changed, 29 insertions, 40 deletions

diff --git a/src/main/java/kekztech/IConduit.java b/src/main/java/kekztech/IConduit.java
index d36c590a63..ce726a2207 100644
--- a/src/main/java/kekztech/IConduit.java
+++ b/src/main/java/kekztech/IConduit.java
@@ -2,22 +2,7 @@ package kekztech;
 
 public interface IConduit {
 	
-	public void setNetwork(ConduitNetworkController network);
-	public ConduitNetworkController getNetwork();
+	public void setNetwork(ItemDistributionNetworkController network);
+	public ItemDistributionNetworkController getNetwork();
 	
-	/**
-	 * Returns the conduit's throughput capacity.
-	 * 
-	 * @return
-	 * 			The conduit's throughput capacity.
-	 */
-	public Number getCapacity();
-	
-	/**
-	 * Call when the throughput capacity was exceeded while traversing this conduit.
-	 */
-	public void onOverload();
-	
-	public boolean testForInputFilter(Object o);
-	public boolean testForOutputFilter(Object o);
 }
diff --git a/src/main/java/kekztech/ConduitNetworkController.java b/src/main/java/kekztech/ItemDistributionNetworkController.java
index 83f43cd54b..e188cb0d26 100644
--- a/src/main/java/kekztech/ConduitNetworkController.java
+++ b/src/main/java/kekztech/ItemDistributionNetworkController.java
@@ -9,15 +9,15 @@ import java.util.UUID;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public class ConduitNetworkController implements Comparable<ConduitNetworkController> {
+public class ItemDistributionNetworkController implements Comparable<ItemDistributionNetworkController> {
 	
-	private static final HashSet<ConduitNetworkController> instances = new HashSet<>();
+	private static final HashSet<ItemDistributionNetworkController> instances = new HashSet<>();
 	
 	private final UUID uuid = UUID.randomUUID();
 	private final LinkedList<IConduit> conduits = new LinkedList<>();
 	private final HashMap<String, IConduit> sources = new HashMap<>(); // k = resource name, v = source conduit
 	
-	public ConduitNetworkController() {
+	public ItemDistributionNetworkController() {
 		
 	}
 	
@@ -29,7 +29,7 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 	 */
 	public static void placeConduit(IConduit conduit) {
 		
-		conduit.setNetwork(new ConduitNetworkController());
+		conduit.setNetwork(new ItemDistributionNetworkController());
 		conduit.getNetwork().addConduit(conduit);
 		
 		final TileEntity te = (TileEntity) conduit;
@@ -38,7 +38,7 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 		final int z = te.zCoord;
 		
 		// Search for adjacent Networks on all six sides
-		final HashSet<ConduitNetworkController> networks = new HashSet<>();
+		final HashSet<ItemDistributionNetworkController> networks = new HashSet<>();
 		final World world = te.getWorldObj();
 		final TileEntity te1x = world.getTileEntity(x + 1, y, z);
 		final TileEntity te0x = world.getTileEntity(x - 1, y, z);
@@ -75,13 +75,13 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 			return;
 		}
 		// Sort networks by descending size
-		final LinkedList<ConduitNetworkController> networkList = new LinkedList<>();
+		final LinkedList<ItemDistributionNetworkController> networkList = new LinkedList<>();
 		networkList.addAll(networks);
 		Collections.sort(networkList, Collections.reverseOrder());
 		// Larger networks consume smaller networks to reduce copying around data
 		while(networkList.size() > 1) {
-			final ConduitNetworkController l = networkList.get(networkList.size() - 2);
-			final ConduitNetworkController r = networkList.getLast();
+			final ItemDistributionNetworkController l = networkList.get(networkList.size() - 2);
+			final ItemDistributionNetworkController r = networkList.getLast();
 			l.appendNetwork(r);
 			networkList.removeLast();
 		}
@@ -104,8 +104,8 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 	
 	@Override
 	public boolean equals(Object o) {
-		if(o instanceof ConduitNetworkController) {
-			final ConduitNetworkController network = (ConduitNetworkController) o;
+		if(o instanceof ItemDistributionNetworkController) {
+			final ItemDistributionNetworkController network = (ItemDistributionNetworkController) o;
 			return uuid.equals(network.getUUID());
 		} else {
 			return false;
@@ -113,7 +113,7 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 	}
 	
 	@Override
-	public int compareTo(ConduitNetworkController o) {
+	public int compareTo(ItemDistributionNetworkController o) {
 		return (int) Math.signum(o.getSize() - this.getSize());
 	}
 	
@@ -141,7 +141,7 @@ public class ConduitNetworkController implements Comparable<ConduitNetworkContro
 	 * @param network
 	 * 			Network to merge with this one.
 	 */
-	private void appendNetwork(ConduitNetworkController network) {
+	private void appendNetwork(ItemDistributionNetworkController network) {
 		
 	}
 	
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index a832faa484..3b88a9074d 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -221,17 +221,14 @@ public class KekzCore {
 				FluidRegistry.getFluidStack("molten.epoxid", 1152),

 				new ItemStack(Block_TFFTStorageFieldBlockT4.getInstance(), 1), 

 				400, 4098);

-		final ItemStack[] tfftmultihatch = {

-				GT_Utility.getIntegratedCircuit(6),

-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),

-				GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 25),

-				ItemList.Field_Generator_HV.get(1L)

-			};

-		GT_Values.RA.addAssemblerRecipe(

-				tfftmultihatch, 

-				FluidRegistry.getFluidStack("molten.epoxid", 576),

-				new ItemStack(Block_TFFTMultiHatch.getInstance(), 1), 

-				6000, 480);

+		final Object[] multi_hatch = {

+				"PRP", "UFU", "PRP",

+				'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 1),

+				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),

+				'U', ItemList.Electric_Pump_IV.get(1L),

+				'F', ItemList.Field_Generator_HV.get(1L)

+		};		

+		GT_ModHandler.addCraftingRecipe(new ItemStack(Block_TFFTMultiHatch.getInstance()), multi_hatch);

 		

 		// Reactor structure blocks

 		final ItemStack[] controlrod = {

diff --git a/src/main/java/kekztech/TFFTFluidHandler.java b/src/main/java/kekztech/TFFTFluidHandler.java
new file mode 100644
index 0000000000..2ed5eac798
--- /dev/null
+++ b/src/main/java/kekztech/TFFTFluidHandler.java
@@ -0,0 +1,7 @@
+package kekztech;
+
+public class TFFTFluidHandler {
+	
+	
+	
+}