Skip to content

Commit

Permalink
Fix many plants not being minable with the scythe
Browse files Browse the repository at this point in the history
Probably missed some, but this is a better list

(cherry picked from commit 759b897)
  • Loading branch information
KnightMiner committed Sep 19, 2022
1 parent c8ebcf4 commit 9a126b6
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"replace": false,
"values": [
"minecraft:azalea",
"minecraft:cobweb",
"minecraft:dried_kelp_block",
"minecraft:glow_lichen",
"minecraft:lily_pad",
"minecraft:redstone_wire",
"minecraft:tripwire",
"minecraft:twisting_vines_plant",
"minecraft:twisting_vines",
"minecraft:vine",
"minecraft:glow_lichen",
"minecraft:weeping_vines_plant",
"minecraft:weeping_vines",
"#minecraft:cave_vines",
"#minecraft:leaves",
"#minecraft:wool"
"#minecraft:wool",
"#minecraft:saplings",
"#minecraft:flowers",
"#minecraft:replaceable_plants",
"#minecraft:coral_plants"
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"replace": false,
"values": [
"minecraft:attached_melon_stem",
"minecraft:attached_pumpkin_stem",
"minecraft:big_dripleaf_stem",
"minecraft:big_dripleaf",
"minecraft:kelp",
"minecraft:kelp_plant",
"minecraft:nether_wart",
"minecraft:small_dripleaf",
"minecraft:spore_blossom",
"minecraft:sugar_cane",
"minecraft:sweet_berry_bush",
"#minecraft:mineable/hoe",
"#forge:mineable/shears"
"#forge:mineable/shears",
"#minecraft:crops"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,14 @@ private void addHarvest() {
// hand axe has a leaf bonus
tag(TinkerTags.Blocks.MINABLE_WITH_HAND_AXE).addTags(MINEABLE_WITH_AXE, BlockTags.LEAVES);
// scythe/kama does hoe or shear blocks
tag(TinkerTags.Blocks.MINABLE_WITH_SHEARS).add(Blocks.COBWEB, Blocks.REDSTONE_WIRE, Blocks.TRIPWIRE, Blocks.VINE, Blocks.GLOW_LICHEN).addTags(BlockTags.LEAVES, BlockTags.WOOL);
tag(TinkerTags.Blocks.MINABLE_WITH_SHEARS)
.add(Blocks.AZALEA, Blocks.COBWEB, Blocks.DRIED_KELP_BLOCK, Blocks.GLOW_LICHEN, Blocks.LILY_PAD, Blocks.REDSTONE_WIRE,
Blocks.TRIPWIRE, Blocks.TWISTING_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.VINE, Blocks.WEEPING_VINES_PLANT, Blocks.WEEPING_VINES)
.addTags(BlockTags.CAVE_VINES, BlockTags.LEAVES, BlockTags.WOOL,BlockTags.SAPLINGS, BlockTags.FLOWERS, BlockTags.REPLACEABLE_PLANTS, BlockTags.CORAL_PLANTS);
// scythe/kama does hoe or shear blocks
tag(TinkerTags.Blocks.MINABLE_WITH_SCYTHE).addTags(MINEABLE_WITH_HOE, TinkerTags.Blocks.MINABLE_WITH_SHEARS);
tag(TinkerTags.Blocks.MINABLE_WITH_SCYTHE)
.add(Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM, Blocks.BIG_DRIPLEAF_STEM, Blocks.BIG_DRIPLEAF, Blocks.KELP, Blocks.KELP_PLANT, Blocks.NETHER_WART, Blocks.SMALL_DRIPLEAF, Blocks.SPORE_BLOSSOM, Blocks.SUGAR_CANE, Blocks.SWEET_BERRY_BUSH)
.addTags(MINEABLE_WITH_HOE, TinkerTags.Blocks.MINABLE_WITH_SHEARS, BlockTags.CROPS);
// sword list is filled to best ability, but will be a bit inexact as vanilla uses materials, hopefully putting this tag under forge will get people to tag their blocks
tag(TinkerTags.Blocks.MINABLE_WITH_SWORD).add(Blocks.COBWEB)
.add(Blocks.COCOA, Blocks.CHORUS_PLANT, Blocks.CHORUS_FLOWER, Blocks.SWEET_BERRY_BUSH, Blocks.VINE, Blocks.MOSS_CARPET, Blocks.MOSS_BLOCK,
Expand Down

0 comments on commit 9a126b6

Please sign in to comment.