From a0d160a056665122eb28e535558beb1e582650e8 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 12 Jan 2022 17:14:46 +0000 Subject: [PATCH] Generated resources changed. --- src/generated/resources/.cache/cache | 13 ++------ .../models/item/reviving_charge.json | 6 ---- .../models/item/straw_charge.json | 6 ---- .../models/item/totem_of_reviving.json | 6 ---- .../recipes/misc/reviving_charge.json | 32 ------------------- .../recipes/misc/straw_charge.json | 32 ------------------- .../recipes/misc/totem_of_reviving.json | 32 ------------------- .../straw_totem.json | 0 .../recipes/reviving_charge.json | 22 ------------- .../totemofreviving/recipes/straw_charge.json | 22 ------------- .../totemofreviving/recipes/straw_totem.json | 4 +-- .../recipes/totem_of_reviving.json | 19 ----------- 12 files changed, 4 insertions(+), 190 deletions(-) delete mode 100755 src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json delete mode 100644 src/generated/resources/assets/totemofreviving/models/item/straw_charge.json delete mode 100755 src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json delete mode 100755 src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json delete mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json delete mode 100755 src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json rename src/generated/resources/data/totemofreviving/advancements/recipes/{misc => totemofreviving}/straw_totem.json (100%) delete mode 100755 src/generated/resources/data/totemofreviving/recipes/reviving_charge.json delete mode 100644 src/generated/resources/data/totemofreviving/recipes/straw_charge.json delete mode 100755 src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4ece7a7..4ab711a 100755 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,12 +1,3 @@ -8a2b88672a3111967914bf84746ee02770dc8aca assets/totemofreviving/models/item/reviving_charge.json -6dfda0ccc2ea9fde90748a9fac81e6e122375b60 assets/totemofreviving/models/item/straw_charge.json 70680f30f3471070d6d4121f0787eb7e2a9d7318 assets/totemofreviving/models/item/straw_totem.json -9802f8a76c014c4e7d5b093643a0f8f2c75474bc assets/totemofreviving/models/item/totem_of_reviving.json -97e29a14be1fa658d16ee23c9791822f6d49dab7 data/totemofreviving/advancements/recipes/misc/reviving_charge.json -4a76d05fbd6fe375b097c1207f2967fd5fbfef5b data/totemofreviving/advancements/recipes/misc/straw_charge.json -8608de575125d59605ad619c16b826cee70c478e data/totemofreviving/advancements/recipes/misc/straw_totem.json -9be362836ef513789b2c8e3d88d35a6b802b5d27 data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json -0a4143689809621511c8e586e6f030e2dd7a5927 data/totemofreviving/recipes/reviving_charge.json -72f1af6072cd28ad40e07d67256f2611bcb2d924 data/totemofreviving/recipes/straw_charge.json -ffba47b4fb65503d8143a387b05e191301b2b895 data/totemofreviving/recipes/straw_totem.json -8d9f9d28b0748d5dacbf0824b8f6531a6a00bbfa data/totemofreviving/recipes/totem_of_reviving.json +8608de575125d59605ad619c16b826cee70c478e data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json +1a3e21a568b1bca2fb3327173d20fab34864e26b data/totemofreviving/recipes/straw_totem.json diff --git a/src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json b/src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json deleted file mode 100755 index 393b156..0000000 --- a/src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "totemofreviving:item/reviving_charge" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json b/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json deleted file mode 100644 index 85c72a4..0000000 --- a/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "totemofreviving:item/straw_charge" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json b/src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json deleted file mode 100755 index 9295aaf..0000000 --- a/src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "totemofreviving:item/totem_of_reviving" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json deleted file mode 100755 index 20ddcc6..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "totemofreviving:reviving_charge" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "totemofreviving:totem_of_reviving" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "totemofreviving:reviving_charge" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json deleted file mode 100644 index 0230cb8..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "totemofreviving:straw_charge" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:emerald" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "totemofreviving:straw_charge" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json b/src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json deleted file mode 100755 index 401738b..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "totemofreviving:totem_of_reviving" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:totem_of_undying" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "totemofreviving:totem_of_reviving" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json similarity index 100% rename from src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json rename to src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json diff --git a/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json b/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json deleted file mode 100755 index 34426eb..0000000 --- a/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "@E@", - "E#E", - "@E@" - ], - "key": { - "#": { - "item": "minecraft:totem_of_undying" - }, - "@": { - "item": "minecraft:diamond_block" - }, - "E": { - "item": "minecraft:ender_pearl" - } - }, - "result": { - "item": "totemofreviving:reviving_charge" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json b/src/generated/resources/data/totemofreviving/recipes/straw_charge.json deleted file mode 100644 index c9669bb..0000000 --- a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "IWI", - "WEW", - "IWI" - ], - "key": { - "W": { - "item": "minecraft:wheat" - }, - "E": { - "item": "minecraft:emerald" - }, - "I": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "totemofreviving:straw_charge" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json index b1fcf7b..b8da68e 100644 --- a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json +++ b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json @@ -3,13 +3,13 @@ "pattern": [ "NSN", "NWN", - "N/N" + "N|N" ], "key": { "W": { "item": "minecraft:wheat" }, - "/": { + "|": { "item": "minecraft:stick" }, "S": { diff --git a/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json b/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json deleted file mode 100755 index 5a4005d..0000000 --- a/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "@@@", - "@#@", - "@@@" - ], - "key": { - "#": { - "item": "minecraft:totem_of_undying" - }, - "@": { - "item": "minecraft:diamond" - } - }, - "result": { - "item": "totemofreviving:totem_of_reviving" - } -} \ No newline at end of file