mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 19:49:50 +00:00
Start on refactor of entire network system.
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it. We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well. Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
This commit is contained in:
1 parent
e47f6032c1
commit
47b4eb28b4
41 files changed
+2008
-2325
No files matched your search
@@ -1,23 +1,18 @@
|
||||
package mekanism.common;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.transmitters.DynamicNetwork;
|
||||
import mekanism.api.transmitters.IGridTransmitter;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.common.base.ILogisticalTransporter;
|
||||
import mekanism.common.content.transporter.TransporterManager;
|
||||
import mekanism.common.util.TransporterUtils;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -27,25 +22,15 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
||||
|
||||
public class InventoryNetwork extends DynamicNetwork<IInventory, InventoryNetwork>
|
||||
{
|
||||
public InventoryNetwork(IGridTransmitter<InventoryNetwork>... varPipes)
|
||||
{
|
||||
transmitters.addAll(Arrays.asList(varPipes));
|
||||
register();
|
||||
}
|
||||
public InventoryNetwork() {}
|
||||
|
||||
public InventoryNetwork(Collection<IGridTransmitter<InventoryNetwork>> collection)
|
||||
{
|
||||
transmitters.addAll(collection);
|
||||
register();
|
||||
}
|
||||
|
||||
public InventoryNetwork(Set<InventoryNetwork> networks)
|
||||
public InventoryNetwork(Collection<InventoryNetwork> networks)
|
||||
{
|
||||
for(InventoryNetwork net : networks)
|
||||
{
|
||||
if(net != null)
|
||||
{
|
||||
addAllTransmitters(net.transmitters);
|
||||
adoptTransmittersAndAcceptorsFrom(net);
|
||||
net.deregister();
|
||||
}
|
||||
}
|
||||
@@ -120,7 +105,13 @@ public class InventoryNetwork extends DynamicNetwork<IInventory, InventoryNetwor
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized Set<IInventory> getAcceptors(Object... data)
|
||||
public void absorbBuffer(IGridTransmitter<IInventory, InventoryNetwork> transmitter) {}
|
||||
|
||||
@Override
|
||||
public void clampBuffer() {}
|
||||
|
||||
@Override
|
||||
public Set<IInventory> getAcceptors(Object data)
|
||||
{
|
||||
Set<IInventory> toReturn = new HashSet<IInventory>();
|
||||
|
||||
@@ -132,71 +123,12 @@ public class InventoryNetwork extends DynamicNetwork<IInventory, InventoryNetwor
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void refresh()
|
||||
{
|
||||
Set<IGridTransmitter<InventoryNetwork>> iterPipes = (Set<IGridTransmitter<InventoryNetwork>>)transmitters.clone();
|
||||
Iterator it = iterPipes.iterator();
|
||||
boolean networkChanged = false;
|
||||
|
||||
while(it.hasNext())
|
||||
{
|
||||
IGridTransmitter<InventoryNetwork> conductor = (IGridTransmitter<InventoryNetwork>)it.next();
|
||||
|
||||
if(conductor == null || conductor.getTile().isInvalid())
|
||||
{
|
||||
it.remove();
|
||||
networkChanged = true;
|
||||
transmitters.remove(conductor);
|
||||
}
|
||||
else {
|
||||
conductor.setTransmitterNetwork(this);
|
||||
}
|
||||
}
|
||||
|
||||
if(networkChanged)
|
||||
{
|
||||
updateCapacity();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void refresh(IGridTransmitter<InventoryNetwork> transmitter)
|
||||
{
|
||||
IInventory[] acceptors = TransporterUtils.getConnectedInventories((ILogisticalTransporter)transmitter.getTile());
|
||||
|
||||
clearAround(transmitter);
|
||||
|
||||
for(IInventory acceptor : acceptors)
|
||||
{
|
||||
ForgeDirection side = ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor));
|
||||
|
||||
if(side != null && acceptor != null && !(acceptor instanceof IGridTransmitter) && transmitter.canConnectToAcceptor(side, true))
|
||||
{
|
||||
possibleAcceptors.put(Coord4D.get((TileEntity)acceptor), acceptor);
|
||||
addSide(Coord4D.get((TileEntity)acceptor), ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return "[FluidNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors.";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected InventoryNetwork create(Collection<IGridTransmitter<InventoryNetwork>> collection)
|
||||
{
|
||||
return new InventoryNetwork(collection);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TransmissionType getTransmissionType()
|
||||
{
|
||||
return TransmissionType.ITEM;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getNeededInfo()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user