mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 20:22:12 +00:00
Fixes
Changes powerInMachines to use long as apparently that can be a thing - prevents overflow Fixes some typos Changes the Set to List
This commit is contained in:
1 parent
e658c41746
commit
c4cec0a0ff
4 files changed
+24
-27
No files matched your search
@@ -82,8 +82,8 @@ public class NetworkPowerManager {
|
||||
return capSupply.maxCap;
|
||||
}
|
||||
|
||||
public int getPowerInReceptors() {
|
||||
int result = 0;
|
||||
public long getPowerInReceptors() {
|
||||
long result = 0;
|
||||
Set<Object> done = new HashSet<Object>();
|
||||
for (ReceptorEntry re : receptors) {
|
||||
if(!re.emmiter.getConnectionsDirty()) {
|
||||
@@ -97,8 +97,8 @@ public class NetworkPowerManager {
|
||||
return result;
|
||||
}
|
||||
|
||||
public int getMaxPowerInReceptors() {
|
||||
int result = 0;
|
||||
public long getMaxPowerInReceptors() {
|
||||
long result = 0;
|
||||
Set<Object> done = new HashSet<Object>();
|
||||
for (ReceptorEntry re : receptors) {
|
||||
if(!re.emmiter.getConnectionsDirty()) {
|
||||
|
||||
@@ -2,9 +2,7 @@ package crazypants.enderio.config;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
@@ -275,7 +273,7 @@ public final class Config {
|
||||
"Railcraft:tool.steel.hoe",
|
||||
"TConstruct:mattock"
|
||||
};
|
||||
public static Set<ItemStack> farmHoes = new HashSet<ItemStack>();
|
||||
public static List<ItemStack> farmHoes = new ArrayList<ItemStack>();
|
||||
|
||||
public static int magnetPowerUsePerSecondRF = 1;
|
||||
public static int magnetPowerCapacityRF = 100000;
|
||||
|
||||
@@ -16,7 +16,6 @@ import crazypants.enderio.gui.CheckBoxEIO;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.gui.GuiContainerBase;
|
||||
import crazypants.gui.GuiScreenBase;
|
||||
import crazypants.gui.GuiToolTip;
|
||||
import crazypants.render.ColorUtil;
|
||||
import crazypants.render.RenderUtil;
|
||||
@@ -321,7 +320,7 @@ public class GuiPowerMonitor extends GuiContainerBase {
|
||||
sb.append(" ");
|
||||
sb.append(PowerDisplayUtil.ofStr());
|
||||
sb.append(" ");
|
||||
sb.append(formatPower(te.maxPowerInCoduits));
|
||||
sb.append(formatPower(te.maxPowerInConduits));
|
||||
sb.append(" ");
|
||||
sb.append(PowerDisplayUtil.abrevation());
|
||||
fontRenderer.drawString(sb.toString(), x, y, rgb, false);
|
||||
@@ -386,7 +385,7 @@ public class GuiPowerMonitor extends GuiContainerBase {
|
||||
rgb = valuesCol;
|
||||
y += fontRenderer.FONT_HEIGHT + 2;
|
||||
sb = new StringBuilder();
|
||||
sb.append(formatPowerFloat(te.aveRfRecieved));
|
||||
sb.append(formatPowerFloat(te.aveRfReceived));
|
||||
sb.append(" ");
|
||||
sb.append(PowerDisplayUtil.abrevation());
|
||||
sb.append(PowerDisplayUtil.perTickStr());
|
||||
|
||||
@@ -24,13 +24,13 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
int energyPerTick = 1;
|
||||
|
||||
int powerInConduits;
|
||||
int maxPowerInCoduits;
|
||||
int maxPowerInConduits;
|
||||
long powerInCapBanks;
|
||||
long maxPowerInCapBanks;
|
||||
int powerInMachines;
|
||||
int maxPowerInMachines;
|
||||
long powerInMachines;
|
||||
long maxPowerInMachines;
|
||||
float aveRfSent;
|
||||
float aveRfRecieved;
|
||||
float aveRfReceived;
|
||||
|
||||
boolean engineControlEnabled = false;
|
||||
float startLevel = 0.75f;
|
||||
@@ -106,8 +106,8 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
return powerInConduits;
|
||||
}
|
||||
|
||||
public float getMaxPowerInCoduits() {
|
||||
return maxPowerInCoduits;
|
||||
public float getMaxPowerInConduits() {
|
||||
return maxPowerInConduits;
|
||||
}
|
||||
|
||||
public float getPowerInCapBanks() {
|
||||
@@ -130,8 +130,8 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
return aveRfSent;
|
||||
}
|
||||
|
||||
public float getAveRfRecieved() {
|
||||
return aveRfRecieved;
|
||||
public float getAveRfReceived() {
|
||||
return aveRfReceived;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -176,19 +176,19 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
}
|
||||
|
||||
private float getPercentFull() {
|
||||
return (float)(powerInConduits + powerInCapBanks) / (maxPowerInCoduits + maxPowerInCapBanks);
|
||||
return (float)(powerInConduits + powerInCapBanks) / (maxPowerInConduits + maxPowerInCapBanks);
|
||||
}
|
||||
|
||||
private void update(NetworkPowerManager pm) {
|
||||
powerInConduits = pm.getPowerInConduits();
|
||||
maxPowerInCoduits = pm.getMaxPowerInConduits();
|
||||
maxPowerInConduits = pm.getMaxPowerInConduits();
|
||||
powerInCapBanks = pm.getPowerInCapacitorBanks();
|
||||
maxPowerInCapBanks = pm.getMaxPowerInCapacitorBanks();
|
||||
powerInMachines = pm.getPowerInReceptors();
|
||||
maxPowerInMachines = pm.getMaxPowerInReceptors();
|
||||
PowerTracker tracker = pm.getNetworkPowerTracker();
|
||||
aveRfSent = tracker.getAverageRfTickSent();
|
||||
aveRfRecieved = tracker.getAverageRfTickRecieved();
|
||||
aveRfReceived = tracker.getAverageRfTickRecieved();
|
||||
}
|
||||
|
||||
private NetworkPowerManager getPowerManager() {
|
||||
@@ -215,7 +215,7 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
|
||||
public void readPowerInfoFromNBT(NBTTagCompound nbtRoot) {
|
||||
powerInConduits = nbtRoot.getInteger("powerInConduits");
|
||||
maxPowerInCoduits = nbtRoot.getInteger("maxPowerInCoduits");
|
||||
maxPowerInConduits = nbtRoot.getInteger("maxPowerInConduits");
|
||||
if(nbtRoot.hasKey("powerInCapBanks")) {
|
||||
powerInCapBanks = nbtRoot.getInteger("powerInCapBanks");
|
||||
maxPowerInCapBanks = nbtRoot.getInteger("maxPowerInCapBanks");
|
||||
@@ -226,7 +226,7 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
powerInMachines = nbtRoot.getInteger("powerInMachines");
|
||||
maxPowerInMachines = nbtRoot.getInteger("maxPowerInMachines");
|
||||
aveRfSent = nbtRoot.getFloat("aveRfSent");
|
||||
aveRfRecieved = nbtRoot.getFloat("aveRfRecieved");
|
||||
aveRfReceived = nbtRoot.getFloat("aveRfReceived");
|
||||
|
||||
engineControlEnabled = nbtRoot.getBoolean("engineControlEnabled");
|
||||
startLevel = nbtRoot.getFloat("startLevel");
|
||||
@@ -241,13 +241,13 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn
|
||||
|
||||
public void writePowerInfoToNBT(NBTTagCompound nbtRoot) {
|
||||
nbtRoot.setInteger("powerInConduits", powerInConduits);
|
||||
nbtRoot.setInteger("maxPowerInCoduits", maxPowerInCoduits);
|
||||
nbtRoot.setInteger("maxPowerInConduits", maxPowerInConduits);
|
||||
nbtRoot.setLong("powerInCapBanksL", powerInCapBanks);
|
||||
nbtRoot.setLong("maxPowerInCapBanksL", maxPowerInCapBanks);
|
||||
nbtRoot.setInteger("powerInMachines", powerInMachines);
|
||||
nbtRoot.setInteger("maxPowerInMachines", maxPowerInMachines);
|
||||
nbtRoot.setLong("powerInMachines", powerInMachines);
|
||||
nbtRoot.setLong("maxPowerInMachines", maxPowerInMachines);
|
||||
nbtRoot.setFloat("aveRfSent", aveRfSent);
|
||||
nbtRoot.setFloat("aveRfRecieved", aveRfRecieved);
|
||||
nbtRoot.setFloat("aveRfReceived", aveRfReceived);
|
||||
|
||||
nbtRoot.setBoolean("engineControlEnabled", engineControlEnabled);
|
||||
nbtRoot.setFloat("startLevel", startLevel);
|
||||
|
||||
Reference in new issue
Block a user