完善梦之能量核心的bigint调用

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/crafttweaker/util/NovaEngUtils.java

@@ -58,15 +58,16 @@ public static String formatNumber(long value) {
     }
 
     @ZenMethod
-    public static String formatNumber(String value) {
-        var BigValue = new BigInteger(value).abs();
+    public static String formatNumber(BigInteger num) {
+        final var value = num.toString();
+        var BigValue = num.abs();
         long big = BigValue.compareTo(BigLongMax) >= 0 ? Long.MAX_VALUE : BigValue.longValue();
         String zf = "";
         if (value.startsWith("-")){
             zf += "-";
         }
         if (big != (Long.MAX_VALUE)){
-            return formatNumber(big,1);
+            return zf + formatNumber(big,1);
         } else {
             int cfs = value.length() - 1;
             float cft = (1.00f * Integer.parseInt(value.substring(0,3))) / 100;

src/main/java/github/kasuminova/novaeng/common/machine/DreamEnergyCore.java

@@ -162,13 +162,13 @@ public void CInit(DynamicMachine machine){
         machine.addMachineEventHandler(ControllerGUIRenderEvent.class, event -> {
             var ctrl = event.getController();
             var data = ctrl.getCustomDataTag();
-            var speed = data.getFloat("speed");
+            var speed = data.hasKey("speed") ? data.getFloat("speed") : 1.0f;
             var energyStored = data.getString("energyStored").isEmpty() ? "0":data.getString("energyStored");
 
             String[] info = {
                     "§b/////////// 梦之管理者 ///////////",
-                    "§b能量储存：§a" + formatNumber(energyStored) + " RF",
-                    "§b输入输出值：§a" + formatNumber((long) (defaultTransferAmount * speed)) + " RF/t",
+                    "§b能量储存：§a" + formatNumber(getBigInt(energyStored)) + " RF",
+                    "§b输入输出值：§a" + formatNumber((long) (defaultTransferAmount * speed),1) + " RF/t",
                     "§b一分钟内平均交互速度：§a" + change(ctrl) + " RF/t",
                     "§b///////////////////////////////////"
             };
@@ -243,11 +243,14 @@ private String change(TileMultiblockMachineController ctrl){
         FixedSizeDeque<String> energy = getEnergyInfo(ctrl.getWorld(),ctrl.getPos());
         var newtime = energy.getFirst();
         var oldtime = energy.getLast();
-        var newbig = getBigInt(newtime);
-        var oldbig = getBigInt(oldtime);
-        var changel = newbig.subtract(oldbig);
-
-        return formatNumber(changel.compareTo(BigLongMax) >= 0 ? longmax : Long.toString(changel.longValue() / (1200L / MinuteScale * energy.size())));
+        var newbig = newtime == null ? BigInteger.ZERO : getBigInt(newtime);
+        var oldbig = oldtime == null ? BigInteger.ZERO : getBigInt(oldtime);
+        if (newbig.equals(oldbig)) {
+            return "0";
+        } else {
+            var changel = newbig.subtract(oldbig);
+            return formatNumber(newbig.subtract(oldbig));
+        }
     }
 
     private static FixedSizeDeque<String> getEnergyInfo(World world,BlockPos pos) {

src/main/java/github/kasuminova/novaeng/common/util/FixedSizeDeque.java

@@ -33,10 +33,16 @@ public E get(int index) {
     }
 
     public E getFirst() {
+        if (deque.isEmpty()){
+            return null;
+        }
         return deque.getFirst();
     }
 
     public E getLast(){
+        if (deque.isEmpty()){
+            return null;
+        }
         return deque.getLast();
     }