From 7b43b9f8c0a2a200ade96b0b3c497c724807f017 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 21 Jul 2020 17:34:23 -0700 Subject: [PATCH] Run Forge's data generators to sync 1.16 vanilla changes. --- .../loot_tables/blocks/large_fern.json | 98 +++++++++++++++++-- .../loot_tables/blocks/tall_grass.json | 98 +++++++++++++++++-- .../loot_tables/blocks/tall_seagrass.json | 8 +- .../data/minecraft/recipes/acacia_sign.json | 1 + .../data/minecraft/recipes/birch_sign.json | 1 + .../data/minecraft/recipes/dark_oak_sign.json | 1 + .../data/minecraft/recipes/jungle_sign.json | 1 + .../data/minecraft/recipes/oak_sign.json | 1 + .../data/minecraft/recipes/spruce_sign.json | 1 + .../data/minecraft/recipes/stone_axe.json | 2 +- .../data/minecraft/recipes/stone_hoe.json | 2 +- .../data/minecraft/recipes/stone_pickaxe.json | 2 +- .../data/minecraft/recipes/stone_shovel.json | 2 +- .../data/minecraft/recipes/stone_sword.json | 2 +- .../net/minecraftforge/common/ForgeMod.java | 2 +- 15 files changed, 199 insertions(+), 23 deletions(-) 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 2eac855915..7b70375037 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 @@ -2,7 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, "entries": [ { "type": "minecraft:alternatives", @@ -17,6 +17,12 @@ } } ], + "functions": [ + { + "function": "minecraft:set_count", + "count": 2 + } + ], "name": "minecraft:fern" }, { @@ -25,13 +31,6 @@ { "condition": "minecraft:survives_explosion" }, - { - "condition": "minecraft:block_state_property", - "block": "minecraft:large_fern", - "properties": { - "half": "lower" - } - }, { "condition": "minecraft:random_chance", "chance": 0.125 @@ -41,6 +40,89 @@ } ] } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:large_fern", + "properties": { + "half": "lower" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "block": "minecraft:large_fern", + "state": { + "half": "upper" + } + } + }, + "offsetY": 1 + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": 2 + } + ], + "name": "minecraft:fern" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.125 + } + ], + "name": "minecraft:wheat_seeds" + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:large_fern", + "properties": { + "half": "upper" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "block": "minecraft:large_fern", + "state": { + "half": "lower" + } + } + }, + "offsetY": -1 + } ] } ] 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 797b682675..53099b83ef 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 @@ -2,7 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, "entries": [ { "type": "minecraft:alternatives", @@ -17,6 +17,12 @@ } } ], + "functions": [ + { + "function": "minecraft:set_count", + "count": 2 + } + ], "name": "minecraft:grass" }, { @@ -25,13 +31,6 @@ { "condition": "minecraft:survives_explosion" }, - { - "condition": "minecraft:block_state_property", - "block": "minecraft:tall_grass", - "properties": { - "half": "lower" - } - }, { "condition": "minecraft:random_chance", "chance": 0.125 @@ -41,6 +40,89 @@ } ] } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:tall_grass", + "properties": { + "half": "lower" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "block": "minecraft:tall_grass", + "state": { + "half": "upper" + } + } + }, + "offsetY": 1 + } + ] + }, + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "forge:shears" + } + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": 2 + } + ], + "name": "minecraft:grass" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.125 + } + ], + "name": "minecraft:wheat_seeds" + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:tall_grass", + "properties": { + "half": "upper" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "block": "minecraft:tall_grass", + "state": { + "half": "lower" + } + } + }, + "offsetY": -1 + } ] } ] 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 ebc23c36e8..435870efa4 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 @@ -2,10 +2,16 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, "entries": [ { "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": 2 + } + ], "name": "minecraft:seagrass" } ], diff --git a/src/generated/resources/data/minecraft/recipes/acacia_sign.json b/src/generated/resources/data/minecraft/recipes/acacia_sign.json index c18c845031..ea0e20fb38 100644 --- a/src/generated/resources/data/minecraft/recipes/acacia_sign.json +++ b/src/generated/resources/data/minecraft/recipes/acacia_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/birch_sign.json b/src/generated/resources/data/minecraft/recipes/birch_sign.json index 80453b6754..959499df37 100644 --- a/src/generated/resources/data/minecraft/recipes/birch_sign.json +++ b/src/generated/resources/data/minecraft/recipes/birch_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/dark_oak_sign.json b/src/generated/resources/data/minecraft/recipes/dark_oak_sign.json index c0fb8b30a6..000147ecc0 100644 --- a/src/generated/resources/data/minecraft/recipes/dark_oak_sign.json +++ b/src/generated/resources/data/minecraft/recipes/dark_oak_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/jungle_sign.json b/src/generated/resources/data/minecraft/recipes/jungle_sign.json index c1218aa9f5..c976a9fb2c 100644 --- a/src/generated/resources/data/minecraft/recipes/jungle_sign.json +++ b/src/generated/resources/data/minecraft/recipes/jungle_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/oak_sign.json b/src/generated/resources/data/minecraft/recipes/oak_sign.json index 2054c0276c..cef23376b3 100644 --- a/src/generated/resources/data/minecraft/recipes/oak_sign.json +++ b/src/generated/resources/data/minecraft/recipes/oak_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/spruce_sign.json b/src/generated/resources/data/minecraft/recipes/spruce_sign.json index c7305269c2..5eb78b6edc 100644 --- a/src/generated/resources/data/minecraft/recipes/spruce_sign.json +++ b/src/generated/resources/data/minecraft/recipes/spruce_sign.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ "###", "###", diff --git a/src/generated/resources/data/minecraft/recipes/stone_axe.json b/src/generated/resources/data/minecraft/recipes/stone_axe.json index dc7c3d75b2..dd76a0389f 100644 --- a/src/generated/resources/data/minecraft/recipes/stone_axe.json +++ b/src/generated/resources/data/minecraft/recipes/stone_axe.json @@ -10,7 +10,7 @@ "tag": "forge:rods/wooden" }, "X": { - "tag": "forge:cobblestone" + "tag": "minecraft:stone_tool_materials" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/stone_hoe.json b/src/generated/resources/data/minecraft/recipes/stone_hoe.json index 7ffdc17ffc..84fbb94d56 100644 --- a/src/generated/resources/data/minecraft/recipes/stone_hoe.json +++ b/src/generated/resources/data/minecraft/recipes/stone_hoe.json @@ -10,7 +10,7 @@ "tag": "forge:rods/wooden" }, "X": { - "tag": "forge:cobblestone" + "tag": "minecraft:stone_tool_materials" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/stone_pickaxe.json b/src/generated/resources/data/minecraft/recipes/stone_pickaxe.json index 5557f044bc..61d09078b6 100644 --- a/src/generated/resources/data/minecraft/recipes/stone_pickaxe.json +++ b/src/generated/resources/data/minecraft/recipes/stone_pickaxe.json @@ -10,7 +10,7 @@ "tag": "forge:rods/wooden" }, "X": { - "tag": "forge:cobblestone" + "tag": "minecraft:stone_tool_materials" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/stone_shovel.json b/src/generated/resources/data/minecraft/recipes/stone_shovel.json index 7997178d87..b625ee501f 100644 --- a/src/generated/resources/data/minecraft/recipes/stone_shovel.json +++ b/src/generated/resources/data/minecraft/recipes/stone_shovel.json @@ -10,7 +10,7 @@ "tag": "forge:rods/wooden" }, "X": { - "tag": "forge:cobblestone" + "tag": "minecraft:stone_tool_materials" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/stone_sword.json b/src/generated/resources/data/minecraft/recipes/stone_sword.json index 38288a7cfc..044a1bc1e0 100644 --- a/src/generated/resources/data/minecraft/recipes/stone_sword.json +++ b/src/generated/resources/data/minecraft/recipes/stone_sword.json @@ -10,7 +10,7 @@ "tag": "forge:rods/wooden" }, "X": { - "tag": "forge:cobblestone" + "tag": "minecraft:stone_tool_materials" } }, "result": { diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 2e76f570df..b3f1a44279 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -189,7 +189,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook if (event.includeServer()) { ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(gen); - gen.addProvider(new ForgeBlockTagsProvider(gen)); + gen.addProvider(blockTags); gen.addProvider(new ForgeItemTagsProvider(gen, blockTags)); gen.addProvider(new ForgeRecipeProvider(gen)); gen.addProvider(new ForgeLootTableProvider(gen));