Support 1.17

This commit is contained in:
Brianna 2021-06-13 14:36:45 -05:00
parent 4fb74bdcdb
commit 407d14f709
2 changed files with 13 additions and 5 deletions

10
pom.xml
View File

@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.3.0-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<id>shaded</id> <id>shaded</id>
@ -83,6 +83,12 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<repositories> <repositories>
<repository> <repository>
<id>public</id> <id>public</id>
@ -97,7 +103,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.16.1</version> <version>1.17</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -1,5 +1,6 @@
package com.songoda.ultimatekits.utils; package com.songoda.ultimatekits.utils;
import com.songoda.core.compatibility.ClassMapping;
import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.compatibility.ServerVersion;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -38,10 +39,11 @@ public class ItemSerializer {
*/ */
static { static {
try { try {
classMojangsonParser = Class.forName(formatNMS("net.minecraft.server.NMS.MojangsonParser")); classMojangsonParser = Class.forName(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_17)
classItemStack = Class.forName(formatNMS("net.minecraft.server.NMS.ItemStack")); ? "net.minecraft.nbt.MojangsonParser" : formatNMS("net.minecraft.server.NMS.MojangsonParser"));
classItemStack = ClassMapping.ITEM_STACK.getClazz();
classCraftItemStack = Class.forName(formatNMS("org.bukkit.craftbukkit.NMS.inventory.CraftItemStack")); classCraftItemStack = Class.forName(formatNMS("org.bukkit.craftbukkit.NMS.inventory.CraftItemStack"));
classNBTTagCompound = Class.forName(formatNMS("net.minecraft.server.NMS.NBTTagCompound")); classNBTTagCompound = ClassMapping.NBT_TAG_COMPOUND.getClazz();
classBukkitItemStack = Class.forName("org.bukkit.inventory.ItemStack"); classBukkitItemStack = Class.forName("org.bukkit.inventory.ItemStack");
methodParseString = classMojangsonParser.getMethod("parse", String.class); methodParseString = classMojangsonParser.getMethod("parse", String.class);