From 545baa23bed8a5925cae19886f8112fa120f1192 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 23 Oct 2018 10:53:09 +0200 Subject: [PATCH] change advancements around a bit --- .../naturesaura/advancements/gold_leaf.json | 2 +- .../advancements/infused_materials.json | 29 +++++++++++++++++++ .../naturesaura/advancements/wood_stand.json | 2 +- .../assets/naturesaura/lang/en_US.lang | 4 ++- .../en_us/entries/items/aura_cache.json | 2 +- .../entries/items/infused_iron_tools.json | 2 +- 6 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/naturesaura/advancements/infused_materials.json diff --git a/src/main/resources/assets/naturesaura/advancements/gold_leaf.json b/src/main/resources/assets/naturesaura/advancements/gold_leaf.json index 25e7abc3..804c0a11 100644 --- a/src/main/resources/assets/naturesaura/advancements/gold_leaf.json +++ b/src/main/resources/assets/naturesaura/advancements/gold_leaf.json @@ -12,7 +12,7 @@ }, "parent": "naturesaura:get_book", "criteria": { - "book": { + "leaf": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ diff --git a/src/main/resources/assets/naturesaura/advancements/infused_materials.json b/src/main/resources/assets/naturesaura/advancements/infused_materials.json new file mode 100644 index 00000000..313c65ab --- /dev/null +++ b/src/main/resources/assets/naturesaura/advancements/infused_materials.json @@ -0,0 +1,29 @@ +{ + "display": { + "icon": { + "item": "naturesaura:infused_iron" + }, + "title": { + "translate": "advancement.naturesaura.infused_materials" + }, + "description": { + "translate": "advancement.naturesaura.infused_materials.desc" + } + }, + "parent": "naturesaura:altar", + "criteria": { + "materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "naturesaura:infused_iron" + }, + { + "item": "naturesaura:infused_stone" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/advancements/wood_stand.json b/src/main/resources/assets/naturesaura/advancements/wood_stand.json index c6a419a9..31fe67a6 100644 --- a/src/main/resources/assets/naturesaura/advancements/wood_stand.json +++ b/src/main/resources/assets/naturesaura/advancements/wood_stand.json @@ -12,7 +12,7 @@ }, "parent": "naturesaura:gold_leaf", "criteria": { - "book": { + "stand": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 1b42e1db..c5815cc8 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -38,4 +38,6 @@ advancement.naturesaura.gold_leaf.desc=Create and harvest a Brilliant Tree advancement.naturesaura.wood_stand=Powers of the Forest advancement.naturesaura.wood_stand.desc=Create a Wooden Stand for the Ritual of the Forest advancement.naturesaura.altar=Empowered -advancement.naturesaura.altar.desc=Create a Natural Altar using the Ritual of the Forest \ No newline at end of file +advancement.naturesaura.altar.desc=Create a Natural Altar using the Ritual of the Forest +advancement.naturesaura.infused_materials=Iron Factory +advancement.naturesaura.infused_materials.desc=Use the Natural Altar to create Infused Iron and Infused Rock \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/aura_cache.json b/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/aura_cache.json index e062e79f..e88cc4ec 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/aura_cache.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/aura_cache.json @@ -2,7 +2,7 @@ "name": "Aura Cache", "icon": "naturesaura:aura_cache", "category": "naturesaura:items", - "advancement": "naturesaura:altar", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/infused_iron_tools.json b/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/infused_iron_tools.json index 6cd4c405..fb3f2d3a 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/infused_iron_tools.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/en_us/entries/items/infused_iron_tools.json @@ -2,7 +2,7 @@ "name": "Botanist's Tools", "icon": "naturesaura:infused_iron_pickaxe", "category": "naturesaura:items", - "advancement": "naturesaura:altar", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text",