Make datagen compile (crashes at runtime, but it compiles)

mekanism · Apr 25, 2024 · a0edb8f · a0edb8f
1 parent 6eb4b06
commit a0edb8f
Show file tree

Hide file tree

Showing 40 changed files with 198 additions and 194 deletions.
diff --git a/src/datagen/additions/java/mekanism/additions/common/AdditionsAdvancementProvider.java b/src/datagen/additions/java/mekanism/additions/common/AdditionsAdvancementProvider.java
@@ -1,5 +1,6 @@
 package mekanism.additions.common;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import mekanism.additions.common.advancements.AdditionsAdvancements;
 import mekanism.additions.common.registries.AdditionsBlocks;
@@ -17,6 +18,7 @@
 import net.minecraft.advancements.critereon.KilledTrigger;
 import net.minecraft.advancements.critereon.KilledTrigger.TriggerInstance;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Items;
@@ -25,8 +27,8 @@
 
 public class AdditionsAdvancementProvider extends BaseAdvancementProvider {
 
-    public AdditionsAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper, MekanismAdditions.MODID);
+    public AdditionsAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper, MekanismAdditions.MODID);
     }
 
     @Override

diff --git a/src/datagen/additions/java/mekanism/additions/common/AdditionsDataGenerator.java b/src/datagen/additions/java/mekanism/additions/common/AdditionsDataGenerator.java
@@ -41,10 +41,10 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new AdditionsBlockStateProvider(output, existingFileHelper));
         //Server side data generators
         gen.addProvider(event.includeServer(), new AdditionsTagProvider(output, lookupProvider, existingFileHelper));
-        gen.addProvider(event.includeServer(), new AdditionsLootProvider(output));
+        gen.addProvider(event.includeServer(), new AdditionsLootProvider(output, lookupProvider));
         gen.addProvider(event.includeServer(), drProvider);
         gen.addProvider(event.includeServer(), new AdditionsDataMapsProvider(output, lookupProvider));
-        gen.addProvider(event.includeServer(), new AdditionsRecipeProvider(output, existingFileHelper));
-        gen.addProvider(event.includeServer(), new AdditionsAdvancementProvider(output, existingFileHelper));
+        gen.addProvider(event.includeServer(), new AdditionsRecipeProvider(output, lookupProvider, existingFileHelper));
+        gen.addProvider(event.includeServer(), new AdditionsAdvancementProvider(output, lookupProvider, existingFileHelper));
     }
 }
diff --git a/src/datagen/additions/java/mekanism/additions/common/loot/AdditionsLootProvider.java b/src/datagen/additions/java/mekanism/additions/common/loot/AdditionsLootProvider.java
@@ -1,16 +1,18 @@
 package mekanism.additions.common.loot;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import mekanism.common.loot.BaseLootProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 
 public class AdditionsLootProvider extends BaseLootProvider {
 
-    public AdditionsLootProvider(PackOutput output) {
+    public AdditionsLootProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
         super(output, List.of(
               new SubProviderEntry(AdditionsBlockLootTables::new, LootContextParamSets.BLOCK),
               new SubProviderEntry(AdditionsEntityLootTables::new, LootContextParamSets.ENTITY)
-        ));
+        ), provider);
     }
 }
diff --git a/src/datagen/additions/java/mekanism/additions/common/recipe/AdditionsRecipeProvider.java b/src/datagen/additions/java/mekanism/additions/common/recipe/AdditionsRecipeProvider.java
@@ -1,6 +1,7 @@
 package mekanism.additions.common.recipe;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import mekanism.additions.common.AdditionsTags;
 import mekanism.additions.common.MekanismAdditions;
 import mekanism.additions.common.block.BlockGlowPanel;
@@ -27,6 +28,8 @@
 import mekanism.common.resource.PrimaryResource;
 import mekanism.common.resource.ResourceType;
 import mekanism.common.tags.MekanismTags;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
@@ -53,8 +56,8 @@ public class AdditionsRecipeProvider extends BaseRecipeProvider {
           TripleLine.of(PLASTIC_SHEET_CHAR, Pattern.DYE, PLASTIC_SHEET_CHAR),
           TripleLine.of(Pattern.GLOWSTONE, PLASTIC_SHEET_CHAR, Pattern.GLOWSTONE));
 
-    public AdditionsRecipeProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper);
+    public AdditionsRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper);
     }
 
     @Override
