From a572c3eb817623377e44a71e4756f67e5daba0ce Mon Sep 17 00:00:00 2001
From: Choonster TheMage <Choonster.2010@gmail.com>
Date: Sat, 11 May 2024 02:10:07 +1000
Subject: [PATCH] Fix LootItemHandler

---
 .../itemhandler/LootItemHandler.java          | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/choonster/testmod3/world/inventory/itemhandler/LootItemHandler.java b/src/main/java/choonster/testmod3/world/inventory/itemhandler/LootItemHandler.java
index 706f8a11..e100bd0e 100644
--- a/src/main/java/choonster/testmod3/world/inventory/itemhandler/LootItemHandler.java
+++ b/src/main/java/choonster/testmod3/world/inventory/itemhandler/LootItemHandler.java
@@ -3,8 +3,10 @@
 import choonster.testmod3.util.InventoryUtils;
 import com.google.common.base.Preconditions;
 import net.minecraft.core.NonNullList;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
@@ -34,12 +36,12 @@ public class LootItemHandler extends ItemStackHandler {
 	protected final Supplier<Level> levelSupplier;
 
 	/**
-	 * The location of the {@link LootTable} to generate loot from.
+	 * The key of the {@link LootTable} to generate loot from.
 	 * <p>
 	 * This will be {@code null} if no {@link LootTable} has been set or loot has already been generated.
 	 */
 	@Nullable
-	protected ResourceLocation lootTableLocation;
+	protected ResourceKey<LootTable> lootTable;
 
 	/**
 	 * The random seed to use when generating loot.
@@ -67,8 +69,8 @@ public LootItemHandler(final NonNullList<ItemStack> stacks, final Supplier<Level
 	 * @return Was the location written to NBT?
 	 */
 	protected boolean checkLootAndWrite(final CompoundTag compound) {
-		if (lootTableLocation != null) {
-			compound.putString("LootTable", lootTableLocation.toString());
+		if (lootTable != null) {
+			compound.putString("LootTable", lootTable.location().toString());
 
 			if (lootTableSeed != 0L) {
 				compound.putLong("LootTableSeed", lootTableSeed);
@@ -88,7 +90,7 @@ protected boolean checkLootAndWrite(final CompoundTag compound) {
 	 */
 	protected boolean checkLootAndRead(final CompoundTag compound) {
 		if (compound.contains("LootTable", Tag.TAG_STRING)) {
-			lootTableLocation = new ResourceLocation(compound.getString("LootTable"));
+			lootTable = ResourceKey.create(Registries.LOOT_TABLE, new ResourceLocation(compound.getString("LootTable")));
 			lootTableSeed = compound.getLong("LootTableSeed");
 			return true;
 		} else {
@@ -126,10 +128,10 @@ public void deserializeNBT(final CompoundTag nbt) {
 	 */
 	public void fillWithLoot(@Nullable final Player player) {
 		final var level = levelSupplier.get();
-		if (lootTableLocation != null && level != null && !level.isClientSide) {
+		if (lootTable != null && level != null && !level.isClientSide) {
 			final var server = Preconditions.checkNotNull(level.getServer());
-			final var lootTable = server.getLootData().getLootTable(lootTableLocation);
-			lootTableLocation = null;
+			final var lootTable = server.reloadableRegistries().getLootTable(this.lootTable);
+			this.lootTable = null;
 
 			final var builder = new LootParams.Builder((ServerLevel) level);
 
@@ -179,7 +181,7 @@ public void setStackInSlot(final int slot, final ItemStack stack) {
 	}
 
 	@Nullable
-	public ResourceLocation getLootTable() {
-		return lootTableLocation;
+	public ResourceKey<LootTable> getLootTable() {
+		return lootTable;
 	}
 }