diff --git a/src/main/java/com/hbm/render/tileentity/RenderRBMKNumitron.java b/src/main/java/com/hbm/render/tileentity/RenderRBMKNumitron.java index b1a1d1bb0..2270591b7 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderRBMKNumitron.java +++ b/src/main/java/com/hbm/render/tileentity/RenderRBMKNumitron.java @@ -74,12 +74,12 @@ public class RenderRBMKNumitron extends TileEntitySpecialRenderer { //** Fill up to 7 characters */ //** For negative numbers when zeroes are added: put the zeroes between the '-' and the number */ - if ((value.length() < 7) && (value.charAt(0) == '-') && (unit.no_leading_zeroes == false)) { + if ((value.length() < 7) && (value.charAt(0) == '-') && unit.leading_zeroes) { value = value.substring(1); while(value.length() < 6) value = "0" + value; value = "-" + value; } else { - String fill_char = unit.no_leading_zeroes?" ":"0"; + String fill_char = unit.leading_zeroes?"0":" "; while(value.length() < 7) value = fill_char + value; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java index 2df44ce5b..c7fe719c2 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKNumitron.java @@ -89,7 +89,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI /** Whether this display is visible on the panel */ public boolean active; /** If leading zeros should not be added */ - public boolean no_leading_zeroes; + public boolean leading_zeroes; /** Which digits are activated (bit mask, msb ignored) */ public long active_digits; /** Display mode 0=normal, 1=integer */ @@ -99,6 +99,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI label = "Display " + (initialIndex + 1); active_digits = 0b01111111; shorten_number = true; + leading_zeroes = true; } public void update() { @@ -123,7 +124,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI public void serialize(ByteBuf buf) { buf.writeBoolean(shorten_number); buf.writeLong(active_digits); - buf.writeBoolean(no_leading_zeroes); + buf.writeBoolean(leading_zeroes); buf.writeBoolean(active); buf.writeBoolean(polling); BufferUtil.writeString(buf, label); @@ -134,7 +135,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI public void deserialize(ByteBuf buf) { shorten_number = buf.readBoolean(); active_digits = buf.readLong(); - no_leading_zeroes = buf.readBoolean(); + leading_zeroes = buf.readBoolean(); active = buf.readBoolean(); polling = buf.readBoolean(); label = BufferUtil.readString(buf); @@ -145,7 +146,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI public void readFromNBT(NBTTagCompound nbt, int index) { this.shorten_number = nbt.getBoolean("shorten_number" + index); this.active_digits = nbt.getLong("active_digits" + index); - this.no_leading_zeroes = nbt.getBoolean("no_leading_zeroes" + index); + this.leading_zeroes = nbt.getBoolean("leading_zeroes" + index); this.active = nbt.getBoolean("active" + index); this.polling = nbt.getBoolean("polling" + index); this.label = nbt.getString("label" + index); @@ -156,7 +157,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI public void writeToNBT(NBTTagCompound nbt, int index) { nbt.setBoolean("shorten_number" + index, shorten_number); nbt.setLong("active_digits" + index, active_digits); - nbt.setBoolean("no_leading_zeroes" + index, no_leading_zeroes); + nbt.setBoolean("leading_zeroes" + index, leading_zeroes); nbt.setBoolean("active" + index, active); nbt.setBoolean("polling" + index, polling); nbt.setString("label" + index, label); @@ -205,7 +206,7 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI java.util.LinkedHashMap map = new java.util.LinkedHashMap<>(); map.put("shorten_number", displays[idx].shorten_number); map.put("active_digits", displays[idx].active_digits); - map.put("no_leading_zeroes", displays[idx].no_leading_zeroes); + map.put("leading_zeroes", displays[idx].leading_zeroes); map.put("active", displays[idx].active); map.put("polling", displays[idx].polling); map.put("label", displays[idx].label); @@ -267,10 +268,10 @@ public class TileEntityRBMKNumitron extends TileEntityLoadedBase implements IGUI @Callback(direct = true, limit = 2) @Optional.Method(modid = "OpenComputers") - public Object[] setDisplayNoLeadingZeroes(Context context, Arguments args) { + public Object[] setDisplayLeadingZeroes(Context context, Arguments args) { int idx = args.checkInteger(0) - 1; if(idx < 0 || idx >= 2) return new Object[] {false, "Invalid index (1-2)"}; - displays[idx].no_leading_zeroes = args.checkBoolean(1); + displays[idx].leading_zeroes = args.checkBoolean(1); markDirty(); return new Object[] {true}; }