@@ -73,7 +76,7 @@ protected void addRecipes(RecipeOutput consumer) {
                     TripleLine.of(OBSIDIAN_CHAR, OBSIDIAN_CHAR, OBSIDIAN_CHAR),
                     TripleLine.of(TNT_CHAR, TNT_CHAR, TNT_CHAR),
                     TripleLine.of(OBSIDIAN_CHAR, OBSIDIAN_CHAR, OBSIDIAN_CHAR))
-              ).key(OBSIDIAN_CHAR, Tags.Items.OBSIDIAN)
+              ).key(OBSIDIAN_CHAR, Tags.Items.OBSIDIANS)
               .key(TNT_CHAR, Blocks.TNT)
               .category(RecipeCategory.REDSTONE)
               .build(consumer);
@@ -105,8 +108,8 @@ private void registerBalloon(RecipeOutput consumer, ItemRegistryObject<ItemBallo
         DyeColor dye = color.getDyeColor();
         if (dye != null) {
             ExtendedShapelessRecipeBuilder.shapelessRecipe(result, 2)
-                  .addIngredient(Tags.Items.LEATHER)
-                  .addIngredient(Tags.Items.STRING)
+                  .addIngredient(Tags.Items.LEATHERS)
+                  .addIngredient(Tags.Items.STRINGS)
                   .addIngredient(dye.getTag())
                   .category(RecipeCategory.DECORATIONS)
                   .build(consumer, MekanismAdditions.rl(basePath + colorString));

diff --git a/src/datagen/additions/java/mekanism/additions/common/recipe/PlasticBlockRecipeProvider.java b/src/datagen/additions/java/mekanism/additions/common/recipe/PlasticBlockRecipeProvider.java
@@ -158,7 +158,7 @@ private void registerPlasticRoad(RecipeOutput consumer, BlockRegistryObject<? ex
         EnumColor color = result.getBlock().getColor();
         ExtendedShapedRecipeBuilder.shapedRecipe(result, 3)
               .pattern(PLASTIC_ROAD)
-              .key(AdditionsRecipeProvider.SAND_CHAR, Tags.Items.SAND)
+              .key(AdditionsRecipeProvider.SAND_CHAR, Tags.Items.SANDS)
               .key(Pattern.CONSTANT, slickPlastic)
               .category(RecipeCategory.BUILDING_BLOCKS)
               .build(consumer, MekanismAdditions.rl(basePath + color.getRegistryPrefix()));

diff --git a/src/datagen/defense/java/mekanism/defense/common/DefenseDataGenerator.java b/src/datagen/defense/java/mekanism/defense/common/DefenseDataGenerator.java
@@ -31,7 +31,7 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new DefenseLangProvider(output));
         //Server side data generators
         gen.addProvider(event.includeServer(), new DefenseTagProvider(output, lookupProvider, existingFileHelper));
-        gen.addProvider(event.includeServer(), new DefenseLootProvider(output));
-        gen.addProvider(event.includeServer(), new DefenseRecipeProvider(output, existingFileHelper));
+        gen.addProvider(event.includeServer(), new DefenseLootProvider(output, lookupProvider));
+        gen.addProvider(event.includeServer(), new DefenseRecipeProvider(output, lookupProvider, existingFileHelper));
     }
 }
diff --git a/src/datagen/defense/java/mekanism/defense/common/DefenseRecipeProvider.java b/src/datagen/defense/java/mekanism/defense/common/DefenseRecipeProvider.java
@@ -1,16 +1,18 @@
 package mekanism.defense.common;
 
+import java.util.concurrent.CompletableFuture;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.common.recipe.BaseRecipeProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 
 @NothingNullByDefault
 public class DefenseRecipeProvider extends BaseRecipeProvider {
 
-    public DefenseRecipeProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper);
+    public DefenseRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper);
     }
 
     @Override

diff --git a/src/datagen/defense/java/mekanism/defense/common/loot/DefenseLootProvider.java b/src/datagen/defense/java/mekanism/defense/common/loot/DefenseLootProvider.java
@@ -1,15 +1,17 @@
 package mekanism.defense.common.loot;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import mekanism.common.loot.BaseLootProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 
 public class DefenseLootProvider extends BaseLootProvider {
 
-    public DefenseLootProvider(PackOutput output) {
+    public DefenseLootProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
         super(output, List.of(
               new SubProviderEntry(DefenseBlockLootTables::new, LootContextParamSets.BLOCK)
-        ));
+        ), provider);
     }
 }
diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsAdvancementProvider.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsAdvancementProvider.java
@@ -1,19 +1,21 @@
 package mekanism.generators.common;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import mekanism.common.advancements.BaseAdvancementProvider;
 import mekanism.generators.common.advancements.GeneratorsAdvancements;
 import mekanism.generators.common.registries.GeneratorsBlocks;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.AdvancementType;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
 
 public class GeneratorsAdvancementProvider extends BaseAdvancementProvider {
 
-    public GeneratorsAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper, MekanismGenerators.MODID);
+    public GeneratorsAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper, MekanismGenerators.MODID);
     }
 
     @Override

diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsDataGenerator.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsDataGenerator.java
@@ -39,8 +39,8 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new GeneratorsBlockStateProvider(output, existingFileHelper));
         //Server side data generators
         gen.addProvider(event.includeServer(), new GeneratorsTagProvider(output, lookupProvider, existingFileHelper));
-        gen.addProvider(event.includeServer(), new GeneratorsLootProvider(output));
-        gen.addProvider(event.includeServer(), new GeneratorsRecipeProvider(output, existingFileHelper));
-        gen.addProvider(event.includeServer(), new GeneratorsAdvancementProvider(output, existingFileHelper));
+        gen.addProvider(event.includeServer(), new GeneratorsLootProvider(output, lookupProvider));
+        gen.addProvider(event.includeServer(), new GeneratorsRecipeProvider(output, lookupProvider, existingFileHelper));
+        gen.addProvider(event.includeServer(), new GeneratorsAdvancementProvider(output, lookupProvider, existingFileHelper));
     }
 }
diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsRecipeProvider.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsRecipeProvider.java
@@ -1,5 +1,6 @@
 package mekanism.generators.common;
 
+import java.util.concurrent.CompletableFuture;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
 import mekanism.api.datagen.recipe.builder.ChemicalChemicalToChemicalRecipeBuilder;
@@ -28,6 +29,7 @@
 import mekanism.generators.common.registries.GeneratorsFluids;
 import mekanism.generators.common.registries.GeneratorsGases;
 import mekanism.generators.common.registries.GeneratorsItems;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.tags.ItemTags;
@@ -49,8 +51,8 @@ public class GeneratorsRecipeProvider extends BaseRecipeProvider {
     private static final char COPPER_CHAR = 'C';
     private static final char FURNACE_CHAR = 'F';
 
-    public GeneratorsRecipeProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper);
+    public GeneratorsRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper);
     }
 
     @Override
@@ -295,7 +297,7 @@ private void addFusionReactorRecipes(RecipeOutput consumer) {
                     TripleLine.of(Pattern.STEEL, Pattern.INGOT, Pattern.STEEL),
                     TripleLine.of(Pattern.INGOT, GLASS_CHAR, Pattern.INGOT),
                     TripleLine.of(Pattern.STEEL, Pattern.INGOT, Pattern.STEEL))
-              ).key(GLASS_CHAR, Tags.Items.GLASS_SILICA)
+              ).key(GLASS_CHAR, Tags.Items.GLASS_BLOCKS_CHEAP)
               .key(Pattern.INGOT, MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.LEAD))
               .key(Pattern.STEEL, MekanismItems.ENRICHED_IRON)
               .build(consumer, MekanismGenerators.rl("reactor/glass"));

diff --git a/src/datagen/generators/java/mekanism/generators/common/loot/GeneratorsLootProvider.java b/src/datagen/generators/java/mekanism/generators/common/loot/GeneratorsLootProvider.java
@@ -1,15 +1,17 @@
 package mekanism.generators.common.loot;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import mekanism.common.loot.BaseLootProvider;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 
 public class GeneratorsLootProvider extends BaseLootProvider {
 
-    public GeneratorsLootProvider(PackOutput output) {
+    public GeneratorsLootProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
         super(output, List.of(
               new SubProviderEntry(GeneratorsBlockLootTables::new, LootContextParamSets.BLOCK)
-        ));
+        ), provider);
     }
 }
