Merge pull request #396 from JorelAli/release/8.7.2

Release/8.7.2
JorelAli · Jan 7, 2023 · 2efd3a3 · 2efd3a3
2 parents 9bca6a3 + 53cdb01
commit 2efd3a3
Show file tree

Hide file tree

Showing 39 changed files with 154 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -44,23 +44,23 @@ The list of what version of the CommandAPI you'll need to run on a specific vers
 
 | Minecraft version | Compatible versions | Latest compatible<br>version | Minimum Java<br>version required<br>to run latest version |
 |--------------------|-----------------------------|------------------------------|-----------------------------------------------------------|
-| **1.13.x** | v1.0 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.15.x** | v2.3a - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.16.1** | v3.0 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.16.2** | v4.0 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.16.3** | v4.2 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.16.4** | v5.2 - 5.12, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.16.5** | v5.7 - 7.0.0, 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.17** | 6.0.x - 8.7.1 | 8.7.1 | 16 |
-| **1.17.1** | 6.1.x - 8.7.1 | 8.7.1 | 16 |
-| **1.18, 1.18.1** | 6.5.2 - 8.7.1 | 8.7.1 | 16 |
-| **1.18.2** | 6.5.4 - 8.7.1 | 8.7.1 | 16 |
-| **1.19** | 8.3.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.19.1** | 8.5.0 - 8.7.1 | 8.7.1 | 16 |
-| **1.19.2** | 8.5.1 - 8.7.1 | 8.7.1 | 16 |
-| **1.19.3** | 8.7.0 - 8.7.1 | 8.7.1 | 16 |
+| **1.13.x** | v1.0 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.14.1, 1.14.2** | v2.0 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.14.3, 1.14.4** | v2.1 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.15.x** | v2.3a - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.16.1** | v3.0 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.16.2** | v4.0 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.16.3** | v4.2 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.16.4** | v5.2 - 5.12, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.16.5** | v5.7 - 7.0.0, 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.17** | 6.0.x - 8.7.2 | 8.7.2 | 16 |
+| **1.17.1** | 6.1.x - 8.7.2 | 8.7.2 | 16 |
+| **1.18, 1.18.1** | 6.5.2 - 8.7.2 | 8.7.2 | 16 |
+| **1.18.2** | 6.5.4 - 8.7.2 | 8.7.2 | 16 |
+| **1.19** | 8.3.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.19.1** | 8.5.0 - 8.7.2 | 8.7.2 | 16 |
+| **1.19.2** | 8.5.1 - 8.7.2 | 8.7.2 | 16 |
+| **1.19.3** | 8.7.0 - 8.7.2 | 8.7.2 | 16 |
 
 -----
 
@@ -369,6 +369,16 @@ This is the current roadmap for the CommandAPI (as of 2nd November 2022):
  </tr>
  </thead>
  <tbody>
+ <tr>
+ <td valign="top"><b>8.7.2</b></td>
+ <td valign="top">January 2023</td>
+ <td valign="top">
+ <ul>
+ <li>Hotfixed issue where various arguments wouldn't work in 1.19.3 (function, recipe, sound, advancement, biome, entities, loot table)</li>
+ <li>Fixed issue where the <code>WorldArgument</code> wouldn't work in 1.19.3</li>
+ </ul>
+ </td>
+ </tr>
  <tr>
  <td valign="top"><b>8.7.1</b></td>
  <td valign="top">December 2022</td>

diff --git a/commandapi-annotations/pom.xml b/commandapi-annotations/pom.xml
@@ -18,7 +18,7 @@
  <parent>
  <groupId>dev.jorel</groupId>
  <artifactId>commandapi</artifactId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
 
  <artifactId>commandapi-annotations</artifactId>

diff --git a/commandapi-core/pom.xml b/commandapi-core/pom.xml
@@ -19,7 +19,7 @@
  <parent>
  <artifactId>commandapi</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-kotlin/pom.xml b/commandapi-kotlin/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>dev.jorel</groupId>
  <artifactId>commandapi</artifactId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
 
  <artifactId>commandapi-kotlin</artifactId>

diff --git a/commandapi-nms/commandapi-1.13.1/pom.xml b/commandapi-nms/commandapi-1.13.1/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.13.2/pom.xml b/commandapi-nms/commandapi-1.13.2/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.13/pom.xml b/commandapi-nms/commandapi-1.13/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.14.3/pom.xml b/commandapi-nms/commandapi-1.14.3/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.14.4/pom.xml b/commandapi-nms/commandapi-1.14.4/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.14/pom.xml b/commandapi-nms/commandapi-1.14/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.15/pom.xml b/commandapi-nms/commandapi-1.15/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.16.1/pom.xml b/commandapi-nms/commandapi-1.16.1/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.16.2/pom.xml b/commandapi-nms/commandapi-1.16.2/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.16.4/pom.xml b/commandapi-nms/commandapi-1.16.4/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.16.5/pom.xml b/commandapi-nms/commandapi-1.16.5/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.17-common/pom.xml b/commandapi-nms/commandapi-1.17-common/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/...pi-nms/commandapi-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java b/...pi-nms/commandapi-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java
@@ -44,6 +44,7 @@
 import org.bukkit.Vibration.Destination.BlockDestination;
 import org.bukkit.Vibration.Destination.EntityDestination;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -89,6 +90,7 @@
 import net.minecraft.commands.CommandFunction.Entry;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.commands.arguments.EntitySummonArgument;
 import net.minecraft.commands.arguments.MobEffectArgument;
