Skip to content

Commit

Permalink
Fix metamorphic stone dropping cobble with silk touch, closes #3509
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hubry
Hubry committed Nov 10, 2020
1 parent d46cb8b commit 7f159a5
Show file tree
Hide file tree
Showing 9 changed files with 264 additions and 60 deletions.
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_desert_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_desert_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_desert_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_desert_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_forest_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_forest_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_forest_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_forest_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_fungal_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_fungal_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_fungal_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_fungal_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_mesa_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_mesa_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_mesa_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_mesa_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_mountain_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_mountain_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_mountain_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_mountain_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_plains_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_plains_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_plains_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_plains_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_swamp_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_swamp_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_swamp_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_swamp_cobblestone"
}
]
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions src/generated/resources/data/botania/loot_tables/blocks/metamorphic_taiga_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,37 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "botania:metamorphic_taiga_cobblestone"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "botania:metamorphic_taiga_stone"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "botania:metamorphic_taiga_cobblestone"
}
]
}
]
}
Expand Down
Loading

0 comments on commit 7f159a5

Please sign in to comment.