diff --git a/src/datagen/main/java/mekanism/common/MekanismDataGenerator.java b/src/datagen/main/java/mekanism/common/MekanismDataGenerator.java
@@ -59,12 +59,12 @@ public static void gatherData(GatherDataEvent event) {
         gen.addProvider(event.includeClient(), new MekanismBlockStateProvider(output, existingFileHelper));
         //Server side data generators
         gen.addProvider(event.includeServer(), new MekanismTagProvider(output, lookupProvider, existingFileHelper));
-        gen.addProvider(event.includeServer(), new MekanismLootProvider(output));
+        gen.addProvider(event.includeServer(), new MekanismLootProvider(output, lookupProvider));
         gen.addProvider(event.includeServer(), drProvider);
         gen.addProvider(event.includeServer(), new MekanismDataMapsProvider(output, lookupProvider));
-        MekanismRecipeProvider recipeProvider = new MekanismRecipeProvider(output, existingFileHelper);
+        MekanismRecipeProvider recipeProvider = new MekanismRecipeProvider(output, lookupProvider, existingFileHelper);
         gen.addProvider(event.includeServer(), recipeProvider);
-        gen.addProvider(event.includeServer(), new MekanismAdvancementProvider(output, existingFileHelper));
+        gen.addProvider(event.includeServer(), new MekanismAdvancementProvider(output, lookupProvider, existingFileHelper));
         gen.addProvider(event.includeServer(), new ComputerHelpProvider(output, Mekanism.MODID));
         //Data generator to help with persisting data when porting across MC versions when optional deps aren't updated yet
         // DO NOT ADD OTHERS AFTER THIS ONE

diff --git a/src/datagen/main/java/mekanism/common/advancements/BaseAdvancementProvider.java b/src/datagen/main/java/mekanism/common/advancements/BaseAdvancementProvider.java
@@ -16,6 +16,7 @@
 import net.minecraft.advancements.critereon.InventoryChangeTrigger.TriggerInstance;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.core.Holder;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
@@ -29,12 +30,14 @@
 
 public abstract class BaseAdvancementProvider implements DataProvider {
 
+    private final CompletableFuture<HolderLookup.Provider> registries;
     private final PackOutput.PathProvider pathProvider;
     private final ExistingFileHelper existingFileHelper;
     private final String modid;
 
-    public BaseAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper, String modid) {
+    public BaseAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper, String modid) {
         this.modid = modid;
+        this.registries = provider;
         this.existingFileHelper = existingFileHelper;
         this.pathProvider = output.createPathProvider(PackOutput.Target.DATA_PACK, "advancements");
     }
@@ -48,17 +51,19 @@ public String getName() {
     @NotNull
     @Override
     public CompletableFuture<?> run(@NotNull CachedOutput cache) {
-        List<CompletableFuture<?>> futures = new ArrayList<>();
-        registerAdvancements(advancement -> {
-            ResourceLocation id = advancement.id();
-            if (existingFileHelper.exists(id, PackType.SERVER_DATA, ".json", "advancements")) {
-                throw new IllegalStateException("Duplicate advancement " + id);
-            }
-            Path path = this.pathProvider.json(id);
-            existingFileHelper.trackGenerated(id, PackType.SERVER_DATA, ".json", "advancements");
-            futures.add(DataProvider.saveStable(cache, Advancement.CODEC, advancement.value(), path));
+        return this.registries.thenCompose(lookupProvider -> {
+            List<CompletableFuture<?>> futures = new ArrayList<>();
+            registerAdvancements(advancement -> {
+                ResourceLocation id = advancement.id();
+                if (existingFileHelper.exists(id, PackType.SERVER_DATA, ".json", "advancements")) {
+                    throw new IllegalStateException("Duplicate advancement " + id);
+                }
+                Path path = this.pathProvider.json(id);
+                existingFileHelper.trackGenerated(id, PackType.SERVER_DATA, ".json", "advancements");
+                futures.add(DataProvider.saveStable(cache, lookupProvider, Advancement.CODEC, advancement.value(), path));
+            });
+            return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
         });
-        return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
     }
 
     protected abstract void registerAdvancements(@NotNull Consumer<AdvancementHolder> consumer);

diff --git a/src/datagen/main/java/mekanism/common/advancements/MekanismAdvancementProvider.java b/src/datagen/main/java/mekanism/common/advancements/MekanismAdvancementProvider.java
@@ -1,6 +1,7 @@
 package mekanism.common.advancements;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import mekanism.api.datagen.recipe.RecipeCriterion;
@@ -37,6 +38,7 @@
 import net.minecraft.advancements.critereon.PlayerTrigger;
 import net.minecraft.advancements.critereon.SummonedEntityTrigger;
 import net.minecraft.advancements.critereon.UsingItemTrigger;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -45,8 +47,8 @@
 
 public class MekanismAdvancementProvider extends BaseAdvancementProvider {
 
-    public MekanismAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, existingFileHelper, Mekanism.MODID);
+    public MekanismAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
+        super(output, provider, existingFileHelper, Mekanism.MODID);
     }
 
     //TODO - 1.19: xp rewards for any of these?