Skip to content

Commit

Permalink
add "c:tools/shear" and deprecated "c:tools/shears" tag to mods shear…
Browse files Browse the repository at this point in the history 
…s item tag and use this tag in all loot tables (#2244)
  • Loading branch information
@cech12
cech12 authored Jul 29, 2024
1 parent 120dc69 commit 1554510
Show file tree
Hide file tree
Showing 25 changed files with 108 additions and 67 deletions.
46 changes: 23 additions & 23 deletions common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/cypress_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion common/src/generated/resources/data/biomesoplenty/loot_table/blocks/dead_branch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
}
],
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/dead_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/empyreal_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/fir_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions ...on/src/generated/resources/data/biomesoplenty/loot_table/blocks/flowering_oak_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -142,7 +142,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/hellbark_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/jacaranda_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/magic_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/mahogany_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/orange_maple_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/origin_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -142,7 +142,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/palm_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/pine_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions ...on/src/generated/resources/data/biomesoplenty/loot_table/blocks/rainbow_birch_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/red_maple_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/redwood_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/snowblossom_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion common/src/generated/resources/data/biomesoplenty/loot_table/blocks/sprout.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
}
],
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/umbran_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/willow_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions common/src/generated/resources/data/biomesoplenty/loot_table/blocks/yellow_maple_leaves.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down Expand Up @@ -74,7 +74,7 @@
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
"items": "#biomesoplenty:shears"
}
},
{
Expand Down
Loading

0 comments on commit 1554510

Please sign in to comment.