Remove RegistryType since it's not needed

EngineHub · Sep 14, 2024 · 9d6dd57 · 9d6dd57
1 parent 26accae
commit 9d6dd57
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 37 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java
@@ -35,7 +35,6 @@
 import com.sk89q.worldedit.extension.platform.Locatable;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.internal.annotation.Offset;
-import com.sk89q.worldedit.internal.annotation.RegistryType;
 import com.sk89q.worldedit.internal.command.CommandRegistrationHandler;
 import com.sk89q.worldedit.internal.command.CommandUtil;
 import com.sk89q.worldedit.internal.cui.ServerCUIHandler;
@@ -532,7 +531,6 @@ public Component call() throws Exception {
     @CommandPermissions("worldedit.registry")
     public void registry(Actor actor,
                          @Arg(desc = "The registry to search through")
-                         @RegistryType
                             Registry<?> registry,
                          @ArgFlag(name = 'p', desc = "Page of results to return", def = "1")
                             int page,

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/RegistryConverter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/RegistryConverter.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.TypeToken;
 import com.sk89q.worldedit.command.util.SuggestionHelper;
-import com.sk89q.worldedit.internal.annotation.RegistryType;
 import com.sk89q.worldedit.registry.Keyed;
 import com.sk89q.worldedit.registry.Registry;
 import com.sk89q.worldedit.util.formatting.text.Component;
@@ -76,7 +75,7 @@ public static void register(CommandManager commandManager) {
             );
 
         // This must be separate as it has a generic type
-        commandManager.registerConverter(Key.of(new TypeToken<>() {}, RegistryType.class), new RegistryConverter<>(Registry.REGISTRY));
+        commandManager.registerConverter(Key.of(new TypeToken<>() {}), new RegistryConverter<>(Registry.REGISTRY));
     }
 
     @SuppressWarnings("unchecked")

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/RegistryType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/annotation/RegistryType.java