Tracked commit 1

- Fix issues with energy cables. Would only accept one connection per block.
- Change infinite energy cable energy amount to Integer.MAX_VALUE
- Stop gas centrifuge from being able to store progress. The gas would just mix again.
- Make the chemical boiler store progress.
- Make the chemical extractor store progress.

Author: aurilisdev

src/main/java/physica/core/client/render/tile/TileRenderEnergyCable.java

@@ -14,6 +14,7 @@
 import net.minecraftforge.common.util.ForgeDirection;
 import physica.CoreReferences;
 import physica.api.core.cable.EnumConductorType;
+import physica.core.common.tile.cable.TileEnergyCable;
 
 @SideOnly(Side.CLIENT)
 public class TileRenderEnergyCable extends TileEntitySpecialRenderer {
@@ -52,7 +53,7 @@ public final void renderTileEntityAt(TileEntity tile, double x, double y, double
 			if (sideTile instanceof IEnergyConnection && ((IEnergyConnection) sideTile).canConnectEnergy(dir.getOpposite()))
 			{
 				drawConnection(dir);
-				if (sideTile.getBlockMetadata() == meta)
+				if (sideTile.getBlockMetadata() == meta && sideTile instanceof TileEnergyCable)
 				{
 					connections++;
 				} else

src/main/java/physica/core/common/tile/TileInfiniteEnergy.java

@@ -9,7 +9,7 @@
 
 public class TileInfiniteEnergy extends TileBase implements IEnergyProvider {
 
-	public static final int VISIBLE_STORAGE = Integer.MAX_VALUE - 100;
+	public static final int VISIBLE_STORAGE = Integer.MAX_VALUE;
 
 	@Override
 	public void updateServer(int ticks)

src/main/java/physica/library/net/energy/EnergyNetwork.java

@@ -21,16 +21,17 @@
 import physica.library.net.EnergyNetworkRegistry;
 
 public class EnergyNetwork {
-	private static final int								DEFAULT_VOLTAGE				= 480;
-	public HashSet<IConductor>								conductorSet				= new HashSet<>();
-	public HashSet<TileEntity>								acceptorSet					= new HashSet<>();
-	public HashMap<TileEntity, ForgeDirection>				acceptorInputMap			= new HashMap<>();
-	private HashMap<EnumConductorType, HashSet<IConductor>>	conductorTypeMap			= new HashMap<>();
-	private int												energyTransmittedBuffer		= 0;
-	private int												energyTransmittedLastTick	= 0;				// TODO: Work on implementing voltage. Is always an concurrent exception???
-	private int												ticksSinceNetworkCreate		= 0;
-	private boolean											fixed						= false;
-	private int												maxPowerTransfer			= 0;
+	private static final int								DEFAULT_VOLTAGE					= 480;
+	public HashSet<IConductor>								conductorSet					= new HashSet<>();
+	public HashSet<TileEntity>								acceptorSet						= new HashSet<>();
+	public HashMap<TileEntity, HashSet<ForgeDirection>>		acceptorInputMap				= new HashMap<>();
+	private HashMap<EnumConductorType, HashSet<IConductor>>	conductorTypeMap				= new HashMap<>();
+	private int												energyTransmittedBuffer			= 0;
+	private int												energyTransmittedLastTick		= 0;
+	private int												fixTimerTicksSinceNetworkCreate	= 0;
+	private int												ticksSinceNetworkRefresh		= 0;
+	private boolean											fixed							= false;
+	private int												maxPowerTransfer				= 0;
 
 	public int getEnergyTransmittedLastTick()
 	{
@@ -85,7 +86,10 @@ public int emit(int energyToSend, ArrayList<TileEntity> ignored)
 						remaining = 0;
 						if (acceptor instanceof IEnergyReceiver)
 						{
-							energySent += ((IEnergyReceiver) acceptor).receiveEnergy(acceptorInputMap.get(acceptor).getOpposite(), currentSending, false);
+							for (ForgeDirection connection : acceptorInputMap.get(acceptor))
+							{
+								energySent += ((IEnergyReceiver) acceptor).receiveEnergy(connection.getOpposite(), currentSending, false);
+							}
 						}
 					}
 				}
@@ -139,12 +143,15 @@ public Set<TileEntity> getEnergyAcceptors()
 			if (acceptor instanceof IEnergyReceiver)
 			{
 				IEnergyReceiver receiver = (IEnergyReceiver) acceptor;
-				ForgeDirection direction = acceptorInputMap.get(acceptor).getOpposite();
-				if (receiver.canConnectEnergy(direction))
+				for (ForgeDirection connection : acceptorInputMap.get(acceptor))
 				{
-					if (receiver.receiveEnergy(direction, Integer.MAX_VALUE, true) > 0 || receiver.getEnergyStored(direction) < receiver.getMaxEnergyStored(direction))
+					ForgeDirection direction = connection.getOpposite();
+					if (receiver.canConnectEnergy(direction))
 					{
-						toReturn.add(acceptor);
+						if (receiver.receiveEnergy(direction, Integer.MAX_VALUE, true) > 0 || receiver.getEnergyStored(direction) < receiver.getMaxEnergyStored(direction))
+						{
+							toReturn.add(acceptor);
+						}
 					}
 				}
 			}
@@ -194,7 +201,9 @@ public void refresh()
 				if (acceptor != null && !(acceptor instanceof IConductor))
 				{
 					acceptorSet.add(acceptor);
-					acceptorInputMap.put(acceptor, ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)));
+					HashSet<ForgeDirection> directions = acceptorInputMap.containsKey(acceptor) ? acceptorInputMap.get(acceptor) : new HashSet<>();
+					directions.add(ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)));
+					acceptorInputMap.put(acceptor, directions);
 				}
 			}
 		}
