-
-
Notifications
You must be signed in to change notification settings - Fork 194
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
datagen output method and rework recipeoutput wrapping
- Loading branch information
Showing
10 changed files
with
197 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/java/net/neoforged/neoforge/common/crafting/OverlappingRecipeOutput.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (c) NeoForged and contributors | ||
| * SPDX-License-Identifier: LGPL-2.1-only | ||
| */ | ||
|
|
||
| package net.neoforged.neoforge.common.crafting; | ||
|
|
||
| import net.minecraft.advancements.Advancement; | ||
| import net.minecraft.advancements.AdvancementHolder; | ||
| import net.minecraft.data.recipes.RecipeOutput; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.item.crafting.Recipe; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| public class OverlappingRecipeOutput implements RecipeOutput { | ||
| private final RecipeOutput inner; | ||
| @Nullable | ||
| private final ResourceLocation override; | ||
|
|
||
| public OverlappingRecipeOutput(RecipeOutput inner, ResourceLocation override) { | ||
| this.inner = inner; | ||
| this.override = override; | ||
| } | ||
|
|
||
| @Override | ||
| public Advancement.Builder advancement() { | ||
| return inner.advancement(); | ||
| } | ||
|
|
||
| @Nullable | ||
| public ResourceLocation getOutputOverride() { | ||
| return override; | ||
| } | ||
|
|
||
| @Override | ||
| public void accept(ResourceLocation id, Recipe<?> recipe, @Nullable AdvancementHolder advancement, RecipeOutput other) { | ||
| inner.accept(id, recipe, advancement, this); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
tests/src/generated/resources/data/minecraft/advancement/recipes/misc/redstone_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_cherry_planks": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": "minecraft:cherry_planks" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "minecraft:redstone_block" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "has_cherry_planks" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "minecraft:redstone_block" | ||
| ] | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
tests/src/generated/resources/data/minecraft/recipe/redstone_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "group": "bed", | ||
| "key": { | ||
| "#": { | ||
| "item": "minecraft:yellow_wool" | ||
| }, | ||
| "X": { | ||
| "item": "minecraft:cherry_planks" | ||
| } | ||
| }, | ||
| "neoforge:override": "minecraft:yellow_bed", | ||
| "pattern": [ | ||
| "###", | ||
| "XXX" | ||
| ], | ||
| "result": { | ||
| "count": 1, | ||
| "id": "minecraft:redstone_block" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters