From d73751b53675457b6f61d16c5b83c8d71533513e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 16 Feb 2023 19:45:20 +0100 Subject: [PATCH] finished the aura imbalance ward --- .../assets/naturesaura/lang/en_us.json | 9 ++++-- .../entries/creating/animal_generator.json | 2 +- .../creating/projectile_generator.json | 2 +- .../creating/slime_split_generator.json | 2 +- .../entries/items/shockwave_creator.json | 2 +- .../en_us/entries/practices/aura_bottle.json | 6 ++++ .../en_us/entries/practices/offering.json | 2 +- .../en_us/entries/using/lower_limiter.json | 18 +++++++++++ .../entries/items/shockwave_creator.json | 2 +- .../fr_fr/entries/practices/offering.json | 2 +- .../creating/slime_split_generator.json | 2 +- .../entries/items/shockwave_creator.json | 2 +- .../zh_cn/entries/practices/offering.json | 2 +- .../advancements/vacuum_bottle.json | 26 ++++++++++++++++ .../naturesaura/recipes/lower_limiter.json | 31 +++++++++++++++++++ 15 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/lower_limiter.json create mode 100644 src/main/resources/data/naturesaura/advancements/vacuum_bottle.json create mode 100644 src/main/resources/data/naturesaura/recipes/lower_limiter.json diff --git a/src/main/resources/assets/naturesaura/lang/en_us.json b/src/main/resources/assets/naturesaura/lang/en_us.json index 329675ed..d228ed22 100644 --- a/src/main/resources/assets/naturesaura/lang/en_us.json +++ b/src/main/resources/assets/naturesaura/lang/en_us.json @@ -78,6 +78,7 @@ "block.naturesaura.slime_split_generator": "Offshoot Observer", "block.naturesaura.spring": "Everlasting Spring", "block.naturesaura.weather_changer": "Cloudshifter", + "block.naturesaura.lower_limiter": "Aura Imbalance Ward", "item.naturesaura.eye": "Environmental Eye", "item.naturesaura.eye_improved": "Environmental Ocular", "item.naturesaura.gold_fiber": "Brilliant Fiber", @@ -192,11 +193,11 @@ "advancement.naturesaura.infused_tools": "Gear Up Intensifies", "advancement.naturesaura.infused_tools.desc": "Create an Infused Iron Pickaxe and Blade", "advancement.naturesaura.aura_bottle_overworld": "A Taste of Sunlight", - "advancement.naturesaura.aura_bottle_overworld.desc": "Collect Aura using a Bottle in the Overworld", + "advancement.naturesaura.aura_bottle_overworld.desc": "Collect Aura using a Bottle and Cork in the Overworld", "advancement.naturesaura.aura_bottle_nether": "Spooky Scary Skeletons", - "advancement.naturesaura.aura_bottle_nether.desc": "Collect Aura using a Bottle in the Nether", + "advancement.naturesaura.aura_bottle_nether.desc": "Collect Aura using a Bottle and Cork in the Nether", "advancement.naturesaura.aura_bottle_end": "Breathy Surroundings", - "advancement.naturesaura.aura_bottle_end.desc": "Collect Aura using a Bottle in the End", + "advancement.naturesaura.aura_bottle_end.desc": "Collect Aura using a Bottle and Cork in the End", "advancement.naturesaura.offering": "Yo God, Ya Want This?", "advancement.naturesaura.offering.desc": "Create an Offering Table for the Offering to the Gods", "advancement.naturesaura.sky_ingot": "Sturdy and Light", @@ -215,6 +216,8 @@ "advancement.naturesaura.eye_improved.desc": "Create an Environmental Ocular to see Aura imbalance effects", "advancement.naturesaura.range_visualizer": "I Spy With my Little Eye", "advancement.naturesaura.range_visualizer.desc": "Create a Mystical Magnifier to see the range of your devices", + "advancement.naturesaura.vacuum_bottle": "Breathe Through, Breathe Deep", + "advancement.naturesaura.vacuum_bottle.desc": "Capture a vacuum using a Bottle and Cork", "command.naturesaura.aura.usage": "/naaura store|drain [range] OR /naaura reset ", "effect.naturesaura.breathless": "Breathless", "entity.naturesaura.effect_inhibitor": "Effect Powder", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/animal_generator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/animal_generator.json index 1eb131d9..cd81b676 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/animal_generator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/animal_generator.json @@ -2,7 +2,7 @@ "name": "Disentangler of Mortals", "icon": "naturesaura:animal_generator", "category": "naturesaura:creating", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/projectile_generator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/projectile_generator.json index c3879b69..c7f30040 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/projectile_generator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/projectile_generator.json @@ -2,7 +2,7 @@ "name": "Shooting Mark", "icon": "naturesaura:projectile_generator", "category": "naturesaura:creating", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/slime_split_generator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/slime_split_generator.json index dc2e51b7..3971bf93 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/slime_split_generator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/creating/slime_split_generator.json @@ -2,7 +2,7 @@ "name": "Offshoot Observer", "icon": "naturesaura:slime_split_generator", "category": "naturesaura:creating", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json index 9467c125..254d3d97 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/items/shockwave_creator.json @@ -2,7 +2,7 @@ "name": "Amulet of Wrath", "icon": "naturesaura:shockwave_creator", "category": "naturesaura:items", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json index fece7a00..dc73b9cf 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json @@ -23,6 +23,12 @@ { "type": "text", "text": "Additionally, the collection of $(aura) in this manner can be automated easily using $(item)Dispensers$(): Putting empty $(item)Bottles and Corks$() into them will cause them to be shot out open, making them fill up with $(aura) in the process. As they are not sucked up by the Dispenser again afterwards, an additional tool like a $(item)Hopper$() is required." + }, + { + "type": "spotlight", + "item": "naturesaura:vacuum_bottle", + "link_recipe": true, + "text": "Lastly, some areas have a severe lack of $(aura), much lower than the $(l:items/eye)Environmental Eye$() can display, and whose air is subsequently nearly devoid of oxygen. Using a $(item)Bottle and Cork$() in areas like these allows bottling up this air and capturing a nearly perfect vacuum in the bottle." } ] } \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json index 506377d0..002eef64 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/offering.json @@ -2,7 +2,7 @@ "name": "Offering to the Gods", "icon": "naturesaura:offering_table", "category": "naturesaura:practices", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/lower_limiter.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/lower_limiter.json new file mode 100644 index 00000000..79d7168f --- /dev/null +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/using/lower_limiter.json @@ -0,0 +1,18 @@ +{ + "name": "Aura Imbalance Ward", + "icon": "naturesaura:lower_limiter", + "category": "naturesaura:using", + "advancement": "naturesaura:vacuum_bottle", + "priority": true, + "pages": [ + { + "type": "text", + "text": "As any magical botanist knows, causing negative $(aura) imbalance effects can be quite dangerous, especially when using a device that consumes $(aura) passively.$(br)For cases like this, the $(item)Aura Imbalance Ward$() provides protection against any dangers: placing it next to a device that uses $(aura) causes the device to cease operation while the $(aura) levels around it are too low.$(br)This comes at no cost in return." + }, + { + "type": "crafting", + "recipe": "naturesaura:lower_limiter", + "text": "Crafting the $(item)Aura Imbalance Ward$()" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/items/shockwave_creator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/items/shockwave_creator.json index 9467c125..254d3d97 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/items/shockwave_creator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/items/shockwave_creator.json @@ -2,7 +2,7 @@ "name": "Amulet of Wrath", "icon": "naturesaura:shockwave_creator", "category": "naturesaura:items", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/practices/offering.json b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/practices/offering.json index 506377d0..002eef64 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/practices/offering.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/fr_fr/entries/practices/offering.json @@ -2,7 +2,7 @@ "name": "Offering to the Gods", "icon": "naturesaura:offering_table", "category": "naturesaura:practices", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/creating/slime_split_generator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/creating/slime_split_generator.json index 4fac461c..887ee104 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/creating/slime_split_generator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/creating/slime_split_generator.json @@ -2,7 +2,7 @@ "name": "分裂观测仪", "icon": "naturesaura:slime_split_generator", "category": "naturesaura:creating", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/items/shockwave_creator.json b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/items/shockwave_creator.json index 3e7df4b0..9053e624 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/items/shockwave_creator.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/items/shockwave_creator.json @@ -2,7 +2,7 @@ "name": "狂怒护身符", "icon": "naturesaura:shockwave_creator", "category": "naturesaura:items", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/practices/offering.json b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/practices/offering.json index c1c62a9b..e7ae5b47 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/practices/offering.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/zh_cn/entries/practices/offering.json @@ -2,7 +2,7 @@ "name": "祭祀诸神", "icon": "naturesaura:offering_table", "category": "naturesaura:practices", - "advancement": "naturesaura:tainted_gold", + "advancement": "naturesaura:infused_materials", "pages": [ { "type": "text", diff --git a/src/main/resources/data/naturesaura/advancements/vacuum_bottle.json b/src/main/resources/data/naturesaura/advancements/vacuum_bottle.json new file mode 100644 index 00000000..298f6e74 --- /dev/null +++ b/src/main/resources/data/naturesaura/advancements/vacuum_bottle.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "naturesaura:vacuum_bottle" + }, + "title": { + "translate": "advancement.naturesaura.vacuum_bottle" + }, + "description": { + "translate": "advancement.naturesaura.vacuum_bottle.desc" + } + }, + "parent": "naturesaura:negative_imbalance", + "criteria": { + "bottle": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": ["naturesaura:vacuum_bottle"] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/naturesaura/recipes/lower_limiter.json b/src/main/resources/data/naturesaura/recipes/lower_limiter.json new file mode 100644 index 00000000..0e65859e --- /dev/null +++ b/src/main/resources/data/naturesaura/recipes/lower_limiter.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S1S", + "2I3", + "S4S" + ], + "key": { + "S": { + "item": "naturesaura:infused_stone" + }, + "1": { + "item": "naturesaura:token_euphoria" + }, + "2": { + "item": "naturesaura:token_terror" + }, + "3": { + "item": "naturesaura:token_rage" + }, + "4": { + "item": "naturesaura:token_grief" + }, + "I": { + "item": "naturesaura:vacuum_bottle" + } + }, + "result": { + "item": "naturesaura:lower_limiter" + } +} \ No newline at end of file