From bb3f608c8d222b5dc98caa00eb4b718e42a3e2b7 Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Tue, 7 Jun 2022 14:35:41 -0700 Subject: [PATCH] 1.19 step 2: poms and versions and all (Denizen 1.2.5) --- README.md | 2 +- dist/pom.xml | 8 +- paper/pom.xml | 2 +- plugin/pom.xml | 2 +- .../denizenscript/denizen/nms/NMSVersion.java | 3 +- .../scripts/commands/entity/LookCommand.java | 1 + pom.xml | 5 +- v1_16/pom.xml | 2 +- v1_17/pom.xml | 2 +- v1_18/pom.xml | 2 +- v1_19/pom.xml | 75 +++++++++++++++++++ .../denizen/nms/v1_19/Handler.java | 2 +- 12 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 v1_19/pom.xml diff --git a/README.md b/README.md index 8d5c568d66..54796d82c7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The Denizen Scripting Language - Spigot Impl An implementation of the Denizen Scripting Language for Spigot servers, with strong Citizens interlinks to emphasize the power of using Denizen with NPCs! -**Version 1.2.4**: Compatible with Spigot 1.16.5, 1.17.1, and 1.18.2! +**Version 1.2.5**: Compatible with Spigot 1.16.5, 1.17.1, 1.18.2, and 1.19! **Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html diff --git a/dist/pom.xml b/dist/pom.xml index bf9c4a464f..c70cb2378c 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 @@ -44,6 +44,12 @@ ${project.parent.version} compile + + com.denizenscript + denizen-v1_19 + ${project.parent.version} + compile + com.denizenscript denizen-paper diff --git a/paper/pom.xml b/paper/pom.xml index b800477eb0..5a9af6aa6d 100644 --- a/paper/pom.xml +++ b/paper/pom.xml @@ -5,7 +5,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 diff --git a/plugin/pom.xml b/plugin/pom.xml index dbca06d182..d319ad06ef 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,7 +4,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java index b1186ceff2..53daa19d83 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java @@ -5,7 +5,8 @@ public enum NMSVersion { NOT_SUPPORTED, v1_16, v1_17, - v1_18; + v1_18, + v1_19; public boolean isAtLeast(NMSVersion version) { return ordinal() >= version.ordinal(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java index 461bff24f4..c17fe1bdf4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java @@ -67,6 +67,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException for (Argument arg : scriptEntry) { if (!scriptEntry.hasObject("location") && !scriptEntry.hasObject("cancel") + && arg.limitToOnlyPrefix("location") && arg.matchesArgumentType(LocationTag.class)) { scriptEntry.addObject("location", arg.asType(LocationTag.class)); } diff --git a/pom.xml b/pom.xml index e71334befd..9ce24c0441 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.denizenscript denizen-parent pom - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT UTF-8 @@ -15,7 +15,7 @@ 1.90.1-SNAPSHOT Unknown CUSTOM - 1.2.4 + 1.2.5 @@ -23,6 +23,7 @@ v1_16 v1_17 v1_18 + v1_19 paper dist diff --git a/v1_16/pom.xml b/v1_16/pom.xml index 8826aa4a4f..45492c8372 100644 --- a/v1_16/pom.xml +++ b/v1_16/pom.xml @@ -5,7 +5,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 diff --git a/v1_17/pom.xml b/v1_17/pom.xml index ed26411418..be4e3ecf5f 100644 --- a/v1_17/pom.xml +++ b/v1_17/pom.xml @@ -5,7 +5,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 diff --git a/v1_18/pom.xml b/v1_18/pom.xml index 8f64ea851c..27028654b8 100644 --- a/v1_18/pom.xml +++ b/v1_18/pom.xml @@ -5,7 +5,7 @@ com.denizenscript denizen-parent - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 4.0.0 diff --git a/v1_19/pom.xml b/v1_19/pom.xml new file mode 100644 index 0000000000..791f2a359e --- /dev/null +++ b/v1_19/pom.xml @@ -0,0 +1,75 @@ + + + + com.denizenscript + denizen-parent + 1.2.5-SNAPSHOT + + 4.0.0 + + denizen-v1_19 + + + + com.denizenscript + denizen + ${project.parent.version} + compile + true + + + org.spigotmc + spigot-api + 1.19-R0.1-SNAPSHOT + provided + + + org.spigotmc + spigot + 1.19-R0.1-SNAPSHOT + remapped-mojang + provided + + + + + + + net.md-5 + specialsource-maven-plugin + 1.2.3 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang + true + org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang + true + remapped-obf + + + + package + + remap + + remap-spigot + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf + + + + + + + + diff --git a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/Handler.java b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/Handler.java index 09767e95c4..d6b65b4165 100644 --- a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/Handler.java +++ b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/Handler.java @@ -106,7 +106,7 @@ public void undisableAsyncCatcher() { @Override public boolean isCorrectMappingsCode() { - return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("eaeedbff51b16ead3170906872fda334"); + return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("7b9de0da1357e5b251eddde9aa762916"); } @Override