Skip to content

Commit a7abef7

Browse files
tal5tal5
authored
26.1 support (#2819)
2 parents 85a7bcb + 06c398a commit a7abef7

63 files changed

Lines changed: 9244 additions & 21 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The Denizen Scripting Language - Spigot Impl
33

44
An implementation of the Denizen Scripting Language for Spigot servers, with strong Citizens interlinks to emphasize the power of using Denizen with NPCs!
55

6-
**Version 1.3.1**: Compatible with Spigot 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.11!
6+
**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!
77

88
**Learn about Denizen from the Beginner's guide:** https://guide.denizenscript.com/guides/background/index.html
99

@@ -45,7 +45,7 @@ An implementation of the Denizen Scripting Language for Spigot servers, with str
4545
<dependency>
4646
<groupId>com.denizenscript</groupId>
4747
<artifactId>denizen</artifactId>
48-
<version>1.3.1-SNAPSHOT</version>
48+
<version>1.3.2-SNAPSHOT</version>
4949
<type>jar</type>
5050
<scope>provided</scope>
5151
<exclusions>

‎dist/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.denizenscript</groupId>
77
<artifactId>denizen-parent</artifactId>
8-
<version>1.3.1-SNAPSHOT</version>
8+
<version>1.3.2-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -60,6 +60,12 @@
6060
<version>${project.parent.version}</version>
6161
<scope>compile</scope>
6262
</dependency>
63+
<dependency>
64+
<groupId>com.denizenscript</groupId>
65+
<artifactId>denizen-v26_1</artifactId>
66+
<version>${project.parent.version}</version>
67+
<scope>compile</scope>
68+
</dependency>
6369
<dependency>
6470
<groupId>com.denizenscript</groupId>
6571
<artifactId>denizen-paper</artifactId>

‎paper/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.denizenscript</groupId>
88
<artifactId>denizen-paper</artifactId>
9-
<version>1.3.1-SNAPSHOT</version>
9+
<version>1.3.2-SNAPSHOT</version>
1010

1111
<repositories>
1212
<repository>

‎plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.denizenscript</groupId>
77
<artifactId>denizen</artifactId>
8-
<version>1.3.1-SNAPSHOT</version>
8+
<version>1.3.2-SNAPSHOT</version>
99

1010
<name>Denizen</name>
1111
<description>Scriptable Minecraft and Citizens2</description>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.spigotmc</groupId>
3232
<artifactId>spigot-api</artifactId>
33-
<version>1.21.11-R0.2-SNAPSHOT</version>
33+
<version>26.1-R0.1-SNAPSHOT</version>
3434
<type>jar</type>
3535
<scope>provided</scope>
3636
</dependency>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,14 @@ else if (javaVersion.startsWith("17")) {
147147
Debug.log("Running on fully supported Java 17.");
148148
}
149149
else if (javaVersion.startsWith("18") || javaVersion.startsWith("19")) {
150-
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.");
150+
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.");
151151
}
152152
else if (javaVersion.startsWith("21")) {
153153
Debug.log("Running on fully supported Java 21.");
154154
}
155+
else if (javaVersion.startsWith("25")) {
156+
Debug.log("Running on fully supported Java 25.");
157+
}
155158
else {
156159
Debug.log("Running on unrecognized (future?) Java version. May or may not work.");
157160
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ public enum NMSVersion {
77
v1_18("1.18"),
88
v1_19("1.19"),
99
v1_20("1.20"),
10-
v1_21("1.21");
10+
v1_21("1.21"),
11+
v26_1("26.1");
1112

1213
final String minecraftVersion;
1314

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,17 @@ public static void removeDenizenRecipes() {
6060
Iterator<Recipe> recipeIterator = Bukkit.recipeIterator();
6161
ArrayList<NamespacedKey> keys = new ArrayList<>();
6262
while (recipeIterator.hasNext()) {
63-
if (recipeIterator.next() instanceof Keyed keyed && keyed.getKey().getNamespace().equals("denizen")) {
64-
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
65-
keys.add(keyed.getKey());
66-
}
67-
else {
68-
recipeIterator.remove();
63+
try {
64+
if (recipeIterator.next() instanceof Keyed keyed && keyed.getKey().getNamespace().equals("denizen")) {
65+
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
66+
keys.add(keyed.getKey());
67+
}
68+
else {
69+
recipeIterator.remove();
70+
}
6971
}
7072
}
73+
catch (AbstractMethodError ignored) {} // TODO: 26.1: work around Spigot bug
7174
}
7275
if (!keys.isEmpty()) {
7376
NMSHandler.itemHelper.removeRecipes(keys);

‎pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
<groupId>com.denizenscript</groupId>
77
<artifactId>denizen-parent</artifactId>
88
<packaging>pom</packaging>
9-
<version>1.3.1-SNAPSHOT</version>
9+
<version>1.3.2-SNAPSHOT</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
1414
<BUILD_CLASS>CUSTOM</BUILD_CLASS>
15-
<DENIZEN_VERSION>1.3.1</DENIZEN_VERSION>
15+
<DENIZEN_VERSION>1.3.2</DENIZEN_VERSION>
1616
</properties>
1717

1818
<modules>
1919
<module>plugin</module>
2020
<module>paper</module>
21+
<module>v26_1</module>
2122
<module>v1_21</module>
2223
<module>v1_20</module>
2324
<module>v1_19</module>

‎v1_17/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.denizenscript</groupId>
88
<artifactId>denizen-v1_17</artifactId>
9-
<version>1.3.1-SNAPSHOT</version>
9+
<version>1.3.2-SNAPSHOT</version>
1010

1111
<dependencies>
1212
<dependency>

‎v1_18/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.denizenscript</groupId>
88
<artifactId>denizen-v1_18</artifactId>
9-
<version>1.3.1-SNAPSHOT</version>
9+
<version>1.3.2-SNAPSHOT</version>
1010

1111
<dependencies>
1212
<dependency>

0 commit comments

Comments
 (0)