Store FloatingLongs as a string in NBT to be able to easily switch to…

… unsigned longs if we decide to without voiding saved energy again
CyberMonitor · Mar 25, 2020 · a2bc3a0 · a2bc3a0
1 parent 2711127
commit a2bc3a0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 50 deletions.
diff --git a/src/api/java/mekanism/api/NBTConstants.java b/src/api/java/mekanism/api/NBTConstants.java
@@ -62,7 +62,6 @@ public final class NBTConstants {
     public static final String CONTROL_TYPE = "controlType";
     public static final String DATA = "data";
     public static final String DATA_TYPE = "dataType";
-    public static final String DECIMAL = "decimal";
     public static final String DELAY = "delay";
     public static final String DIMENSION = "dimension";
     public static final String DUMP_LEFT = "dumpLeft";
@@ -154,6 +153,5 @@ public final class NBTConstants {
     public static final String UPDATE_DELAY = "updateDelay";
     public static final String UPGRADES = "upgrades";
     public static final String USED_NODES = "usedNodes";
-    public static final String VALUE = "value";
     public static final String WORLD_GEN_VERSION = "worldGenVersion";
 }
diff --git a/src/api/java/mekanism/api/energy/IEnergyContainer.java b/src/api/java/mekanism/api/energy/IEnergyContainer.java
@@ -164,7 +164,7 @@ default FloatingLong getNeeded() {
     default CompoundNBT serializeNBT() {
         CompoundNBT nbt = new CompoundNBT();
         if (!isEmpty()) {
-            nbt.put(NBTConstants.STORED, getEnergy().serializeNBT());
+            nbt.putString(NBTConstants.STORED, getEnergy().toString());
         }
         return nbt;
     }

diff --git a/src/api/java/mekanism/api/math/FloatingLong.java b/src/api/java/mekanism/api/math/FloatingLong.java
@@ -3,20 +3,16 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Objects;
-import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import mcp.MethodsReturnNonnullByDefault;
-import mekanism.api.NBTConstants;
-import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.common.util.INBTSerializable;
 
 /**
  * A class representing a positive number with an internal value defined by a long, and a floating point number stored in a short
  */
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public class FloatingLong extends Number implements Comparable<FloatingLong>, INBTSerializable<CompoundNBT> {
+public class FloatingLong extends Number implements Comparable<FloatingLong> {
 
     //TODO: Eventually we should define a way of doing a set of operations all at once, and outputting a new value
     // given that way we can internally do all the calculations using primitives rather than spamming a lot of objects
@@ -131,20 +127,6 @@ public static FloatingLong createConst(long value, short decimal) {
         return new FloatingLong(value, decimal, true);
     }
 
-    /**
-     * Reads a mutable {@link FloatingLong} from NBT
-     *
-     * @param nbt The {@link CompoundNBT} to read from
-     *
-     * @return A mutable {@link FloatingLong}, or {@link #ZERO} if the given nbt is null or empty.
-     */
-    public static FloatingLong readFromNBT(@Nullable CompoundNBT nbt) {
-        if (nbt == null || nbt.isEmpty()) {
-            return ZERO;
-        }
-        return create(nbt.getLong(NBTConstants.VALUE), nbt.getShort(NBTConstants.DECIMAL));
-    }
-
     /**
      * Reads a mutable {@link FloatingLong} from a buffer
      *
@@ -655,23 +637,6 @@ public double doubleValue() {
         return longValue() + decimal / (double) SINGLE_UNIT;
     }
 
-    @Override
-    public CompoundNBT serializeNBT() {
-        //TODO: Do we want to do this in a different form to make sure that it will support unsigned longs
-        CompoundNBT nbt = new CompoundNBT();
-        nbt.putLong(NBTConstants.VALUE, value);
-        nbt.putShort(NBTConstants.DECIMAL, decimal);
-        return nbt;
-    }
-
-    @Override
-    public void deserializeNBT(CompoundNBT nbt) {
-        if (isConstant) {
-            throw new IllegalStateException("Tried to modify a floating constant long");
-        }
-        setAndClampValues(nbt.getLong(NBTConstants.VALUE), nbt.getShort(NBTConstants.DECIMAL));
-    }
-
     /**
      * Writes this {@link FloatingLong} to the given buffer
      *

diff --git a/src/main/java/mekanism/common/capabilities/energy/BasicEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/BasicEnergyContainer.java
@@ -163,7 +163,7 @@ public FloatingLong getMaxEnergy() {
     public CompoundNBT serializeNBT() {
         CompoundNBT nbt = new CompoundNBT();
         if (!isEmpty()) {
-            nbt.put(NBTConstants.STORED, stored.serializeNBT());
+            nbt.putString(NBTConstants.STORED, stored.toString());
         }
         return nbt;
     }

diff --git a/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java b/src/main/java/mekanism/common/capabilities/energy/ResistiveHeaterEnergyContainer.java
@@ -41,7 +41,7 @@ public void updateEnergyUsage(FloatingLong energyUsage) {
     @Override
     public CompoundNBT serializeNBT() {
         CompoundNBT nbt = super.serializeNBT();
-        nbt.put(NBTConstants.ENERGY_USAGE, getEnergyPerTick().serializeNBT());
+        nbt.putString(NBTConstants.ENERGY_USAGE, getEnergyPerTick().toString());
         return nbt;
     }
 

diff --git a/src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java b/src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java
@@ -143,15 +143,15 @@ public void read(CompoundNBT nbtTags) {
     @Override
     public CompoundNBT write(CompoundNBT nbtTags) {
         super.write(nbtTags);
-        nbtTags.put(NBTConstants.LAST_FIRED, lastFired.serializeNBT());
+        nbtTags.putString(NBTConstants.LAST_FIRED, lastFired.toString());
         return nbtTags;
     }
 
     @Nonnull
     @Override
     public CompoundNBT getUpdateTag() {
         CompoundNBT updateTag = super.getUpdateTag();
-        updateTag.put(NBTConstants.LAST_FIRED, lastFired.serializeNBT());
+        updateTag.putString(NBTConstants.LAST_FIRED, lastFired.toString());
         return updateTag;
     }
 

diff --git a/src/main/java/mekanism/common/tile/laser/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/laser/TileEntityLaserAmplifier.java
@@ -114,8 +114,8 @@ public void read(CompoundNBT nbtTags) {
     @Override
     public CompoundNBT write(CompoundNBT nbtTags) {
         super.write(nbtTags);
-        nbtTags.put(NBTConstants.MIN, minThreshold.serializeNBT());
-        nbtTags.put(NBTConstants.MAX, maxThreshold.serializeNBT());
+        nbtTags.putString(NBTConstants.MIN, minThreshold.toString());
+        nbtTags.putString(NBTConstants.MAX, maxThreshold.toString());
         nbtTags.putInt(NBTConstants.TIME, time);
         nbtTags.putInt(NBTConstants.OUTPUT_MODE, outputMode.ordinal());
         return nbtTags;

diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java
@@ -142,8 +142,12 @@ public TransmitterType getTransmitterType() {
     @Override
     public void read(CompoundNBT nbtTags) {
         super.read(nbtTags);
-        if (nbtTags.contains(NBTConstants.ENERGY_STORED, NBT.TAG_COMPOUND)) {
-            lastWrite = FloatingLong.readFromNBT(nbtTags.getCompound(NBTConstants.ENERGY_STORED));
+        if (nbtTags.contains(NBTConstants.ENERGY_STORED, NBT.TAG_STRING)) {
+            try {
+                lastWrite = FloatingLong.parseFloatingLong(nbtTags.getString(NBTConstants.ENERGY_STORED));
+            } catch (NumberFormatException e) {
+                lastWrite = FloatingLong.ZERO;
+            }
         } else {
             lastWrite = FloatingLong.ZERO;
         }
@@ -157,7 +161,7 @@ public CompoundNBT write(CompoundNBT nbtTags) {
         if (lastWrite.isZero()) {
             nbtTags.remove(NBTConstants.ENERGY_STORED);
         } else {
-            nbtTags.put(NBTConstants.ENERGY_STORED, lastWrite.serializeNBT());
+            nbtTags.putString(NBTConstants.ENERGY_STORED, lastWrite.toString());
         }
         return nbtTags;
     }

diff --git a/src/main/java/mekanism/common/util/NBTUtils.java b/src/main/java/mekanism/common/util/NBTUtils.java
@@ -142,8 +142,12 @@ public static void setInfusionStackIfPresent(CompoundNBT nbt, String key, Consum
     }
 
     public static void setFloatingLongIfPresent(CompoundNBT nbt, String key, FloatingLongConsumer setter) {
-        if (nbt.contains(key, NBT.TAG_COMPOUND)) {
-            setter.accept(FloatingLong.readFromNBT(nbt.getCompound(key)));
+        if (nbt.contains(key, NBT.TAG_STRING)) {
+            try {
+                setter.accept(FloatingLong.parseFloatingLong(nbt.getString(key)));
+            } catch (NumberFormatException e) {
+                setter.accept(FloatingLong.ZERO);
+            }
         }
     }