Accept grass, flowers and other natural plants beside tree trunks.
Co-authored-by: Cursor <cursoragent@cursor.com>
@@ -1,6 +1,7 @@
1
1
package nl.timfalken.copperfarmer;
2
2
3
3
import org.bukkit.Material;
4
import org.bukkit.Tag;
4
5
import org.bukkit.block.Block;
5
6
import org.bukkit.block.BlockFace;
6
7
import org.bukkit.block.data.type.Leaves;
@@ -37,7 +38,23 @@ final class TreeRegistry {
37
38
Material.PALE_MOSS_CARPET,
38
39
Material.PALE_HANGING_MOSS,
39
40
Material.PINK_PETALS,
40
Material.LEAF_LITTER
41
Material.LEAF_LITTER,
42
Material.SHORT_GRASS,
43
Material.TALL_GRASS,
44
Material.FERN,
45
Material.LARGE_FERN,
46
Material.DEAD_BUSH,
47
Material.BUSH,
48
Material.FIREFLY_BUSH,
49
Material.WILDFLOWERS,
50
Material.BEE_NEST,
51
Material.BROWN_MUSHROOM,
52
Material.RED_MUSHROOM,
53
Material.SWEET_BERRY_BUSH,
54
Material.SUGAR_CANE,
55
Material.BAMBOO,
56
Material.BAMBOO_SAPLING,
57
Material.HANGING_ROOTS
41
58
);
42
59
43
60
record Species(String name, Set<Material> logs, Set<Material> leaves, Material sapling) {
@@ -121,6 +138,7 @@ final class TreeRegistry {
121
138
if (neighbour.isAir()) return true;
122
139
if (neighbour == log) return true;
123
140
if (CLUTTER.contains(neighbour)) return true;
141
if (Tag.REPLACEABLE.isTagged(neighbour) || Tag.FLOWERS.isTagged(neighbour)) return true;
124
142
if (allowedLeaves.contains(neighbour)) {
125
143
return neighbourBlock.getBlockData() instanceof Leaves leaves && !leaves.isPersistent();
126
144
}
@@ -1,6 +1,7 @@1
package nl.timfalken.copperfarmer;1
package nl.timfalken.copperfarmer;2
2
3
import org.bukkit.Material;3
import org.bukkit.Material;4
import org.bukkit.Tag;4
import org.bukkit.block.Block;5
import org.bukkit.block.Block;5
import org.bukkit.block.BlockFace;6
import org.bukkit.block.BlockFace;6
import org.bukkit.block.data.type.Leaves;7
import org.bukkit.block.data.type.Leaves;@@ -37,7 +38,23 @@ final class TreeRegistry {37
Material.PALE_MOSS_CARPET,38
Material.PALE_MOSS_CARPET,38
Material.PALE_HANGING_MOSS,39
Material.PALE_HANGING_MOSS,39
Material.PINK_PETALS,40
Material.PINK_PETALS,40
Material.LEAF_LITTER41
Material.LEAF_LITTER,42
Material.SHORT_GRASS,43
Material.TALL_GRASS,44
Material.FERN,45
Material.LARGE_FERN,46
Material.DEAD_BUSH,47
Material.BUSH,48
Material.FIREFLY_BUSH,49
Material.WILDFLOWERS,50
Material.BEE_NEST,51
Material.BROWN_MUSHROOM,52
Material.RED_MUSHROOM,53
Material.SWEET_BERRY_BUSH,54
Material.SUGAR_CANE,55
Material.BAMBOO,56
Material.BAMBOO_SAPLING,57
Material.HANGING_ROOTS41
);58
);42
59
43
record Species(String name, Set<Material> logs, Set<Material> leaves, Material sapling) {60
record Species(String name, Set<Material> logs, Set<Material> leaves, Material sapling) {@@ -121,6 +138,7 @@ final class TreeRegistry {121
if (neighbour.isAir()) return true;138
if (neighbour.isAir()) return true;122
if (neighbour == log) return true;139
if (neighbour == log) return true;123
if (CLUTTER.contains(neighbour)) return true;140
if (CLUTTER.contains(neighbour)) return true;141
if (Tag.REPLACEABLE.isTagged(neighbour) || Tag.FLOWERS.isTagged(neighbour)) return true;124
if (allowedLeaves.contains(neighbour)) {142
if (allowedLeaves.contains(neighbour)) {125
return neighbourBlock.getBlockData() instanceof Leaves leaves && !leaves.isPersistent();143
return neighbourBlock.getBlockData() instanceof Leaves leaves && !leaves.isPersistent();126
}144
}