diff --git a/common/mekanism/api/DynamicNetwork.java b/common/mekanism/api/DynamicNetwork.java
index 6d56e5e94..6a22fa598 100644
--- a/common/mekanism/api/DynamicNetwork.java
+++ b/common/mekanism/api/DynamicNetwork.java
@@ -77,6 +77,12 @@ public abstract class DynamicNetwork implements ITransmitterNetwork
return transmitters.size();
}
+ @Override
+ public int getAcceptorSize()
+ {
+ return possibleAcceptors.size();
+ }
+
@Override
public void tick()
{
diff --git a/common/mekanism/api/GasNetwork.java b/common/mekanism/api/GasNetwork.java
index 7c65e1370..1236871b5 100644
--- a/common/mekanism/api/GasNetwork.java
+++ b/common/mekanism/api/GasNetwork.java
@@ -263,4 +263,16 @@ public class GasNetwork extends DynamicNetwork
{
return TransmissionType.GAS;
}
+
+ @Override
+ public String getNeeded()
+ {
+ return "Undefined for Gas networks.";
+ }
+
+ @Override
+ public String getFlow()
+ {
+ return "Not defined yet for Fluid networks";
+ }
}
diff --git a/common/mekanism/api/ITransmitter.java b/common/mekanism/api/ITransmitter.java
index f6c0c5828..c8801a557 100644
--- a/common/mekanism/api/ITransmitter.java
+++ b/common/mekanism/api/ITransmitter.java
@@ -49,4 +49,12 @@ public interface ITransmitter
public void fixNetwork();
public boolean areNetworksEqual(TileEntity tileEntity);
+
+ public int getNetworkSize();
+
+ public int getNetworkAcceptorSize();
+
+ public String getNetworkNeeded();
+
+ public String getNetworkFlow();
}
diff --git a/common/mekanism/api/ITransmitterNetwork.java b/common/mekanism/api/ITransmitterNetwork.java
index 527c696aa..d0cb53069 100644
--- a/common/mekanism/api/ITransmitterNetwork.java
+++ b/common/mekanism/api/ITransmitterNetwork.java
@@ -8,6 +8,12 @@ public interface ITransmitterNetwork
public int getSize();
+ public int getAcceptorSize();
+
+ public String getNeeded();
+
+ public String getFlow();
+
public Set getAcceptors(Object... data);
public void removeTransmitter(ITransmitter transmitter);
diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java
index e46694062..0dcf6b777 100644
--- a/common/mekanism/common/EnergyNetwork.java
+++ b/common/mekanism/common/EnergyNetwork.java
@@ -21,6 +21,7 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import universalelectricity.core.block.IElectrical;
+import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityPack;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler.PowerReceiver;
@@ -60,7 +61,7 @@ public class EnergyNetwork extends DynamicNetwork
register();
}
- public double getEnergyNeeded(ArrayList ignored)
+ public double getEnergyNeeded(List ignored)
{
double totalNeeded = 0;
@@ -427,4 +428,16 @@ public class EnergyNetwork extends DynamicNetwork
{
return TransmissionType.ENERGY;
}
+
+ @Override
+ public String getNeeded()
+ {
+ return ElectricityDisplay.getDisplay((float) (getEnergyNeeded(new ArrayList())*Mekanism.TO_UE), ElectricityDisplay.ElectricUnit.JOULES);
+ }
+
+ @Override
+ public String getFlow()
+ {
+ return ElectricityDisplay.getDisplay((float) (getPower()*Mekanism.TO_UE), ElectricityDisplay.ElectricUnit.WATT);
+ }
}
diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java
index 0ab527521..cc2254799 100644
--- a/common/mekanism/common/FluidNetwork.java
+++ b/common/mekanism/common/FluidNetwork.java
@@ -267,4 +267,16 @@ public class FluidNetwork extends DynamicNetwork
{
return TransmissionType.FLUID;
}
+
+ @Override
+ public String getNeeded()
+ {
+ return "Undefined for Fluid networks";
+ }
+
+ @Override
+ public String getFlow()
+ {
+ return "Not defined yet for Fluid networks";
+ }
}
diff --git a/common/mekanism/common/InventoryNetwork.java b/common/mekanism/common/InventoryNetwork.java
index ee2b7479b..3a6e7293f 100644
--- a/common/mekanism/common/InventoryNetwork.java
+++ b/common/mekanism/common/InventoryNetwork.java
@@ -196,4 +196,16 @@ public class InventoryNetwork extends DynamicNetwork= ENERGY_PER_USE)
{
setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
- ITransmitter cable = (ITransmitter)tileEntity;
+ ITransmitter cable = (ITransmitter)tileEntity;
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
- player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Cables: " + EnumColor.DARK_GREY + cable.getNetwork().transmitters.size()));
- player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + cable.getNetwork().possibleAcceptors.size()));
- player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Needed energy: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay((float)(cable.getNetwork().getEnergyNeeded(new ArrayList())*Mekanism.TO_UE), ElectricUnit.JOULES)));
- player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + ElectricityDisplay.getDisplay((float)(cable.getNetwork().getPower()*Mekanism.TO_UE), ElectricUnit.WATT)));
+ player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Cables: " + EnumColor.DARK_GREY + cable.getNetworkSize()));
+ player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + cable.getNetworkAcceptorSize()));
+ player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Needed energy: " + EnumColor.DARK_GREY + cable.getNetworkNeeded()));
+ player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + cable.getNetworkFlow() ));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
}
}
diff --git a/common/mekanism/common/TileEntityLogisticalTransporter.java b/common/mekanism/common/TileEntityLogisticalTransporter.java
index 6a96cd6b2..90e7be2f2 100644
--- a/common/mekanism/common/TileEntityLogisticalTransporter.java
+++ b/common/mekanism/common/TileEntityLogisticalTransporter.java
@@ -161,4 +161,28 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter
{
return false;
}
+
+ @Override
+ public int getNetworkSize()
+ {
+ return getNetwork().getSize();
+ }
+
+ @Override
+ public int getNetworkAcceptorSize()
+ {
+ return getNetwork().getAcceptorSize();
+ }
+
+ @Override
+ public String getNetworkNeeded()
+ {
+ return getNetwork().getNeeded();
+ }
+
+ @Override
+ public String getNetworkFlow()
+ {
+ return getNetwork().getFlow();
+ }
}
diff --git a/common/mekanism/common/TileEntityUniversalCable.java b/common/mekanism/common/TileEntityUniversalCable.java
index 5d42956d3..e009e18b2 100644
--- a/common/mekanism/common/TileEntityUniversalCable.java
+++ b/common/mekanism/common/TileEntityUniversalCable.java
@@ -170,4 +170,28 @@ public class TileEntityUniversalCable extends TileEntityTransmitter