mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 21:20:12 +00:00
Run Forge's data generators to sync 1.16 vanilla changes.
This commit is contained in:
1 parent
daa85d3c5b
commit
7b43b9f8c0
15 files changed
+199
-23
No files matched your search
@@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -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,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "sign",
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"tag": "forge:rods/wooden"
|
||||
},
|
||||
"X": {
|
||||
"tag": "forge:cobblestone"
|
||||
"tag": "minecraft:stone_tool_materials"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"tag": "forge:rods/wooden"
|
||||
},
|
||||
"X": {
|
||||
"tag": "forge:cobblestone"
|
||||
"tag": "minecraft:stone_tool_materials"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"tag": "forge:rods/wooden"
|
||||
},
|
||||
"X": {
|
||||
"tag": "forge:cobblestone"
|
||||
"tag": "minecraft:stone_tool_materials"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"tag": "forge:rods/wooden"
|
||||
},
|
||||
"X": {
|
||||
"tag": "forge:cobblestone"
|
||||
"tag": "minecraft:stone_tool_materials"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"tag": "forge:rods/wooden"
|
||||
},
|
||||
"X": {
|
||||
"tag": "forge:cobblestone"
|
||||
"tag": "minecraft:stone_tool_materials"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in new issue
Block a user