From 38e1a5a1f177e207b3690d7f2de008ae09a4fde6 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 1 Jul 2017 08:31:05 -0500 Subject: [PATCH] Fix base advancements being specified dumbly --- .../botania/advancements/main/root.json | 178 +----------------- .../advancements/main/sky_of_beginning.json | 178 +----------------- 2 files changed, 6 insertions(+), 350 deletions(-) diff --git a/src/main/resources/assets/botania/advancements/main/root.json b/src/main/resources/assets/botania/advancements/main/root.json index 0cfa662ae..5ce661224 100644 --- a/src/main/resources/assets/botania/advancements/main/root.json +++ b/src/main/resources/assets/botania/advancements/main/root.json @@ -14,187 +14,15 @@ "announce_to_chat": false }, "criteria": { - "white": { + "flower": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:flower", - "data": 0 - } - ] - } - }, - "orange": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 1 - } - ] - } - }, - "magenta": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 2 - } - ] - } - }, - "light_blue": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 3 - } - ] - } - }, - "yellow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 4 - } - ] - } - }, - "lime": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 5 - } - ] - } - }, - "pink": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 6 - } - ] - } - }, - "gray": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 7 - } - ] - } - }, - "silver": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 8 - } - ] - } - }, - "cyan": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 9 - } - ] - } - }, - "purple": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 10 - } - ] - } - }, - "blue": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 11 - } - ] - } - }, - "brown": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 12 - } - ] - } - }, - "green": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 13 - } - ] - } - }, - "red": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 14 - } - ] - } - }, - "black": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 15 + "item": "botania:flower" } ] } } - }, - "requirements": [ - [ - "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", - "silver", "cyan", "purple", "blue", "brown", "green", "red", "black" - ] - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/sky_of_beginning.json b/src/main/resources/assets/botania/advancements/main/sky_of_beginning.json index d28ec9fbd..eea05c6a3 100644 --- a/src/main/resources/assets/botania/advancements/main/sky_of_beginning.json +++ b/src/main/resources/assets/botania/advancements/main/sky_of_beginning.json @@ -13,187 +13,15 @@ }, "parent": "botania:main/root", "criteria": { - "white": { + "flower": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "botania:flower", - "data": 0 - } - ] - } - }, - "orange": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 1 - } - ] - } - }, - "magenta": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 2 - } - ] - } - }, - "light_blue": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 3 - } - ] - } - }, - "yellow": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 4 - } - ] - } - }, - "lime": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 5 - } - ] - } - }, - "pink": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 6 - } - ] - } - }, - "gray": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 7 - } - ] - } - }, - "silver": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 8 - } - ] - } - }, - "cyan": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 9 - } - ] - } - }, - "purple": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 10 - } - ] - } - }, - "blue": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 11 - } - ] - } - }, - "brown": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 12 - } - ] - } - }, - "green": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 13 - } - ] - } - }, - "red": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 14 - } - ] - } - }, - "black": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "botania:flower", - "data": 15 + "item": "botania:flower" } ] } } - }, - "requirements": [ - [ - "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", - "silver", "cyan", "purple", "blue", "brown", "green", "red", "black" - ] - ] + } } \ No newline at end of file