@@ -293,6 +295,16 @@ public CommandSourceStack getCLWFromCommandSender(CommandSender sender) {
  return VanillaCommandWrapper.getListener(sender);
  }
 
+ @Override
+ public final World getDimension(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld();
+ }
+
+ @Override
+ public final Environment getEnvironment(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld().getEnvironment();
+ }
+
  @Override
  public Object getEntitySelector(CommandContext<CommandSourceStack> cmdCtx, String str, ArgumentSubType subType) throws CommandSyntaxException {
 

diff --git a/commandapi-nms/commandapi-1.17.1/pom.xml b/commandapi-nms/commandapi-1.17.1/pom.xml
@@ -19,7 +19,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.17/pom.xml b/commandapi-nms/commandapi-1.17/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.18.2/pom.xml b/commandapi-nms/commandapi-1.18.2/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java b/commandapi-nms/commandapi-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java
@@ -50,6 +50,7 @@
 import org.bukkit.Vibration.Destination.BlockDestination;
 import org.bukkit.Vibration.Destination.EntityDestination;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -101,6 +102,7 @@
 import net.minecraft.commands.CommandFunction.Entry;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.commands.arguments.EntitySummonArgument;
 import net.minecraft.commands.arguments.MobEffectArgument;
@@ -360,6 +362,16 @@ public CommandSourceStack getCLWFromCommandSender(CommandSender sender) {
  return VanillaCommandWrapper.getListener(sender);
  }
 
+ @Override
+ public final World getDimension(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld();
+ }
+
+ @Override
+ public final Environment getEnvironment(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld().getEnvironment();
+ }
+
  @Override
  public Object getEntitySelector(CommandContext<CommandSourceStack> cmdCtx, String str, ArgumentSubType subType) throws CommandSyntaxException {
 

diff --git a/commandapi-nms/commandapi-1.18/pom.xml b/commandapi-nms/commandapi-1.18/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java b/commandapi-nms/commandapi-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java
@@ -49,6 +49,7 @@
 import org.bukkit.Vibration.Destination.BlockDestination;
 import org.bukkit.Vibration.Destination.EntityDestination;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -98,6 +99,7 @@
 import net.minecraft.commands.CommandFunction.Entry;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.commands.arguments.EntitySummonArgument;
 import net.minecraft.commands.arguments.MobEffectArgument;
@@ -304,6 +306,16 @@ public CommandSourceStack getCLWFromCommandSender(CommandSender sender) {
  return VanillaCommandWrapper.getListener(sender);
  }
 
+ @Override
+ public final World getDimension(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld();
+ }
+
+ @Override
+ public final Environment getEnvironment(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld().getEnvironment();
+ }
+
  @Override
  public Object getEntitySelector(CommandContext<CommandSourceStack> cmdCtx, String str, ArgumentSubType subType) throws CommandSyntaxException {
 

diff --git a/commandapi-nms/commandapi-1.19-common/pom.xml b/commandapi-nms/commandapi-1.19-common/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/...pi-nms/commandapi-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java b/...pi-nms/commandapi-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java
@@ -50,6 +50,7 @@
 import org.bukkit.Vibration.Destination.BlockDestination;
 import org.bukkit.Vibration.Destination.EntityDestination;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
@@ -104,6 +105,7 @@
 import net.minecraft.commands.CommandFunction.Entry;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.ComponentArgument;
+import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.commands.arguments.EntitySummonArgument;
 import net.minecraft.commands.arguments.MobEffectArgument;
@@ -386,6 +388,16 @@ public final CommandSourceStack getCLWFromCommandSender(CommandSender sender) {
  return VanillaCommandWrapper.getListener(sender);
  }
 
+ @Override
+ public final World getDimension(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld();
+ }
+
+ @Override
+ public final Environment getEnvironment(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
+ return DimensionArgument.getDimension(cmdCtx, key).getWorld().getEnvironment();
+ }
+
  @Override
  public final Object getEntitySelector(CommandContext<CommandSourceStack> cmdCtx, String key, ArgumentSubType subType) throws CommandSyntaxException {
 

diff --git a/commandapi-nms/commandapi-1.19.1/pom.xml b/commandapi-nms/commandapi-1.19.1/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/commandapi-nms/commandapi-1.19.3/pom.xml b/commandapi-nms/commandapi-1.19.3/pom.xml
@@ -21,7 +21,7 @@
  <parent>
  <artifactId>commandapi-nms</artifactId>
  <groupId>dev.jorel</groupId>
- <version>8.7.1</version>
+ <version>8.7.2</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>