NBTItem for 1.18,1.17 and 1.16.5

core/pom.xml

@@ -163,7 +163,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId><!-- Using spigot instead of spigot-api to access GameProfile class -->
-            <version>1.18-pre8-R0.1-SNAPSHOT</version>
+            <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

core/src/main/java/de/jeff_media/jefflib/JeffLib.java

@@ -64,6 +64,7 @@ public static Random getRandom() {
      */
     public static void registerPlayerScrollEvent() {
         JeffLibNotInitializedException.check();
+
         Bukkit.getPluginManager().registerEvents(new PlayerScrollListener(), main);
     }
 

core/src/main/java/de/jeff_media/jefflib/internal/nms/AbstractNMSHandler.java

@@ -7,6 +7,7 @@
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 @InternalOnly
@@ -30,4 +31,6 @@ public interface AbstractNMSHandler {
 
     void setHeadTexture(@NotNull final Block block, @NotNull final GameProfile gameProfile);
 
+    NBTItem getNBTItem(ItemStack item);
+
 }

core/src/main/java/de/jeff_media/jefflib/internal/nms/NBTItem.java

@@ -0,0 +1,30 @@
+package de.jeff_media.jefflib.internal.nms;
+
+import de.jeff_media.jefflib.internal.InternalOnly;
+import org.bukkit.inventory.ItemStack;
+
+@InternalOnly
+public abstract class NBTItem {
+
+
+    public abstract void setString(String key,String value);
+    public abstract void setBoolean(String key,boolean value);
+    public abstract void setInt(String key,int value);
+    public abstract void setLong(String key,long value);
+    public abstract void setDouble(String key,double value);
+
+
+    public abstract String getString(String key);
+    public abstract boolean getBoolean(String key);
+    public abstract int getInt(String key);
+    public abstract long getLong(String key);
+    public abstract double getDouble(String key);
+
+
+    public abstract boolean hasKey(String key);
+
+    public abstract ItemStack getBukkitItem();
+
+    public abstract void removeKey(String key);
+
+}

spigot_1_16_R1/pom.xml

@@ -24,13 +24,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

spigot_1_16_R1/src/main/java/de/jeff_media/jefflib/internal/nms/v1_16_R1/NMSHandler.java

@@ -5,6 +5,7 @@
 import de.jeff_media.jefflib.data.Hologram;
 import de.jeff_media.jefflib.data.tuples.Pair;
 import de.jeff_media.jefflib.internal.nms.AbstractNMSHandler;
+import de.jeff_media.jefflib.internal.nms.NBTItem;
 import net.minecraft.server.v1_16_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +15,7 @@
 import org.bukkit.craftbukkit.v1_16_R1.util.CraftChatMessage;
 //import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public class NMSHandler implements AbstractNMSHandler {
@@ -99,4 +101,8 @@ public void setHeadTexture(final Block block, final @NotNull GameProfile gamePro
     }
 
 
+    @Override
+    public NBTItem getNBTItem(ItemStack item) {
+        return null;
+    }
 }

spigot_1_16_R2/pom.xml

@@ -24,13 +24,14 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.3-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
+
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

spigot_1_16_R2/src/main/java/de/jeff_media/jefflib/internal/nms/v1_16_R2/NMSHandler.java

@@ -5,6 +5,7 @@
 import de.jeff_media.jefflib.data.Hologram;
 import de.jeff_media.jefflib.data.tuples.Pair;
 import de.jeff_media.jefflib.internal.nms.AbstractNMSHandler;
+import de.jeff_media.jefflib.internal.nms.NBTItem;
 import net.minecraft.server.v1_16_R2.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +15,7 @@
 import org.bukkit.craftbukkit.v1_16_R2.util.CraftChatMessage;
 //import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public class NMSHandler implements AbstractNMSHandler {
@@ -98,5 +100,10 @@ public void setHeadTexture(final Block block, final @NotNull GameProfile gamePro
         skull.setGameProfile(gameProfile);
     }
 
+    @Override
+    public NBTItem getNBTItem(ItemStack item) {
+        return null;
+    }
+
 
 }

spigot_1_16_R3/src/main/java/de/jeff_media/jefflib/internal/nms/v1_16_R3/NBTItemHandler.java

@@ -0,0 +1,84 @@
+package de.jeff_media.jefflib.internal.nms.v1_16_R3;
+
+import de.jeff_media.jefflib.internal.nms.NBTItem;
+import net.minecraft.server.v1_16_R3.ItemStack;
+import net.minecraft.server.v1_16_R3.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+
+public class NBTItemHandler extends NBTItem {
+
+    private ItemStack nmsItem;
+    private NBTTagCompound compound;
+
+    public NBTItemHandler(org.bukkit.inventory.ItemStack item){
+        if(item==null) return;
+        this.nmsItem = CraftItemStack.asNMSCopy(item);
+        this.compound = nmsItem.getOrCreateTag();
+    }
+
+    @Override
+    public void setString(String key, String value) {
+        compound.setString(key,value);
+    }
+
+    @Override
+    public void setBoolean(String key, boolean value) {
+        compound.setBoolean(key,value);
+    }
+
+    @Override
+    public void setInt(String key, int value) {
+        compound.setInt(key,value);
+    }
+
+    @Override
+    public void setLong(String key, long value) {
+        compound.setLong(key,value);
+    }
+
+    @Override
+    public void setDouble(String key, double value) {
+        compound.setDouble(key,value);
+    }
+
+    @Override
+    public String getString(String key) {
+        return compound.getString(key);
+    }
+
+    @Override
+    public boolean getBoolean(String key) {
+        return compound.getBoolean(key);
+    }
+
+    @Override
+    public int getInt(String key) {
+        return compound.getInt(key);
+    }
+
+    @Override
+    public long getLong(String key) {
+        return compound.getLong(key);
+    }
+
+    @Override
+    public double getDouble(String key) {
+        return compound.getDouble(key);
+    }
+
+    @Override
+    public boolean hasKey(String key) {
+        return compound.hasKey(key);
+    }
+
+    @Override
+    public org.bukkit.inventory.ItemStack getBukkitItem() {
+        nmsItem.save(compound);
+        return CraftItemStack.asBukkitCopy(nmsItem);
+    }
+
+    @Override
+    public void removeKey(String key) {
+        compound.remove(key);
+    }
+}

