diff --git a/src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java b/src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java index 2a729b123..6821b19ea 100644 --- a/src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java @@ -1,5 +1,6 @@ package mekanism.api.energy; +import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.common.util.MekanismUtils; @@ -12,21 +13,28 @@ import ic2.api.energy.tile.IEnergySink; public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { + public Coord4D coord; + public static EnergyAcceptorWrapper get(TileEntity tileEntity) { + EnergyAcceptorWrapper wrapper = null; if(tileEntity instanceof IStrictEnergyAcceptor) { - return new MekanismAcceptor((IStrictEnergyAcceptor)tileEntity); + wrapper = new MekanismAcceptor((IStrictEnergyAcceptor)tileEntity); } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { - return new RFAcceptor((IEnergyReceiver)tileEntity); + wrapper = new RFAcceptor((IEnergyReceiver)tileEntity); } else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) { - return new IC2Acceptor((IEnergySink)tileEntity); + wrapper = new IC2Acceptor((IEnergySink)tileEntity); } - return null; + if(wrapper != null) + { + wrapper.coord = Coord4D.get(tileEntity); + } + return wrapper; } public abstract double getNeeded(); diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index cce316dfc..fc0546a34 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -13,7 +13,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; -import mekanism.api.energy.EnergyAcceptorWrapper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -23,13 +22,17 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; +import scala.collection.parallel.ParIterableLike.Collect; + public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler { public LinkedHashSet> transmitters = new LinkedHashSet<>(); public LinkedHashSet> transmittersToAdd = new LinkedHashSet<>(); + public LinkedHashSet> transmittersAdded = new LinkedHashSet<>(); public HashMap possibleAcceptors = new HashMap(); public HashMap> acceptorDirections = new HashMap>(); + public HashMap, EnumSet> changedAcceptors = new HashMap<>(); private List updateQueue = new ArrayList(); @@ -41,6 +44,7 @@ public abstract class DynamicNetwork> implemen protected double meanCapacity = 0; protected boolean needsUpdate = false; + protected int updateDelay = 0; protected World worldObj = null; @@ -51,37 +55,81 @@ public abstract class DynamicNetwork> implemen public void commit() { - for(IGridTransmitter transmitter : transmittersToAdd) + if(!transmittersToAdd.isEmpty()) { - if(transmitter.isValid()) + for(IGridTransmitter transmitter : transmittersToAdd) { - if(worldObj == null) worldObj = transmitter.world(); - Coord4D coord = transmitter.coord(); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + if(transmitter.isValid()) + { + if(worldObj == null) worldObj = transmitter.world(); + Coord4D coord = transmitter.coord(); + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + A acceptor = transmitter.getAcceptor(side); + if(acceptor != null) + { + Coord4D acceptorCoord = coord.getFromSide(side); + possibleAcceptors.put(acceptorCoord, acceptor); + EnumSet directions = acceptorDirections.get(acceptorCoord); + if(directions != null) + { + directions.add(side.getOpposite()); + } else + { + acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); + } + } + } + transmitter.setTransmitterNetwork((N)this); + absorbBuffer(transmitter); + transmitters.add(transmitter); + } + } + updateCapacity(); + clampBuffer(); + queueClientUpdate((Collection>)transmittersToAdd.clone()); + transmittersToAdd.clear(); + } + + if(!changedAcceptors.isEmpty()) + { + for(Entry, EnumSet> entry : changedAcceptors.entrySet()) + { + IGridTransmitter transmitter = entry.getKey(); + EnumSet directionsChanged = entry.getValue(); + + for(ForgeDirection side : directionsChanged) { A acceptor = transmitter.getAcceptor(side); + Coord4D acceptorCoord = transmitter.coord().getFromSide(side); + EnumSet directions = acceptorDirections.get(acceptorCoord); if(acceptor != null) { - possibleAcceptors.put(coord, acceptor); - EnumSet directions = acceptorDirections.get(coord.getFromSide(side)); + possibleAcceptors.put(acceptorCoord, acceptor); if(directions != null) { directions.add(side.getOpposite()); } else { - acceptorDirections.put(coord, EnumSet.of(side.getOpposite())); + acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); + } + } + else + { + if(directions != null) + { + directions.remove(side.getOpposite()); + if(directions.isEmpty()) + { + possibleAcceptors.remove(acceptorCoord); + acceptorDirections.remove(acceptorCoord); + } } } } - transmitter.setOrphan(false); - transmitter.setTransmitterNetwork((N)this); - absorbBuffer(transmitter); - transmitters.add(transmitter); } + changedAcceptors.clear(); } - updateCapacity(); - clampBuffer(); - transmittersToAdd.clear(); } public abstract void absorbBuffer(IGridTransmitter transmitter); @@ -104,11 +152,23 @@ public abstract class DynamicNetwork> implemen { transmitter.takeShare(); transmitter.setTransmitterNetwork(null); - transmitter.setOrphan(true); TransmitterNetworkRegistry.registerOrphanTransmitter(transmitter); } } + public void acceptorChanged(IGridTransmitter transmitter, ForgeDirection side) + { + EnumSet directions = changedAcceptors.get(transmitter); + if(directions != null) + { + directions.add(side); + } else + { + changedAcceptors.put(transmitter, EnumSet.of(side)); + } + TransmitterNetworkRegistry.registerChangedNetwork(this); + } + public void adoptTransmittersAndAcceptorsFrom(N net) { for(IGridTransmitter transmitter : net.transmitters) @@ -253,7 +313,8 @@ public abstract class DynamicNetwork> implemen { Iterator i = updateQueue.iterator(); - try { + try + { while(i.hasNext()) { DelayQueue q = i.next(); @@ -261,13 +322,27 @@ public abstract class DynamicNetwork> implemen if(q.delay > 0) { q.delay--; - } - else { + } else + { needsUpdate = true; i.remove(); } } - } catch(Exception e) {} + } catch(Exception e) + { + } + + if(updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0) + { + MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(this, (Collection)transmittersAdded)); + transmittersAdded.clear(); + needsUpdate = true; + } + } } } @@ -289,6 +364,24 @@ public abstract class DynamicNetwork> implemen } } + public void queueClientUpdate(Collection> newTransmitters) + { + transmittersAdded.addAll(newTransmitters); + updateDelay = 2; + } + + public static class TransmittersAddedEvent extends Event + { + public DynamicNetwork network; + public Collection newTransmitters; + + public TransmittersAddedEvent(DynamicNetwork net, Collection added) + { + network = net; + newTransmitters = added; + } + } + public static class ClientTickUpdate extends Event { public DynamicNetwork network; diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index d2e6bb20d..254b4bb5d 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -9,6 +9,8 @@ import net.minecraftforge.common.util.ForgeDirection; public interface IGridTransmitter> extends ITransmitter { + public boolean hasTransmitterNetwork(); + /** * Gets the network currently in use by this transmitter segment. * @return network this transmitter is using diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 0d3e4d188..1b9735a39 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.HashSet; import mekanism.api.Coord4D; +import mekanism.common.Mekanism; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.FMLCommonHandler; @@ -33,6 +34,14 @@ public class TransmitterNetworkRegistry } } + public static void reset() + { + getInstance().networks.clear(); + getInstance().networksToChange.clear(); + getInstance().invalidTransmitters.clear(); + getInstance().orphanTransmitters.clear(); + } + public static void invalidateTransmitter(IGridTransmitter transmitter) { getInstance().invalidTransmitters.add(transmitter); @@ -43,6 +52,11 @@ public class TransmitterNetworkRegistry getInstance().orphanTransmitters.put(transmitter.coord(), transmitter); } + public static void registerChangedNetwork(DynamicNetwork network) + { + getInstance().networksToChange.add(network); + } + public static TransmitterNetworkRegistry getInstance() { return INSTANCE; @@ -86,6 +100,10 @@ public class TransmitterNetworkRegistry public void removeInvalidTransmitters() { + if(!invalidTransmitters.isEmpty()) + { + Mekanism.logger.debug("Dealing with " + invalidTransmitters.size() + " invalid Transmitters"); + } for(IGridTransmitter invalid : invalidTransmitters) { if(!invalid.isOrphan()) @@ -102,13 +120,17 @@ public class TransmitterNetworkRegistry public void assignOrphans() { + if(!orphanTransmitters.isEmpty()) + { + Mekanism.logger.debug("Dealing with " + orphanTransmitters.size() + " orphan Transmitters"); + } for(IGridTransmitter orphanTransmitter : orphanTransmitters.values()) { DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter); if(network != null) { networksToChange.add(network); - networks.add(network); + network.register(); } } orphanTransmitters.clear(); @@ -124,12 +146,15 @@ public class TransmitterNetworkRegistry switch(finder.networksFound.size()) { case 0: + Mekanism.logger.debug("No networks found. Creating new network"); network = startOrphan.createEmptyNetwork(); break; case 1: + Mekanism.logger.debug("Using single found network"); network = finder.networksFound.iterator().next(); break; default: + Mekanism.logger.debug("Merging " + finder.networksFound.size() + " networks"); network = startOrphan.mergeNetworks(finder.networksFound); } network.addNewTransmitters(finder.connectedTransmitters); diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 677ce7459..5fd005db6 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -1,5 +1,6 @@ package mekanism.common; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -151,7 +152,8 @@ public class EnergyNetwork extends DynamicNetwork availableAcceptors = new ArrayList<>(); + availableAcceptors.addAll(getAcceptors(null)); Collections.shuffle(availableAcceptors); @@ -161,44 +163,25 @@ public class EnergyNetwork extends DynamicNetwork sides = acceptorDirections.get(acceptor.coord); + + if(sides == null || sides.isEmpty()) { - TileEntity acceptor = (TileEntity)obj; - double currentSending = sending+remaining; - EnumSet sides = acceptorDirections.get(Coord4D.get(acceptor)); + continue; + } - if(sides == null || sides.isEmpty()) - { - continue; - } + for(ForgeDirection side : sides) + { + double prev = sent; - for(ForgeDirection side : sides) + sent += acceptor.transferEnergyToAcceptor(side, currentSending); + + if(sent > prev) { - double prev = sent; - - if(acceptor instanceof IStrictEnergyAcceptor) - { - sent += ((IStrictEnergyAcceptor)acceptor).transferEnergyToAcceptor(side.getOpposite(), currentSending); - } - else if(MekanismUtils.useRF() && acceptor instanceof IEnergyReceiver) - { - IEnergyReceiver handler = (IEnergyReceiver)acceptor; - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*general.TO_TE), false); - sent += used*general.FROM_TE; - } - else if(MekanismUtils.useIC2() && acceptor instanceof IEnergySink) - { - double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)acceptor).getSinkTier())*general.FROM_IC2); - toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*general.FROM_IC2); - sent += (toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2)); - } - - if(sent > prev) - { - break; - } + break; } } } @@ -233,7 +216,7 @@ public class EnergyNetwork extends DynamicNetwork 0) + if(acceptor.canReceiveEnergy(side) && acceptor.getNeeded() > 0) { toReturn.add(acceptor); break; diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index a83b64385..720f06147 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -1,5 +1,6 @@ package mekanism.common; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -69,7 +70,7 @@ public class FluidNetwork extends DynamicNetwork else { if(buffer.getFluid() != net.buffer.getFluid()) { - //throw new RuntimeException("Fluid types did not match when merging networks: " + buffer.getFluid().getName() + " vs. " + net.buffer.getFluid().getName()); + throw new RuntimeException("Fluid types did not match when merging networks: " + buffer.getFluid().getName() + " vs. " + net.buffer.getFluid().getName()); } buffer.amount += net.buffer.amount; @@ -142,7 +143,8 @@ public class FluidNetwork extends DynamicNetwork public int tickEmit(FluidStack fluidToSend, boolean doTransfer) { - List availableAcceptors = Arrays.asList(getAcceptors(fluidToSend).toArray()); + List availableAcceptors = new ArrayList<>(); + availableAcceptors.addAll(getAcceptors(fluidToSend)); Collections.shuffle(availableAcceptors); @@ -154,33 +156,29 @@ public class FluidNetwork extends DynamicNetwork int remaining = fluidToSend.amount % divider; int sending = (fluidToSend.amount-remaining)/divider; - for(Object obj : availableAcceptors) + for(IFluidHandler acceptor : availableAcceptors) { - if(obj instanceof IFluidHandler) - { - IFluidHandler acceptor = (IFluidHandler)obj; - int currentSending = sending; - EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); + int currentSending = sending; + EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); - if(remaining > 0) + if(remaining > 0) + { + currentSending++; + remaining--; + } + + for(ForgeDirection side : sides) + { + int prev = fluidSent; + + if(acceptor != null && fluidToSend != null) { - currentSending++; - remaining--; + fluidSent += acceptor.fill(side, new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); } - for(ForgeDirection side : sides) + if(fluidSent > prev) { - int prev = fluidSent; - - if(acceptor != null && fluidToSend != null) - { - fluidSent += acceptor.fill(side.getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); - } - - if(fluidSent > prev) - { - break; - } + break; } } } @@ -247,7 +245,7 @@ public class FluidNetwork extends DynamicNetwork if(didTransfer != prevTransfer || needsUpdate) { - MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer)); + MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, getScale(), didTransfer)); needsUpdate = false; } @@ -315,7 +313,7 @@ public class FluidNetwork extends DynamicNetwork for(ForgeDirection side : sides) { - if(acceptor != null && acceptor.canFill(side.getOpposite(), fluidToSend.getFluid())) + if(acceptor != null && acceptor.canFill(side, fluidToSend.getFluid())) { toReturn.add(acceptor); break; @@ -331,12 +329,14 @@ public class FluidNetwork extends DynamicNetwork public final FluidNetwork fluidNetwork; public final FluidStack fluidType; + public final float fluidScale; public final boolean didTransfer; - public FluidTransferEvent(FluidNetwork network, FluidStack type, boolean did) + public FluidTransferEvent(FluidNetwork network, FluidStack type, float scale, boolean did) { fluidNetwork = network; fluidType = type; + fluidScale = scale; didTransfer = did; } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 034cb21ff..b5d4d74ab 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -25,6 +25,7 @@ import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.DynamicNetwork.ClientTickUpdate; import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; +import mekanism.api.transmitters.DynamicNetwork.TransmittersAddedEvent; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; import mekanism.common.EnergyNetwork.EnergyTransferEvent; @@ -60,6 +61,7 @@ import mekanism.common.integration.OreDictManager; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multipart.MultipartMekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; +import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import mekanism.common.recipe.BinRecipe; @@ -112,6 +114,8 @@ import org.apache.logging.log4j.Logger; import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import codechicken.multipart.handler.MultipartProxy; +import sun.reflect.annotation.ExceptionProxy; + import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFuelHandler; @@ -1081,6 +1085,7 @@ public class Mekanism FrequencyManager.reset(); TransporterManager.reset(); PathfinderCache.reset(); + TransmitterNetworkRegistry.reset(); } @EventHandler @@ -1251,7 +1256,7 @@ public class Mekanism public void onEnergyTransferred(EnergyTransferEvent event) { try { - packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.ENERGY, Coord4D.get((TileEntity)event.energyNetwork.transmitters.iterator().next()), event.power), event.energyNetwork.getPacketRange()); + packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.ENERGY, event.energyNetwork.transmitters.iterator().next().coord(), event.power), event.energyNetwork.getPacketRange()); } catch(Exception e) {} } @@ -1259,7 +1264,7 @@ public class Mekanism public void onGasTransferred(GasTransferEvent event) { try { - packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.GAS, Coord4D.get((TileEntity)event.gasNetwork.transmitters.iterator().next()), event.transferType, event.didTransfer), event.gasNetwork.getPacketRange()); + packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.GAS, event.gasNetwork.transmitters.iterator().next().coord(), event.transferType, event.didTransfer), event.gasNetwork.getPacketRange()); } catch(Exception e) {} } @@ -1267,7 +1272,15 @@ public class Mekanism public void onLiquidTransferred(FluidTransferEvent event) { try { - packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.FLUID, Coord4D.get((TileEntity)event.fluidNetwork.transmitters.iterator().next()), event.fluidType, event.didTransfer), event.fluidNetwork.getPacketRange()); + packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.FLUID, event.fluidNetwork.transmitters.iterator().next().coord(), event.fluidType, event.fluidScale, event.didTransfer), event.fluidNetwork.getPacketRange()); + } catch(Exception e) {} + } + + @SubscribeEvent + public void onTransmittersAddedEvent(TransmittersAddedEvent event) + { + try { + packetHandler.sendToReceivers(new TransmitterUpdateMessage(PacketType.UPDATE, event.network.transmitters.iterator().next().coord(), event.newTransmitters), event.network.getPacketRange()); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index de3d2ed06..f454098ea 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -56,7 +56,7 @@ public class MultipartTransmitter> extends Tran { IGridTransmitter transmitter = ((ITransmitterTile)potentialTransmitterTile).getTransmitter(); - if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())); + if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { return sideCoord; } @@ -73,7 +73,7 @@ public class MultipartTransmitter> extends Tran @Override public boolean isValid() { - return !(getPart().tile() == null || getPart().tile().isInvalid()); + return !(getPart().tile() == null || getPart().tile().isInvalid()) && coord().exists(world()); } @Override @@ -100,7 +100,7 @@ public class MultipartTransmitter> extends Tran @Override public void takeShare() { - + containingPart.takeShare(); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java index e25304f29..6e5bb2bca 100644 --- a/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartHeatTransmitter.java @@ -57,6 +57,8 @@ public class PartHeatTransmitter extends PartTransmitter 0) { - int last = lastWrite != null ? lastWrite.amount : 0; + FluidStack last = getSaveShare(); - if(last != getSaveShare()) + if((last != null && !(lastWrite != null && lastWrite.amount == last.amount && lastWrite.getFluid() == last.getFluid())) || (last == null && lastWrite != null)) { + lastWrite = last; MekanismUtils.saveChunk(tile()); } } @@ -84,7 +85,7 @@ public class PartMechanicalPipe extends PartTransmitter 0) + if(lastWrite != null && lastWrite.amount > 0) { - FluidStack stack = new FluidStack(getTransmitter().getTransmitterNetwork().buffer.getFluid(), toSave); - lastWrite = stack; - nbtTags.setTag("cacheFluid", stack.writeToNBT(new NBTTagCompound())); + nbtTags.setTag("cacheFluid", lastWrite.writeToNBT(new NBTTagCompound())); } nbtTags.setInteger("tier", tier.ordinal()); @@ -234,6 +231,12 @@ public class PartMechanicalPipe extends PartTransmitter> extends PartSidedPipe implements ITransmitterTile @@ -65,37 +61,42 @@ public abstract class PartTransmitter> extends protected void onModeChange(ForgeDirection side) { super.onModeChange(side); - - if(!world().isRemote) - { - Mekanism.packetHandler.sendToDimension(new TransmitterUpdateMessage(PacketType.UPDATE, Coord4D.get(tile())), world().provider.dimensionId); - } } @Override public void onNeighborTileChanged(int side, boolean weak) { super.onNeighborTileChanged(side, weak); - - if(!world().isRemote) - { - Mekanism.packetHandler.sendToDimension(new TransmitterUpdateMessage(PacketType.UPDATE, Coord4D.get(tile())), world().provider.dimensionId); - } } @Override public void markDirtyTransmitters() { super.markDirtyTransmitters(); - TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); + if(getTransmitter().hasTransmitterNetwork()) + { + TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); + } + } + + @Override + public void markDirtyAcceptor(ForgeDirection side) + { + super.markDirtyAcceptor(side); + if(getTransmitter().hasTransmitterNetwork()) + { + getTransmitter().getTransmitterNetwork().acceptorChanged(getTransmitter(), side); + } } public A getCachedAcceptor(ForgeDirection side) { - return (A)cachedAcceptors[side.ordinal()]; + return connectionMapContainsSide(currentAcceptorConnections, side) ? (A)cachedAcceptors[side.ordinal()] : null; } public abstract int getCapacity(); public abstract Object getBuffer(); + + public abstract void takeShare(); } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 082188227..d04546d72 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -70,10 +70,11 @@ public class PartUniversalCable extends PartTransmitter 0) { - double last = lastWrite; + double last = getSaveShare(); - if(last != getSaveShare()) + if(last != lastWrite) { + lastWrite = last; MekanismUtils.saveChunk(tile()); } } @@ -164,11 +165,7 @@ public class PartUniversalCable extends PartTransmitter)tileEntity).getTransmitterNetwork().clientEnergyScale = message.power; + IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter(); + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.ENERGY) + { + ((IGridTransmitter)transmitter).getTransmitterNetwork().clientEnergyScale = message.power; + } } } else if(message.packetType == PacketType.GAS) { TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); - if(tileEntity instanceof IGridTransmitter && ((IGridTransmitter)tileEntity).getTransmissionType() == TransmissionType.GAS) + if(tileEntity instanceof ITransmitterTile) { - GasNetwork net = ((IGridTransmitter)tileEntity).getTransmitterNetwork(); - - if(message.gasType != null) + IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter(); + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS) { - net.refGas = message.gasType; - } + GasNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); - net.buffer = message.gasStack; - net.didTransfer = message.didGasTransfer; + if(message.gasType != null) + { + net.refGas = message.gasType; + } + + net.buffer = message.gasStack; + net.didTransfer = message.didGasTransfer; + } } } else if(message.packetType == PacketType.FLUID) { TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); - if(tileEntity instanceof IGridTransmitter && ((IGridTransmitter)tileEntity).getTransmissionType() == TransmissionType.FLUID) + if(tileEntity instanceof ITransmitterTile) { - FluidNetwork net = ((IGridTransmitter< IFluidHandler, FluidNetwork>)tileEntity).getTransmitterNetwork(); - - if(message.fluidType != null) + IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter(); + if(transmitter.hasTransmitterNetwork() && ((ITransmitterTile)tileEntity).getTransmitter().getTransmissionType() == TransmissionType.FLUID) { - net.refFluid = message.fluidType; - } + FluidNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); - net.buffer = message.fluidStack; - net.didTransfer = message.didFluidTransfer; - net.fluidScale = net.getScale(); + if(message.fluidType != null) + { + net.refFluid = message.fluidType; + } + + net.didTransfer = message.didFluidTransfer; + net.fluidScale = message.fluidScale; + } } } return null; @@ -104,9 +131,13 @@ public class PacketTransmitterUpdate implements IMessageHandler transmittersAdded; + public Collection transmitterCoords; public TransmitterUpdateMessage() {} @@ -117,6 +148,9 @@ public class PacketTransmitterUpdate implements IMessageHandler)data[0]; + break; case ENERGY: power = (Double)data[0]; break; @@ -126,7 +160,8 @@ public class PacketTransmitterUpdate implements IMessageHandler(); + int numTransmitters = dataStream.readInt(); + + for(int i = 0; i < numTransmitters; i++) + { + transmitterCoords.add(Coord4D.read(dataStream)); + } + } + else if(packetType == PacketType.ENERGY) { power = dataStream.readDouble(); } @@ -189,13 +241,8 @@ public class PacketTransmitterUpdate implements IMessageHandler> implements return theNetwork; } + @Override public boolean hasTransmitterNetwork() { return !isOrphan() && getTransmitterNetwork() != null; @@ -24,6 +25,7 @@ public abstract class Transmitter> implements public void setTransmitterNetwork(N network) { theNetwork = network; + orphaned = network == null; } @Override diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 299b58a44..005c3a457 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -14,11 +14,9 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; -import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyConnection; @@ -186,7 +184,7 @@ public final class CableUtils public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, ForgeDirection side) { - if(tileEntity instanceof IGridTransmitter) + if(tileEntity instanceof ITransmitterTile) { return false; } diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 8cfd36e98..5c7e0c87e 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -3,6 +3,7 @@ package mekanism.common.util; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.transmitters.ITransmitterTile; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -24,7 +25,7 @@ public class HeatUtils source.transferHeatTo(-heatToTransfer); sink.transferHeatTo(heatToTransfer); - if(!(sink instanceof IGridTransmitter)) + if(!(sink instanceof ITransmitterTile)) { heatTransferred[0] += heatToTransfer; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 419b5ff71..d41f1b44b 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -656,44 +656,54 @@ public final class MekanismUtils float numUpgrades = upgrades.get(Upgrade.ENERGY) == null ? 0 : (float)upgrades.get(Upgrade.ENERGY); return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); } - + /** - * A better "isBlockIndirectlyGettingPowered()" that doesn't load chunks. + * Checks if a block is directly getting powered by any of its neighbors without loading any chunks. * @param world - the world to perform the check in - * @param coord - the coordinate of the block performing the check - * @return if the block is indirectly getting powered by LOADED chunks + * @param coord - the Coord4D of the block to check + * @return if the block is directly getting powered */ - public static boolean isGettingPowered(World world, Coord4D coord) + public static boolean isDirectlyGettingPowered(World world, Coord4D coord) { - return isGettingPowered(world, coord, true); + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + Coord4D sideCoord = coord.getFromSide(side); + if(sideCoord.exists(world)) + { + if(world.isBlockProvidingPowerTo(coord.xCoord, coord.yCoord, coord.zCoord, side.ordinal()) > 0) + { + return true; + } + } + } + return false; } /** * Extension of preceding isGettingPowered() method, used to define expansions of the check. * @param world - the world to perform the check in * @param coord - the coordinate of the block performing the check - * @param expand - whether or not the check should be recursively called on the surrounding coordinates * @return if the block is indirectly getting powered by LOADED chunks */ - public static boolean isGettingPowered(World world, Coord4D coord, boolean expand) + public static boolean isGettingPowered(World world, Coord4D coord) { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { Coord4D sideCoord = coord.getFromSide(side); - if(sideCoord.exists(world) && sideCoord.getFromSide(side).exists(world)) { - if(world.isBlockProvidingPowerTo(sideCoord.xCoord, sideCoord.yCoord, sideCoord.zCoord, side.getOpposite().ordinal()) > 0) + Block block = sideCoord.getBlock(world); + boolean weakPower = block.shouldCheckWeakPower(world, coord.xCoord, coord.yCoord, coord.zCoord, side.ordinal()); + if(weakPower && isDirectlyGettingPowered(world, sideCoord)) { return true; } - else if(expand && isGettingPowered(world, sideCoord, false)) + else if(!weakPower && block.isProvidingWeakPower(world, sideCoord.xCoord, sideCoord.yCoord, sideCoord.zCoord, side.ordinal()) > 0) { return true; } } } - return false; } diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 33a8e46a9..63759c8d7 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -1,10 +1,7 @@ package mekanism.common.util; -import java.util.Arrays; - import mekanism.api.Coord4D; -import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.TransmissionType; +import mekanism.api.transmitters.ITransmitterTile; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -16,31 +13,9 @@ public final class PipeUtils { public static final FluidTankInfo[] EMPTY = new FluidTankInfo[] {}; - /** - * Gets all the pipes around a tile entity. - * @param tileEntity - center tile entity - * @return array of TileEntities - */ - public static TileEntity[] getConnectedPipes(TileEntity tileEntity) - { - TileEntity[] pipes = new TileEntity[] {null, null, null, null, null, null}; - - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity pipe = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - - if(TransmissionType.checkTransmissionType(pipe, TransmissionType.FLUID)) - { - pipes[orientation.ordinal()] = pipe; - } - } - - return pipes; - } - public static boolean isValidAcceptorOnSide(TileEntity tile, ForgeDirection side) { - if(tile instanceof IGridTransmitter || !(tile instanceof IFluidHandler)) + if(tile instanceof ITransmitterTile || !(tile instanceof IFluidHandler)) return false; IFluidHandler container = (IFluidHandler)tile; @@ -64,65 +39,6 @@ public final class PipeUtils return false; } - /** - * Gets all the adjacent connections to a TileEntity. - * @param tileEntity - center TileEntity - * @return boolean[] of adjacent connections - */ - public static boolean[] getConnections(TileEntity tileEntity) - { - boolean[] connectable = new boolean[] {false, false, false, false, false, false}; - - TileEntity[] connectedPipes = PipeUtils.getConnectedPipes(tileEntity); - IFluidHandler[] connectedAcceptors = PipeUtils.getConnectedAcceptors(tileEntity); - - for(IFluidHandler container : connectedAcceptors) - { - if(container != null) - { - int side = Arrays.asList(connectedAcceptors).indexOf(container); - - FluidTankInfo[] infoArray = container.getTankInfo(ForgeDirection.getOrientation(side).getOpposite()); - - if(infoArray != null && infoArray.length > 0) - { - boolean notNull = false; - - for(FluidTankInfo info : container.getTankInfo(ForgeDirection.getOrientation(side).getOpposite())) - { - if(info != null) - { - notNull = true; - break; - } - } - - if(notNull) - { - connectable[side] = true; - } - } - else if(container.canDrain(ForgeDirection.getOrientation(side).getOpposite(), FluidRegistry.WATER) - || container.canFill(ForgeDirection.getOrientation(side).getOpposite(), FluidRegistry.WATER)) //I hesitate to pass null to these. - { - connectable[side] = true; - } - } - } - - for(TileEntity tile : connectedPipes) - { - if(tile != null) - { - int side = Arrays.asList(connectedPipes).indexOf(tile); - - connectable[side] = true; - } - } - - return connectable; - } - /** * Gets all the acceptors around a tile entity. * @param tileEntity - center tile entity @@ -136,7 +52,7 @@ public final class PipeUtils { TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - if(acceptor instanceof IFluidHandler && !(acceptor instanceof IGridTransmitter)) + if(acceptor instanceof IFluidHandler && !(acceptor instanceof ITransmitterTile)) { acceptors[orientation.ordinal()] = (IFluidHandler)acceptor; }