Skip to content

Commit ef3c8ce

Browse files
pupnewfsterpupnewfster
committed
Make datagen compile (crashes at runtime, but it compiles)
1 parent d137027 commit ef3c8ce

File tree

40 files changed

+198
-194
lines changed

40 files changed

+198
-194
lines changed

‎src/datagen/additions/java/mekanism/additions/common/AdditionsAdvancementProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package mekanism.additions.common;
22

3+
import java.util.concurrent.CompletableFuture;
34
import java.util.function.Consumer;
45
import mekanism.additions.common.advancements.AdditionsAdvancements;
56
import mekanism.additions.common.registries.AdditionsBlocks;
@@ -17,6 +18,7 @@
1718
import net.minecraft.advancements.critereon.KilledTrigger;
1819
import net.minecraft.advancements.critereon.KilledTrigger.TriggerInstance;
1920
import net.minecraft.core.Holder;
21+
import net.minecraft.core.HolderLookup;
2022
import net.minecraft.data.PackOutput;
2123
import net.minecraft.world.entity.EntityType;
2224
import net.minecraft.world.item.Items;
@@ -25,8 +27,8 @@
2527

2628
public class AdditionsAdvancementProvider extends BaseAdvancementProvider {
2729

28-
public AdditionsAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
29-
super(output, existingFileHelper, MekanismAdditions.MODID);
30+
public AdditionsAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
31+
super(output, provider, existingFileHelper, MekanismAdditions.MODID);
3032
}
3133

3234
@Override

‎src/datagen/additions/java/mekanism/additions/common/AdditionsDataGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public static void gatherData(GatherDataEvent event) {
4141
gen.addProvider(event.includeClient(), new AdditionsBlockStateProvider(output, existingFileHelper));
4242
//Server side data generators
4343
gen.addProvider(event.includeServer(), new AdditionsTagProvider(output, lookupProvider, existingFileHelper));
44-
gen.addProvider(event.includeServer(), new AdditionsLootProvider(output));
44+
gen.addProvider(event.includeServer(), new AdditionsLootProvider(output, lookupProvider));
4545
gen.addProvider(event.includeServer(), drProvider);
4646
gen.addProvider(event.includeServer(), new AdditionsDataMapsProvider(output, lookupProvider));
47-
gen.addProvider(event.includeServer(), new AdditionsRecipeProvider(output, existingFileHelper));
48-
gen.addProvider(event.includeServer(), new AdditionsAdvancementProvider(output, existingFileHelper));
47+
gen.addProvider(event.includeServer(), new AdditionsRecipeProvider(output, lookupProvider, existingFileHelper));
48+
gen.addProvider(event.includeServer(), new AdditionsAdvancementProvider(output, lookupProvider, existingFileHelper));
4949
}
5050
}

‎src/datagen/additions/java/mekanism/additions/common/loot/AdditionsLootProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package mekanism.additions.common.loot;
22

33
import java.util.List;
4+
import java.util.concurrent.CompletableFuture;
45
import mekanism.common.loot.BaseLootProvider;
6+
import net.minecraft.core.HolderLookup;
57
import net.minecraft.data.PackOutput;
68
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
79

810
public class AdditionsLootProvider extends BaseLootProvider {
911

10-
public AdditionsLootProvider(PackOutput output) {
12+
public AdditionsLootProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
1113
super(output, List.of(
1214
new SubProviderEntry(AdditionsBlockLootTables::new, LootContextParamSets.BLOCK),
1315
new SubProviderEntry(AdditionsEntityLootTables::new, LootContextParamSets.ENTITY)
14-
));
16+
), provider);
1517
}
1618
}

‎src/datagen/additions/java/mekanism/additions/common/recipe/AdditionsRecipeProvider.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mekanism.additions.common.recipe;
22

