mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Replace AdvancementProvider patch with Forge helper (#9188)
This commit is contained in:
1 parent
2ea16d89ca
commit
4802ceeccc
4 files changed
+86
-65
No files matched your search
@@ -1016,25 +1016,19 @@ public class DataGeneratorTest
|
||||
}
|
||||
}
|
||||
|
||||
public static class Advancements extends AdvancementProvider
|
||||
public static class Advancements extends ForgeAdvancementProvider
|
||||
{
|
||||
|
||||
|
||||
public Advancements(PackOutput output, CompletableFuture<HolderLookup.Provider> providerCompletableFuture, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(output, providerCompletableFuture, List.of(new Provider(existingFileHelper)));
|
||||
super(output, providerCompletableFuture, existingFileHelper, List.of(new Provider()));
|
||||
}
|
||||
|
||||
private static class Provider implements AdvancementSubProvider {
|
||||
|
||||
private final ExistingFileHelper fileHelper;
|
||||
|
||||
private Provider(ExistingFileHelper fileHelper) {
|
||||
this.fileHelper = fileHelper;
|
||||
}
|
||||
private static class Provider implements AdvancementGenerator {
|
||||
|
||||
@Override
|
||||
public void generate(HolderLookup.Provider registries, Consumer<Advancement> consumer) {
|
||||
public void generate(HolderLookup.Provider registries, Consumer<Advancement> saver, ExistingFileHelper existingFileHelper) {
|
||||
Advancement.Builder.advancement().display(Items.DIRT,
|
||||
Component.translatable(Items.DIRT.getDescriptionId()),
|
||||
Component.translatable("dirt_description"),
|
||||
@@ -1044,7 +1038,7 @@ public class DataGeneratorTest
|
||||
true,
|
||||
false)
|
||||
.addCriterion("has_dirt", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIRT))
|
||||
.save(consumer, new ResourceLocation(MODID, "obtain_dirt"), fileHelper);
|
||||
.save(saver, new ResourceLocation(MODID, "obtain_dirt"), existingFileHelper);
|
||||
|
||||
Advancement.Builder.advancement().display(Items.DIAMOND_BLOCK,
|
||||
Component.translatable(Items.DIAMOND_BLOCK.getDescriptionId()),
|
||||
@@ -1055,7 +1049,7 @@ public class DataGeneratorTest
|
||||
true,
|
||||
false)
|
||||
.addCriterion("obtained_diamond_block", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_BLOCK))
|
||||
.save(consumer, new ResourceLocation("obtain_diamond_block"), fileHelper);
|
||||
.save(saver, new ResourceLocation("obtain_diamond_block"), existingFileHelper);
|
||||
|
||||
Advancement.Builder.advancement()
|
||||
.display(Blocks.GRASS_BLOCK,
|
||||
@@ -1067,7 +1061,7 @@ public class DataGeneratorTest
|
||||
false,
|
||||
false)
|
||||
.addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.CRAFTING_TABLE))
|
||||
.save(consumer, new ResourceLocation("story/root"), fileHelper);
|
||||
.save(saver, new ResourceLocation("story/root"), existingFileHelper);
|
||||
|
||||
// This should cause an error because of the parent not existing
|
||||
/* Advancement.Builder.advancement().display(Blocks.COBBLESTONE,
|
||||
@@ -1092,7 +1086,7 @@ public class DataGeneratorTest
|
||||
false)
|
||||
.addCriterion("get_cobbleStone", InventoryChangeTrigger.TriggerInstance.hasItems(Items.COBBLESTONE))
|
||||
.parent(new ResourceLocation("forge", "dummy_parent"))
|
||||
.save(consumer, new ResourceLocation("good_parent"), fileHelper);
|
||||
.save(saver, new ResourceLocation("good_parent"), existingFileHelper);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1161,4 +1155,4 @@ public class DataGeneratorTest
|
||||
// So remove modid to match
|
||||
return model.replaceAll("^\\w+:", "minecraft:");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user