diff --git a/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch b/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch index 7c0e20fde1..09324c7782 100644 --- a/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch +++ b/patches/minecraft/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java +++ b/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.java -@@ -55,7 +_,13 @@ +@@ -55,7 +_,15 @@ ResourceLocation resourcelocation1 = filetoidconverter.fileToId(resourcelocation); try (Reader reader = entry.getValue().openAsReader()) { @@ -12,6 +12,8 @@ + continue; + } + p_368755_.parse(p_369854_, json).ifSuccess(p_370131_ -> { ++ p_370131_ = net.minecraftforge.common.ForgeHooks.onJsonDataParsed(p_368755_, resourcelocation1, p_370131_); ++ if (p_370131_ == null) return; if (p_279404_.putIfAbsent(resourcelocation1, (T)p_370131_) != null) { throw new IllegalStateException("Duplicate data file ignored with ID " + resourcelocation1); } diff --git a/patches/minecraft/net/minecraft/world/level/storage/loot/LootDataType.java.patch b/patches/minecraft/net/minecraft/world/level/storage/loot/LootDataType.java.patch deleted file mode 100644 index c793505791..0000000000 --- a/patches/minecraft/net/minecraft/world/level/storage/loot/LootDataType.java.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/net/minecraft/world/level/storage/loot/LootDataType.java -+++ b/net/minecraft/world/level/storage/loot/LootDataType.java -@@ -29,9 +_,12 @@ - } - - private static LootDataType.Validator createLootTableValidator() { -- return (p_327551_, p_327552_, p_327553_) -> p_327553_.validate( -+ return (p_327551_, p_327552_, p_327553_) -> { -+ p_327553_.setLootTableId(p_327552_.location()); -+ p_327553_.validate( - p_327551_.setContextKeySet(p_327553_.getParamSet()).enterElement("{" + p_327552_.registry() + "/" + p_327552_.location() + "}", p_327552_) - ); -+ }; - } - - @FunctionalInterface diff --git a/patches/minecraft/net/minecraft/world/level/storage/loot/LootTable.java.patch b/patches/minecraft/net/minecraft/world/level/storage/loot/LootTable.java.patch index a77d8cb9fa..50da067952 100644 --- a/patches/minecraft/net/minecraft/world/level/storage/loot/LootTable.java.patch +++ b/patches/minecraft/net/minecraft/world/level/storage/loot/LootTable.java.patch @@ -60,7 +60,7 @@ return objectarraylist; } -@@ -210,6 +_,54 @@ +@@ -210,6 +_,68 @@ public static LootTable.Builder lootTable() { return new LootTable.Builder(); @@ -90,6 +90,20 @@ + return null; + } + ++ public int poolCount() { ++ return this.pools.size(); ++ } ++ ++ public LootPool getPool(int entry) { ++ return this.pools.get(entry); ++ } ++ ++ @org.jetbrains.annotations.Nullable ++ public LootPool removePool(int entry) { ++ checkFrozen(); ++ return this.pools.remove(entry); ++ } ++ + public void addPool(LootPool pool) { + checkFrozen(); + if (pools.stream().anyMatch(e -> e == pool)) { diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index cff683126f..efa7a7179b 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -88,6 +88,7 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.WorldData; import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootDataType; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.block.state.BlockState; @@ -1242,4 +1243,15 @@ public final class ForgeHooks { public static DataComponentMap gatherItemComponents(Item item, DataComponentMap dataComponents) { return DataComponentMap.composite(dataComponents, ForgeEventFactory.gatherItemComponentsEvent(item, dataComponents).getDataComponentMap()); } + + @SuppressWarnings("unchecked") + public static T onJsonDataParsed(Codec codec, ResourceLocation key, T value) { + if (codec == LootDataType.TABLE.codec()) { + var table = (LootTable)value; + table.setLootTableId(key); + value = (T)net.minecraftforge.event.ForgeEventFactory.onLoadLootTable(key, table); + } + + return value; + } } \ No newline at end of file diff --git a/src/test/generated/loot_events/data/loot_events/loot_table/blocks/test.json b/src/test/generated/loot_events/data/loot_events/loot_table/blocks/test.json new file mode 100644 index 0000000000..252f3538fc --- /dev/null +++ b/src/test/generated/loot_events/data/loot_events/loot_table/blocks/test.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:apple" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "loot_events:blocks/test" +} \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java b/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java index 2b5500f5ab..638fcc64d7 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java @@ -28,7 +28,6 @@ import net.minecraftforge.common.world.BiomeModifier; import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.test.BaseTestMod; @@ -36,7 +35,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; - @Mod(BiomeTestMod.MOD_ID) public class BiomeTestMod extends BaseTestMod { public static final String MOD_ID = "biome_test_mod"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java b/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java index 7ea6333c92..4bfc98972d 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java @@ -27,7 +27,6 @@ import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.test.BaseTestMod; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java index 6d64b0d1ac..96de0e9bb9 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java @@ -76,7 +76,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; -import java.util.stream.Collectors; @GameTestHolder("forge.global_loot_modifiers") @Mod(GlobalLootModifiersTest.MODID) diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootEventsTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootEventsTest.java new file mode 100644 index 0000000000..be2dc79057 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootEventsTest.java @@ -0,0 +1,120 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.debug.gameplay.loot; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.event.LootTableLoadEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.gametest.GameTestHolder; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import net.minecraftforge.test.BaseTestMod; + +@Mod(LootEventsTest.MODID) +@GameTestHolder("forge." + LootEventsTest.MODID) +public class LootEventsTest extends BaseTestMod { + public static final String MODID = "loot_events"; + @SuppressWarnings("unused") + private static Logger LOGGER = LogManager.getLogger(); + + private static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); + private static final RegistryObject TEST_BLOCK = BLOCKS.register("test", () -> new Block(name(MODID, "test", BlockBehaviour.Properties.of()))); + + public LootEventsTest(FMLJavaModLoadingContext context) { + super(context); + MinecraftForge.EVENT_BUS.register(ForgeEvents.class); + } + + @SubscribeEvent + public void runData(GatherDataEvent event) { + var out = event.getGenerator().getPackOutput(); + var lookup = event.getLookupProvider(); + event.getGenerator().addProvider(event.includeServer(), new LootProvider(out, lookup)); + } + + @GameTest(template = "forge:empty3x3x3") + public static void test_load_table(GameTestHelper helper) { + var center = new BlockPos(1, 1, 1); + helper.setBlock(center, TEST_BLOCK.get()); + helper.assertBlock(center, block -> block == TEST_BLOCK.get(), "Failed to set block"); + + var player = helper.makeMockServerPlayer(); + player.gameMode.destroyBlock(helper.absolutePos(center)); + + helper.assertItemEntityPresent(Items.GOLDEN_APPLE, center, 1.0); + helper.assertItemEntityNotPresent(Items.APPLE, center, 1.0); + + helper.succeed(); + } + + private class ForgeEvents { + @SubscribeEvent + public static void onLootTableLoad(LootTableLoadEvent event) { + if (event.getName().equals(TEST_BLOCK.get().getLootTable().orElse(null).location())) { + event.getTable().removePool(0); + event.getTable().addPool( + LootPool.lootPool() + .setRolls(ConstantValue.exactly(1f)) + .add(LootItem.lootTableItem(Items.GOLDEN_APPLE)) + .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1))) + .build() + ); + } + } + } + + private static class LootProvider extends LootTableProvider { + public LootProvider(PackOutput out, CompletableFuture lookup) { + super(out, Set.of(), List.of( + new LootTableProvider.SubProviderEntry(BlockLoot::new, LootContextParamSets.BLOCK) + ), lookup); + } + + private static class BlockLoot extends BlockLootSubProvider implements IConditionBuilder { + public BlockLoot(HolderLookup.Provider lookup) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), lookup); + } + + @Override + protected Iterable getKnownBlocks() { + return List.of(TEST_BLOCK.get()); + } + + @Override + protected void generate() { + this.dropOther(TEST_BLOCK.get(), Items.APPLE); + } + } + } +} diff --git a/src/test/java/net/minecraftforge/mdk/Datagen.java b/src/test/java/net/minecraftforge/mdk/Datagen.java index 872448b558..5b699d8b95 100644 --- a/src/test/java/net/minecraftforge/mdk/Datagen.java +++ b/src/test/java/net/minecraftforge/mdk/Datagen.java @@ -12,7 +12,6 @@ import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import java.util.Optional; diff --git a/src/test/java/net/minecraftforge/test/TestHelperMod.java b/src/test/java/net/minecraftforge/test/TestHelperMod.java index ec8f137dbd..ff4ee4ef86 100644 --- a/src/test/java/net/minecraftforge/test/TestHelperMod.java +++ b/src/test/java/net/minecraftforge/test/TestHelperMod.java @@ -21,7 +21,6 @@ import net.minecraft.world.item.Items; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.RegisterEvent;