33
import java.util.List;
4+
import java.util.concurrent.CompletableFuture;
45
import mekanism.additions.common.AdditionsTags;
56
import mekanism.additions.common.MekanismAdditions;
67
import mekanism.additions.common.block.BlockGlowPanel;
@@ -27,6 +28,8 @@
2728
import mekanism.common.resource.PrimaryResource;
2829
import mekanism.common.resource.ResourceType;
2930
import mekanism.common.tags.MekanismTags;
31+
import net.minecraft.core.HolderLookup;
32+
import net.minecraft.core.HolderLookup.Provider;
3033
import net.minecraft.data.PackOutput;
3134
import net.minecraft.data.recipes.RecipeCategory;
3235
import net.minecraft.data.recipes.RecipeOutput;
@@ -53,8 +56,8 @@ public class AdditionsRecipeProvider extends BaseRecipeProvider {
5356
TripleLine.of(PLASTIC_SHEET_CHAR, Pattern.DYE, PLASTIC_SHEET_CHAR),
5457
TripleLine.of(Pattern.GLOWSTONE, PLASTIC_SHEET_CHAR, Pattern.GLOWSTONE));
5558

56-
public AdditionsRecipeProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
57-
super(output, existingFileHelper);
59+
public AdditionsRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
60+
super(output, provider, existingFileHelper);
5861
}
5962

6063
@Override
@@ -73,7 +76,7 @@ protected void addRecipes(RecipeOutput consumer) {
7376
TripleLine.of(OBSIDIAN_CHAR, OBSIDIAN_CHAR, OBSIDIAN_CHAR),
7477
TripleLine.of(TNT_CHAR, TNT_CHAR, TNT_CHAR),
7578
TripleLine.of(OBSIDIAN_CHAR, OBSIDIAN_CHAR, OBSIDIAN_CHAR))
76-
).key(OBSIDIAN_CHAR, Tags.Items.OBSIDIAN)
79+
).key(OBSIDIAN_CHAR, Tags.Items.OBSIDIANS)
7780
.key(TNT_CHAR, Blocks.TNT)
7881
.category(RecipeCategory.REDSTONE)
7982
.build(consumer);
@@ -105,8 +108,8 @@ private void registerBalloon(RecipeOutput consumer, ItemRegistryObject<ItemBallo
105108
DyeColor dye = color.getDyeColor();
106109
if (dye != null) {
107110
ExtendedShapelessRecipeBuilder.shapelessRecipe(result, 2)
108-
.addIngredient(Tags.Items.LEATHER)
109-
.addIngredient(Tags.Items.STRING)
111+
.addIngredient(Tags.Items.LEATHERS)
112+
.addIngredient(Tags.Items.STRINGS)
110113
.addIngredient(dye.getTag())
111114
.category(RecipeCategory.DECORATIONS)
112115
.build(consumer, MekanismAdditions.rl(basePath + colorString));

‎src/datagen/additions/java/mekanism/additions/common/recipe/PlasticBlockRecipeProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private void registerPlasticRoad(RecipeOutput consumer, BlockRegistryObject<? ex
158158
EnumColor color = result.getBlock().getColor();
159159
ExtendedShapedRecipeBuilder.shapedRecipe(result, 3)
160160
.pattern(PLASTIC_ROAD)
161-
.key(AdditionsRecipeProvider.SAND_CHAR, Tags.Items.SAND)
161+
.key(AdditionsRecipeProvider.SAND_CHAR, Tags.Items.SANDS)
162162
.key(Pattern.CONSTANT, slickPlastic)
163163
.category(RecipeCategory.BUILDING_BLOCKS)
164164
.build(consumer, MekanismAdditions.rl(basePath + color.getRegistryPrefix()));

‎src/datagen/defense/java/mekanism/defense/common/DefenseDataGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static void gatherData(GatherDataEvent event) {
3131
gen.addProvider(event.includeClient(), new DefenseLangProvider(output));
3232
//Server side data generators
3333
gen.addProvider(event.includeServer(), new DefenseTagProvider(output, lookupProvider, existingFileHelper));
34-
gen.addProvider(event.includeServer(), new DefenseLootProvider(output));
35-
gen.addProvider(event.includeServer(), new DefenseRecipeProvider(output, existingFileHelper));
34+
gen.addProvider(event.includeServer(), new DefenseLootProvider(output, lookupProvider));
35+
gen.addProvider(event.includeServer(), new DefenseRecipeProvider(output, lookupProvider, existingFileHelper));
3636
}
3737
}

‎src/datagen/defense/java/mekanism/defense/common/DefenseRecipeProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package mekanism.defense.common;
22

3+
import java.util.concurrent.CompletableFuture;
34
import mekanism.api.annotations.NothingNullByDefault;
45
import mekanism.common.recipe.BaseRecipeProvider;
6+
import net.minecraft.core.HolderLookup;
57
import net.minecraft.data.PackOutput;
68
import net.minecraft.data.recipes.RecipeOutput;
79
import net.neoforged.neoforge.common.data.ExistingFileHelper;
810

911
@NothingNullByDefault
1012
public class DefenseRecipeProvider extends BaseRecipeProvider {
1113

12-
public DefenseRecipeProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
13-
super(output, existingFileHelper);
14+
public DefenseRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
15+
super(output, provider, existingFileHelper);
1416
}
1517

1618
@Override

‎src/datagen/defense/java/mekanism/defense/common/loot/DefenseLootProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package mekanism.defense.common.loot;
22

33
import java.util.List;
4+
import java.util.concurrent.CompletableFuture;
45
import mekanism.common.loot.BaseLootProvider;
6+
import net.minecraft.core.HolderLookup;
57
import net.minecraft.data.PackOutput;
68
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
79

810
public class DefenseLootProvider extends BaseLootProvider {
911

10-
public DefenseLootProvider(PackOutput output) {
12+
public DefenseLootProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
1113
super(output, List.of(
1214
new SubProviderEntry(DefenseBlockLootTables::new, LootContextParamSets.BLOCK)
13-
));
15+
), provider);
1416
}
1517
}

