From c07d3d12bd0704e5cf31a5c47420bf739ca82cbf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Jul 2019 21:53:54 -0700 Subject: [PATCH] Fix a couple recipes/loot tables --- .../botania/loot_tables/blocks/fake_air.json | 19 +----------------- .../loot_tables/blocks/gaia_wall_head.json | 2 +- .../loot_tables/blocks/miniisland.json | 20 ------------------- .../loot_tables/blocks/solid_vine.json | 11 +++------- .../data/botania/recipes/fertilizer_dye.json | 8 ++++---- .../{phtanom_ink.json => phantom_ink.json} | 0 .../data/botania/recipes/vivid_seeds.json | 2 +- 7 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 src/main/resources/data/botania/loot_tables/blocks/miniisland.json rename src/main/resources/data/botania/recipes/{phtanom_ink.json => phantom_ink.json} (100%) diff --git a/src/main/resources/data/botania/loot_tables/blocks/fake_air.json b/src/main/resources/data/botania/loot_tables/blocks/fake_air.json index c2a5ad621..68701f9f6 100644 --- a/src/main/resources/data/botania/loot_tables/blocks/fake_air.json +++ b/src/main/resources/data/botania/loot_tables/blocks/fake_air.json @@ -1,20 +1,3 @@ { - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "botania:fake_air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] + "type": "minecraft:block" } \ No newline at end of file diff --git a/src/main/resources/data/botania/loot_tables/blocks/gaia_wall_head.json b/src/main/resources/data/botania/loot_tables/blocks/gaia_wall_head.json index 197eb576a..1a4f3571e 100644 --- a/src/main/resources/data/botania/loot_tables/blocks/gaia_wall_head.json +++ b/src/main/resources/data/botania/loot_tables/blocks/gaia_wall_head.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "botania:gaia_wall_head" + "name": "botania:gaia_head" } ], "conditions": [ diff --git a/src/main/resources/data/botania/loot_tables/blocks/miniisland.json b/src/main/resources/data/botania/loot_tables/blocks/miniisland.json deleted file mode 100644 index b32de187f..000000000 --- a/src/main/resources/data/botania/loot_tables/blocks/miniisland.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "botania:miniisland" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/botania/loot_tables/blocks/solid_vine.json b/src/main/resources/data/botania/loot_tables/blocks/solid_vine.json index 6332af6e6..ca8e7d092 100644 --- a/src/main/resources/data/botania/loot_tables/blocks/solid_vine.json +++ b/src/main/resources/data/botania/loot_tables/blocks/solid_vine.json @@ -2,17 +2,12 @@ "type": "minecraft:block", "pools": [ { - "name": "main", + "name": "vanilla", "rolls": 1, "entries": [ { - "type": "minecraft:item", - "name": "botania:solid_vine" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:loot_table", + "name": "minecraft:vine" } ] } diff --git a/src/main/resources/data/botania/recipes/fertilizer_dye.json b/src/main/resources/data/botania/recipes/fertilizer_dye.json index 08018d5ce..02e988357 100644 --- a/src/main/resources/data/botania/recipes/fertilizer_dye.json +++ b/src/main/resources/data/botania/recipes/fertilizer_dye.json @@ -7,16 +7,16 @@ "item": "minecraft:bone_meal" }, { - "item": "minecraft:dandelion_yellow" + "item": "minecraft:yellow_dye" }, { - "item": "minecraft:dandelion_yellow" + "item": "minecraft:yellow_dye" }, { - "item": "minecraft:rose_red" + "item": "minecraft:red_dye" }, { - "item": "minecraft:rose_red" + "item": "minecraft:red_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/phtanom_ink.json b/src/main/resources/data/botania/recipes/phantom_ink.json similarity index 100% rename from src/main/resources/data/botania/recipes/phtanom_ink.json rename to src/main/resources/data/botania/recipes/phantom_ink.json diff --git a/src/main/resources/data/botania/recipes/vivid_seeds.json b/src/main/resources/data/botania/recipes/vivid_seeds.json index 43c3444f4..a2c4d4559 100644 --- a/src/main/resources/data/botania/recipes/vivid_seeds.json +++ b/src/main/resources/data/botania/recipes/vivid_seeds.json @@ -8,7 +8,7 @@ "item": "botania:grass_seeds" }, { - "item": "minecraft:cactus_green" + "item": "minecraft:green_dye" } ], "type": "minecraft:crafting_shapeless"