1.19 step 2: poms and versions and all (Denizen 1.2.5)

DenizenScript · Jun 7, 2022 · bb3f608 · bb3f608
1 parent 3370a50
commit bb3f608
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 11 deletions.
diff --git 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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,6 +44,12 @@
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen-v1_19</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen-paper</artifactId>

diff --git a/paper/pom.xml b/paper/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git 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
@@ -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
@@ -6,7 +6,7 @@
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,14 +15,15 @@
         <dcore.version>1.90.1-SNAPSHOT</dcore.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
         <BUILD_CLASS>CUSTOM</BUILD_CLASS>
-        <DENIZEN_VERSION>1.2.4</DENIZEN_VERSION>
+        <DENIZEN_VERSION>1.2.5</DENIZEN_VERSION>
     </properties>
 
     <modules>
         <module>plugin</module>
         <module>v1_16</module>
         <module>v1_17</module>
         <module>v1_18</module>
+        <module>v1_19</module>
         <module>paper</module>
         <module>dist</module>
     </modules>

diff --git a/v1_16/pom.xml b/v1_16/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/v1_17/pom.xml b/v1_17/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/v1_18/pom.xml b/v1_18/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/v1_19/pom.xml b/v1_19/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.denizenscript</groupId>
+        <artifactId>denizen-parent</artifactId>
+        <version>1.2.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>denizen-v1_19</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.19-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.19-R0.1-SNAPSHOT</version>
+            <classifier>remapped-mojang</classifier>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.md-5</groupId>
+                <artifactId>specialsource-maven-plugin</artifactId>
+                <version>1.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-obf</id>
+                        <configuration>
+                            <srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <reverse>true</reverse>
+                            <remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedArtifactAttached>true</remappedArtifactAttached>
+                            <remappedClassifierName>remapped-obf</remappedClassifierName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <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>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
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
@@ -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