trueog/Utilities-OG
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from SKBotNL/main

Browse Source 
Fix item slots and use CraftBukkit and NMS APIs to deserialize slot NBT tags
This commit was merged in pull request #6.
This commit is contained in:
NotAlexNoyle authored and GitHub committed 2026-09-16 12:46:51 -04:00
2 parents 6e165d05d1 0a02285270
commit 4aae52d843
1 file changed
+35 -15
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/trueog/utilitiesog/UtilitiesOG.java
+35 -15
View File
@@ -14,7 +14,7 @@ import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
import net.trueog.utilitiesog.utils.PlayerDataUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
@@ -504,19 +504,20 @@ public final class UtilitiesOG extends JavaPlugin {
for (int i = 0; i < inventoryData.size(); i++) {
final CompoundTag slotTag = inventoryData.getCompound(i);
final int slot = slotTag.getByte("Slot") & 0xFF;
final String id = slotTag.getString("id");
final int count = slotTag.getByte("Count") & 0xFF;
final Material material = Material.matchMaterial(id);
if (material == null) {
final byte slot = slotTag.getByte("Slot");
final ItemStack itemStack = CraftItemStack.asBukkitCopy(net.minecraft.world.item.ItemStack.of(slotTag));
continue;
if (slot >= 0 && slot <= 35) {
}
inventoryContents[slot] = itemStack;
if (slot < inventoryContents.length) {
} else if (slot >= 100 && slot <= 103) {
inventoryContents[slot] = new ItemStack(material, count);
inventoryContents[slot - 64] = itemStack;
} else if (slot == -106) {
inventoryContents[40] = itemStack;
}
@@ -529,7 +530,7 @@ public final class UtilitiesOG extends JavaPlugin {
public static void setInventoryData(UUID uuid, @Nullable ItemStack @NotNull [] items) {
final ListTag inventoryData = new ListTag();
for (int i = 0; i < items.length; i++) {
for (byte i = 0; i < items.length; i++) {
final ItemStack item = items[i];
if (item == null) {
@@ -538,10 +539,29 @@ public final class UtilitiesOG extends JavaPlugin {
}
final CompoundTag slotTag = new CompoundTag();
slotTag.putByte("Slot", (byte) i);
slotTag.putString("id", item.getType().getKey().toString());
slotTag.putByte("Count", (byte) item.getAmount());
final byte slot;
if (i <= 35) {
slot = i;
} else if (i <= 39) {
slot = (byte) (i + 64);
} else if (i == 40) {
slot = -106;
} else {
continue;
}
CompoundTag slotTag = new CompoundTag();
CraftItemStack.asNMSCopy(item).save(slotTag);
slotTag.putByte("Slot", slot);
inventoryData.add(slotTag);
}