Fix GoG dye recipe, remove brass to cacophonium recipe

This commit is contained in:
Hubry committed 2020-07-13 21:17:22 +02:00
1 parent 069cb964b6
commit 50a0ced86b
5 files changed
+256 -141

No files matched your search

@@ -0,0 +1,212 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:bone_meal"
},
[
{
"item": "minecraft:white_dye"
},
{
"item": "minecraft:orange_dye"
},
{
"item": "minecraft:magenta_dye"
},
{
"item": "minecraft:light_blue_dye"
},
{
"item": "minecraft:yellow_dye"
},
{
"item": "minecraft:lime_dye"
},
{
"item": "minecraft:pink_dye"
},
{
"item": "minecraft:gray_dye"
},
{
"item": "minecraft:light_gray_dye"
},
{
"item": "minecraft:cyan_dye"
},
{
"item": "minecraft:purple_dye"
},
{
"item": "minecraft:blue_dye"
},
{
"item": "minecraft:brown_dye"
},
{
"item": "minecraft:green_dye"
},
{
"item": "minecraft:red_dye"
},
{
"item": "minecraft:black_dye"
}
],
[
{
"item": "minecraft:white_dye"
},
{
"item": "minecraft:orange_dye"
},
{
"item": "minecraft:magenta_dye"
},
{
"item": "minecraft:light_blue_dye"
},
{
"item": "minecraft:yellow_dye"
},
{
"item": "minecraft:lime_dye"
},
{
"item": "minecraft:pink_dye"
},
{
"item": "minecraft:gray_dye"
},
{
"item": "minecraft:light_gray_dye"
},
{
"item": "minecraft:cyan_dye"
},
{
"item": "minecraft:purple_dye"
},
{
"item": "minecraft:blue_dye"
},
{
"item": "minecraft:brown_dye"
},
{
"item": "minecraft:green_dye"
},
{
"item": "minecraft:red_dye"
},
{
"item": "minecraft:black_dye"
}
],
[
{
"item": "minecraft:white_dye"
},
{
"item": "minecraft:orange_dye"
},
{
"item": "minecraft:magenta_dye"
},
{
"item": "minecraft:light_blue_dye"
},
{
"item": "minecraft:yellow_dye"
},
{
"item": "minecraft:lime_dye"
},
{
"item": "minecraft:pink_dye"
},
{
"item": "minecraft:gray_dye"
},
{
"item": "minecraft:light_gray_dye"
},
{
"item": "minecraft:cyan_dye"
},
{
"item": "minecraft:purple_dye"
},
{
"item": "minecraft:blue_dye"
},
{
"item": "minecraft:brown_dye"
},
{
"item": "minecraft:green_dye"
},
{
"item": "minecraft:red_dye"
},
{
"item": "minecraft:black_dye"
}
],
[
{
"item": "minecraft:white_dye"
},
{
"item": "minecraft:orange_dye"
},
{
"item": "minecraft:magenta_dye"
},
{
"item": "minecraft:light_blue_dye"
},
{
"item": "minecraft:yellow_dye"
},
{
"item": "minecraft:lime_dye"
},
{
"item": "minecraft:pink_dye"
},
{
"item": "minecraft:gray_dye"
},
{
"item": "minecraft:light_gray_dye"
},
{
"item": "minecraft:cyan_dye"
},
{
"item": "minecraft:purple_dye"
},
{
"item": "minecraft:blue_dye"
},
{
"item": "minecraft:brown_dye"
},
{
"item": "minecraft:green_dye"
},
{
"item": "minecraft:red_dye"
},
{
"item": "minecraft:black_dye"
}
]
],
"result": {
"item": "botania:fertilizer",
"count": 3
}
}
@@ -1,24 +0,0 @@
{
"result": {
"item": "botania:fertilizer",
"count": 3
},
"ingredients": [
{
"item": "minecraft:bone_meal"
},
{
"tag": "botania:dyes"
},
{
"tag": "botania:dyes"
},
{
"tag": "botania:dyes"
},
{
"tag": "botania:dyes"
}
],
"type": "minecraft:crafting_shapeless"
}
@@ -1,43 +1,32 @@
{
"advancements": [
{
"conditions": [
{
"type": "forge:true"
}
],
"advancement": {
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"botania:cacophonium"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:note_block"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "botania:cacophonium"
}
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"botania:cacophonium"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:note_block"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "botania:cacophonium"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -1,63 +1,19 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"tag": "forge:ingots/brass",
"type": "forge:tag_empty"
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
" G ",
"GNG",
"GG "
],
"key": {
"N": {
"item": "minecraft:note_block"
},
"G": {
"tag": "forge:ingots/gold"
}
},
"result": {
"item": "botania:cacophonium"
}
}
"type": "minecraft:crafting_shaped",
"pattern": [
" G ",
"GNG",
"GG "
],
"key": {
"N": {
"item": "minecraft:note_block"
},
{
"conditions": [
{
"type": "forge:true"
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
" G ",
"GNG",
"GG "
],
"key": {
"N": {
"item": "minecraft:note_block"
},
"G": [
{
"tag": "forge:ingots/gold"
},
{
"tag": "forge:ingots/brass"
}
]
},
"result": {
"item": "botania:cacophonium"
}
}
"G": {
"tag": "forge:ingots/gold"
}
]
},
"result": {
"item": "botania:cacophonium"
}
}
@@ -981,32 +981,14 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider {
.addCriterion("has_item", hasItem(ModTags.Items.GEMS_MANA_DIAMOND))
.build(consumer);
ResourceLocation cacophoniumId = Registry.ITEM.getKey(ModItems.cacophonium);
Supplier<ShapedRecipeBuilder> cacophoniumBase = () -> ShapedRecipeBuilder.shapedRecipe(ModItems.cacophonium)
ShapedRecipeBuilder.shapedRecipe(ModItems.cacophonium)
.key('N', Items.NOTE_BLOCK)
.key('G', Tags.Items.INGOTS_GOLD)
.patternLine(" G ")
.patternLine("GNG")
.patternLine("GG ")
.addCriterion("has_item", hasItem(Items.NOTE_BLOCK));
ConditionalRecipe.builder()
.addCondition(new TagEmptyCondition("forge", "ingots/brass"))
.addRecipe(cacophoniumBase.get().key('G', Tags.Items.INGOTS_GOLD)::build)
.addCondition(TrueCondition.INSTANCE)
.addRecipe(
cacophoniumBase.get().key('G', Ingredient.fromItemListStream(Stream.of(
new Ingredient.TagList(Tags.Items.INGOTS_GOLD),
new Ingredient.TagList(ItemTags.makeWrapperTag("forge:ingots/brass")))
))::build
).setAdvancement(prefix("recipes/botania/cacophonium"),
ConditionalAdvancement.builder()
.addCondition(TrueCondition.INSTANCE)
.addAdvancement(Advancement.Builder.builder()
.withParentId(new ResourceLocation("recipes/root"))
.withRewards(AdvancementRewards.Builder.recipe(cacophoniumId))
.withCriterion("has_item", hasItem(Items.NOTE_BLOCK))
.withCriterion("has_the_recipe", RecipeUnlockedTrigger.func_235675_a_(cacophoniumId))
.withRequirementsStrategy(IRequirementsStrategy.OR))
).build(consumer, cacophoniumId);
.addCriterion("has_item", hasItem(Items.NOTE_BLOCK))
.build(consumer);
ShapedRecipeBuilder.shapedRecipe(ModItems.grassHorn)
.key('S', ModItems.grassSeeds)