spigot_1_16_R3/src/main/java/de/jeff_media/jefflib/internal/nms/v1_16_R3/NMSHandler.java

@@ -5,6 +5,8 @@
 import de.jeff_media.jefflib.data.Hologram;
 import de.jeff_media.jefflib.data.tuples.Pair;
 import de.jeff_media.jefflib.internal.nms.AbstractNMSHandler;
+import de.jeff_media.jefflib.internal.nms.NBTItem;
+import lombok.Lombok;
 import net.minecraft.server.v1_16_R3.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +16,7 @@
 import org.bukkit.craftbukkit.v1_16_R3.util.CraftChatMessage;
 //import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public class NMSHandler implements AbstractNMSHandler {
@@ -98,5 +101,11 @@ public void setHeadTexture(final Block block, final @NotNull GameProfile gamePro
         skull.setGameProfile(gameProfile);
     }
 
+    @Override
+    public NBTItem getNBTItem(ItemStack item) {
+
+        return new NBTItemHandler(item);
+    }
+
 
 }

spigot_1_17_R1/src/main/java/de/jeff_media/jefflib/internal/nms/v1_17_R1/NBTItemHandler.java

@@ -0,0 +1,84 @@
+package de.jeff_media.jefflib.internal.nms.v1_17_R1;
+
+import de.jeff_media.jefflib.internal.nms.NBTItem;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+
+public class NBTItemHandler extends NBTItem {
+
+    private ItemStack nmsItem;
+    private NBTTagCompound compound;
+
+    public NBTItemHandler(org.bukkit.inventory.ItemStack item){
+        if(item==null) return;
+        this.nmsItem = CraftItemStack.asNMSCopy(item);
+        this.compound = nmsItem.getOrCreateTag();
+    }
+
+    @Override
+    public void setString(String key, String value) {
+        compound.setString(key,value);
+    }
+
+    @Override
+    public void setBoolean(String key, boolean value) {
+        compound.setBoolean(key,value);
+    }
+
+    @Override
+    public void setInt(String key, int value) {
+        compound.setInt(key,value);
+    }
+
+    @Override
+    public void setLong(String key, long value) {
+        compound.setLong(key,value);
+    }
+
+    @Override
+    public void setDouble(String key, double value) {
+        compound.setDouble(key,value);
+    }
+
+    @Override
+    public String getString(String key) {
+        return compound.getString(key);
+    }
+
+    @Override
+    public boolean getBoolean(String key) {
+        return compound.getBoolean(key);
+    }
+
+    @Override
+    public int getInt(String key) {
+        return compound.getInt(key);
+    }
+
+    @Override
+    public long getLong(String key) {
+        return compound.getLong(key);
+    }
+
+    @Override
+    public double getDouble(String key) {
+        return compound.getDouble(key);
+    }
+
+    @Override
+    public boolean hasKey(String key) {
+        return compound.hasKey(key);
+    }
+
+    @Override
+    public org.bukkit.inventory.ItemStack getBukkitItem() {
+        nmsItem.save(compound);
+        return CraftItemStack.asBukkitCopy(nmsItem);
+    }
+
+    @Override
+    public void removeKey(String key) {
+        compound.remove(key);
+    }
+}

spigot_1_17_R1/src/main/java/de/jeff_media/jefflib/internal/nms/v1_17_R1/NMSHandler.java

@@ -5,6 +5,7 @@
 import de.jeff_media.jefflib.data.Hologram;
 import de.jeff_media.jefflib.data.tuples.Pair;
 import de.jeff_media.jefflib.internal.nms.AbstractNMSHandler;
+import de.jeff_media.jefflib.internal.nms.NBTItem;
 import net.minecraft.core.BlockPosition;
 import net.minecraft.network.chat.IChatBaseComponent;
 import net.minecraft.network.protocol.Packet;
@@ -23,6 +24,7 @@
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public class NMSHandler implements AbstractNMSHandler {
@@ -107,6 +109,8 @@ public void setHeadTexture(final @NotNull Block block, final @NotNull GameProfil
         skull.setGameProfile(gameProfile);
     }
 
-
-
+    @Override
+    public NBTItem getNBTItem(ItemStack item) {
+        return new NBTItemHandler(item);
+    }
 }

spigot_1_18_R1/pom.xml

@@ -57,13 +57,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18-pre8-R0.1-SNAPSHOT</version>
+            <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.18-pre8-R0.1-SNAPSHOT</version>
+            <version>1.18-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>