‎src/datagen/generators/java/mekanism/generators/common/GeneratorsAdvancementProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package mekanism.generators.common;
22

3+
import java.util.concurrent.CompletableFuture;
34
import java.util.function.Consumer;
45
import mekanism.common.advancements.BaseAdvancementProvider;
56
import mekanism.generators.common.advancements.GeneratorsAdvancements;
67
import mekanism.generators.common.registries.GeneratorsBlocks;
78
import net.minecraft.advancements.AdvancementHolder;
89
import net.minecraft.advancements.AdvancementType;
10+
import net.minecraft.core.HolderLookup;
911
import net.minecraft.data.PackOutput;
1012
import net.neoforged.neoforge.common.data.ExistingFileHelper;
1113
import org.jetbrains.annotations.NotNull;
1214

1315
public class GeneratorsAdvancementProvider extends BaseAdvancementProvider {
1416

15-
public GeneratorsAdvancementProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
16-
super(output, existingFileHelper, MekanismGenerators.MODID);
17+
public GeneratorsAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
18+
super(output, provider, existingFileHelper, MekanismGenerators.MODID);
1719
}
1820

1921
@Override

‎src/datagen/generators/java/mekanism/generators/common/GeneratorsDataGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static void gatherData(GatherDataEvent event) {
3939
gen.addProvider(event.includeClient(), new GeneratorsBlockStateProvider(output, existingFileHelper));
4040
//Server side data generators
4141
gen.addProvider(event.includeServer(), new GeneratorsTagProvider(output, lookupProvider, existingFileHelper));
42-
gen.addProvider(event.includeServer(), new GeneratorsLootProvider(output));
43-
gen.addProvider(event.includeServer(), new GeneratorsRecipeProvider(output, existingFileHelper));
44-
gen.addProvider(event.includeServer(), new GeneratorsAdvancementProvider(output, existingFileHelper));
42+
gen.addProvider(event.includeServer(), new GeneratorsLootProvider(output, lookupProvider));
43+
gen.addProvider(event.includeServer(), new GeneratorsRecipeProvider(output, lookupProvider, existingFileHelper));
44+
gen.addProvider(event.includeServer(), new GeneratorsAdvancementProvider(output, lookupProvider, existingFileHelper));
4545
}
4646
}

0 commit comments

Comments
 (0)