修复类相关

Author: Alumopper

ResourceIDGenerator.jar

@@ -7,6 +7,7 @@
 import top.mcfpp.core.lang.Var;
 import top.mcfpp.lib.ListChatComponent;
 import top.mcfpp.lib.PlainChatComponent;
+import top.mcfpp.util.TempPool;
 import top.mcfpp.util.ValueWrapper;
 
 import java.util.UUID;
@@ -15,7 +16,7 @@ public class MCAnyConcreteData {
 
     @MNIFunction(normalParams = {"any a"}, returnType = "JavaVar")
     public static void getJavaVar(@NotNull Var<?> value, ValueWrapper<Var<?>> returnValue){
-        var re = new JavaVar(value, UUID.randomUUID().toString());
+        var re = new JavaVar(value, TempPool.INSTANCE.getVarIdentify());
         returnValue.setValue(re);
     }
 

src/main/java/top/mcfpp/mni/MCAnyConcreteData.java

@@ -8,14 +8,15 @@
 import top.mcfpp.core.lang.Var;
 import top.mcfpp.lib.ListChatComponent;
 import top.mcfpp.lib.PlainChatComponent;
+import top.mcfpp.util.TempPool;
 import top.mcfpp.util.ValueWrapper;
 
 import java.util.UUID;
 
 public class MCAnyData {
     @MNIFunction(caller = "any", returnType = "JavaVar")
     public static void getJavaVar(@NotNull Var<?> caller, ValueWrapper<Var<?>> returnValue){
-        var re = new JavaVar(caller, UUID.randomUUID().toString());
+        var re = new JavaVar(caller, "temp_" + TempPool.INSTANCE.getVarIdentify());
         returnValue.setValue(re);
     }
 

src/main/java/top/mcfpp/mni/MCAnyData.java

@@ -15,6 +15,7 @@
 import top.mcfpp.core.lang.nbt.NBTListConcrete;
 import top.mcfpp.model.function.Function;
 import top.mcfpp.util.NBTUtil;
+import top.mcfpp.util.TempPool;
 import top.mcfpp.util.ValueWrapper;
 
 import java.io.IOException;
@@ -197,7 +198,7 @@ public static void indexOf(Var<?> e, NBTListConcrete caller, ValueWrapper<MCInt>
         if(e instanceof MCFPPValue<?>){
             //确定的
             var i = caller.getValue().indexOf(e);
-            returnVar.setValue(new MCIntConcrete(i, UUID.randomUUID().toString()));
+            returnVar.setValue(new MCIntConcrete(i, TempPool.INSTANCE.getVarIdentify()));
         }else {
             NBTListData.indexOf(e, (NBTList) caller.toDynamic(true), returnVar);
         }
@@ -210,11 +211,11 @@ public static void lastIndexOf(Var<?> e, NBTListConcrete caller, ValueWrapper<MC
             //确定的
             for (int i = caller.getValue().size() - 1; i >= 0; i--) {
                 if(caller.getValue().get(i).equals(e)){
-                    returnVar.setValue(new MCIntConcrete(i, UUID.randomUUID().toString()));
+                    returnVar.setValue(new MCIntConcrete(i, TempPool.INSTANCE.getVarIdentify()));
                     return;
                 }
             }
-            returnVar.setValue((MCInt) returnVar.getValue().assignedBy(new MCIntConcrete(-1, UUID.randomUUID().toString())));
+            returnVar.setValue((MCInt) returnVar.getValue().assignedBy(new MCIntConcrete(-1, TempPool.INSTANCE.getVarIdentify())));
         }else {
             NBTListData.lastIndexOf(e, (NBTList) caller.toDynamic(true), returnVar);
         }
@@ -224,7 +225,7 @@ public static void lastIndexOf(Var<?> e, NBTListConcrete caller, ValueWrapper<MC
     public static void contains(Var<?> e, NBTListConcrete caller, ValueWrapper<ScoreBool> returnVar){
         if(e instanceof MCFPPValue eC){
             var contains = caller.getValue().contains(eC.getValue());
-            returnVar.setValue(returnVar.getValue().assignedBy(new ScoreBoolConcrete(contains, UUID.randomUUID().toString())).toScoreBool());
+            returnVar.setValue(returnVar.getValue().assignedBy(new ScoreBoolConcrete(contains, TempPool.INSTANCE.getVarIdentify())).toScoreBool());
         }else {
             caller.toDynamic(false);
             NBTListData.contains(e, caller, returnVar);

src/main/java/top/mcfpp/mni/NBTListConcreteData.java

@@ -18,6 +18,7 @@
 import top.mcfpp.model.function.Function;
 import top.mcfpp.util.LogProcessor;
 import top.mcfpp.util.NBTUtil;
+import top.mcfpp.util.TempPool;
 import top.mcfpp.util.ValueWrapper;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@ public class System {
 
     @MNIFunction(normalParams = {"any a"}, returnType = "type")
     public static void typeOf(@NotNull Var<?> value, ValueWrapper<MCFPPTypeVar> returnValue){
-        var re = new MCFPPTypeVar(value.getType(), UUID.randomUUID().toString());
+        var re = new MCFPPTypeVar(value.getType(), TempPool.INSTANCE.getVarIdentify());
         returnValue.setValue(re);
     }
 

src/main/java/top/mcfpp/mni/System.java

@@ -1,5 +1,3 @@
-
-    
 package top.mcfpp.mni.resource;
 
 public class AdvancementConcreteData {

src/main/java/top/mcfpp/mni/resource/AdvancementConcreteData.java

@@ -1,4 +1,3 @@
-
 package top.mcfpp.mni.resource;
 
 public class AdvancementData {

src/main/java/top/mcfpp/mni/resource/AdvancementData.java

@@ -1,5 +1,3 @@
-
-    
 package top.mcfpp.mni.resource;
 
 public class BiomeConcreteData {

src/main/java/top/mcfpp/mni/resource/BiomeConcreteData.java

@@ -1,4 +1,3 @@
-
 package top.mcfpp.mni.resource;
 
 public class BiomeData {

src/main/java/top/mcfpp/mni/resource/BiomeData.java

@@ -1,5 +1,3 @@
-
-    
 package top.mcfpp.mni.resource;
 
 public class BlockConcreteData {