From 889b3dee9402142a488586ea947cd71b3845d966 Mon Sep 17 00:00:00 2001 From: SammySemicolon <69329424+SammySemicolon@users.noreply.github.com> Date: Mon, 28 Oct 2024 03:08:00 +0100 Subject: [PATCH] Update DataGenerators.java --- .../com/sammy/malum/data/DataGenerators.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/sammy/malum/data/DataGenerators.java b/src/main/java/com/sammy/malum/data/DataGenerators.java index 7fdd81b1f..b006704b1 100644 --- a/src/main/java/com/sammy/malum/data/DataGenerators.java +++ b/src/main/java/com/sammy/malum/data/DataGenerators.java @@ -21,23 +21,26 @@ public class DataGenerators { @SubscribeEvent public static void gatherData(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - PackOutput output = generator.getPackOutput(); - CompletableFuture provider = event.getLookupProvider(); - ExistingFileHelper helper = event.getExistingFileHelper(); + var generator = event.getGenerator(); + var output = generator.getPackOutput(); + var provider = event.getLookupProvider(); + var helper = event.getExistingFileHelper(); - MalumItemModels itemModelsProvider = new MalumItemModels(output, helper); - MalumBlockTags blockTagsProvider = new MalumBlockTags(output, provider, helper); + var itemModelsProvider = new MalumItemModels(output, helper); + var blockStatesProvider = new MalumBlockStates(output, helper, itemModelsProvider); + + var blockTagsProvider = new MalumBlockTags(output, provider, helper); + var itemTagsProvider = new MalumItemTags(output, provider, blockTagsProvider.contentsGetter(), helper); // generator.addProvider(event.includeClient(), new MalumFusionBlockModels(output)); - generator.addProvider(event.includeClient(), new MalumBlockStates(output, helper, itemModelsProvider)); generator.addProvider(event.includeClient(), itemModelsProvider); - + generator.addProvider(event.includeClient(), blockStatesProvider); generator.addProvider(event.includeServer(), blockTagsProvider); + generator.addProvider(event.includeServer(), itemTagsProvider); + generator.addProvider(event.includeServer(), new MalumBlockLootTables(output)); - generator.addProvider(event.includeServer(), new MalumItemTags(output, provider, blockTagsProvider.contentsGetter(), helper)); generator.addProvider(event.includeServer(), new MalumRecipes(output));