fix: Fix chestLootHoldsBlockheadSeeds not working reliably on modded loot chests

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/pantryforblockheads/loot/ModLootModifiers.java

@@ -1,16 +1,20 @@
 package net.blay09.mods.pantryforblockheads.loot;
 
 import net.blay09.mods.balm.Balm;
-import net.blay09.mods.balm.world.level.storage.loot.UnpackedLootTableHolder;
+import net.blay09.mods.balm.world.level.storage.loot.BalmLootModifier;
 import net.blay09.mods.pantryforblockheads.PantryForBlockheads;
 import net.blay09.mods.pantryforblockheads.tag.ModBlockTags;
-import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.Util;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import org.jspecify.annotations.Nullable;
+
+import java.util.List;
 
 public final class ModLootModifiers {
     private static final ThreadLocal<Boolean> isApplyingSeedChestLoot = ThreadLocal.withInitial(() -> false);
@@ -20,50 +24,51 @@ private ModLootModifiers() {
     }
 
     public static void initialize() {
-        Balm.lootModifiers().registerLootModifier(PantryForBlockheads.id("seed_chest_loot"), (context, loot) -> {
-            if (isApplyingSeedChestLoot.get() || !context.hasParameter(LootContextParams.ORIGIN)) {
-                return;
-            }
+        Balm.lootModifiers().registerLootModifier(PantryForBlockheads.id("seed_chest_loot"), new BalmLootModifier() {
+            @Override
+            public void apply(LootContext context, List<ItemStack> loot, @Nullable ResourceKey<LootTable> lootTableId) {
+                if (isApplyingSeedChestLoot.get() || lootTableId == null) {
+                    return;
+                }
 
-            final var blockEntity = context.getLevel().getBlockEntity(BlockPos.containing(context.getParameter(LootContextParams.ORIGIN)));
-            if (blockEntity instanceof UnpackedLootTableHolder unpackedLootTableHolder) {
-                unpackedLootTableHolder.balm$getUnpackedLootTable().ifPresent(lootTableId -> {
-                    if (PantryForBlockheads.config().vanillaModifications.chestLootHoldsBlockheadSeeds) {
-                        final var level = context.getLevel();
-                        final var additionsLootTable = Identifier.fromNamespaceAndPath(PantryForBlockheads.MOD_ID, lootTableId.identifier().getPath()).withPrefix("loot_additions/");
-                        final var lootTable = level.getServer().reloadableRegistries().getLootTable(ResourceKey.create(Registries.LOOT_TABLE, additionsLootTable));
-                        isApplyingSeedChestLoot.set(true);
-                        try {
-                            lootTable.getRandomItems(context, loot::add);
-                        } finally {
-                            isApplyingSeedChestLoot.set(false);
-                        }
+                if (PantryForBlockheads.config().vanillaModifications.chestLootHoldsBlockheadSeeds) {
+                    final var level = context.getLevel();
+                    final var additionsLootTable = Identifier.fromNamespaceAndPath(PantryForBlockheads.MOD_ID, lootTableId.identifier().getPath()).withPrefix("loot_additions/");
+                    final var lootTable = level.getServer().reloadableRegistries().getLootTable(ResourceKey.create(Registries.LOOT_TABLE, additionsLootTable));
+                    isApplyingSeedChestLoot.set(true);
+                    try {
+                        lootTable.getRandomItems(context, loot::add);
+                    } finally {
+                        isApplyingSeedChestLoot.set(false);
                     }
-                });
+                }
             }
         });
 
-        Balm.lootModifiers().registerLootModifier(PantryForBlockheads.id("grass_seeds"), (context, loot) -> {
-            if (isApplyingGrassSeeds.get()) {
-                return;
-            }
+        Balm.lootModifiers().registerLootModifier(PantryForBlockheads.id("grass_seeds"), new BalmLootModifier() {
+            @Override
+            public void apply(LootContext context, List<ItemStack> loot, @Nullable ResourceKey<LootTable> lootTableId) {
+                if (isApplyingGrassSeeds.get()) {
+                    return;
+                }
 
-            if (!PantryForBlockheads.config().vanillaModifications.grassDropsBlockheadSeeds) {
-                return;
-            }
+                if (!PantryForBlockheads.config().vanillaModifications.grassDropsBlockheadSeeds) {
+                    return;
+                }
 
-            final BlockState blockState = context.getOptionalParameter(LootContextParams.BLOCK_STATE);
-            if (blockState == null || !blockState.is(ModBlockTags.DROPS_SEEDS)) {
-                return;
-            }
+                final BlockState blockState = context.getOptionalParameter(LootContextParams.BLOCK_STATE);
+                if (blockState == null || !blockState.is(ModBlockTags.DROPS_SEEDS)) {
+                    return;
+                }
 
-            final var level = context.getLevel();
-            final var grassSeedLootTable = level.getServer().reloadableRegistries().getLootTable(ModLootTables.GRASS_SEEDS);
-            isApplyingGrassSeeds.set(true);
-            try {
-                grassSeedLootTable.getRandomItems(context, loot::add);
-            } finally {
-                isApplyingGrassSeeds.set(false);
+                final var level = context.getLevel();
+                final var grassSeedLootTable = level.getServer().reloadableRegistries().getLootTable(ModLootTables.GRASS_SEEDS);
+                isApplyingGrassSeeds.set(true);
+                try {
+                    grassSeedLootTable.getRandomItems(context, loot::add);
+                } finally {
+                    isApplyingGrassSeeds.set(false);
+                }
             }
         });
     }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-balm = "26.1.2.2"
+balm = "26.1.2.3-SNAPSHOT"
 minecraft = "26.1.2"
 neoForm = "26.1.2-1"
 neoForge = "26.1.2.12-beta"