mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
[1.18.x] Add 3 new ingredient types, and make existing ingredients compatible with datagen (#8517)
This commit is contained in:
1 parent
c3bd365baa
commit
093acab825
24 files changed
+1130
-38
No files matched your search
@@ -27,14 +27,25 @@ import java.util.stream.Stream;
|
||||
|
||||
import com.google.gson.JsonNull;
|
||||
import com.google.gson.JsonPrimitive;
|
||||
import net.minecraft.Util;
|
||||
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
|
||||
import net.minecraft.data.advancements.AdvancementProvider;
|
||||
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.TranslatableComponent;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.block.ButtonBlock;
|
||||
import net.minecraft.world.level.block.PressurePlateBlock;
|
||||
import net.minecraft.world.level.block.StandingSignBlock;
|
||||
import net.minecraft.world.level.block.WallSignBlock;
|
||||
import net.minecraftforge.common.crafting.CompoundIngredient;
|
||||
import net.minecraftforge.common.crafting.PartialNBTIngredient;
|
||||
import net.minecraftforge.common.crafting.DifferenceIngredient;
|
||||
import net.minecraftforge.common.crafting.IntersectionIngredient;
|
||||
import net.minecraftforge.common.crafting.NBTIngredient;
|
||||
import net.minecraftforge.common.data.SoundDefinition;
|
||||
import net.minecraftforge.common.data.SoundDefinitionsProvider;
|
||||
import org.apache.commons.lang3.tuple.Triple;
|
||||
@@ -157,6 +168,7 @@ public class DataGeneratorTest
|
||||
@Override
|
||||
protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer)
|
||||
{
|
||||
// conditional recipe
|
||||
ResourceLocation ID = new ResourceLocation("data_gen_test", "conditional");
|
||||
|
||||
ConditionalRecipe.builder()
|
||||
@@ -222,6 +234,78 @@ public class DataGeneratorTest
|
||||
)
|
||||
.generateAdvancement()
|
||||
.build(consumer, new ResourceLocation("data_gen_test", "conditional2"));
|
||||
|
||||
// ingredient tests
|
||||
// strict NBT match - should match an unnamed iron pickaxe that lost 3 durability
|
||||
Ingredient nbtIngredient = NBTIngredient.of(Util.make(() ->
|
||||
{
|
||||
ItemStack stack = new ItemStack(Items.IRON_PICKAXE);
|
||||
stack.setDamageValue(3);
|
||||
return stack;
|
||||
}));
|
||||
ShapelessRecipeBuilder.shapeless(Items.GOLDEN_PICKAXE)
|
||||
.requires(nbtIngredient)
|
||||
.unlockedBy("has_pickaxe", has(Items.IRON_PICKAXE))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "exact_nbt_ingredient"));
|
||||
|
||||
// ingredient tests
|
||||
// contains NBT match - should match a stone pickaxe that lost 3 durability, regardless of setting its name
|
||||
ShapelessRecipeBuilder.shapeless(Items.IRON_PICKAXE)
|
||||
.requires(PartialNBTIngredient.of(Items.STONE_PICKAXE, Util.make(() ->
|
||||
{
|
||||
CompoundTag nbt = new CompoundTag();
|
||||
nbt.putInt(ItemStack.TAG_DAMAGE, 3);
|
||||
return nbt;
|
||||
})))
|
||||
.unlockedBy("has_pickaxe", has(Items.STONE_PICKAXE))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "contains_nbt_ingredient_single_item"));
|
||||
|
||||
// contains NBT match - should match a wood, stone, or iron pickaxe that was named "Diamond Pickaxe", regardless of damage
|
||||
ShapelessRecipeBuilder.shapeless(Items.DIAMOND_PICKAXE)
|
||||
.requires(PartialNBTIngredient.of(Util.make(() ->
|
||||
{
|
||||
CompoundTag nbt = new CompoundTag();
|
||||
CompoundTag display = new CompoundTag();
|
||||
display.putString(ItemStack.TAG_DISPLAY_NAME, "{\"text\":\"Diamond Pickaxe\"}");
|
||||
nbt.put(ItemStack.TAG_DISPLAY, display);
|
||||
return nbt;
|
||||
}), Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.IRON_PICKAXE))
|
||||
.unlockedBy("has_pickaxe", has(Items.WOODEN_PICKAXE))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "contains_nbt_ingredient_item_set"));
|
||||
|
||||
// intersection - should match all non-flammable planks
|
||||
ShapedRecipeBuilder.shaped(Blocks.NETHERRACK)
|
||||
.pattern("###")
|
||||
.pattern("###")
|
||||
.pattern(" # ")
|
||||
.define('#', IntersectionIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.NON_FLAMMABLE_WOOD)))
|
||||
.unlockedBy("has_planks", has(Items.CRIMSON_PLANKS))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "intersection_ingredient"));
|
||||
|
||||
// difference - should match all flammable fences
|
||||
ShapedRecipeBuilder.shaped(Items.FLINT_AND_STEEL)
|
||||
.pattern(" # ")
|
||||
.pattern("###")
|
||||
.pattern(" # ")
|
||||
.define('#', DifferenceIngredient.of(Ingredient.of(ItemTags.FENCES), Ingredient.of(ItemTags.NON_FLAMMABLE_WOOD)))
|
||||
.unlockedBy("has_fence", has(Items.CRIMSON_FENCE))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "difference_ingredient"));
|
||||
|
||||
// compound - should match planks, logs, or bedrock
|
||||
ShapedRecipeBuilder.shaped(Blocks.DIRT)
|
||||
.pattern("###")
|
||||
.pattern(" # ")
|
||||
.define('#', CompoundIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.LOGS), Ingredient.of(Blocks.BEDROCK)))
|
||||
.unlockedBy("has_planks", has(Items.CRIMSON_PLANKS))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "compound_ingredient_only_vanilla"));
|
||||
|
||||
// compound - should match planks, logs, or a stone pickaxe with 3 damage
|
||||
ShapedRecipeBuilder.shaped(Blocks.GOLD_BLOCK)
|
||||
.pattern("#")
|
||||
.pattern("#")
|
||||
.define('#', CompoundIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.LOGS), nbtIngredient))
|
||||
.unlockedBy("has_planks", has(Items.CRIMSON_PLANKS))
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "compound_ingredient_custom_types"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user