diff --git a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java index 6e538ef3..c8127a0e 100644 --- a/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/ru/bclib/blocks/BaseLeavesBlock.java @@ -23,6 +23,7 @@ import ru.bclib.client.render.BCLRenderLayer; import ru.bclib.interfaces.BlockModelProvider; import ru.bclib.interfaces.RenderLayerProvider; import ru.bclib.interfaces.TagProvider; +import ru.bclib.items.tool.BaseShearsItem; import ru.bclib.util.MHelper; import java.util.Collections; @@ -31,12 +32,12 @@ import java.util.function.Consumer; public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider { protected final Block sapling; - + private static FabricBlockSettings makeLeaves(MaterialColor color) { return FabricBlockSettings .copyOf(Blocks.OAK_LEAVES) .mapColor(color) - .requiresTool() + //.requiresTool() .allowsSpawning((state, world, pos, type) -> false) .suffocates((state, world, pos) -> false) .blockVision((state, world, pos) -> false); @@ -72,7 +73,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, public List getDrops(BlockState state, LootContext.Builder builder) { ItemStack tool = builder.getParameter(LootContextParams.TOOL); if (tool != null) { - if (tool.isCorrectToolForDrops(state) || EnchantmentHelper.getItemEnchantmentLevel( + if (BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel( Enchantments.SILK_TOUCH, tool ) > 0) { @@ -95,7 +96,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, @Override public void addTags(List> blockTags, List> itemTags) { blockTags.add(FabricMineableTags.SHEARS_MINEABLE); - blockTags.add(TagAPI.MINEABLE_HOE); + //blockTags.add(TagAPI.MINEABLE_HOE); blockTags.add(BlockTags.LEAVES); } } diff --git a/src/main/java/ru/bclib/items/tool/BaseShearsItem.java b/src/main/java/ru/bclib/items/tool/BaseShearsItem.java index 90af703f..bdc5df08 100644 --- a/src/main/java/ru/bclib/items/tool/BaseShearsItem.java +++ b/src/main/java/ru/bclib/items/tool/BaseShearsItem.java @@ -10,7 +10,11 @@ public class BaseShearsItem extends ShearsItem { public BaseShearsItem(Properties properties) { super(properties); } - + + public static boolean isShear(ItemStack tool){ + return tool.is(Items.SHEARS) | tool.is(TagAPI.ITEM_COMMON_SHEARS) || tool.is(TagAPI.ITEM_SHEARS); + } + public static boolean isShear(ItemStack itemStack, Item item){ if (item == Items.SHEARS){ return itemStack.is(item) | itemStack.is(TagAPI.ITEM_COMMON_SHEARS) || itemStack.is(TagAPI.ITEM_SHEARS);