Merge branch 'master' into 1.7

Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java
This commit is contained in:
cp committed 2014-03-04 13:00:52 +08:00
commit 1bb3dbabc7
9 files changed
+42 -26

No files matched your search

@@ -110,18 +110,15 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
BlockCoord loc = itemConduit.getLocation().getLocation(side);
ItemStack result = null;
ItemStack result = item.copy();
List<NetworkedInventory> invs = getOrCreate(loc);
for (NetworkedInventory inv : invs) {
if(inv.con.getLocation().equals(loc)) {
if(inv.con.getLocation().equals(itemConduit.getLocation())) {
int numInserted = inv.insertIntoTargets(item.copy());
if(numInserted >= item.stackSize) {
return null;
}
if(result == null) {
result = item.copy();
}
result.stackSize -= numInserted;
}
}
@@ -241,7 +241,7 @@ public class NetworkPowerManager {
for (IPowerConduit con : network.getConduits()) {
if(con.hasExternalConnections()) {
PowerTracker tracker = getOrCreateTracker(con);
tracker.tickStart((float) con.getPowerHandler().getEnergyStored());
tracker.tickStart(con.getEnergyStored());
}
}
}
@@ -273,7 +273,7 @@ public class NetworkPowerManager {
for (IPowerConduit con : network.getConduits()) {
if(con.hasExternalConnections()) {
PowerTracker tracker = getOrCreateTracker(con);
tracker.tickEnd((float) con.getPowerHandler().getEnergyStored());
tracker.tickEnd(con.getEnergyStored());
}
}
}
@@ -90,7 +90,7 @@ public class GuiPowerMonitor extends GuiScreenBase {
@Override
protected void updateText() {
text.clear();
text.add(formatPower(te.getPowerHandler().getEnergyStored()) + "/" + formatPower(te.getPowerHandler().getMaxEnergyStored()) + " "
text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getPowerHandler().getMaxEnergyStored()) + " "
+ PowerDisplayUtil.abrevation());
}