diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java index 20c326586..601609099 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java @@ -1,5 +1,6 @@ package net.momirealms.craftengine.bukkit.item; +import com.saicone.rtag.item.ItemTagStream; import net.momirealms.craftengine.bukkit.item.behavior.BucketItemBehavior; import net.momirealms.craftengine.bukkit.item.behavior.FlintAndSteelItemBehavior; import net.momirealms.craftengine.bukkit.item.behavior.WaterBucketItemBehavior; @@ -138,7 +139,10 @@ public class BukkitItemManager extends AbstractItemManager { @Override public Item fromByteArray(byte[] bytes) { - return this.factory.wrap(ItemStack.deserializeBytes(bytes)); + if (VersionHelper.isOrAbove1_21_6()) { + return this.factory.wrap(ItemStack.deserializeBytes(bytes)); + } + return this.factory.wrap(ItemTagStream.INSTANCE.fromBytes(bytes)); } @Override diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java index 5cf774fd7..3dcff2fc1 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java @@ -1,6 +1,7 @@ package net.momirealms.craftengine.bukkit.item.factory; import com.google.gson.JsonElement; +import com.saicone.rtag.item.ItemTagStream; import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections; import net.momirealms.craftengine.bukkit.util.ItemTags; import net.momirealms.craftengine.core.item.ItemFactory; @@ -9,6 +10,7 @@ import net.momirealms.craftengine.core.item.JukeboxPlayable; import net.momirealms.craftengine.core.item.setting.EquipmentData; import net.momirealms.craftengine.core.plugin.CraftEngine; import net.momirealms.craftengine.core.util.Key; +import net.momirealms.craftengine.core.util.VersionHelper; import net.momirealms.sparrow.nbt.Tag; import org.bukkit.inventory.ItemStack; @@ -48,7 +50,10 @@ public abstract class BukkitItemFactory> extend @Override protected byte[] toByteArray(W item) { - return item.getItem().serializeAsBytes(); + if (VersionHelper.isOrAbove1_21_6()) { + return item.getItem().serializeAsBytes(); + } + return ItemTagStream.INSTANCE.toBytes(item.getItem()); } @Override