Improve performance of schematic generator. (-30%)

Rollczi · Sep 27, 2023 · da4f717 · da4f717
1 parent bd5bfb1
commit da4f717
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/litecommands-core/src/dev/rollczi/litecommands/schematic/SchematicFormat.java b/litecommands-core/src/dev/rollczi/litecommands/schematic/SchematicFormat.java
@@ -4,14 +4,12 @@ public class SchematicFormat {
 
     private final String prefix;
     private final String suffix;
-    private final String commandFormat;
     private final String argumentFormat;
     private final String optionalArgumentFormat;
 
-    SchematicFormat(String prefix, String suffix, String commandFormat, String argumentFormat, String optionalArgumentFormat) {
+    SchematicFormat(String prefix, String suffix, String argumentFormat, String optionalArgumentFormat) {
         this.prefix = prefix;
         this.suffix = suffix;
-        this.commandFormat = commandFormat;
         this.argumentFormat = argumentFormat;
         this.optionalArgumentFormat = optionalArgumentFormat;
     }
@@ -24,10 +22,6 @@ public String suffix() {
         return suffix;
     }
 
-    public String commandFormat() {
-        return commandFormat;
-    }
-
     public String argumentFormat() {
         return argumentFormat;
     }
@@ -37,19 +31,19 @@ public String optionalArgumentFormat() {
     }
 
     public static SchematicFormat of(String prefix, String suffix, String commandFormat, String argumentFormat, String optionalArgumentFormat) {
-        return new SchematicFormat(prefix, suffix, commandFormat, argumentFormat, optionalArgumentFormat);
+        return new SchematicFormat(prefix, suffix, argumentFormat, optionalArgumentFormat);
     }
 
     public static SchematicFormat angleBrackets() {
-        return new SchematicFormat("/", "", "%s", "<%s>", "[%s]");
+        return new SchematicFormat("/", "", "<%s>", "[%s]");
     }
 
     public static SchematicFormat squareBrackets() {
-        return new SchematicFormat("/", "", "%s", "[%s]", "<%s>");
+        return new SchematicFormat("/", "", "[%s]", "<%s>");
     }
 
     public static SchematicFormat parentheses() {
-        return new SchematicFormat("/", "", "%s", "(%s)", "(%s)");
+        return new SchematicFormat("/", "", "(%s)", "(%s)");
     }
 
     public static Builder builder() {
@@ -60,7 +54,6 @@ public static class Builder {
 
         private String prefix = "/";
         private String suffix = "";
-        private String command = "%s";
         private String argument = "<%s>";
         private String optionalArgument = "[%s]";
 
@@ -74,11 +67,6 @@ public Builder suffix(String suffix) {
             return this;
         }
 
-        public Builder command(String command) {
-            this.command = command;
-            return this;
-        }
-
         public Builder argument(String argument) {
             this.argument = argument;
             return this;
@@ -90,7 +78,7 @@ public Builder optionalArgument(String optionalArgument) {
         }
 
         public SchematicFormat build() {
-            return new SchematicFormat(prefix, suffix, command, argument, optionalArgument);
+            return new SchematicFormat(prefix, suffix, argument, optionalArgument);
         }
 
     }

diff --git a/litecommands-core/src/dev/rollczi/litecommands/schematic/SchematicGeneratorSimpleImpl.java b/litecommands-core/src/dev/rollczi/litecommands/schematic/SchematicGeneratorSimpleImpl.java
@@ -37,8 +37,9 @@ public Schematic generate(SchematicInput<SENDER> schematicInput) {
     private Stream<String> generateRaw(SchematicInput<SENDER> schematicInput) {
         CommandExecutor<SENDER> executor = schematicInput.getExecutor();
         String base = schematicInput.collectRoutes().stream()
-            .map(route -> String.format(format.commandFormat(), route.getName()) + SEPARATOR)
-            .collect(Collectors.joining());
+            .map(route -> route.getName())
+            .collect(Collectors.joining(SEPARATOR))
+            + SEPARATOR;
 
         if (executor != null) {
             return Stream.of(base + generateExecutor(executor));