数据模板的定义和赋值，数据模板的成员

将默认的访问修饰符更改为public

Author: Alumopper

.mclib

@@ -4,7 +4,7 @@
 			"id":"default",
 			"functions":[
 				{
-					"id":"hello",
+					"id":"main",
 					"normalParams":[
 
 					],
@@ -16,7 +16,41 @@
 				}
 			],
 			"classes":[
-				
+				{
+					"id":"Test",
+					"parents":[
+						
+					],
+					"field":{
+						"vars":[
+							{
+								"id":"qwq",
+								"type":"nbt"
+							}
+						],
+						"functions":[
+							{
+								"id":"test",
+								"normalParams":[
+									
+								],
+								"returnType":"void",
+								"isAbstract":false,
+								"tags":[
+									
+								]
+							}
+						]
+					},
+					"staticField":{
+						"vars":[
+							
+						],
+						"functions":[
+							
+						]
+					}
+				}
 			],
 			"template":[
 

src/main/antlr/mcfppLexer.g4

@@ -100,7 +100,7 @@ INLINE:'inline';
 
 CLASS:'class';
 INTERFACE:'interface';
-TEMPLATE:'template';
+DATA:'data';
 FUNCTION:'func';
 
 GLOBAL:'global';

src/main/antlr/mcfppParser.g4

@@ -132,7 +132,7 @@ classFieldDeclaration
 
 //数据模板
 templateDeclaration
-    :   FINAL? type TEMPLATE classWithoutNamespace (EXTENDS className)? templateBody
+    :   FINAL? DATA classWithoutNamespace (COLON className)? templateBody
     ;
 
 templateBody
@@ -144,27 +144,22 @@ templateMemberDeclaration
     ;
 
 staticTemplateMemberDeclaration
-    :   accessModifier? STATIC? templateMember
+    :   accessModifier? STATIC templateMember
     ;
 
 templateMember
     :   templateFunctionDeclaration
-    |   templateFieldDeclaration ';'
+    |   templateFieldDeclaration
     ;
 
 templateFunctionDeclaration
     :  FUNCTION Identifier functionParams (ARROW functionReturnType)? '{' functionBody '}'
     ;
 
 templateFieldDeclaration
-    :   (templateFieldDeclarationExpression ',')* templateFieldDeclarationExpression ';'
+    :   CONST? type Identifier ('=' expression)? ';'
     ;
 
-templateFieldDeclarationExpression
-    :   CONST? Identifier '=' expression
-    ;
-
-
 //接口声明
 interfaceDeclaration
     :   classAnnotation? INTERFACE classWithoutNamespace (ARROW className (',' className)*)? interfaceBody
@@ -230,10 +225,6 @@ fieldDeclarationExpression
 
 fieldModifier : CONST|DYNAMIC|IMPORT;
 
-javaMethodParams
-    :   '(' type (',' type)* ')'
-    ;
-
 functionParams
     :   readOnlyParams? normalParams
     ;
@@ -262,10 +253,6 @@ expression
     |   conditionalOrExpression
     ;
 
-//expression
-//    :   conditionalOrExpression
-//    ;
-
 //能作为语句的表达式
 statementExpression
     :   (basicExpression '=' )? expression
@@ -378,15 +365,9 @@ functionBody
     :   statement*
     ;
 
-//functionCall
-//    :   namespaceID arguments
-//    |   varWithSelector arguments
-//    ;
-
 statement
     :   fieldDeclaration ';'
     |   statementExpression ';'
-//    |   functionCall ';'
     |   ifStatement
     |   forStatement
     |   whileStatement
@@ -403,8 +384,6 @@ orgCommand
     :   OrgCommand
     ;
 
-
-
 controlStatement
     :   BREAK
     |   CONTINUE

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

@@ -0,0 +1,4 @@
+package top.mcfpp.mni;
+
+public class CommandFunctionData {
+}

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

@@ -2,6 +2,7 @@
 
 import kotlin.jvm.functions.Function4;
 import org.jetbrains.annotations.NotNull;
+import top.mcfpp.annotations.MNIRegister;
 import top.mcfpp.lang.CanSelectMember;
 import top.mcfpp.lang.JavaVar;
 import top.mcfpp.lang.Var;
@@ -12,27 +13,10 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-public class MCAnyData extends MNIMethodContainer {
-
-    static HashMap<String, Function4<Var<?>[], Var<?>[], CanSelectMember, ValueWrapper<Var<?>>, java.lang.Void>> methods;
-
-    static {
-        methods = new HashMap<>();
-        methods.put("toString", (vars, vars2, canSelectMember, varValueWrapper) -> {
-            //不会有参数
-            Function.Companion.addCommand("tellraw @a " + canSelectMember);
-            return null;
-        });
-        methods.put("getJavaVar", (r, n, caller, re) -> {
-            //不会有参数
-            re.setValue(new JavaVar(caller, UUID.randomUUID().toString()));
-            return null;
-        });
-    }
-
-    @NotNull
-    @Override
-    public Function4<Var<?>[], Var<?>[], CanSelectMember, ValueWrapper<Var<?>>, java.lang.Void> getMNIMethod(@NotNull String name) {
-        return methods.get(name);
+public class MCAnyData {
+    @MNIRegister(normalParams = {"any a"}, returnType = "JavaVar")
+    public static void getJavaVar(@NotNull Var<?> value, ValueWrapper<Var<?>> returnValue){
+        var re = new JavaVar(value, UUID.randomUUID().toString());
+        returnValue.setValue(re);
     }
 }

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

@@ -13,21 +13,7 @@
 
 import java.util.HashMap;
 
-public class MCIntData extends MNIMethodContainer {
-    static HashMap<String, Function4<Var<?>[], Var<?>[], CanSelectMember, ValueWrapper<Var<?>>, java.lang.Void>> methods;
-
-    static {
-        methods = new HashMap<>();
-        methods.put("test", (vars, vars2, canSelectMember, varValueWrapper) -> {
-            //不会有参数
-            Function.Companion.addCommand("say " + canSelectMember);
-            return null;
-        });
-
-        methods.put("qwq", (vars, vars2, canSelectMember, varValueWrapper) -> {
-            return null;
-        });
-    }
+public class MCIntData {
 
     @MNIRegister(caller = "int")
     public void test(MCInt caller) {
@@ -40,10 +26,4 @@ public void qwq(MCInt i, MCInt caller, ValueWrapper<JavaVar> re){
         Function.Companion.addCommand("say i=" + i);
         Function.Companion.addCommand("say this=" + caller);
     }
-
-    @NotNull
-    @Override
-    public Function4<Var<?>[], Var<?>[], CanSelectMember, ValueWrapper<Var<?>>, java.lang.Void> getMNIMethod(@NotNull String name) {
-        return methods.get(name);
-    }
 }