diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java b/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java index 3927308..0c0ecec 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java @@ -26,7 +26,7 @@ public class DataGenerators { generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModSoundDefinitionsProvider(generator, existingFileHelper)); - generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); + generator.addProvider(event.includeServer(), new ModLootTableProvider(generator, lookupProvider)); generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider)); } } diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/loot/ModBlockLootTableProvider.java b/src/main/java/dev/micle/firefly_bush_backport/data/loot/ModBlockLootTableProvider.java index 9365028..076b56a 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/data/loot/ModBlockLootTableProvider.java +++ b/src/main/java/dev/micle/firefly_bush_backport/data/loot/ModBlockLootTableProvider.java @@ -1,17 +1,17 @@ package dev.micle.firefly_bush_backport.data.loot; import dev.micle.firefly_bush_backport.block.ModBlocks; +import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.Block; -import net.minecraftforge.registries.RegistryObject; import org.jetbrains.annotations.NotNull; import java.util.Set; public class ModBlockLootTableProvider extends BlockLootSubProvider { - public ModBlockLootTableProvider() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + public ModBlockLootTableProvider(HolderLookup.Provider provider) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), provider); } @Override @@ -21,6 +21,6 @@ public class ModBlockLootTableProvider extends BlockLootSubProvider { @Override protected @NotNull Iterable getKnownBlocks() { - return ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator; + return ModBlocks.BLOCKS.getEntries().stream().map(x -> (Block)x.value())::iterator; } } diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/server/ModLootTableProvider.java b/src/main/java/dev/micle/firefly_bush_backport/data/server/ModLootTableProvider.java index 4d30a38..f7f7333 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/data/server/ModLootTableProvider.java +++ b/src/main/java/dev/micle/firefly_bush_backport/data/server/ModLootTableProvider.java @@ -1,17 +1,19 @@ package dev.micle.firefly_bush_backport.data.server; import dev.micle.firefly_bush_backport.data.loot.ModBlockLootTableProvider; +import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; public class ModLootTableProvider extends LootTableProvider { - public ModLootTableProvider(DataGenerator generator) { + public ModLootTableProvider(DataGenerator generator, CompletableFuture registries) { super(generator.getPackOutput(), Set.of(), List.of( new LootTableProvider.SubProviderEntry(ModBlockLootTableProvider::new, LootContextParamSets.BLOCK) - )); + ), registries); } }