diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java new file mode 100644 index 0000000000..961c39b976 --- /dev/null +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.api.datagen.v1.advancement; + +import java.util.function.Consumer; + +import org.jetbrains.annotations.ApiStatus; + +import net.minecraft.advancements.AdvancementHolder; +import net.minecraft.resources.Identifier; + +/** + * Advancement builder extensions provided by Fabric. + */ +@ApiStatus.NonExtendable +public interface FabricAdvancementBuilder { + /** + * Builds and saves the advancement. + * @param output The output to save the advancement to + * @param id The id of the advancement + * @return A new holder containing the saved advancement + */ + default AdvancementHolder save(Consumer output, Identifier id) { + throw new UnsupportedOperationException("Implemented via mixin"); + } +} diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java new file mode 100644 index 0000000000..af8b080d0a --- /dev/null +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/advancement/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@NullMarked +package net.fabricmc.fabric.api.datagen.v1.advancement; + +import org.jspecify.annotations.NullMarked; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java index ed8789345d..e96006641b 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java @@ -78,6 +78,21 @@ public abstract class FabricAdvancementProvider implements DataProvider { }; } + /** + * Creates a reference to an existing advancement. + * + * {@snippet : + * Advancement.Builder builder = ...; + * builder.parent(createPlaceholder(Identifier.withDefaultNamespace("adventure/root"))) + * } + * + * @param id The identifier to create a reference for. + * @return A new holder containing the provided id. + */ + public static AdvancementHolder createPlaceholder(Identifier id) { + return Advancement.Builder.advancement().build(id); + } + @Override public CompletableFuture run(CachedOutput output) { return this.registryLookup.thenCompose(lookup -> { diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java new file mode 100644 index 0000000000..6eea353804 --- /dev/null +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/advancement/AdvancementBuilderMixin.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.mixin.datagen.advancement; + +import java.util.function.Consumer; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementHolder; +import net.minecraft.resources.Identifier; + +import net.fabricmc.fabric.api.datagen.v1.advancement.FabricAdvancementBuilder; + +@Mixin(Advancement.Builder.class) +abstract class AdvancementBuilderMixin implements FabricAdvancementBuilder { + @Shadow + public abstract AdvancementHolder build(Identifier id); + + @Override + public AdvancementHolder save(Consumer output, Identifier id) { + AdvancementHolder advancement = build(id); + output.accept(advancement); + return advancement; + } +} diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker index f153ee4bfd..714c7aa27c 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker +++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.classtweaker @@ -53,6 +53,7 @@ accessible class net/minecraft/client/data/models/ModelProvider$ItemInfoCollecto accessible class net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector accessible field net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector generators Ljava/util/Map; +transitive-inject-interface net/minecraft/advancements/Advancement$Builder net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder transitive-inject-interface net/minecraft/data/loot/BlockLootSubProvider net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootSubProvider transitive-inject-interface net/minecraft/data/loot/EntityLootSubProvider net/fabricmc/fabric/api/datagen/v1/loot/FabricEntityLootSubProvider transitive-inject-interface net/minecraft/data/recipes/RecipeOutput net/fabricmc/fabric/api/datagen/v1/recipe/FabricRecipeOutput diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json index 245e601ded..80e1ba5173 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json +++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.mixins.json @@ -11,6 +11,7 @@ "TagAppenderMixin$TagAppender1Mixin", "TagBuilderMixin", "TagsProviderMixin", + "advancement.AdvancementBuilderMixin", "loot.BlockLootSubProviderAccessor", "loot.BlockLootSubProviderMixin", "loot.EntityLootSubProviderAccessor", diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json new file mode 100644 index 0000000000..30c7cb14c1 --- /dev/null +++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:adventure/root", + "criteria": { + "killed_something": { + "trigger": "minecraft:player_killed_entity" + } + }, + "display": { + "announce_to_chat": false, + "background": "minecraft:textures/gui/advancements/backgrounds/end.png", + "description": { + "translate": "advancements.test.adventure_child.description" + }, + "frame": "goal", + "icon": { + "id": "fabric-data-gen-api-v1-testmod:simple_block" + }, + "show_toast": false, + "title": { + "translate": "advancements.test.adventure_child.title" + } + }, + "requirements": [ + [ + "killed_something" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java index 317f4562ed..a700ee421b 100644 --- a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java +++ b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java @@ -385,6 +385,18 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { false, false, false) .addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity()) .save(withConditions(consumer, NEVER_LOADED), MOD_ID + ":test/root_not_loaded"); + + AdvancementHolder adventureChild = Advancement.Builder.advancement() + .display(SIMPLE_BLOCK, + Component.translatable("advancements.test.adventure_child.title"), + Component.translatable("advancements.test.adventure_child.description"), + Identifier.withDefaultNamespace("textures/gui/advancements/backgrounds/end.png"), + AdvancementType.GOAL, + false, false, false + ) + .addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity()) + .parent(createPlaceholder(Identifier.withDefaultNamespace("adventure/root"))) + .save(consumer, Identifier.fromNamespaceAndPath(MOD_ID, "test/adventure_child")); } } diff --git a/fabric-data-generation-api-v1/template.classtweaker b/fabric-data-generation-api-v1/template.classtweaker index 814a93d44b..6ebc9f947b 100644 --- a/fabric-data-generation-api-v1/template.classtweaker +++ b/fabric-data-generation-api-v1/template.classtweaker @@ -48,6 +48,7 @@ accessible class net/minecraft/client/data/models/ModelProvider$ItemInfoCollecto accessible class net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector accessible field net/minecraft/client/data/models/ModelProvider$BlockStateGeneratorCollector generators Ljava/util/Map; +transitive-inject-interface net/minecraft/advancements/Advancement$Builder net/fabricmc/fabric/api/datagen/v1/advancement/FabricAdvancementBuilder transitive-inject-interface net/minecraft/data/loot/BlockLootSubProvider net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootSubProvider transitive-inject-interface net/minecraft/data/loot/EntityLootSubProvider net/fabricmc/fabric/api/datagen/v1/loot/FabricEntityLootSubProvider transitive-inject-interface net/minecraft/data/recipes/RecipeOutput net/fabricmc/fabric/api/datagen/v1/recipe/FabricRecipeOutput