Prepare for 5.4.2-SNAPSHOT

Pante · Aug 6, 2022 · ca8ea41 · ca8ea41
1 parent df6397d
commit ca8ea41
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
+## 5.4.2 - Drip, drop, drip, drop (06/08/2022)
+
+**Compatible Spigot versions: 1.19.1**
+
+This updates addresses a few breaking bugs
+
+## Commons
+* Fix `ConcurrentModificationException` caused by self-visiting literal aliase still throwing on Spigot
+* Fix commands not being executed due to changes in how Spigot forwards command execution
+
+
 ## 5.4.1 - Life is your restaurant (06/08/2022)
 
-**Compatible Spigot versions: 1.19.0, 1.19.1, 1.19.2**
+**Note: DEFECTIVE - DO NOT USE**
+
+**Compatible Spigot versions: 1.19.0**
 
 This update addresses a `ConcurrentModificationException` caused by self-visiting literal aliases.
 
@@ -10,6 +23,8 @@ This update addresses a `ConcurrentModificationException` caused by self-visitin
 
 ## 5.4.0 - When clouds go rolling by (28/06/2022)
 
+**Note: DEFECTIVE - DO NOT USE**
+
 **Compatible Spigot versions: 1.19.0**
 
 This update adds support for Spigot 1.19.0.

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@
 
 | Chimera Version | Minecraft Version |
 |-----------------|-------------------|
-| 5.4.1           | 1.19.0 - 1.19.2   |
+| 5.4.2           | 1.19.1            |
 | 5.3.0           | 1.18.2            |
 | 5.2.0           | 1.18.0 - 1.18.1   |
 | 5.1.0           | 1.17.1            |
@@ -63,7 +63,7 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>annotations</artifactId>
-    <version>5.4.1</version>
+    <version>5.4.2</version>
 </dependency>
 ```
 
@@ -76,7 +76,7 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>commons</artifactId>
-    <version>5.4.1</version>
+    <version>5.4.2</version>
 </dependency>
 ```
 
