From 1ed4e719fda7456587e513d356d846fdd9ebcf30 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 28 Apr 2020 00:33:13 +0200 Subject: [PATCH] Fixes and adjustments to the loot tables --- .../loot_tables/blocks/alfalfa_crops.json | 5 ++-- .../loot_tables/blocks/apple_leaves.json | 4 +-- .../loot_tables/blocks/apple_sapling.json | 2 +- .../loot_tables/blocks/bakery_door.json | 19 +++++++++++- .../loot_tables/blocks/diamond_door.json | 19 +++++++++++- .../loot_tables/blocks/library_door.json | 19 +++++++++++- .../loot_tables/blocks/slime_drop.json | 29 +++++++++++++++++-- 7 files changed, 86 insertions(+), 11 deletions(-) diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/alfalfa_crops.json b/src/main/resources/data/unicopia/loot_tables/blocks/alfalfa_crops.json index 9e7e13ff..66ca97e0 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/alfalfa_crops.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/alfalfa_crops.json @@ -9,14 +9,13 @@ "children": [ { "type": "minecraft:item", - "name": "unicopia:alfalfa", + "name": "unicopia:alfalfa_leaves", "conditions": [ { "condition": "minecraft:block_state_property", "block": "unicopia:alfalfa_crops", "properties": { - "age": "7", - "type": "normal" + "age": "7" } } ], diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/apple_leaves.json index ebbba995..2471851b 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/apple_leaves.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/apple_leaves.json @@ -35,7 +35,7 @@ ] } ], - "name": "unicopia:apple_leaves" + "name": "unicopia:apple_seeds" }, { "type": "minecraft:item", @@ -54,7 +54,7 @@ ] } ], - "name": "unicopia:apple_sapling" + "name": "unicopia:apple_seeds" } ] } diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/apple_sapling.json index 17066e96..9cf00faf 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/apple_sapling.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/apple_sapling.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "unicopia:apple_sapling" + "name": "unicopia:apple_seeds" } ], "conditions": [ diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/bakery_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/bakery_door.json index bcc06dda..68897c6c 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/bakery_door.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/bakery_door.json @@ -4,7 +4,24 @@ { "rolls": 1, "entries": [ - { "type": "minecraft:item", "name": "unicopia:bakery_door" } + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:oak_door", + "properties": { + "half": "lower" + } + } + ], + "name": "unicopia:bakery_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } ] } ] diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/diamond_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/diamond_door.json index 7b2cdcbb..a0aaeeb3 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/diamond_door.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/diamond_door.json @@ -4,7 +4,24 @@ { "rolls": 1, "entries": [ - { "type": "minecraft:item", "name": "unicopia:diamond_door" } + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:oak_door", + "properties": { + "half": "lower" + } + } + ], + "name": "unicopia:diamond_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } ] } ] diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/library_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/library_door.json index 413924ba..aff1bb82 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/library_door.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/library_door.json @@ -4,7 +4,24 @@ { "rolls": 1, "entries": [ - { "type": "minecraft:item", "name": "unicopia:library_door" } + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:oak_door", + "properties": { + "half": "lower" + } + } + ], + "name": "unicopia:library_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } ] } ] diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/slime_drop.json b/src/main/resources/data/unicopia/loot_tables/blocks/slime_drop.json index 07a271ba..96c26be2 100644 --- a/src/main/resources/data/unicopia/loot_tables/blocks/slime_drop.json +++ b/src/main/resources/data/unicopia/loot_tables/blocks/slime_drop.json @@ -10,11 +10,25 @@ { "type": "minecraft:item", "name": "unicopia:slime_drop", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.125 + } + ], "functions": [ { "function": "minecraft:set_count", "count": { "min": 1, "max": 3 } - } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 2 + } + } ] }, { @@ -24,7 +38,18 @@ { "function": "minecraft:set_count", "count": { "min": 3, "max": 5 } - } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "function": "minecraft:explosion_decay" + } ] } ]