修复了数据模板类型变量nbt路径错误的问题

Author: Alumopper

src/main/kotlin/top/mcfpp/lang/DataTemplateObject.kt

@@ -38,7 +38,7 @@ open class DataTemplateObject : Var<DataTemplateObject> {
      * @param template 模板的类型
      * @param identifier 标识符
      */
-    constructor(template: DataTemplate, identifier: String = UUID.randomUUID().toString()) {
+    constructor(template: DataTemplate, identifier: String = UUID.randomUUID().toString()): super(identifier) {
         this.templateType = template
         this.name = identifier
         this.identifier = identifier
@@ -286,20 +286,7 @@ class DataTemplateObjectConcrete: DataTemplateObject, MCFPPValue<CompoundTag>{
         val parent = this.parent
 
         if(parent != null){
-            val cmd = when(parent){
-                is ClassPointer -> {
-                    Commands.selectRun(parent)
-                }
-                is ObjectClass -> {
-                    arrayOf(Command.build("execute as ${parent.uuid} run "))
-                }
-                else -> TODO()
-
-            }
-            if(cmd.size == 2){
-                Function.addCommand(cmd[0])
-            }
-            Function.addCommand(cmd.last().build(Commands.dataSetValue(nbtPath, value)))
+            Function.addCommands(Commands.selectRun(parent, Commands.dataSetValue(nbtPath, value)))
         }else {
             Function.addCommand(Commands.dataSetValue(nbtPath, value))
         }

src/main/kotlin/top/mcfpp/model/function/Function.kt

@@ -453,8 +453,12 @@ open class Function : Member, FieldContainer, Serializable {
      * @param returnType
      */
     fun buildReturnVar(returnType: MCFPPType): Var<*>{
-        return if(returnType == MCFPPBaseType.Void) Void()
-        else Var.buildUnConcrete("return",returnType,this)
+        return if(returnType == MCFPPBaseType.Void) {
+            Void()
+        }
+        else {
+            Var.buildUnConcrete("return", returnType, this)
+        }
     }
 
     /**
@@ -654,12 +658,7 @@ open class Function : Member, FieldContainer, Serializable {
             LogProcessor.error("Function $identifier has no return value but tried to return a ${v.type}")
             return
         }
-        try {
-            returnVar.assign(v)
-        } catch (e: VariableConverseException) {
-            LogProcessor.error("Cannot convert " + v.javaClass + " to " + currBaseFunction.returnVar.javaClass)
-            throw VariableConverseException()
-        }
+        returnVar.assign(v)
     }
 
     /**