26.1 support

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.3.1**: Compatible with Spigot 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.11!
+**Version 1.3.2**: Compatible with Spigot 1.17.1, 1.18.2, 1.19.4, 1.20.6, 1.21.11, and 26.1!
 
 **Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html
 
@@ -45,7 +45,7 @@ An implementation of the Denizen Scripting Language for Spigot servers, with str
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
+            <version>1.3.2-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>

dist/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.denizenscript</groupId>
         <artifactId>denizen-parent</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -60,6 +60,12 @@
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen-v26_1</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen-paper</artifactId>

paper/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-paper</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <repositories>
         <repository>

plugin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <name>Denizen</name>
     <description>Scriptable Minecraft and Citizens2</description>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.11-R0.2-SNAPSHOT</version>
+            <version>26.1-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

plugin/src/main/java/com/denizenscript/denizen/Denizen.java

@@ -147,11 +147,14 @@ else if (javaVersion.startsWith("17")) {
             Debug.log("Running on fully supported Java 17.");
         }
         else if (javaVersion.startsWith("18") || javaVersion.startsWith("19")) {
-            getLogger().warning("Running unreliable Java version. modern Minecraft versions are built for Java 21 or 17. Other Java versions are not guaranteed to function properly.");
+            getLogger().warning("Running unreliable Java version. modern Minecraft versions are built for Java 25, 21, or 17. Other Java versions are not guaranteed to function properly.");
         }
         else if (javaVersion.startsWith("21")) {
             Debug.log("Running on fully supported Java 21.");
         }
+        else if (javaVersion.startsWith("25")) {
+            Debug.log("Running on fully supported Java 25.");
+        }
         else {
             Debug.log("Running on unrecognized (future?) Java version. May or may not work.");
         }

plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java

@@ -7,7 +7,8 @@ public enum NMSVersion {
     v1_18("1.18"),
     v1_19("1.19"),
     v1_20("1.20"),
-    v1_21("1.21");
+    v1_21("1.21"),
+    v26_1("26.1");
 
     final String minecraftVersion;
 

plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java

@@ -60,14 +60,17 @@ public static void removeDenizenRecipes() {
         Iterator<Recipe> recipeIterator = Bukkit.recipeIterator();
         ArrayList<NamespacedKey> keys = new ArrayList<>();
         while (recipeIterator.hasNext()) {
-            if (recipeIterator.next() instanceof Keyed keyed && keyed.getKey().getNamespace().equals("denizen")) {
-                if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
-                    keys.add(keyed.getKey());
-                }
-                else {
-                    recipeIterator.remove();
+            try {
+                if (recipeIterator.next() instanceof Keyed keyed && keyed.getKey().getNamespace().equals("denizen")) {
+                    if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+                        keys.add(keyed.getKey());
+                    }
+                    else {
+                        recipeIterator.remove();
+                    }
                 }
             }
+            catch (AbstractMethodError ignored) {} // TODO: 26.1: work around Spigot bug
         }
         if (!keys.isEmpty()) {
             NMSHandler.itemHelper.removeRecipes(keys);

pom.xml

@@ -6,18 +6,19 @@
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
         <BUILD_CLASS>CUSTOM</BUILD_CLASS>
-        <DENIZEN_VERSION>1.3.1</DENIZEN_VERSION>
+        <DENIZEN_VERSION>1.3.2</DENIZEN_VERSION>
     </properties>
 
     <modules>
         <module>plugin</module>
         <module>paper</module>
+        <module>v26_1</module>
         <module>v1_21</module>
         <module>v1_20</module>
         <module>v1_19</module>

v1_17/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-v1_17</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

v1_18/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-v1_18</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

v1_19/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-v1_19</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

v1_20/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-v1_20</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

v1_21/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.denizenscript</groupId>
     <artifactId>denizen-v1_21</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

v26_1/pom.xml

@@ -0,0 +1,47 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.denizenscript</groupId>
+    <artifactId>denizen-v26_1</artifactId>
+    <version>1.3.2-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>26.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>26.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>