mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +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
@@ -19,25 +19,15 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
|
||||
public double heatLost = 0;
|
||||
public double heatTransferred = 0;
|
||||
|
||||
public HeatNetwork(IGridTransmitter<HeatNetwork>... varPipes)
|
||||
{
|
||||
transmitters.addAll(Arrays.asList(varPipes));
|
||||
register();
|
||||
}
|
||||
public HeatNetwork() {}
|
||||
|
||||
public HeatNetwork(Collection<IGridTransmitter<HeatNetwork>> collection)
|
||||
{
|
||||
transmitters.addAll(collection);
|
||||
register();
|
||||
}
|
||||
|
||||
public HeatNetwork(Set<HeatNetwork> networks)
|
||||
public HeatNetwork(Collection<HeatNetwork> networks)
|
||||
{
|
||||
for(HeatNetwork net : networks)
|
||||
{
|
||||
if(net != null)
|
||||
{
|
||||
addAllTransmitters(net.transmitters);
|
||||
adoptTransmittersAndAcceptorsFrom(net);
|
||||
net.deregister();
|
||||
}
|
||||
}
|
||||
@@ -45,13 +35,6 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
|
||||
register();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected HeatNetwork create(Collection<IGridTransmitter<HeatNetwork>> collection)
|
||||
{
|
||||
return new HeatNetwork(collection);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getNeededInfo()
|
||||
{
|
||||
@@ -71,50 +54,17 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<IHeatTransfer> getAcceptors(Object... data)
|
||||
public void absorbBuffer(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter) {}
|
||||
|
||||
@Override
|
||||
public void clampBuffer() {}
|
||||
|
||||
@Override
|
||||
public Set<IHeatTransfer> getAcceptors(Object data)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void refresh()
|
||||
{
|
||||
Set<IGridTransmitter<HeatNetwork>> iterPipes = (Set<IGridTransmitter<HeatNetwork>>)transmitters.clone();
|
||||
Iterator<IGridTransmitter<HeatNetwork>> it = iterPipes.iterator();
|
||||
boolean networkChanged = false;
|
||||
|
||||
while(it.hasNext())
|
||||
{
|
||||
IGridTransmitter<HeatNetwork> conductor = it.next();
|
||||
|
||||
if(conductor == null || conductor.getTile().isInvalid())
|
||||
{
|
||||
it.remove();
|
||||
networkChanged = true;
|
||||
transmitters.remove(conductor);
|
||||
}
|
||||
else {
|
||||
conductor.setTransmitterNetwork(this);
|
||||
}
|
||||
}
|
||||
|
||||
if(networkChanged)
|
||||
{
|
||||
updateCapacity();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void refresh(IGridTransmitter<HeatNetwork> transmitter)
|
||||
{
|
||||
}
|
||||
|
||||
@Override
|
||||
public TransmissionType getTransmissionType()
|
||||
{
|
||||
return TransmissionType.HEAT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpdate()
|
||||
{
|
||||
@@ -126,7 +76,7 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
|
||||
|
||||
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
|
||||
{
|
||||
for(IGridTransmitter<HeatNetwork> transmitter : transmitters)
|
||||
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
|
||||
{
|
||||
if(transmitter instanceof IHeatTransfer)
|
||||
{
|
||||
@@ -137,7 +87,7 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
|
||||
}
|
||||
}
|
||||
|
||||
for(IGridTransmitter<HeatNetwork> transmitter : transmitters)
|
||||
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
|
||||
{
|
||||
if(transmitter instanceof IHeatTransfer)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user