diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json index 1f21719ca8..b5c1cddd06 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json index ff85bcb0c1..fda0e111c6 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json index 7f5a40ddfa..053c26954c 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json index eb2d4e9619..891c672df6 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] }, { "rolls": 1.0, @@ -175,8 +174,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json index ebe23a780d..928f7ebc3b 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json b/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json new file mode 100644 index 0000000000..07d73ebc2a --- /dev/null +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json @@ -0,0 +1,115 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "forge:can_tool_perform_action", + "action": "shears_dig" + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "east": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "west": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "north": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "south": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "up": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:glow_lichen", + "properties": { + "down": "true" + } + } + ], + "count": 1.0, + "add": true + }, + { + "function": "minecraft:set_count", + "count": -1.0, + "add": true + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:glow_lichen" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json b/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json index 0f0983b346..d74ce36923 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json @@ -15,8 +15,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json index 8cda8be7d6..596cb094ce 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json @@ -122,8 +122,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json b/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json index c9250aafce..701b686268 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json @@ -63,8 +63,7 @@ }, "offsetY": 1 } - ], - "functions": [] + ] }, { "rolls": 1.0, @@ -128,8 +127,7 @@ }, "offsetY": -1 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json b/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json index fa2a63122e..16e25ecb95 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json @@ -15,8 +15,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json index ccb89a161d..a35b8b7639 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] }, { "rolls": 1.0, @@ -175,8 +174,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json b/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json index f996cf799c..310cc9c304 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json @@ -15,8 +15,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json b/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json index 4a9484e262..b9f2c7e77f 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json @@ -15,8 +15,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json b/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json index a94bb541a6..370b057017 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json @@ -121,8 +121,7 @@ ] } } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json b/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json index 48c510fb7a..e2d5ac85e9 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json @@ -63,8 +63,7 @@ }, "offsetY": 1 } - ], - "functions": [] + ] }, { "rolls": 1.0, @@ -128,8 +127,7 @@ }, "offsetY": -1 } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json b/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json index d856068a48..d4bea9e120 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json @@ -22,8 +22,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json b/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json index 690089222e..2c91a3e9b4 100644 --- a/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json @@ -15,8 +15,7 @@ "condition": "forge:can_tool_perform_action", "action": "shears_dig" } - ], - "functions": [] + ] } ] } \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java index 173fa8b50b..d62aee49eb 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java @@ -107,6 +107,9 @@ public final class ForgeLootTableProvider extends LootTableProvider { } for (LootPoolEntryContainer lootEntry : lootEntries) { + if (findAndReplaceInLootEntry(lootEntry, from, toolAction)) { + found = true; + } if (lootEntry instanceof CompositeEntryBase) { if (findAndReplaceInParentedLootEntry((CompositeEntryBase) lootEntry, from, toolAction)) { found = true;