Merge pull request #130 from Silvre/remove-minestom-perms

Remove Minestom permissions annotation

Author: Revxrsal

minestom/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     implementation(project(":common"))
-    compileOnly("net.minestom:minestom-snapshots:7ce047b22e")
+    compileOnly("net.minestom:minestom-snapshots:39d445482f")
 }
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))

minestom/src/main/java/revxrsal/commands/minestom/MinestomLampConfig.java

@@ -83,7 +83,6 @@ private MinestomLampConfig(ActorFactory<A> actorFactory, ArgumentTypes<A> argume
                 .accept(minestomSenderResolver())
                 .accept(minestomParameterTypes())
                 .accept(minestomExceptionHandler())
-                .accept(minestomPermissions())
                 .accept(registrationHooks(actorFactory, argumentTypes))
                 .accept(minestomContextParameters());
     }

minestom/src/main/java/revxrsal/commands/minestom/MinestomVisitors.java

@@ -42,14 +42,12 @@
 import revxrsal.commands.exception.CommandExceptionHandler;
 import revxrsal.commands.minestom.actor.ActorFactory;
 import revxrsal.commands.minestom.actor.MinestomCommandActor;
-import revxrsal.commands.minestom.annotation.CommandPermission;
 import revxrsal.commands.minestom.argument.ArgumentTypes;
 import revxrsal.commands.minestom.argument.MinestomArgumentTypes;
 import revxrsal.commands.minestom.exception.MinestomExceptionHandler;
 import revxrsal.commands.minestom.hooks.MinestomCommandHooks;
 import revxrsal.commands.minestom.parameters.InstanceParameterType;
 import revxrsal.commands.minestom.parameters.PlayerParameterType;
-import revxrsal.commands.minestom.sender.MinestomPermissionFactory;
 import revxrsal.commands.minestom.sender.MinestomSenderResolver;
 
 import static revxrsal.commands.minestom.MinestomStubParameterType.stubParameterType;
@@ -180,14 +178,4 @@ public final class MinestomVisitors {
             builder.parameterTypes().addContextParameterLast(InstanceManager.class, (a, b) -> MinecraftServer.getInstanceManager());
         };
     }
-
-    /**
-     * Adds support for the {@link CommandPermission} annotation
-     *
-     * @param <A> The actor type
-     * @return This visitor
-     */
-    public static <A extends MinestomCommandActor> @NotNull LampBuilderVisitor<A> minestomPermissions() {
-        return builder -> builder.permissionFactory(MinestomPermissionFactory.INSTANCE);
-    }
 }

minestom/src/main/java/revxrsal/commands/minestom/annotation/CommandPermission.java

@@ -23,6 +23,7 @@
  */
 package revxrsal.commands.minestom.util;
 
+import net.minestom.server.command.ArgumentParserType;
 import net.minestom.server.command.CommandSender;
 import net.minestom.server.command.builder.arguments.Argument;
 import net.minestom.server.command.builder.exception.ArgumentSyntaxException;
@@ -77,7 +78,7 @@ private RenamedArgument(@NotNull String newId, @NotNull Argument<T> argument) {
         }
 
         @Override
-        public String parser() {
+        public ArgumentParserType parser() {
             return argument.parser();
         }