if优化

Author: Alumopper

src/main/antlr/mcfppParser.g4

@@ -447,7 +447,6 @@ statement
     :   fieldDeclaration ';'
     |   statementExpression ';'
     |   ifStatement
-    |   forStatement
     |   whileStatement
     |   doWhileStatement ';'
     |   ';'
@@ -494,38 +493,17 @@ ifStatement
     ;
 
 elseIfStatement
-    :   ELSE IF '('expression')' ifBlock
+    :   ELSE IF '('expression')' block
     ;
 
 elseStatement
-    :   ELSE ifBlock
+    :   ELSE block
     ;
 
 ifBlock
     :   block
     ;
 
-forStatement
-    :   FOR '(' forControl ')' forBlock
-    ;
-
-forBlock
-    :   block
-    ;
-
-forControl
-    :   forInit ';' expression? ';' forUpdate
-    ;
-
-forInit
-    :   (fieldDeclaration|statementExpression)?
-    |   (fieldDeclaration|statementExpression) (',' (fieldDeclaration|statementExpression))+
-    ;
-
-forUpdate
-    :   statementExpression*
-    ;
-
 whileStatement
     :   WHILE '(' expression ')' whileBlock
     ;

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

@@ -3,6 +3,7 @@
 import top.mcfpp.annotations.MNIFunction;
 import top.mcfpp.core.lang.JsonTextConcrete;
 import top.mcfpp.core.lang.MCInt;
+import top.mcfpp.core.lang.MCIntConcrete;
 import top.mcfpp.lib.ListChatComponent;
 import top.mcfpp.lib.ScoreChatComponent;
 import top.mcfpp.util.ValueWrapper;
@@ -11,8 +12,12 @@ public class MCIntData {
 
     @MNIFunction(caller = "int", returnType = "text", override = true)
     public static void toText(MCInt caller, ValueWrapper<JsonTextConcrete> returnValue) {
+        if(caller instanceof MCIntConcrete intConcrete){
+            MCIntConcreteData.toText(intConcrete, returnValue);
+            return;
+        }
         var l = new ListChatComponent();
-        l.getComponents().add(new ScoreChatComponent(caller));
+        l.append(new ScoreChatComponent(caller));
         returnValue.setValue(new JsonTextConcrete(l, "re"));
     }
 }

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

@@ -15,7 +15,7 @@ public class MCStringConcreteData {
     @MNIFunction(caller = "string", returnType = "text", override = true)
     public static void toText(MCStringConcrete caller, ValueWrapper<JsonTextConcrete> returnValue) {
         var l = new ListChatComponent();
-        l.getComponents().add(new PlainChatComponent(caller.getValue().getValue()));
+        l.append(new PlainChatComponent(caller.getValue().getValue()));
         returnValue.setValue(new JsonTextConcrete(l, "re"));
     }
 }

src/main/kotlin/top/mcfpp/Project.kt

@@ -160,6 +160,8 @@ object Project {
             //是否生成数据包
             config.noDatapack = jsonObject.getBooleanValue("noDatapack")
 
+            config.noComment = jsonObject.getBooleanValue("noComment")
+
 
         } catch (e: Exception) {
             LogProcessor.error("Error while reading project from file \"$path\"")

src/main/kotlin/top/mcfpp/ProjectConfig.kt

@@ -1,7 +1,6 @@
 package top.mcfpp
 
 import top.mcfpp.command.CommentType
-import top.mcfpp.io.MCFPPFile
 import java.nio.file.Path
 import kotlin.io.path.Path
 
@@ -70,5 +69,10 @@ open class ProjectConfig(
     /**
      * 不生成数据包
      */
-    var noDatapack: Boolean = false
+    var noDatapack: Boolean = false,
+
+    /**
+     * 不生成注释
+     */
+    var noComment: Boolean = false
 )