DO NOT LOOK AT THE CODE OF ManageConfigArgs.kt PLEASE

src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt

@@ -28,7 +28,6 @@ import java.util.*
 
 
 // TODO: finish the particle ticking
-// TODO: make custom commands to create particles easier (only temporarily saved)
 
 
 var ALL_PARTICLE_EMITTERS: Array<ParticleEmitter> = emptyArray()

src/main/kotlin/com/bytedice/bde_particles/commands/ManageConfigArgs.kt

@@ -8,7 +8,6 @@ import com.mojang.brigadier.arguments.FloatArgumentType
 import com.mojang.brigadier.arguments.IntegerArgumentType
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
-import com.mojang.brigadier.builder.RequiredArgumentBuilder
 import com.mojang.brigadier.context.CommandContext
 import net.minecraft.server.command.CommandManager
 import net.minecraft.server.command.ServerCommandSource
@@ -21,6 +20,10 @@ import java.awt.Color
 import java.util.concurrent.CompletableFuture
 
 
+// CLOSE THIS FILE IMMEDIATELY, YOU ARE ENTERING EGYPTIAN (pyramid) AND ITALIAN (spaghetti) TERRITORY
+
+val curves = arrayOf("LINEAR", "SQRT", "EXPONENT", "CUBIC", "SINE", "COSINE", "INVERSE", "LOG", "EXP", "BOUNCE")
+
 fun argUpdateEmitterParam(context: CommandContext<ServerCommandSource>, paramName: String, typeValue: Any) : MutableText {
   val emitterIdVal = StringArgumentType.getString(context, "Registered Emitter ID")
   val success = updateSingleParam(emitterIdVal, -1, paramName, typeValue)
@@ -193,7 +196,12 @@ class ArgConfigParticleKeys {
   }
   fun rotRandom() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("rotRandom")
-      .then(argPairVector3f()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
                   .executes { context ->
                     val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                     val vectors = x1x2ToPairVector3f(context)
@@ -203,10 +211,20 @@ class ArgConfigParticleKeys {
                     Command.SINGLE_SUCCESS
                   }
                 )
+              )
+            )
+          )
+        )
+      )
   }
   fun rotVelRandom() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("rotVelRandom")
-      .then(argPairVector3f()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
                   .executes { context ->
                     val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                     val vectors = x1x2ToPairVector3f(context)
@@ -216,10 +234,20 @@ class ArgConfigParticleKeys {
                     Command.SINGLE_SUCCESS
                   }
                 )
+              )
+            )
+          )
+        )
+      )
   }
   fun sizeRandom() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("sizeRandom")
-      .then(argPairVector3f()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
                   .executes { context ->
                     val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                     val vectors = x1x2ToPairVector3f(context)
@@ -229,6 +257,11 @@ class ArgConfigParticleKeys {
                     Command.SINGLE_SUCCESS
                   }
                 )
+              )
+            )
+          )
+        )
+      )
   }
   fun uniformSize() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("uniformSize")
@@ -244,7 +277,12 @@ class ArgConfigParticleKeys {
   }
   fun velRandom() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("velRandom")
-      .then(argPairVector3f()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
                   .executes { context ->
                     val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                     val vectors = x1x2ToPairVector3f(context)
@@ -254,11 +292,21 @@ class ArgConfigParticleKeys {
                     Command.SINGLE_SUCCESS
                   }
                 )
+              )
+            )
+          )
+        )
+      )
   }
-  fun forceFields() {} // TODO
+  fun forceFields() : LiteralArgumentBuilder<ServerCommandSource> {
+    return CommandManager.literal("ForceFields")
+      .then(argAddForceField())
+  } // TODO
   fun gravity() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("gravity")
-      .then(argVector3f("X", "Y", "Z")
+      .then(CommandManager.argument("X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Z", FloatArgumentType.floatArg())
             .executes { context ->
               val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
               val x1 = FloatArgumentType.getFloat(context, "X")
@@ -270,6 +318,8 @@ class ArgConfigParticleKeys {
               Command.SINGLE_SUCCESS
             }
           )
+        )
+      )
   }
   fun drag() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("drag")
@@ -312,7 +362,17 @@ class ArgConfigParticleKeys {
   }
   fun rotVelCurve() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("rotVelCurve")
