mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
#581 Power monitors redstone engine controls don't work bug
This commit is contained in:
1 parent
ff135ea4a7
commit
3e4a5033d5
2 files changed
+7
-9
No files matched your search
@@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import crazypants.enderio.Log;
|
||||
import crazypants.enderio.network.IPacketEio;
|
||||
import crazypants.util.DyeColor;
|
||||
|
||||
public class PacketPowerMonitor implements IPacketEio {
|
||||
|
||||
@@ -16,7 +15,7 @@ public class PacketPowerMonitor implements IPacketEio {
|
||||
boolean engineControlEnabled;
|
||||
float startLevel;
|
||||
float stopLevel;
|
||||
DyeColor signalColor;
|
||||
|
||||
|
||||
public PacketPowerMonitor() {
|
||||
}
|
||||
@@ -25,6 +24,9 @@ public class PacketPowerMonitor implements IPacketEio {
|
||||
x = pm.xCoord;
|
||||
y = pm.yCoord;
|
||||
z = pm.zCoord;
|
||||
engineControlEnabled = pm.engineControlEnabled;
|
||||
startLevel = pm.startLevel;
|
||||
stopLevel = pm.stopLevel;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -35,7 +37,7 @@ public class PacketPowerMonitor implements IPacketEio {
|
||||
buf.writeBoolean(engineControlEnabled);
|
||||
buf.writeFloat(startLevel);
|
||||
buf.writeFloat(stopLevel);
|
||||
buf.writeShort(signalColor.ordinal());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -46,7 +48,7 @@ public class PacketPowerMonitor implements IPacketEio {
|
||||
engineControlEnabled = buffer.readBoolean();
|
||||
startLevel = buffer.readFloat();
|
||||
stopLevel = buffer.readFloat();
|
||||
signalColor = DyeColor.fromIndex(buffer.readShort());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,7 +71,6 @@ public class PacketPowerMonitor implements IPacketEio {
|
||||
pm.engineControlEnabled = engineControlEnabled;
|
||||
pm.startLevel = startLevel;
|
||||
pm.stopLevel = stopLevel;
|
||||
pm.signalColor = signalColor;
|
||||
player.worldObj.markBlockForUpdate(x, y, z);
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal
|
||||
boolean engineControlEnabled = false;
|
||||
float startLevel = 0.75f;
|
||||
float stopLevel = 0.99f;
|
||||
DyeColor signalColor = DyeColor.RED;
|
||||
|
||||
private Signal currentlyEmmittedSignal;
|
||||
|
||||
@@ -143,7 +142,7 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal
|
||||
float percentFull = getPercentFull();
|
||||
if(currentlyEmmittedSignal == null) {
|
||||
if(percentFull <= startLevel) {
|
||||
sig = new Signal(xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN, 15, signalColor);
|
||||
sig = new Signal(xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN, 15, DyeColor.RED);
|
||||
}
|
||||
} else {
|
||||
if(percentFull >= stopLevel) {
|
||||
@@ -216,7 +215,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal
|
||||
engineControlEnabled = nbtRoot.getBoolean("engineControlEnabled");
|
||||
startLevel = nbtRoot.getFloat("startLevel");
|
||||
stopLevel = nbtRoot.getFloat("stopLevel");
|
||||
signalColor = DyeColor.fromIndex(nbtRoot.getShort("signalColor"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -235,7 +233,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal
|
||||
nbtRoot.setBoolean("engineControlEnabled", engineControlEnabled);
|
||||
nbtRoot.setFloat("startLevel", startLevel);
|
||||
nbtRoot.setFloat("stopLevel", stopLevel);
|
||||
nbtRoot.setShort("signalColor", (short) signalColor.ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user