@@ -89,6 +89,6 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>typist</artifactId>
-    <version>5.4.1</version>
+    <version>5.4.2</version>
 </dependency>
 ```
diff --git a/annotations/dependency-reduced-pom.xml b/annotations/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>chimera</artifactId>
     <groupId>com.karuslabs</groupId>
-    <version>5.4.1</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>annotations</artifactId>

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>5.4.1</version>
+        <version>5.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>annotations</artifactId>

diff --git a/commons/dependency-reduced-pom.xml b/commons/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>chimera</artifactId>
     <groupId>com.karuslabs</groupId>
-    <version>5.4.1</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons</artifactId>
@@ -30,9 +30,9 @@
               <goal>remap</goal>
             </goals>
             <configuration>
-              <srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+              <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
               <reverse>true</reverse>
-              <remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+              <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
               <remappedArtifactAttached>true</remappedArtifactAttached>
               <remappedClassifierName>remapped-obf</remappedClassifierName>
             </configuration>
@@ -45,8 +45,8 @@
             </goals>
             <configuration>
               <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-              <srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-              <remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+              <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+              <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
             </configuration>
           </execution>
         </executions>
@@ -75,20 +75,20 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.19-R0.1-SNAPSHOT</version>
+      <version>1.19.1-R0.1-SNAPSHOT</version>
       <classifier>remapped-mojang</classifier>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.mojang</groupId>
       <artifactId>brigadier</artifactId>
-      <version>1.0.17</version>
+      <version>1.0.18</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>5.4.1</version>
+        <version>5.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>commons</artifactId>
@@ -24,15 +24,15 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.19.1-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
-            <version>1.0.17</version>
+            <version>1.0.18</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -59,9 +59,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -74,8 +74,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/commons/src/main/java/com/karuslabs/commons/command/dispatcher/DispatcherCommand.java b/commons/src/main/java/com/karuslabs/commons/command/dispatcher/DispatcherCommand.java
@@ -39,6 +39,10 @@
  * <br><br>
  * <b>Note:</b><br>
  * This class was adapted from Spigot's {@code VanillaCommand}.
+ * 
+ * As of 1.19, only commands from console are forwarded to a {@code DispatcherCommand}.
+ * Commands issued by players are routed directly to the native {@code CommandDispatcher}.
+ * This behaviour is weird as fuck.
  */
 public class DispatcherCommand extends Command implements PluginIdentifiableCommand {
 

diff --git a/commons/src/main/java/com/karuslabs/commons/command/dispatcher/SpigotMapper.java b/commons/src/main/java/com/karuslabs/commons/command/dispatcher/SpigotMapper.java
@@ -27,7 +27,7 @@
 import com.karuslabs.commons.command.tree.Mapper;
 import com.karuslabs.commons.command.types.Type;
 
-import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.*;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.tree.*;
@@ -45,6 +45,10 @@
 /**
  * A mapper that maps the commands in a {@link Dispatcher} to the internal dispatcher 
  * of the server.
+ * 
+ * As of 1.19, only commands from console are forwarded to a {@code DispatcherCommand}.
+ * Commands issued by players are routed directly to the native {@code CommandDispatcher}.
+ * This behaviour is weird as fuck. We previously only mapped completion related information.
  */
 class SpigotMapper extends Mapper<CommandSender, CommandSourceStack> {
 
@@ -80,6 +84,23 @@ protected ArgumentType<?> type(ArgumentCommandNode<CommandSender, ?> command) {
         return type instanceof Type<?> mappable ? mappable.mapped() : type;
     }
 
+    @Override
+    protected Command<CommandSourceStack> execution(CommandNode<CommandSender> command) {
+        return reparse(command);
+    }
+
+    Command<CommandSourceStack> reparse(CommandNode<CommandSender> command) {
+        return (context) -> {
+            var sender = context.getSource().getBukkitSender();
+
+            var input = context.getInput();
+            input = input.length() <= 1 ? "" : input.substring(1);
+
+            var reparsed = dispatcher.parse(input, sender).getContext().build(context.getInput());
+            return command.getCommand().run(reparsed);
+        };
+    }
+
     /**
      * Wraps the requirement of the given command in a predicate that transforms 
      * a {@code CommandListenerWrapper} into a {@code CommandSender}.

diff --git a/commons/src/main/java/com/karuslabs/commons/command/tree/TreeWalker.java b/commons/src/main/java/com/karuslabs/commons/command/tree/TreeWalker.java
@@ -132,7 +132,7 @@ public void add(RootCommandNode<R> root, Collection<? extends CommandNode<T>> co
             redirect(command.getRedirect(), result, source);
             descend(command.getChildren(), result, source);
         }
-
+        
         return result;
     }
 

diff --git a/commons/src/main/java/com/karuslabs/commons/command/tree/nodes/Nodes.java b/commons/src/main/java/com/karuslabs/commons/command/tree/nodes/Nodes.java
@@ -114,6 +114,10 @@ public B optionally(CommandNode<T> node) {
      */
     static <Node extends CommandNode<T> & Mutable<T>, T> void addChild(Node node, CommandNode<T> child, Consumer<CommandNode<T>> addition) {
         var current = node.getChild(child.getName());
+        if (current == child) { // Don't visit again if node is itself, will cause CMEs
+            return;
+        }
+
         if (current != null) {
             node.removeChild(current.getName()); // Needs to be removed otherwise child will not replace current
 
@@ -133,9 +137,7 @@ static <Node extends CommandNode<T> & Mutable<T>, T> void addChild(Node node, Co
             var aliases = ((Aliasable<T>) child).aliases();
 
             for (var alias : aliases) {
-                if (node.getChild(alias.getName()) == null) {
-                    addition.accept(alias);
-                }
+                addition.accept(alias);
             }
 
             if (current != null) {

diff --git a/commons/src/test/java/com/karuslabs/commons/MockServer.java b/commons/src/test/java/com/karuslabs/commons/MockServer.java
@@ -766,5 +766,10 @@ public boolean isEnforcingSecureProfiles() {
     public int getMaxChainedNeighborUpdates() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public <T extends Keyed> Registry<T> getRegistry(Class<T> type) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.karuslabs</groupId>
     <artifactId>chimera</artifactId>
-    <version>5.4.1</version>
+    <version>5.4.2-SNAPSHOT</version>
     <packaging>pom</packaging> 
 
     <name>Chimera</name>

diff --git a/typist-example-plugin/dependency-reduced-pom.xml b/typist-example-plugin/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>chimera</artifactId>
     <groupId>com.karuslabs</groupId>
-    <version>5.4.1</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>typist-example-plugin</artifactId>
@@ -57,6 +57,13 @@
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.19.1-R0.1-SNAPSHOT</version>
+      <classifier>remapped-mojang</classifier>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.mojang</groupId>
       <artifactId>brigadier</artifactId>
@@ -72,7 +79,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -92,7 +99,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -108,7 +115,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/typist-example-plugin/pom.xml b/typist-example-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>5.4.1</version>
+        <version>5.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>typist-example-plugin</artifactId>
@@ -36,6 +36,14 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.19.1-R0.1-SNAPSHOT</version>
+            <classifier>remapped-mojang</classifier>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
-Original file line number
+Diff line change
@@ Expand Up @@
                 redirect(command.getRedirect(), result, source);
                 descend(command.getChildren(), result, source);
             }
             return result;
         }
@@ Expand Down @@