-      .then(argCurve()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
+                  .then(CommandManager.argument("Curve", StringArgumentType.string())
+                    .suggests { _, builder ->
+                      curves.forEach { builder.suggest(it) }
+                      CompletableFuture.completedFuture(builder.build())
+                    }
                     .executes { context ->
                       val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                       val vectors = x1x2ToPairVector3f(context)
@@ -328,10 +388,26 @@ class ArgConfigParticleKeys {
                       Command.SINGLE_SUCCESS
                     }
                   )
+                )
+              )
+            )
+          )
+        )
+      )
   }
   fun sizeCurve() : LiteralArgumentBuilder<ServerCommandSource> {
     return CommandManager.literal("sizeCurve")
-      .then(argCurve()
+      .then(CommandManager.argument("Min X", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
+            .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
+              .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
+                .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg())
+                  .then(CommandManager.argument("Curve", StringArgumentType.string())
+                    .suggests { _, builder ->
+                      curves.forEach { builder.suggest(it) }
+                      CompletableFuture.completedFuture(builder.build())
+                    }
                     .executes { context ->
                       val particleIndex = IntegerArgumentType.getInteger(context, "Particle Index")
                       val vectors = x1x2ToPairVector3f(context)
@@ -347,42 +423,13 @@ class ArgConfigParticleKeys {
                       Command.SINGLE_SUCCESS
                     }
                   )
-  }
+                )
-}
+              )
-
-
-fun argPairVector3f(): RequiredArgumentBuilder<ServerCommandSource, Float> {
-  return CommandManager.argument("Min X", FloatArgumentType.floatArg())
-    .then(CommandManager.argument("Min Y", FloatArgumentType.floatArg())
-      .then(CommandManager.argument("Min Z", FloatArgumentType.floatArg())
-        .then(CommandManager.argument("Max X", FloatArgumentType.floatArg())
-          .then(CommandManager.argument("Max Y", FloatArgumentType.floatArg())
-            .then(CommandManager.argument("Max Z", FloatArgumentType.floatArg()))
             )
           )
         )
       )
   }
-
-
-fun argVector3f(xName: String, yName: String, zName: String) : RequiredArgumentBuilder<ServerCommandSource, Float> {
-  return CommandManager.argument(xName, FloatArgumentType.floatArg())
-    .then(CommandManager.argument(yName, FloatArgumentType.floatArg())
-      .then(CommandManager.argument(zName, FloatArgumentType.floatArg()))
-    )
-}
-
-
-val curves = arrayOf("LINEAR", "SQRT", "EXPONENT", "CUBIC", "SINE", "COSINE", "INVERSE", "LOG", "EXP", "BOUNCE")
-
-fun argCurve() : RequiredArgumentBuilder<ServerCommandSource, Float> {
-  return argPairVector3f()
-    .then(CommandManager.argument("Curve", StringArgumentType.string())
-      .suggests { _, builder ->
-        curves.forEach { builder.suggest(it) }
-        CompletableFuture.completedFuture(builder.build())
-      }
-    )
 }
 
 
@@ -417,17 +464,23 @@ fun x1x2ToPairVector3f(context: CommandContext<ServerCommandSource>) : Pair<Vect
 fun argAddForceField() : LiteralArgumentBuilder<ServerCommandSource> {
   return CommandManager.literal("add")
     .then(CommandManager.argument("Name", StringArgumentType.string())
-      .then(argVector3f("X Pos", "Y Pos", "Z Pos")
+      .then(CommandManager.argument("X Pos", FloatArgumentType.floatArg())
+        .then(CommandManager.argument("Y Pos", FloatArgumentType.floatArg())
+          .then(CommandManager.argument("Z Pos", FloatArgumentType.floatArg())
             .then(CommandManager.argument("Min Force", FloatArgumentType.floatArg())
               .then(CommandManager.argument("Max Force", FloatArgumentType.floatArg())
-            .then(CommandManager.literal("Sphere")
+                .then(CommandManager.literal("sphere")
                   .then(CommandManager.argument("Radius", FloatArgumentType.floatArg())
                     .executes { context -> forceFieldAddSphereExec(context) }
                   )
                 )
                 .then(CommandManager.literal("cube")
-              .then(argVector3f("X Size", "Y Size", "Z Size")
+                  .then(CommandManager.argument("X Size", FloatArgumentType.floatArg())
-                .then(argVector3f("X Force", "Y Force", "Z Force")
+                    .then(CommandManager.argument("Y Size", FloatArgumentType.floatArg())
+                      .then(CommandManager.argument("Z Size", FloatArgumentType.floatArg())
+                        .then(CommandManager.argument("X Force", FloatArgumentType.floatArg())
+                          .then(CommandManager.argument("Y Force", FloatArgumentType.floatArg())
+                            .then(CommandManager.argument("Z Force", FloatArgumentType.floatArg())
                               .executes { context -> forceFieldAddCubeExec(context) }
                             )
                           )
@@ -436,6 +489,12 @@ fun argAddForceField() : LiteralArgumentBuilder<ServerCommandSource> {
                     )
                   )
                 )
+              )
+            )
+          )
+        )
+      )
+    )
 }
 
 

src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt

@@ -243,7 +243,7 @@ fun argConfig() : LiteralArgumentBuilder<ServerCommandSource> {
         .then(particleConfigKeys.sizeRandom())
         .then(particleConfigKeys.uniformSize())
         .then(particleConfigKeys.velRandom())
-        //.then(particleConfigKeys.forceFields())
+        .then(particleConfigKeys.forceFields())
         .then(particleConfigKeys.gravity())
         .then(particleConfigKeys.drag())
         .then(particleConfigKeys.minVel())