diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 84bf11195..f9b0a1ceb 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -1,5 +1,6 @@ package mekanism.api.gas; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -12,6 +13,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.Mekanism; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; @@ -112,6 +114,8 @@ public class GasNetwork extends DynamicNetwork return; } + if(!gas.isGasEqual(buffer)) Mekanism.logger.warn("Gas type " + gas.getGas().getName() + " of buffer doesn't match type " + buffer.getGas().getName() + " of absorbing network"); + buffer.amount += gas.amount; gas.amount = 0; } @@ -132,7 +136,9 @@ public class GasNetwork extends DynamicNetwork public int tickEmit(GasStack stack) { - List availableAcceptors = Arrays.asList(getAcceptors(stack.getGas()).toArray()); + List availableAcceptors = new ArrayList<>(); + + availableAcceptors.addAll(getAcceptors(stack.getGas())); Collections.shuffle(availableAcceptors); @@ -145,30 +151,26 @@ public class GasNetwork extends DynamicNetwork int remaining = toSend % divider; int sending = (toSend-remaining)/divider; - for(Object obj : availableAcceptors) + for(IGasHandler acceptor : availableAcceptors) { - if(obj instanceof IGasHandler) + int currentSending = sending; + EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); + + if(remaining > 0) { - IGasHandler acceptor = (IGasHandler)obj; - int currentSending = sending; - EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); + currentSending++; + remaining--; + } - if(remaining > 0) - { - currentSending++; - remaining--; - } + for(ForgeDirection side : sides) + { + int prev = toSend; - for(ForgeDirection side : sides) + toSend -= acceptor.receiveGas(side, new GasStack(stack.getGas(), currentSending), true); + + if(toSend < prev) { - int prev = toSend; - - toSend -= acceptor.receiveGas(side.getOpposite(), new GasStack(stack.getGas(), currentSending), true); - - if(toSend < prev) - { - break; - } + break; } } } @@ -301,7 +303,7 @@ public class GasNetwork extends DynamicNetwork for(ForgeDirection side : sides) { - if(acceptor != null && acceptor.canReceiveGas(side.getOpposite(), type)) + if(acceptor != null && acceptor.canReceiveGas(side, type)) { toReturn.add(acceptor); break; diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index b92826285..436d4e70a 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -357,16 +357,7 @@ public abstract class DynamicNetwork> implemen } @Override - public void clientTick() - { - ticksSinceCreate++; - - if(ticksSinceCreate == 5 && getSize() > 0) - { - TileEntity tile = (TileEntity)transmitters.iterator().next(); - MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(tile)); - } - } + public void clientTick() {} public void queueClientUpdate(Collection> newTransmitters) { diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 5120b197e..298bc2ecb 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -514,7 +514,7 @@ public class RenderPartTransmitter implements IIconSelfRegister public void renderContents(PartPressurizedTube tube, Vector3 pos) { - if(tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0) + if(!tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0) { return; } diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 74c75dacd..816dd026d 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -95,6 +95,8 @@ public class FluidNetwork extends DynamicNetwork return; } + if(!fluid.isFluidEqual(buffer)) Mekanism.logger.warn("Fluid type " + fluid.getFluid().getName() + " of buffer doesn't match type " + buffer.getFluid().getName() + " of absorbing network"); + buffer.amount += fluid.amount; fluid.amount = 0; } @@ -231,7 +233,7 @@ public class FluidNetwork extends DynamicNetwork if(didTransfer != prevTransfer || needsUpdate) { - MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, getScale(), didTransfer)); + MinecraftForge.EVENT_BUS.post(new FluidTransferEvent(this, buffer, didTransfer)); needsUpdate = false; } @@ -315,14 +317,12 @@ 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, float scale, boolean did) + public FluidTransferEvent(FluidNetwork network, FluidStack type, boolean did) { fluidNetwork = network; fluidType = type; - fluidScale = scale; didTransfer = did; } } diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 56453d7b7..7ef23db57 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -61,16 +61,16 @@ public class InventoryNetwork extends DynamicNetwork 0.01) { diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 0d0c6927b..eca01a551 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -47,6 +47,7 @@ public class PacketTransmitterUpdate implements IMessageHandler> implements @Override public void setTransmitterNetwork(N network) { + if(world().isRemote && theNetwork != null) + { + theNetwork.transmitters.remove(this); + } theNetwork = network; - orphaned = network == null; + orphaned = theNetwork == null; + if(world().isRemote && theNetwork != null) + { + theNetwork.transmitters.add(this); + } } @Override