@@ -393,14 +402,19 @@ public void tick()
 		clearJoulesTransmitted();
 		if (!fixed)
 		{
-			ticksSinceNetworkCreate += 1;
-			if (ticksSinceNetworkCreate > 1200)
+			fixTimerTicksSinceNetworkCreate += 1;
+			if (fixTimerTicksSinceNetworkCreate > 1200)
 			{
-				ticksSinceNetworkCreate = 0;
+				fixTimerTicksSinceNetworkCreate = 0;
 				fixMessedUpNetwork(conductorSet.toArray(new IConductor[0])[0]);
 			}
 		}
-
+		ticksSinceNetworkRefresh++;
+		if (ticksSinceNetworkRefresh > 1600)
+		{
+			ticksSinceNetworkRefresh = 0;
+			refresh();
+		}
 	}
 
 	public void clearJoulesTransmitted()

src/nuclear/physica/nuclear/common/tile/TileChemicalBoiler.java

@@ -74,7 +74,6 @@ public void updateServer(int ticks)
 		} else
 		{
 			drainBattery(SLOT_ENERGY);
-			operatingTicks = 0;
 		}
 		ItemStack waterInput = getStackInSlot(SLOT_INPUT1);
 		if (waterInput != null && waterInput.getItem() == Items.water_bucket && waterTank.getCapacity() - waterTank.getFluidAmount() >= 1000)

src/nuclear/physica/nuclear/common/tile/TileChemicalExtractor.java

@@ -69,7 +69,6 @@ public void updateServer(int ticks)
 		} else
 		{
 			drainBattery(SLOT_ENERGY);
-			operatingTicks = 0;
 		}
 		ItemStack input = getStackInSlot(SLOT_INPUT);
 		if (input != null)

src/nuclear/physica/nuclear/common/tile/TileGasCentrifuge.java

@@ -58,9 +58,6 @@ public void updateServer(int ticks)
 					operatingTicks = 0;
 				}
 				extractEnergy();
-			} else
-			{
-				operatingTicks = 0;
 			}
 			ForgeDirection direction = getFacing().getOpposite();
 			TileEntity tile = worldObj.getTileEntity(xCoord + direction.offsetX, yCoord + direction.offsetY, zCoord + direction.offsetZ);
@@ -76,6 +73,7 @@ public void updateServer(int ticks)
 		} else
 		{
 			drainBattery(SLOT_ENERGY);
+			operatingTicks = 0;
 		}
 	}