From f01379a16d829167c96a7d0f502dedce0734d02c Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Tue, 29 Oct 2019 11:01:35 +0100 Subject: sync before trip to Lucy --- .../java/kekztech/ConduitNetworkController.java | 152 +++++++++++++++++++++ src/main/java/kekztech/IConduit.java | 23 ++++ src/main/java/kekztech/KekzCore.java | 1 - 3 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 src/main/java/kekztech/ConduitNetworkController.java create mode 100644 src/main/java/kekztech/IConduit.java (limited to 'src/main/java/kekztech') diff --git a/src/main/java/kekztech/ConduitNetworkController.java b/src/main/java/kekztech/ConduitNetworkController.java new file mode 100644 index 0000000000..83f43cd54b --- /dev/null +++ b/src/main/java/kekztech/ConduitNetworkController.java @@ -0,0 +1,152 @@ +package kekztech; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.UUID; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class ConduitNetworkController implements Comparable { + + private static final HashSet instances = new HashSet<>(); + + private final UUID uuid = UUID.randomUUID(); + private final LinkedList conduits = new LinkedList<>(); + private final HashMap sources = new HashMap<>(); // k = resource name, v = source conduit + + public ConduitNetworkController() { + + } + + /** + * Places a new conduit as it's own network. Merges with adjacent networks automatically. + * + * @param conduit + * The conduit to be placed + */ + public static void placeConduit(IConduit conduit) { + + conduit.setNetwork(new ConduitNetworkController()); + conduit.getNetwork().addConduit(conduit); + + final TileEntity te = (TileEntity) conduit; + final int x = te.xCoord; + final int y = te.yCoord; + final int z = te.zCoord; + + // Search for adjacent Networks on all six sides + final HashSet 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); + final TileEntity te1y = world.getTileEntity(x, y + 1, z); + final TileEntity te0y = world.getTileEntity(x, y - 1, z); + final TileEntity te1z = world.getTileEntity(x, y, z + 1); + final TileEntity te0z = world.getTileEntity(x, y, z - 1); + if(te1x != null && te1x instanceof IConduit) { + final IConduit c = (IConduit) te1x; + networks.add(c.getNetwork()); + } + if(te0x != null && te0x instanceof IConduit) { + final IConduit c = (IConduit) te0x; + networks.add(c.getNetwork()); + } + if(te1y != null && te1y instanceof IConduit) { + final IConduit c = (IConduit) te1y; + networks.add(c.getNetwork()); + } + if(te0y != null && te0y instanceof IConduit) { + final IConduit c = (IConduit) te0y; + networks.add(c.getNetwork()); + } + if(te1z != null && te1z instanceof IConduit) { + final IConduit c = (IConduit) te1z; + networks.add(c.getNetwork()); + } + if(te0z != null && te0z instanceof IConduit) { + final IConduit c = (IConduit) te0z; + networks.add(c.getNetwork()); + } + // Return prematurely if no adjacent network was found + if(networks.size() == 0) { + return; + } + // Sort networks by descending size + final LinkedList 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(); + l.appendNetwork(r); + networkList.removeLast(); + } + + } + + /** + * Deletes this conduit and breaks up adjacent networks into separate networks. + * + * @param conduit + * Conduit to be removed. + */ + public static void destroyConduit(IConduit conduit) { + + } + + public void run() { + + } + + @Override + public boolean equals(Object o) { + if(o instanceof ConduitNetworkController) { + final ConduitNetworkController network = (ConduitNetworkController) o; + return uuid.equals(network.getUUID()); + } else { + return false; + } + } + + @Override + public int compareTo(ConduitNetworkController o) { + return (int) Math.signum(o.getSize() - this.getSize()); + } + + public UUID getUUID() { + return uuid; + } + + public int getSize() { + return conduits.size(); + } + + /** + * Register a new conduit to this network. + * + * @param conduit + * New conduit. + */ + private void addConduit(IConduit conduit) { + conduits.add(conduit); + } + + /** + * Merge another network with this one if they have been connected by a new conduit. + * + * @param network + * Network to merge with this one. + */ + private void appendNetwork(ConduitNetworkController network) { + + } + + private void updateSource() { + + } + +} diff --git a/src/main/java/kekztech/IConduit.java b/src/main/java/kekztech/IConduit.java new file mode 100644 index 0000000000..d36c590a63 --- /dev/null +++ b/src/main/java/kekztech/IConduit.java @@ -0,0 +1,23 @@ +package kekztech; + +public interface IConduit { + + public void setNetwork(ConduitNetworkController network); + public ConduitNetworkController 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/KekzCore.java b/src/main/java/kekztech/KekzCore.java index b9f8e47015..993b984d4a 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -222,7 +222,6 @@ public class KekzCore { GT_Utility.getIntegratedCircuit(6), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 25), - ItemList.Electric_Motor_EV.get(1L, (Object[]) null), ItemList.Field_Generator_HV.get(1L, (Object[]) null) }; GT_Values.RA.addAssemblerRecipe( -- cgit