保证IDataUtils的安全性

Author: Circulate233

src/main/java/github/kasuminova/novaeng/common/handler/DreamEnergyPortHandler.java

@@ -7,7 +7,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import sonar.fluxnetworks.common.connection.transfer.BasicTransferHandler;
-import sonar.fluxnetworks.common.tileentity.TileFluxStorage;
 
 public class DreamEnergyPortHandler extends BasicTransferHandler<TileDreamEnergyPort> {
     private long removed;
@@ -36,10 +35,6 @@ public void onCycleStart() {
     @Override
     public void onCycleEnd() {
         this.removed = 0L;
-        if (this.buffer > 0){
-            this.addToBuffer(this.buffer);
-            this.buffer = 0L;
-        }
     }
 
     @Override
@@ -50,7 +45,7 @@ public void updateTransfers(EnumFacing... enumFacings) {
     public void addToBuffer(long energy) {
         if (energy > 0L) {
             DreamEnergyCore.receiveEnergy(getCtrl(),1,energy);
-            ((TileFluxStorage)this.device).markServerEnergyChanged();
+            ((TileDreamEnergyPort)this.device).markServerEnergyChanged();
         }
     }
 
@@ -61,7 +56,7 @@ public long removeFromBuffer(long energy) {
         } else {
             DreamEnergyCore.extractEnergy(getCtrl(),1,a);
             this.removed += a;
-            ((TileFluxStorage)this.device).markServerEnergyChanged();
+            ((TileDreamEnergyPort)this.device).markServerEnergyChanged();
             return a;
         }
     }

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

@@ -15,94 +15,104 @@
 @ZenExpansion("crafttweaker.data.IData")
 public class IDataUtils {
 
-    public static NBTTagCompound get(IData data) {
-        return CraftTweakerMC.getNBTCompound(data);
+    private static NBTTagCompound get(IData data) {
+        return get(data,"NULL");
+    }
+
+    private static NBTTagCompound get(IData data,String path) {
+        var datan = CraftTweakerMC.getNBT(data);
+        if (datan instanceof NBTTagCompound nt){
+            return nt;
+        }
+        var nbt = new NBTTagCompound();
+        nbt.setTag(path,datan);
+        return nbt;
     }
 
     @ZenMethod
     public static IData get(IData data,String path,@Optional IData defaultValue) {
         if (check(data,path)){
-            return CraftTweakerMC.getIData(get(data).getTag(path));
+            return CraftTweakerMC.getIData(get(data,path).getTag(path));
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static boolean getBool(IData data, String path,@Optional boolean defaultValue){
         if (check(data,path)){
-            return get(data).getBoolean(path);
+            return get(data,path).getBoolean(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static byte getByte(IData data, String path,@Optional byte defaultValue) {
         if (check(data,path)){
-            return get(data).getByte(path);
+            return get(data,path).getByte(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static double getDouble(IData data, String path, @Optional double defaultValue) {
         if (check(data, path)) {
-            return get(data).getDouble(path);
+            return get(data,path).getDouble(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static float getFloat(IData data, String path, @Optional float defaultValue) {
         if (check(data, path)) {
-            return get(data).getFloat(path);
+            return get(data,path).getFloat(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static int getInt(IData data, String path, @Optional int defaultValue) {
         if (check(data, path)) {
-            return get(data).getInteger(path);
+            return get(data,path).getInteger(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static List<IData> getList(IData data, String path, @Optional List<IData> defaultValue) {
         if (check(data, path)) {
-            return CraftTweakerMC.getIData(get(data).getTag(path)).asList();
+            return CraftTweakerMC.getIData(get(data,path).getTag(path)).asList();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static long getLong(IData data, String path, @Optional long defaultValue) {
         if (check(data, path)) {
-            return get(data).getLong(path);
+            return get(data,path).getLong(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static Map<String, IData> getMap(IData data, String path, @Optional Map<String, IData> defaultValue) {
         if (check(data, path)) {
-            return CraftTweakerMC.getIData(get(data).getTag(path)).asMap();
+            return CraftTweakerMC.getIData(get(data,path).getTag(path)).asMap();
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static short getShort(IData data, String path, @Optional short defaultValue) {
         if (check(data, path)) {
-            return get(data).getShort(path);
+            return get(data,path).getShort(path);
         }
         return defaultValue;
     }
 
     @ZenMethod
     public static String getString(IData data, String path, @Optional String defaultValue) {
         if (check(data, path)) {
-            return get(data).getString(path);
+            return get(data,path).getString(path);
         }
         return defaultValue;
     }