Fix missing drops when breaking Uncolossal Chest, Closes #153

CyclopsMC · Mar 12, 2022 · df93650 · df93650
1 parent bde3de9
commit df93650
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java b/src/main/java/org/cyclops/colossalchests/block/UncolossalChest.java
@@ -3,6 +3,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.Containers;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -120,6 +121,18 @@ public void tick(BlockState blockState, ServerLevel level, BlockPos pos, Random
         }
     }
 
+    @Override
+    public void onRemove(BlockState blockState, Level level, BlockPos blockPos, BlockState blockStateNew, boolean p_60519_) {
+        if (!blockState.is(blockStateNew.getBlock())) {
+            BlockEntityHelpers.get(level, blockPos, BlockEntityUncolossalChest.class)
+                    .ifPresent(blockEntity -> {
+                        Containers.dropContents(level, blockPos, blockEntity.getInventory());
+                        level.updateNeighbourForOutputSignal(blockPos, this);
+                    });
+            super.onRemove(blockState, level, blockPos, blockStateNew, p_60519_);
+        }
+    }
+
     @Override
     public FluidState getFluidState(BlockState blockState) {
         return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState);

diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -3,6 +3,7 @@
   "values": [
     "colossalchests:chest_wall_wood",
     "colossalchests:colossal_chest_wood",
-    "colossalchests:interface_wood"
+    "colossalchests:interface_wood",
+    "colossalchests:uncolossal_chest"
   ]
 }