From a5bc87f35e7d4bd781a7502784e80552ae49ccb1 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 16 Feb 2023 15:03:00 +0100 Subject: [PATCH] integrate tainted gold back into the progression --- .../assets/naturesaura/lang/en_us.json | 4 --- .../book/en_us/entries/using/altar.json | 9 +++++-- .../book/fr_fr/entries/using/altar.json | 2 +- .../advancements/tainted_gold.json | 26 ------------------- .../recipes/altar/tainted_gold.json | 4 +-- .../recipes/altar/tainted_gold_block.json | 4 +-- 6 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 src/main/resources/data/naturesaura/advancements/tainted_gold.json diff --git a/src/main/resources/assets/naturesaura/lang/en_us.json b/src/main/resources/assets/naturesaura/lang/en_us.json index 73738fb8..6e5b8de4 100644 --- a/src/main/resources/assets/naturesaura/lang/en_us.json +++ b/src/main/resources/assets/naturesaura/lang/en_us.json @@ -169,8 +169,6 @@ "info.naturesaura.remaining": "%s remaining", "info.naturesaura.break_prevention": "Eir's Token applied", "info.naturesaura.broken": " (Broken)", - "info.naturesaura.required_aura_type.naturesaura:overworld": "Requires Natural Altar", - "info.naturesaura.required_aura_type.naturesaura:nether": "Requires Crimson Altar", "info.naturesaura.pet_reviver": "Your pet %s was in distress and has been sent home.", "advancement.naturesaura.root": "Nature's Aura", "advancement.naturesaura.root.desc": "Becoming a magical botanist", @@ -184,8 +182,6 @@ "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", - "advancement.naturesaura.tainted_gold": "Gold Factory", - "advancement.naturesaura.tainted_gold.desc": "Use the Crimson Altar to create Tainted Gold", "advancement.naturesaura.furnace_heater": "Cozy Warmth", "advancement.naturesaura.furnace_heater.desc": "Create an Extraneous Firestarter to heat your furnace", "advancement.naturesaura.placer": "Plop Plop Placement", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/altar.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/altar.json index 70f0d336..6caaec63 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/altar.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/altar.json @@ -23,17 +23,22 @@ { "type": "crafting", "recipe": "naturesaura:gold_brick", - "text": "Creating the $(item)Golden Stone Bricks$() that are used in the $(item)Natural Altar$()'s multiblock" + "text": "Creating the $(item)Golden Stone Bricks$() that are used in the $(item)Natural Altar$()'s multiblock. Alternatively, $(item)Golden Nether Bricks$() can be created in a similar fashion." }, { "type": "text", - "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)In the future, one might come across materials that require a different type of $(aura) to be present around the altar, for which the $(l:using/crimson_altar)Crimson Altar$() will have to be constructed." + "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed." }, { "type": "naturesaura:altar", "text": "Creating $(item)Infused Iron$(), a material blessed with the powers of $(aura), allowing it to be used in several magical $(thing)natural items$().$(br)Note that the same infusion is possible using the materials' block form.", "recipe": "naturesaura:infused_iron" }, + { + "type": "naturesaura:altar", + "text": "Creating $(item)Tainted Gold$(), a material blessed with the deeper, darker aspects of $(aura), meaning they take much longer to infuse while using less $(aura) in the process.$(br)Note that the same infusion is possible using the materials' block form.", + "recipe": "naturesaura:tainted_gold" + }, { "type": "naturesaura:altar", "text": "Creating $(item)Infused Rock$(), an earthly material infused with $(aura).", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/using/altar.json b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/using/altar.json index 70f0d336..d367a19a 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/using/altar.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/using/altar.json @@ -27,7 +27,7 @@ }, { "type": "text", - "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed.$(br2)In the future, one might come across materials that require a different type of $(aura) to be present around the altar, for which the $(l:using/crimson_altar)Crimson Altar$() will have to be constructed." + "text": "When the $(item)Natural Altar$() has collected a sufficient amount of $(aura), it will be able to infuse items of certain materials. To do this, simply place any material onto the altar and wait for the infusion to be completed." }, { "type": "naturesaura:altar", diff --git a/src/main/resources/data/naturesaura/advancements/tainted_gold.json b/src/main/resources/data/naturesaura/advancements/tainted_gold.json deleted file mode 100644 index 02b3ce56..00000000 --- a/src/main/resources/data/naturesaura/advancements/tainted_gold.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "naturesaura:tainted_gold" - }, - "title": { - "translate": "advancement.naturesaura.tainted_gold" - }, - "description": { - "translate": "advancement.naturesaura.tainted_gold.desc" - } - }, - "parent": "naturesaura:aura_bottle_nether", - "criteria": { - "materials": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["naturesaura:tainted_gold"] - } - ] - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json b/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json index 71468b28..87cc63ac 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json +++ b/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json @@ -6,6 +6,6 @@ "output": { "item": "naturesaura:tainted_gold" }, - "aura": 15000, - "time": 80 + "aura": 3000, + "time": 300 } \ No newline at end of file diff --git a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json b/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json index 9d88b6cc..abb84029 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json +++ b/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json @@ -6,6 +6,6 @@ "output": { "item": "naturesaura:tainted_gold_block" }, - "aura": 135000, - "time": 700 + "aura": 27000, + "time": 2625 } \ No newline at end of file