keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Run Forge's data generators to sync 1.16 vanilla changes.

Browse source
This commit is contained in:
LexManos 2020-07-21 17:34:23 -07:00
parent daa85d3c5b
commit 7b43b9f8c0
15 changed files with 199 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json
View file

@ -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
}
]
}
]

98
src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json
View file

@ -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
}
]
}
]

8
src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json
View file

@ -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"
}
],

1
src/generated/resources/data/minecraft/recipes/acacia_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

1
src/generated/resources/data/minecraft/recipes/birch_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

1
src/generated/resources/data/minecraft/recipes/dark_oak_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

1
src/generated/resources/data/minecraft/recipes/jungle_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

1
src/generated/resources/data/minecraft/recipes/oak_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

1
src/generated/resources/data/minecraft/recipes/spruce_sign.json
View file

@ -1,5 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"group": "sign",
"pattern": [
"###",
"###",

2
src/generated/resources/data/minecraft/recipes/stone_axe.json
View file

@ -10,7 +10,7 @@
"tag": "forge:rods/wooden"
},
"X": {
"tag": "forge:cobblestone"
"tag": "minecraft:stone_tool_materials"
}
},
"result": {

2
src/generated/resources/data/minecraft/recipes/stone_hoe.json
View file

@ -10,7 +10,7 @@
"tag": "forge:rods/wooden"
},
"X": {
"tag": "forge:cobblestone"
"tag": "minecraft:stone_tool_materials"
}
},
"result": {

2
src/generated/resources/data/minecraft/recipes/stone_pickaxe.json
View file

@ -10,7 +10,7 @@
"tag": "forge:rods/wooden"
},
"X": {
"tag": "forge:cobblestone"
"tag": "minecraft:stone_tool_materials"
}
},
"result": {

2
src/generated/resources/data/minecraft/recipes/stone_shovel.json
View file

@ -10,7 +10,7 @@
"tag": "forge:rods/wooden"
},
"X": {
"tag": "forge:cobblestone"
"tag": "minecraft:stone_tool_materials"
}
},
"result": {

2
src/generated/resources/data/minecraft/recipes/stone_sword.json
View file

@ -10,7 +10,7 @@
"tag": "forge:rods/wooden"
},
"X": {
"tag": "forge:cobblestone"
"tag": "minecraft:stone_tool_materials"
}
},
"result": {

2
src/main/java/net/minecraftforge/common/ForgeMod.java
View file

@ -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));