It compiles again

JorelAli · May 9, 2024 · acda2d1 · acda2d1
1 parent f29a59c
commit acda2d1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/commandapi-test/commandapi-test-bukkit/commandapi-test-bukkit-impl-1.17/pom.xml b/commandapi-test/commandapi-test-bukkit/commandapi-test-bukkit-impl-1.17/pom.xml
@@ -89,16 +89,6 @@
  <version>1.0.17</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>dev.jorel</groupId>
- <artifactId>commandapi-test-bukkit-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>dev.jorel</groupId>
- <artifactId>commandapi-paper-shade</artifactId>
- <version>${project.version}</version>
- </dependency>
 
  <!-- Version-specific dependencies -->
  <dependency>
@@ -119,6 +109,18 @@
  <classifier>remapped-mojang</classifier>
  <scope>provided</scope>
  </dependency>
+
+ <!-- CommandAPI stuff -->
+ <dependency>
+ <groupId>dev.jorel</groupId>
+ <artifactId>commandapi-test-bukkit-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dev.jorel</groupId>
+ <artifactId>commandapi-paper-shade</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  </dependencies>
 
  <build>

diff --git a/commandapi-test/commandapi-test-bukkit/commandapi-test-bukkit-impl-1.18/pom.xml b/commandapi-test/commandapi-test-bukkit/commandapi-test-bukkit-impl-1.18/pom.xml
@@ -90,16 +90,6 @@
  <version>1.0.17</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>dev.jorel</groupId>
- <artifactId>commandapi-test-bukkit-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>dev.jorel</groupId>
- <artifactId>commandapi-paper-shade</artifactId>
- <version>${project.version}</version>
- </dependency>
 
  <!-- Version-specific dependencies -->
  <dependency>
@@ -119,6 +109,18 @@
  <classifier>remapped-mojang</classifier>
  <scope>provided</scope>
  </dependency>
+
+ <!-- CommandAPI stuff -->
+ <dependency>
+ <groupId>dev.jorel</groupId>
+ <artifactId>commandapi-test-bukkit-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dev.jorel</groupId>
+ <artifactId>commandapi-paper-shade</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  </dependencies>
 
  <build>

diff --git a/commandapi-test/commandapi-test-bukkit/pom.xml b/commandapi-test/commandapi-test-bukkit/pom.xml
@@ -18,11 +18,12 @@
  <module>commandapi-test-bukkit-impl-1.17</module>
  <module>commandapi-test-bukkit-impl-1.18</module>
  <module>commandapi-test-bukkit-impl-1.19.2</module>
+ <!-- These modules need implementing in Paper
  <module>commandapi-test-bukkit-impl-1.19.4</module>
  <module>commandapi-test-bukkit-impl-1.20</module>
  <module>commandapi-test-bukkit-impl-1.20.2</module>
  <module>commandapi-test-bukkit-impl-1.20.3</module>
- <module>commandapi-test-bukkit-impl-1.20.5</module>
+ <module>commandapi-test-bukkit-impl-1.20.5</module> -->
  </modules>
 
 </project>