Refactor merge system and Release 3.10.5

Rollczi · Rollczi · commit d778bc7c326a · 2025-08-12T00:40:45.000+02:00
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ maven("https://repo.panda-lang.org/releases")
 
 #### ➕ Add LiteCommands to dependencies
 ```kts
-implementation("dev.rollczi:{artifact}:3.10.4")
+implementation("dev.rollczi:{artifact}:3.10.5")
 ```
 ```xml
 <dependency>
diff --git a/buildSrc/src/main/kotlin/litecommands-publish.gradle.kts b/buildSrc/src/main/kotlin/litecommands-publish.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "dev.rollczi"
-version = "3.10.5-SNAPSHOT"
+version = "3.10.5"
 
 publishing {
     java {
diff --git a/examples/bukkit-adventure-platform/build.gradle.kts b/examples/bukkit-adventure-platform/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
-version = "3.10.4"
+version = "3.10.5"
 
 repositories {
     mavenCentral()
@@ -16,8 +16,8 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.10.4") // <-- uncomment in your project
-    // implementation("dev.rollczi:litecommands-adventure-platform:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.10.5") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-adventure-platform:3.10.5") // <-- uncomment in your project
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
     implementation("net.kyori:adventure-text-minimessage:4.24.0")
 
diff --git a/examples/bukkit-chatgpt/build.gradle.kts b/examples/bukkit-chatgpt/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
-version = "3.10.4"
+version = "3.10.5"
 
 repositories {
     mavenCentral()
@@ -16,8 +16,8 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.10.4") // <-- uncomment in your project
-    // implementation("dev.rollczi:litecommands-chatgpt:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.10.5") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-chatgpt:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle
     implementation(project(":litecommands-chatgpt")) // don't use this line in your build.gradle
 }
diff --git a/examples/bukkit/build.gradle.kts b/examples/bukkit/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
-version = "3.10.4"
+version = "3.10.5"
 
 repositories {
     mavenCentral()
@@ -16,8 +16,8 @@ repositories {
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.10.4") // <-- uncomment in your project
-    // implementation("dev.rollczi:litecommands-folia:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.10.5") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-folia:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle
     implementation(project(":litecommands-folia")) // don't use this line in your build.gradle
 }
diff --git a/examples/fabric/build.gradle.kts b/examples/fabric/build.gradle.kts
@@ -29,8 +29,8 @@ dependencies {
     modLocalRuntime("maven.modrinth:luckperms:5.4.36-forge")
     modLocalRuntime("com.terraformersmc:modmenu:13.0.3")
 
-    // modImplementation("dev.rollczi:litecommands-fabric:3.10.4") <-- uncomment in your project
-    // modImplementation("dev.rollczi:litecommands-luckperms:3.10.4") <-- uncomment in your project
+    // modImplementation("dev.rollczi:litecommands-fabric:3.10.5") <-- uncomment in your project
+    // modImplementation("dev.rollczi:litecommands-luckperms:3.10.5") <-- uncomment in your project
     implementation(project(path = ":litecommands-fabric", configuration = "namedElements")) // <-- REMOVE THIS
     implementation(project(":litecommands-luckperms")) // <-- REMOVE THIS
 }
diff --git a/examples/fabric/src/main/resources/fabric.mod.json b/examples/fabric/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
     "schemaVersion": 1,
     "id": "litecommands_example",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "name": "LiteCommands Fabric Example",
     "description": "Annotation based command framework for Fabric.",
     "authors": [
diff --git a/examples/jda/build.gradle.kts b/examples/jda/build.gradle.kts
@@ -5,15 +5,15 @@ plugins {
 }
 
 group = "dev.rollczi"
-version = "3.10.4"
+version = "3.10.5"
 
 repositories {
     mavenCentral()
     maven("https://repo.panda-lang.org/releases")
 }
 
 dependencies {
-    // implementation("dev.rollczi:litecommands-jda:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-jda:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-jda")) // don't use this line in your build.gradle
 
     implementation("net.dv8tion:JDA:5.6.1")
diff --git a/examples/minestom/build.gradle.kts b/examples/minestom/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation("net.minestom:minestom:${Versions.MINESTOM}")
     implementation("net.kyori:adventure-text-minimessage:4.24.0")
 
-    // implementation("dev.rollczi:litecommands-minestom:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-minestom:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-minestom")) // don't use this line in your build.gradle
 }
 
diff --git a/examples/paper/build.gradle.kts b/examples/paper/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-bukkit:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-bukkit:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle
 }
 
diff --git a/examples/telegrambots/build.gradle.kts b/examples/telegrambots/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    // implementation("dev.rollczi:litecommands-telegrambots:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-telegrambots:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-telegrambots")) // don't use this line in your build.gradle
 
     implementation("org.telegram:telegrambots-longpolling:${Versions.TELEGRAM_BOTS}")
diff --git a/examples/velocity/build.gradle.kts b/examples/velocity/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
     annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
 
-    // implementation("dev.rollczi:litecommands-velocity:3.10.4") // <-- uncomment in your project
+    // implementation("dev.rollczi:litecommands-velocity:3.10.5") // <-- uncomment in your project
     implementation(project(":litecommands-velocity")) // don't use this line in your build.gradle
 }
 
diff --git a/examples/velocity/src/main/java/dev/rollczi/example/velocity/ExamplePlugin.java b/examples/velocity/src/main/java/dev/rollczi/example/velocity/ExamplePlugin.java
@@ -22,7 +22,7 @@
 import dev.rollczi.litecommands.velocity.LiteVelocityFactory;
 import dev.rollczi.litecommands.velocity.tools.VelocityOnlyPlayerContextual;
 
-@Plugin(id = "example-plugin", name = "ExamplePlugin", version = "3.10.4", authors = "Rollczi")
+@Plugin(id = "example-plugin", name = "ExamplePlugin", version = "3.10.5", authors = "Rollczi")
 public class ExamplePlugin {
 
     private final ProxyServer proxyServer;
diff --git a/litecommands-annotations/test/dev/rollczi/litecommands/annotations/permission/MergeCommandPermissionHandleTest.java b/litecommands-annotations/test/dev/rollczi/litecommands/annotations/permission/MergeCommandPermissionHandleTest.java
@@ -0,0 +1,155 @@
+package dev.rollczi.litecommands.annotations.permission;
+
+import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.command.RootCommand;
+import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.priority.Priority;
+import dev.rollczi.litecommands.annotations.priority.PriorityValue;
+import dev.rollczi.litecommands.unit.annotations.LiteTestSpec;
+import java.time.Duration;
+import org.junit.jupiter.api.Test;
+
+class MergeCommandPermissionHandleTest extends LiteTestSpec {
+
+    @Command(name = "test")
+    @Permission("test.classOne.permission")
+    static class TestCommandOne {
+
+        @Execute(name = "reload")
+        void executeReload() {}
+
+        @Execute(name = "sub")
+        @Permission("test.method.permission.string")
+        void executeSub(@Arg String text) {}
+
+    }
+
+    @Test
+    void testReloadCommandRequiresOnlyClassPermission() {
+        platform.execute("test reload")
+            .assertMissingPermission("test.classOne.permission");
+    }
+
+
+    @Test
+    void testSubCommandWithStringArgRequiresClassAndMethodPermissions() {
+        platform.execute("test sub arg")
+            .assertMissingPermission("test.method.permission.string", "test.classOne.permission");
+    }
+
+
+    @Command(name = "test")
+    @Permission("test.classTwo.permission")
+    static class TestCommandTwo {
+
+        @Execute(name = "sub")
+        @Permission("test.method.permission")
+        void executeSub() {}
+
+    }
+
+    @Test
+    void testSubCommandNoArgsRequiresClassAndMethodPermissions() {
+        platform.execute("test sub")
+            .assertMissingPermission("test.method.permission", "test.classTwo.permission");
+    }
+
+    @Command(name = "test")
+    static class TestCommandThree {
+
+        @Execute
+        @Permission("test.root.three")
+        void executeRoot() {}
+
+        @Execute(name = "multi")
+        @Permission("test.multi.three")
+        void executeMulti(@Arg String arg1, @Arg int arg2, @Arg boolean arg3) {}
+
+    }
+
+    @Test
+    void testRootExecutorNoArgs() {
+        platform.execute("test")
+            .assertMissingPermission("test.root.three");
+    }
+
+    @Test
+    void testMultiArgCommandRequiresOnlyMethodPermission() {
+        platform.execute("test multi hello 123 true")
+            .assertMissingPermission("test.multi.three");
+    }
+
+    @Command(name = "test")
+    @Permission("test.class.four")
+    static class TestCommandFour {
+
+        @Execute(name = "sub")
+        void executeSubWithTwoArgs(@Arg String arg1, @Arg String arg2) {}
+
+    }
+
+    @Test
+    void testSubCommandWithTwoStringArgsRequiresOnlyClassPermissionFromItsClass() {
+        platform.execute("test sub arg1 arg2")
+            .assertMissingPermission("test.class.four");
+    }
+
+    @RootCommand
+    static class RootCommandImpl {
+
+        @Execute(name = "test")
+        @Priority(PriorityValue.HIGH)
+        @Permission("root.amount")
+        void executeAmount(@Arg int amount) {}
+
+    }
+
+    @Test
+    void testRootCommandWithIntArg() {
+        platform.execute("test 123")
+            .assertMissingPermission("root.amount");
+    }
+
+    @RootCommand
+    @Permission("root.two.class")
+    static class RootCommandTwo {
+        @Execute(name = "test")
+        void executeWithString(@Arg String text) {}
+    }
+
+    @Test
+    void testRootCommandWithStringArg() {
+        platform.execute("test hello")
+            .assertMissingPermission("root.two.class");
+    }
+
+    @RootCommand
+    static class RootCommandDuration {
+        @Execute(name = "test")
+        @Priority(PriorityValue.HIGH)
+        @Permission("root.duration")
+        void executeOtherCmd(@Arg Duration text) {}
+    }
+
+    @Test
+    void testDurationRootCommand() {
+        platform.execute("test 1d")
+            .assertMissingPermission("root.duration");
+    }
+
+    @RootCommand
+    @Permission("root.four.class")
+    static class RootCommandFour {
+        @Execute(name = "test")
+        @Permission("root.four.method")
+        void executeWithTwoArgs(@Arg String text, @Arg int number) {}
+    }
+
+    @Test
+    void testRootCommandWithTwoArgsAndCombinedPermissions() {
+        platform.execute("test hello 123")
+            .assertMissingPermission("root.four.class", "root.four.method");
+    }
+
+}
diff --git a/litecommands-core/src/dev/rollczi/litecommands/command/CommandRouteImpl.java b/litecommands-core/src/dev/rollczi/litecommands/command/CommandRouteImpl.java
@@ -103,13 +103,10 @@ public CommandRoute<SENDER> merge(CommandRoute<SENDER> toMerge) {
         List<String> aliases = new ArrayList<>(this.aliases);
         aliases.addAll(toMerge.getAliases());
 
-        CommandRouteImpl<SENDER> merged = new CommandRouteImpl<SENDER>(this.name, aliases, this.parent) {
-            @Override
-            public boolean isReference() {
-                return CommandRouteImpl.this.isReference(); // because parent is the same. TODO: refactor
-            }
-        };
+        // TODO: Bridge should be other type of command node
+        CommandRouteBridge merged = new CommandRouteBridge(aliases);
 
+        // TODO: Bridge should have multiple source of metadata
         merged.meta().putAll(this.meta());
         merged.meta().putAll(toMerge.meta());
 
@@ -146,7 +143,11 @@ public MetaCollector metaCollector() {
     public void appendChildren(CommandRoute<SENDER> children) {
         for (String name : children.names()) {
             if (this.childrenByName.containsKey(name)) {
-                throw new IllegalArgumentException("Route with name or alias '" + name + "' already exists!");
+                CommandRoute<SENDER> toMerge = this.childrenByName.get(name);
+                this.childRoutes.remove(toMerge);
+                this.childrenByName.remove(name);
+
+                children = toMerge.merge(children);
             }
         }
 
@@ -172,4 +173,15 @@ public String toString() {
             ", meta=" + meta +
             '}';
     }
+
+    private class CommandRouteBridge extends CommandRouteImpl<SENDER> {
+        public CommandRouteBridge(List<String> aliases) {
+            super(CommandRouteImpl.this.name, aliases, CommandRouteImpl.this.parent);
+        }
+
+        @Override
+        public boolean isReference() {
+            return CommandRouteImpl.this.isReference(); // because parent is the same. TODO: refactor
+        }
+    }
 }
diff --git a/litecommands-core/src/dev/rollczi/litecommands/command/builder/CommandBuilderCollector.java b/litecommands-core/src/dev/rollczi/litecommands/command/builder/CommandBuilderCollector.java
@@ -17,20 +17,7 @@ public List<CommandBuilder<SENDER>> collectCommands() {
         List<CommandBuilder<SENDER>> collectedBuilders = new ArrayList<>();
 
         for (CommandBuilderProvider<SENDER> provider : this.providers) {
-
-            nextBuilder:
-            for (CommandBuilder<SENDER> builder : provider.getCommands()) {
-                for (CommandBuilder<SENDER> collectedBuilder : collectedBuilders) {
-                    if (!collectedBuilder.hasSimilarNames(builder)) {
-                        continue;
-                    }
-
-                    collectedBuilder.meagre(builder);
-                    continue nextBuilder;
-                }
-
-                collectedBuilders.add(builder);
-            }
+            collectedBuilders.addAll(provider.getCommands());
         }
 
         return collectedBuilders;
diff --git a/litecommands-core/src/dev/rollczi/litecommands/command/builder/CommandBuilderRootImpl.java b/litecommands-core/src/dev/rollczi/litecommands/command/builder/CommandBuilderRootImpl.java
diff --git a/litecommands-fabric/src/main/resources/fabric.mod.json b/litecommands-fabric/src/main/resources/fabric.mod.json
diff --git a/litecommands-unit/src/dev/rollczi/litecommands/unit/AssertExecute.java b/litecommands-unit/src/dev/rollczi/litecommands/unit/AssertExecute.java

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`group = "dev.rollczi"`
`7`		`-version = "3.10.5-SNAPSHOT"`
	`7`	`+version = "3.10.5"`
`8`	`8`
`9`	`9`	`publishing {`
`10`	`10`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"schemaVersion": 1,`
`3`	`3`	`"id": "litecommands_example",`
`4`		`- "version": "3.10.4",`
	`4`	`+ "version": "3.10.5",`
`5`	`5`	`"name": "LiteCommands Fabric Example",`
`6`	`6`	`"description": "Annotation based command framework for Fabric.",`
`7`	`7`	`"authors": [`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`group = "dev.rollczi"`
`8`		`-version = "3.10.4"`
	`8`	`+version = "3.10.5"`
`9`	`9`
`10`	`10`	`repositories {`
`11`	`11`	`mavenCentral()`
`12`	`12`	`maven("https://repo.panda-lang.org/releases")`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- // implementation("dev.rollczi:litecommands-jda:3.10.4") // <-- uncomment in your project`
	`16`	`+ // implementation("dev.rollczi:litecommands-jda:3.10.5") // <-- uncomment in your project`
`17`	`17`	`implementation(project(":litecommands-jda")) // don't use this line in your build.gradle`
`18`	`18`
`19`	`19`	`implementation("net.dv8tion:JDA:5.6.1")`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`implementation("net.minestom:minestom:${Versions.MINESTOM}")`
`19`	`19`	`implementation("net.kyori:adventure-text-minimessage:4.24.0")`
`20`	`20`
`21`		`- // implementation("dev.rollczi:litecommands-minestom:3.10.4") // <-- uncomment in your project`
	`21`	`+ // implementation("dev.rollczi:litecommands-minestom:3.10.5") // <-- uncomment in your project`
`22`	`22`	`implementation(project(":litecommands-minestom")) // don't use this line in your build.gradle`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ repositories {`
`14`	`14`	`dependencies {`
`15`	`15`	`compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")`
`16`	`16`
`17`		`- // implementation("dev.rollczi:litecommands-bukkit:3.10.4") // <-- uncomment in your project`
	`17`	`+ // implementation("dev.rollczi:litecommands-bukkit:3.10.5") // <-- uncomment in your project`
`18`	`18`	`implementation(project(":litecommands-bukkit")) // don't use this line in your build.gradle`
`19`	`19`	`}`
`20`	`20`