From 632c34739a60a07c827e18f97fb2761a24550240 Mon Sep 17 00:00:00 2001
From: Flanks255 <32142731+Flanks255@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:58:42 -0600
Subject: [PATCH] Removed "requiresCorrectToolForDrops" from all blocks, Closes
 #1447

---
 CHANGELOG.md                                                | 3 ++-
 .../actuallyadditions/mod/blocks/ActuallyBlocks.java        | 6 +++---
 .../actuallyadditions/mod/blocks/BlockColoredLamp.java      | 2 +-
 .../actuallyadditions/mod/blocks/BlockFermentingBarrel.java | 2 +-
 .../actuallyadditions/mod/blocks/BlockLeafGenerator.java    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25f9ab4f5..43d8562e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 1.3.11+mc1.21.1
-* Fixed Farmer not playing well with non vanilla farmland.
+* Fixed Farmer not playing well with non-vanilla farmland.
 * Added the ability to change the farmers work area with a compass.
+* Make blocks still drop items even when broken incorrectly.
 
 # 1.3.10+mc1.21.1
 * Fixed Fluid placer not being harvestable.
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java
index 10dcd8a5b..bbecec629 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java
@@ -322,15 +322,15 @@ public final class ActuallyBlocks {
         (b) -> new AABlockItem(b, defaultBlockItemProperties));
 
     public static BlockBehaviour.Properties miscBlockProperties() {
-        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).requiresCorrectToolForDrops().strength(1.5f, 10f);
+        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).strength(1.5f, 10f);
     }
 
     public static BlockBehaviour.Properties defaultPickProps(float hardness, float resistance) {
-        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).requiresCorrectToolForDrops().strength(hardness, resistance).sound(SoundType.STONE);
+        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).strength(hardness, resistance).sound(SoundType.STONE);
     }
 
     public static BlockBehaviour.Properties defaultPickProps() {
-        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).requiresCorrectToolForDrops().strength(1.5F, 10.0F).sound(SoundType.STONE);
+        return BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).strength(1.5F, 10.0F).sound(SoundType.STONE);
     }
 
     public static BlockBehaviour.Properties defaultCropProps() {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
index 755cdc9c4..a30efe4b5 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java
@@ -55,7 +55,7 @@ public class BlockColoredLamp extends BlockBase {
     private static final BooleanProperty LIT = BlockStateProperties.LIT;
 
     public BlockColoredLamp() {
-        super(Properties.of().mapColor(MapColor.NONE).instrument(NoteBlockInstrument.HAT).strength(0.5F, 3.0F).requiresCorrectToolForDrops());
+        super(Properties.of().mapColor(MapColor.NONE).instrument(NoteBlockInstrument.HAT).strength(0.5F, 3.0F));
         this.registerDefaultState(this.stateDefinition.any().setValue(LIT, false));
     }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
index ee4c051cb..329233f0a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java
@@ -39,7 +39,7 @@ import javax.annotation.Nullable;
 public class BlockFermentingBarrel extends BlockContainerBase {
 
     public BlockFermentingBarrel() {
-        super(Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).requiresCorrectToolForDrops().strength(0.5F, 5.0F).sound(SoundType.WOOD));
+        super(Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(0.5F, 5.0F).sound(SoundType.WOOD));
     }
 
     @Nullable
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
index 627b56475..7029102f9 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
 public class BlockLeafGenerator extends DirectionalBlock.Container {
 
     public BlockLeafGenerator() {
-        super(Properties.of().mapColor(MapColor.METAL).strength(5.0F, 10.0F).requiresCorrectToolForDrops().strength(5.0F, 10.0F).sound(SoundType.METAL));
+        super(Properties.of().mapColor(MapColor.METAL).strength(5.0F, 10.0F).strength(5.0F, 10.0F).sound(SoundType.METAL));
     }
 
     @Nullable