Loot Provider (for blocks with automatic drop, suggestion #78)

gradle.properties

@@ -11,7 +11,7 @@ loader_version= 0.13.3
 fabric_version = 0.48.0+1.18.2
 
 # Mod Properties
-mod_version = 1.4.5
+mod_version = 1.4.6
 maven_group = ru.bclib
 archives_base_name = bclib
 

src/main/java/ru/bclib/blocks/BaseAnvilBlock.java

@@ -28,6 +28,7 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
 import ru.bclib.interfaces.CustomItemProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.items.BaseAnvilItem;
 
 import java.util.Collections;
@@ -36,7 +37,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 
-public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelProvider, CustomItemProvider {
+public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelProvider, CustomItemProvider, LootProvider {
 	public static final IntegerProperty DESTRUCTION = BlockProperties.DESTRUCTION;
 	public IntegerProperty durability;
 	
@@ -96,8 +97,7 @@ public abstract class BaseAnvilBlock extends AnvilBlock implements BlockModelPro
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		int destruction = state.getValue(DESTRUCTION);
 		int durability = state.getValue(getDurabilityProp());
 		int value = destruction * getMaxDurability() + durability;

src/main/java/ru/bclib/blocks/BaseBarrelBlock.java

@@ -24,7 +24,6 @@ import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.BlockHitResult;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.blockentities.BaseBarrelBlockEntity;
@@ -32,14 +31,14 @@ import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.registry.BaseBlockEntities;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Random;
 
-public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider {
+public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider, LootProvider {
 	public BaseBarrelBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source).noOcclusion());
 	}
@@ -53,14 +52,6 @@ public class BaseBarrelBlock extends BarrelBlock implements BlockModelProvider {
 		return BaseBlockEntities.BARREL.create(blockPos, blockState);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		List<ItemStack> drop = super.getDrops(state, builder);
-		drop.add(new ItemStack(this.asItem()));
-		return drop;
-	}
-	
 	@Override
 	public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
 		if (world.isClientSide) {

src/main/java/ru/bclib/blocks/BaseBlock.java

@@ -3,15 +3,11 @@ package ru.bclib.blocks;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.level.storage.loot.LootContext;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -23,7 +19,7 @@ import java.util.function.Consumer;
  *	 <li>Automatically create an Item-Model from the Block-Model</li>
  * </ul>
  */
-public class BaseBlock extends Block implements BlockModelProvider {
+public class BaseBlock extends Block implements BlockModelProvider, LootProvider {
 	/**
 	 * Creates a new Block with the passed properties
 	 *
@@ -33,17 +29,6 @@ public class BaseBlock extends Block implements BlockModelProvider {
 		super(settings);
 	}
 	
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * This implementation will drop the Block itself
-	 */
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	/**
 	 * {@inheritDoc}
 	 * <p>

src/main/java/ru/bclib/blocks/BaseBlockWithEntity.java

@@ -1,16 +1,12 @@
 package ru.bclib.blocks;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
-
-public class BaseBlockWithEntity extends BaseEntityBlock {
+public class BaseBlockWithEntity extends BaseEntityBlock implements LootProvider {
 	public BaseBlockWithEntity(Properties settings) {
 		super(settings);
 	}
@@ -19,10 +15,4 @@ public class BaseBlockWithEntity extends BaseEntityBlock {
 	public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) {
 		return null;
 	}
-	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
 }

src/main/java/ru/bclib/blocks/BaseBookshelfBlock.java

@@ -18,12 +18,13 @@ import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
+import ru.bclib.interfaces.LootProvider;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-public class BaseBookshelfBlock extends BaseBlock {
+public class BaseBookshelfBlock extends BaseBlock implements LootProvider {
 	public BaseBookshelfBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source));
 	}
@@ -33,7 +34,7 @@ public class BaseBookshelfBlock extends BaseBlock {
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null) {
 			int silk = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool);

src/main/java/ru/bclib/blocks/BaseButtonBlock.java

@@ -7,24 +7,21 @@ import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ButtonBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.AttachFace;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelProvider {
+public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	protected BaseButtonBlock(Block parent, Properties properties, boolean sensitive) {
@@ -32,12 +29,6 @@ public abstract class BaseButtonBlock extends ButtonBlock implements BlockModelP
 		this.parent = parent;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseChainBlock.java

@@ -7,27 +7,24 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ChainBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.MaterialColor;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider {
+public class BaseChainBlock extends ChainBlock implements BlockModelProvider, RenderLayerProvider, LootProvider {
 	public BaseChainBlock(MaterialColor color) {
 		this(FabricBlockSettings.copyOf(Blocks.CHAIN).color(color));
 	}
@@ -36,12 +33,6 @@ public class BaseChainBlock extends ChainBlock implements BlockModelProvider, Re
 		super(properties);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseChestBlock.java

@@ -7,23 +7,21 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.registry.BaseBlockEntities;
 
-import java.util.List;
 import java.util.Optional;
 
-public class BaseChestBlock extends ChestBlock implements BlockModelProvider {
+public class BaseChestBlock extends ChestBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BaseChestBlock(Block source) {
@@ -36,14 +34,6 @@ public class BaseChestBlock extends ChestBlock implements BlockModelProvider {
 		return BaseBlockEntities.CHEST.create(blockPos, blockState);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		List<ItemStack> drop = super.getDrops(state, builder);
-		drop.add(new ItemStack(this.asItem()));
-		return drop;
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseComposterBlock.java

@@ -6,34 +6,25 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.ModelsHelper.MultiPartBuilder;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider {
+public class BaseComposterBlock extends ComposterBlock implements BlockModelProvider, LootProvider {
 	public BaseComposterBlock(Block source) {
 		super(FabricBlockSettings.copyOf(source));
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this.asItem()));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/BaseCraftingTableBlock.java

@@ -5,24 +5,21 @@ import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CraftingTableBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Optional;
 
-public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider {
+public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockModelProvider, LootProvider {
 	public BaseCraftingTableBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source));
 	}
@@ -31,12 +28,6 @@ public class BaseCraftingTableBlock extends CraftingTableBlock implements BlockM
 		super(properties);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this.asItem()));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/BaseCropBlock.java

@@ -22,6 +22,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.util.BlocksHelper;
 import ru.bclib.util.MHelper;
 
@@ -29,7 +30,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-public class BaseCropBlock extends BasePlantBlock {
+public class BaseCropBlock extends BasePlantBlock implements LootProvider {
 	public static final IntegerProperty AGE = IntegerProperty.create("age", 0, 3);
 	private static final VoxelShape SHAPE = Block.box(2, 0, 2, 14, 14, 14);
 	
@@ -69,7 +70,7 @@ public class BaseCropBlock extends BasePlantBlock {
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		if (state.getValue(AGE) < 3) {
 			return Collections.singletonList(new ItemStack(this));
 		}

src/main/java/ru/bclib/blocks/BaseDoorBlock.java

@@ -27,6 +27,7 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.interfaces.TagProvider;
 
@@ -35,7 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider {
+public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, BlockModelProvider, TagProvider, LootProvider {
 	public BaseDoorBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source).strength(3F, 3F).noOcclusion());
 	}
@@ -45,10 +46,8 @@ public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, Blo
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		if (state.getValue(HALF) == DoubleBlockHalf.LOWER)
-			return Collections.singletonList(new ItemStack(this.asItem()));
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
+		if (state.getValue(HALF) == DoubleBlockHalf.LOWER) return Collections.singletonList(new ItemStack(this.asItem()));
 		else return Collections.emptyList();
 	}
 	

src/main/java/ru/bclib/blocks/BaseDoublePlantBlock.java

@@ -30,6 +30,7 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import ru.bclib.client.render.BCLRenderLayer;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.items.tool.BaseShearsItem;
 import ru.bclib.util.BlocksHelper;
@@ -37,7 +38,7 @@ import ru.bclib.util.BlocksHelper;
 import java.util.List;
 import java.util.Random;
 
-public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements RenderLayerProvider, BonemealableBlock {
+public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements RenderLayerProvider, BonemealableBlock, LootProvider {
 	private static final VoxelShape SHAPE = Block.box(4, 2, 4, 12, 16, 12);
 	public static final IntegerProperty ROTATION = BlockProperties.ROTATION;
 	public static final BooleanProperty TOP = BooleanProperty.create("top");
@@ -109,7 +110,7 @@ public abstract class BaseDoublePlantBlock extends BaseBlockNotFull implements R
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		if (state.getValue(TOP)) {
 			return Lists.newArrayList();
 		}

src/main/java/ru/bclib/blocks/BaseFenceBlock.java

@@ -8,24 +8,21 @@ import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FenceBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.ModelsHelper.MultiPartBuilder;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
+public class BaseFenceBlock extends FenceBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BaseFenceBlock(Block source) {
@@ -33,12 +30,6 @@ public class BaseFenceBlock extends FenceBlock implements BlockModelProvider {
 		this.parent = source;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java

@@ -31,6 +31,7 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.registry.BaseBlockEntities;
 
@@ -38,7 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider {
+public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, RenderLayerProvider, LootProvider {
 	public BaseFurnaceBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source).lightLevel(state -> state.getValue(LIT) ? 13 : 0));
 	}
@@ -103,8 +104,7 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		List<ItemStack> drop = Lists.newArrayList(new ItemStack(this));
 		BlockEntity blockEntity = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
 		if (blockEntity instanceof BaseFurnaceBlockEntity) {

src/main/java/ru/bclib/blocks/BaseGateBlock.java

@@ -7,36 +7,27 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FenceGateBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider {
+public class BaseGateBlock extends FenceGateBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BaseGateBlock(Block source) {
 		super(FabricBlockSettings.copyOf(source).noOcclusion());
 		this.parent = source;
 	}
-	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
+
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/BaseGlassBlock.java

@@ -43,12 +43,13 @@ public class BaseGlassBlock extends BaseBlockNotFull implements AddMineablePicka
     }
 
     @Environment(EnvType.CLIENT)
+    @SuppressWarnings("deprecation")
     public boolean skipRendering(BlockState state, BlockState neighbor, Direction facing) {
         return neighbor.getBlock() == this ? true : super.skipRendering(state, neighbor, facing);
     }
 
     @Override
-    public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+    public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
         ItemStack tool = builder.getParameter(LootContextParams.TOOL);
         if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
             return Collections.singletonList(new ItemStack(this));

src/main/java/ru/bclib/blocks/BaseLadderBlock.java

@@ -6,26 +6,23 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.LadderBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider {
+public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider, BlockModelProvider, LootProvider {
 	public BaseLadderBlock(Block block) {
 		this(FabricBlockSettings.copyOf(block).noOcclusion());
 	}
@@ -59,10 +56,4 @@ public class BaseLadderBlock extends LadderBlock implements RenderLayerProvider,
 		registerBlockModel(stateId, modelId, blockState, modelCache);
 		return ModelsHelper.createFacingModel(modelId, blockState.getValue(FACING), false, true);
 	}
-	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
 }

src/main/java/ru/bclib/blocks/BaseLeavesBlock.java

@@ -21,6 +21,7 @@ import ru.bclib.api.tag.NamedItemTags;
 import ru.bclib.api.tag.TagAPI.TagLocation;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.interfaces.TagProvider;
 import ru.bclib.interfaces.tools.AddMineableHoe;
@@ -32,7 +33,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe {
+public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider, RenderLayerProvider, TagProvider, AddMineableShears, AddMineableHoe, LootProvider {
 	protected final Block sapling;
 
 	private static FabricBlockSettings makeLeaves(MaterialColor color) {
@@ -71,8 +72,7 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		return BaseLeavesBlock.getLeaveDrops(this, this.sapling, builder, 16, 16);
 	}
 	

src/main/java/ru/bclib/blocks/BaseMetalBarsBlock.java

@@ -9,26 +9,23 @@ import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.IronBarsBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider {
+public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvider, RenderLayerProvider, LootProvider {
 	public BaseMetalBarsBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source).strength(5.0F, 6.0F).noOcclusion());
 	}
@@ -37,12 +34,6 @@ public class BaseMetalBarsBlock extends IronBarsBlock implements BlockModelProvi
 		super(properties);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	public Optional<String> getModelString(String block) {
 		ResourceLocation blockId = Registry.BLOCK.getKey(this);
 		if (block.contains("item")) {

src/main/java/ru/bclib/blocks/BaseOreBlock.java

@@ -19,6 +19,7 @@ import net.minecraft.world.level.material.MaterialColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.util.LootUtil;
 import ru.bclib.util.MHelper;
 
@@ -26,7 +27,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class BaseOreBlock extends OreBlock implements BlockModelProvider {
+public class BaseOreBlock extends OreBlock implements BlockModelProvider, LootProvider {
 	private final Supplier<Item> dropItem;
 	private final int minCount;
 	private final int maxCount;
@@ -61,13 +62,12 @@ public class BaseOreBlock extends OreBlock implements BlockModelProvider {
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		return LootUtil
-				.getDrops(this, state, builder)
-				.orElseGet(
-						()->BaseOreBlock.getDroppedItems(this, dropItem.get(), maxCount, minCount, miningLevel, state, builder)
-				);
+			.getDrops(this, state, builder)
+			.orElseGet(
+				()->BaseOreBlock.getDroppedItems(this, dropItem.get(), maxCount, minCount, miningLevel, state, builder)
+			);
 	}
 	
 	public static List<ItemStack> getDroppedItems(ItemLike block, Item dropItem, int maxCount, int minCount, int miningLevel, BlockState state, LootContext.Builder builder) {

src/main/java/ru/bclib/blocks/BasePathBlock.java

@@ -24,13 +24,14 @@ import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
+import ru.bclib.interfaces.LootProvider;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BasePathBlock extends BaseBlockNotFull {
+public class BasePathBlock extends BaseBlockNotFull implements LootProvider {
 	private static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 15, 16);
 	
 	private Block baseBlock;
@@ -46,7 +47,7 @@ public class BasePathBlock extends BaseBlockNotFull {
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Collections.singletonList(new ItemStack(this));

src/main/java/ru/bclib/blocks/BasePlantBlock.java

@@ -34,6 +34,7 @@ import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 import ru.bclib.items.tool.BaseShearsItem;
 
@@ -41,7 +42,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 
-public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderLayerProvider, BonemealableBlock{
+public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderLayerProvider, BonemealableBlock, LootProvider {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
 	
 	public BasePlantBlock() {
@@ -108,7 +109,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		//TODO: 1.18.2 Test if shearing still works
 		if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel(

src/main/java/ru/bclib/blocks/BasePressurePlateBlock.java

@@ -7,23 +7,20 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.PressurePlateBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BasePressurePlateBlock extends PressurePlateBlock implements BlockModelProvider {
+public class BasePressurePlateBlock extends PressurePlateBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BasePressurePlateBlock(Sensitivity rule, Block source) {
@@ -31,12 +28,6 @@ public class BasePressurePlateBlock extends PressurePlateBlock implements BlockM
 		this.parent = source;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/BaseRotatedPillarBlock.java

@@ -6,22 +6,19 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockModelProvider {
+public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockModelProvider, LootProvider {
 	public BaseRotatedPillarBlock(Properties settings) {
 		super(settings);
 	}
@@ -30,12 +27,6 @@ public class BaseRotatedPillarBlock extends RotatedPillarBlock implements BlockM
 		this(FabricBlockSettings.copyOf(block));
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseSignBlock.java

@@ -36,7 +36,6 @@ import net.minecraft.world.level.block.state.properties.WoodType;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
@@ -44,13 +43,11 @@ import ru.bclib.blockentities.BaseSignBlockEntity;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
 import ru.bclib.interfaces.CustomItemProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.util.BlocksHelper;
 
-import java.util.Collections;
-import java.util.List;
-
 @SuppressWarnings("deprecation")
-public class BaseSignBlock extends SignBlock implements BlockModelProvider, CustomItemProvider {
+public class BaseSignBlock extends SignBlock implements BlockModelProvider, CustomItemProvider, LootProvider {
 	public static final IntegerProperty ROTATION = BlockStateProperties.ROTATION_16;
 	public static final BooleanProperty FLOOR = BooleanProperty.create("floor");
 	private static final VoxelShape[] WALL_SHAPES = new VoxelShape[] {
@@ -170,11 +167,6 @@ public class BaseSignBlock extends SignBlock implements BlockModelProvider, Cust
 		return state.setValue(ROTATION, mirror.mirror(state.getValue(ROTATION), 16));
 	}
 	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	public boolean canPlaceLiquid(BlockGetter world, BlockPos pos, BlockState state, Fluid fluid) {
 		return super.canPlaceLiquid(world, pos, state, fluid);

src/main/java/ru/bclib/blocks/BaseSlabBlock.java

@@ -22,13 +22,14 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
 import ru.bclib.interfaces.CustomItemProvider;
+import ru.bclib.interfaces.LootProvider;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, CustomItemProvider {
+public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, CustomItemProvider, LootProvider {
 	private final Block parent;
 	public final boolean fireproof;
 
@@ -43,8 +44,7 @@ public class BaseSlabBlock extends SlabBlock implements BlockModelProvider, Cust
 	}
 	
 	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		int count = state.getValue(TYPE) == SlabType.DOUBLE ? 2 : 1;
 		return Collections.singletonList(new ItemStack(this, count));
 	}

src/main/java/ru/bclib/blocks/BaseStairsBlock.java

@@ -10,26 +10,23 @@ import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.StairBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Half;
 import net.minecraft.world.level.block.state.properties.StairsShape;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
 import ru.bclib.interfaces.CustomItemProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseStairsBlock extends StairBlock implements BlockModelProvider, CustomItemProvider {
+public class BaseStairsBlock extends StairBlock implements BlockModelProvider, CustomItemProvider, LootProvider {
 	private final Block parent;
 	public final boolean fireproof;
 
@@ -43,12 +40,6 @@ public class BaseStairsBlock extends StairBlock implements BlockModelProvider, C
 		this.fireproof = fireproof;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/BaseTerrainBlock.java

@@ -86,7 +86,7 @@ public class BaseTerrainBlock extends BaseBlock {
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) > 0) {
 			return Collections.singletonList(new ItemStack(this));

src/main/java/ru/bclib/blocks/BaseTrapdoorBlock.java

@@ -7,28 +7,25 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.TrapDoorBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.Half;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider {
+public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvider, BlockModelProvider, LootProvider {
 	public BaseTrapdoorBlock(Block source) {
 		this(FabricBlockSettings.copyOf(source).strength(3.0F, 3.0F).noOcclusion());
 	}
@@ -37,12 +34,6 @@ public class BaseTrapdoorBlock extends TrapDoorBlock implements RenderLayerProvi
 		super(properties);
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	public BCLRenderLayer getRenderLayer() {
 		return BCLRenderLayer.CUTOUT;

src/main/java/ru/bclib/blocks/BaseVineBlock.java

@@ -107,7 +107,7 @@ public class BaseVineBlock extends BaseBlockNotFull implements RenderLayerProvid
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel(
 			Enchantments.SILK_TOUCH,

src/main/java/ru/bclib/blocks/BaseWallBlock.java

@@ -8,24 +8,21 @@ import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.WallBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.WallSide;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseWallBlock extends WallBlock implements BlockModelProvider {
+public class BaseWallBlock extends WallBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BaseWallBlock(Block source) {
@@ -33,12 +30,6 @@ public class BaseWallBlock extends WallBlock implements BlockModelProvider {
 		this.parent = source;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation blockId) {

src/main/java/ru/bclib/blocks/BaseWeightedPlateBlock.java

@@ -7,23 +7,20 @@ import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.WeightedPressurePlateBlock;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
 import org.jetbrains.annotations.Nullable;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implements BlockModelProvider {
+public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implements BlockModelProvider, LootProvider {
 	private final Block parent;
 	
 	public BaseWeightedPlateBlock(Block source) {
@@ -34,12 +31,6 @@ public class BaseWeightedPlateBlock extends WeightedPressurePlateBlock implement
 		this.parent = source;
 	}
 	
-	@Override
-	@SuppressWarnings("deprecation")
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	@Environment(EnvType.CLIENT)
 	public BlockModel getItemModel(ResourceLocation resourceLocation) {

src/main/java/ru/bclib/blocks/FeatureSaplingBlock.java

@@ -8,7 +8,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
@@ -21,7 +20,6 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.feature.Feature;
 import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
@@ -30,15 +28,14 @@ import ru.bclib.client.models.ModelsHelper;
 import ru.bclib.client.models.PatternsHelper;
 import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.BlockModelProvider;
+import ru.bclib.interfaces.LootProvider;
 import ru.bclib.interfaces.RenderLayerProvider;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 import java.util.function.Function;
 
-public class FeatureSaplingBlock extends SaplingBlock implements RenderLayerProvider, BlockModelProvider {
+public class FeatureSaplingBlock extends SaplingBlock implements RenderLayerProvider, BlockModelProvider, LootProvider {
 	private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
 	private final Function<BlockState, Feature<?>> feature;
 	
@@ -72,11 +69,6 @@ public class FeatureSaplingBlock extends SaplingBlock implements RenderLayerProv
 		return feature.apply(state);
 	}
 	
-	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
-		return Collections.singletonList(new ItemStack(this));
-	}
-	
 	@Override
 	public BlockState updateShape(BlockState state, Direction facing, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
 		if (!canSurvive(state, world, pos)) return Blocks.AIR.defaultBlockState();

src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java

@@ -97,7 +97,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel(
 			Enchantments.SILK_TOUCH,

src/main/java/ru/bclib/blocks/UpDownPlantBlock.java

@@ -78,7 +78,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements Rende
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		ItemStack tool = builder.getParameter(LootContextParams.TOOL);
 		if (tool != null && BaseShearsItem.isShear(tool) || EnchantmentHelper.getItemEnchantmentLevel(
 			Enchantments.SILK_TOUCH,

src/main/java/ru/bclib/blocks/WallMushroomBlock.java

@@ -32,7 +32,7 @@ public abstract class WallMushroomBlock extends BaseWallPlantBlock {
 	}
 	
 	@Override
-	public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) {
+	public List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
 		return Lists.newArrayList(new ItemStack(this));
 	}
 	

src/main/java/ru/bclib/interfaces/LootProvider.java

@@ -0,0 +1,15 @@
+package ru.bclib.interfaces;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.LootContext;
+
+import java.util.Collections;
+import java.util.List;
+
+public interface LootProvider extends ItemLike {
+	default List<ItemStack> getLoot(BlockState state, LootContext.Builder builder) {
+		return Collections.singletonList(new ItemStack(this));
+	}
+}

src/main/java/ru/bclib/mixin/common/BlockBehaviourMixin.java

@@ -0,0 +1,27 @@
+package ru.bclib.mixin.common;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.LootContext;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import ru.bclib.interfaces.LootProvider;
+
+import java.util.List;
+
+@Mixin(BlockBehaviour.class)
+public class BlockBehaviourMixin {
+	@Inject(
+		method = "getDrops(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/storage/loot/LootContext$Builder;)Ljava/util/List;",
+		at = @At("HEAD"), cancellable = true
+	)
+	private void bclib_getBlockDrops(BlockState state, LootContext.Builder builder, CallbackInfoReturnable<List<ItemStack>> info) {
+		if (this instanceof LootProvider) {
+			LootProvider provider = LootProvider.class.cast(this);
+			info.setReturnValue(provider.getLoot(state, builder));
+		}
+	}
+}

src/main/resources/bclib.mixins.common.json

@@ -27,6 +27,7 @@
 		"NetherBiomeDataMixin",
 		"PistonBaseBlockMixin",
 		"TheEndBiomeDataMixin",
+		"BlockBehaviourMixin",
 		"BlockStateBaseMixin",
 		"ChunkGeneratorMixin",
 		"WorldGenRegionMixin",