Merge pull request #4 from AerWyn81/master

Added support 1.20.2

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "fr.fabienhebuterne.customcraft"
-    version = "1.5.0"
+    version = "1.5.1"
 
     apply(plugin = "base")
     apply(plugin = "java")

common/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     implementation(project(":nms:v1_19_R2"))
     implementation(project(":nms:v1_19_R3"))
     implementation(project(":nms:v1_20_R1"))
+    implementation(project(":nms:v1_20_R2"))
 }
 
 tasks.withType<Jar> {

common/src/main/java/fr/fabienhebuterne/customcraft/nms/NmsLoader.java

@@ -22,6 +22,7 @@ public static ItemStackSerializer loadNms(Plugin plugin) {
             case "v1_19_R2" -> new ItemStackSerializer_1_19_R2();
             case "v1_19_R3" -> new ItemStackSerializer_1_19_R3();
             case "v1_20_R1" -> new ItemStackSerializer_1_20_R1();
+            case "v1_20_R2" -> new ItemStackSerializer_1_20_R2();
             default -> {
                 Bukkit.getLogger().severe("Your server version isn't compatible with CustomCraft");
                 if (plugin != null) {

nms/v1_20_R2/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("java")
+}
+
+dependencies {
+    implementation(project(":nms:interfaces"))
+    compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly(files("../../libs/spigot-1.20.2-R0.1-SNAPSHOT.jar"))
+}

nms/v1_20_R2/src/main/java/fr/fabienhebuterne/customcraft/nms/ItemStackSerializer_1_20_R2.java

@@ -0,0 +1,53 @@
+package fr.fabienhebuterne.customcraft.nms;
+
+import com.google.common.io.BaseEncoding;
+import net.minecraft.nbt.NBTCompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.inventory.ItemStack;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class ItemStackSerializer_1_20_R2 implements ItemStackSerializer {
+    @Override
+    public String serializeItemStack(ItemStack itemStack) {
+        if (itemStack == null) {
+            return "null";
+        }
+
+        ByteArrayOutputStream outputStream = null;
+
+        try {
+            NBTTagCompound nbtTagCompound = new NBTTagCompound();
+            net.minecraft.world.item.ItemStack itemStackNms = CraftItemStack.asNMSCopy(itemStack);
+            NBTTagCompound nbtToSave = itemStackNms.b(nbtTagCompound);
+            outputStream = new ByteArrayOutputStream();
+            NBTCompressedStreamTools.a(nbtToSave, outputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return BaseEncoding.base64().encode(outputStream.toByteArray());
+    }
+
+    @Override
+    public ItemStack deserializeItemStack(String itemStack) {
+        if (itemStack.equals("null")) {
+            return null;
+        }
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(BaseEncoding.base64().decode(itemStack));
+
+        try {
+            NBTTagCompound tagCompound = NBTCompressedStreamTools.a(inputStream);
+            net.minecraft.world.item.ItemStack itemStackNms = net.minecraft.world.item.ItemStack.a(tagCompound);
+            return CraftItemStack.asBukkitCopy(itemStackNms);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}

settings.gradle.kts

@@ -6,5 +6,6 @@ include(
     "nms:v1_19_R1",
     "nms:v1_19_R2",
     "nms:v1_19_R3",
-    "nms:v1_20_R1"
+    "nms:v1_20_R1",
+    "nms:v1_20_R2"
 )