Included everything because relocation does not include unused classes.

WOFTNW · May 31, 2024 · f2a8ca7 · f2a8ca7
1 parent f64ac00
commit f2a8ca7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/dreamvisitor/pom.xml b/dreamvisitor/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.stonley890</groupId>
   <artifactId>dreamvisitor</artifactId>
-  <version>2.13.1-hotfix-2</version>
+  <version>2.13.1-hotfix-3</version>
   <packaging>jar</packaging>
 
   <name>Dreamvisitor</name>
@@ -143,6 +143,9 @@
                 <relocation>
                   <pattern>dev.jorel.commandapi</pattern>
                   <shadedPattern>io.github.stonley890.dreamvisitor.shaded.dev.jorel.commandapi</shadedPattern>
+                  <includes>
+                    <include>dev.jorel.commandapi.*</include>
+                  </includes>
                 </relocation>
               </relocations>
             </configuration>

diff --git a/dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/commands/CmdAdminRadio.java b/dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/commands/CmdAdminRadio.java
@@ -3,6 +3,7 @@
 import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.CommandPermission;
+import dev.jorel.commandapi.ExecutableCommand;
 import dev.jorel.commandapi.arguments.GreedyStringArgument;
 import io.github.stonley890.dreamvisitor.Dreamvisitor;
 import io.github.stonley890.dreamvisitor.functions.Radio;
@@ -15,7 +16,7 @@ public class CmdAdminRadio implements DVCommand {
 
     @NotNull
     @Override
-    public CommandAPICommand getCommand() {
+    public ExecutableCommand<?, ?> getCommand() {
         return new CommandAPICommand("aradio")
                 .withPermission(CommandPermission.OP)
                 .withHelp("Use the admin radio.", "Sends a message to all operators.")

diff --git a/dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/commands/CommandUtils.java b/dreamvisitor/src/main/java/io/github/stonley890/dreamvisitor/commands/CommandUtils.java
@@ -21,7 +21,6 @@ public static Argument<Tribe> customTribeArgument(String nodeName) {
             }
             return tribe;
         }).replaceSuggestions(ArgumentSuggestions.strings(info -> Arrays.stream(Tribe.values()).map(tribe -> tribe.name().toUpperCase()).toArray(String[]::new)));
-
     }
 
 }
diff --git a/dreamvisitor/src/main/resources/plugin.yml b/dreamvisitor/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: io.github.stonley890.dreamvisitor.Dreamvisitor
 name: Dreamvisitor
-version: 2.13.1
+version: 2.13.1-hotfix-3
 api-version: 1.20
 description: A plugin created by Bog for WoF:TNW to add various features.
 author: Stonley890
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 return tribe;
             }).replaceSuggestions(ArgumentSuggestions.strings(info -> Arrays.stream(Tribe.values()).map(tribe -> tribe.name().toUpperCase()).toArray(String[]::new)));
         }
     }