Smashing blocks damage mobs above

WenXin20 · Mar 4, 2025 · 35a8ad8 · 35a8ad8
1 parent f723f04
commit 35a8ad8
Showing 1 changed file with 45 additions and 29 deletions.
diff --git a/src/main/java/com/wenxin2/marioverse/mixin/LivingEntityMixin.java b/src/main/java/com/wenxin2/marioverse/mixin/LivingEntityMixin.java
@@ -164,24 +164,7 @@ public void baseTick(CallbackInfo ci) {
         if (stateAboveEntity.is(TagRegistry.SMASHABLE_BLOCKS)
                 && entity.getType().is(TagRegistry.CAN_SMASH_BLOCKS) && entity.getDeltaMovement().y > 0
                 && !entity.getPersistentData().getBoolean("marioverse:has_smashed_block")) {
-            if (entity.getPersistentData().getBoolean("marioverse:has_mushroom")) {
-                if (stateAboveEntity.getBlock() instanceof SlabBlock) {
-                    if (stateAboveEntity.getValue(SlabBlock.TYPE) == SlabType.DOUBLE) {
-                        world.setBlock(posAboveEntity, stateAboveEntity.setValue(SlabBlock.TYPE, SlabType.TOP), 3);
-                        entity.getPersistentData().putBoolean("marioverse:has_smashed_block", true);
-                    } else world.destroyBlock(posAboveEntity, false);
-                    world.levelEvent(2001, posAboveEntity, Block.getId(stateAboveEntity));
-                } else world.destroyBlock(posAboveEntity, false);
-                entity.getPersistentData().putBoolean("marioverse:has_smashed_block", true);
-                world.gameEvent(this, GameEvent.BLOCK_CHANGE, posAboveEntity);
-                if (stateAboveEntity.is(BlockTags.CRYSTAL_SOUND_BLOCKS))
-                    world.playSound(null, posAboveEntity, SoundType.AMETHYST.getBreakSound(), SoundSource.BLOCKS, 1.0F, 1.0F);
-                else world.playSound(null, posAboveEntity, SoundRegistry.BLOCK_SMASH.get(), SoundSource.BLOCKS, 1.0F, 1.0F);
-                this.marioverse$dropCoin(world, posAboveEntity, this);
-            } else {
-                world.playSound(null, posAboveEntity, SoundRegistry.BLOCK_SMASH_FAIL.get(), SoundSource.BLOCKS, 1.0F, 1.0F);
-                this.marioverse$dropCoin(world, posAboveEntity, this);
-            }
+            marioverse$smashBlock(world, posAboveEntity, stateAboveEntity, entity);
         }
 
         if (stateAboveEntity.is(TagRegistry.BONKABLE_BLOCKS)
@@ -545,17 +528,7 @@ private void handleEntityEvent(byte id, CallbackInfo info) {
             ItemStack storedItem = questionBlockEntity.getTheItem();
 
             if (!world.getBlockState(pos).getValue(QuestionBlock.EMPTY)) {
-                AABB boundingBox = new AABB(pos.above()).inflate(0.5);
-                List<Entity> entitiesAbove = world.getEntities(null, boundingBox);
-
-                if (!entitiesAbove.isEmpty()) {
-                    for (Entity entityAbove : entitiesAbove) {
-                        if (entityAbove instanceof LivingEntity livingEntity) {
-                            // TODO: Add custom damage source
-                            livingEntity.hurt(world.damageSources().generic(), 4.0F);
-                        }
-                    }
-                }
+                marioverse$hitEntityAbove(pos, world);
             }
 
             if (!storedItem.isEmpty() && !world.getBlockState(pos).getValue(QuestionBlock.EMPTY)) {
@@ -587,6 +560,49 @@ private void handleEntityEvent(byte id, CallbackInfo info) {
         }
     }
 
+    @Unique
+    private void marioverse$smashBlock(Level world, BlockPos pos, BlockState state, LivingEntity entity) {
+
+        marioverse$hitEntityAbove(pos, world);
+
+        if (entity.getPersistentData().getBoolean("marioverse:has_mushroom")) {
+            if (state.getBlock() instanceof SlabBlock) {
+                if (state.getValue(SlabBlock.TYPE) == SlabType.DOUBLE) {
+                    world.setBlock(pos, state.setValue(SlabBlock.TYPE, SlabType.TOP), 3);
+                    entity.getPersistentData().putBoolean("marioverse:has_smashed_block", true);
+                } else world.destroyBlock(pos, false);
+                world.levelEvent(2001, pos, Block.getId(state));
+            } else world.destroyBlock(pos, false);
+
+            entity.getPersistentData().putBoolean("marioverse:has_smashed_block", true);
+            world.gameEvent(this, GameEvent.BLOCK_CHANGE, pos);
+
+            if (state.is(BlockTags.CRYSTAL_SOUND_BLOCKS))
+                world.playSound(null, pos, SoundType.AMETHYST.getBreakSound(), SoundSource.BLOCKS, 1.0F, 1.0F);
+            else world.playSound(null, pos, SoundRegistry.BLOCK_SMASH.get(), SoundSource.BLOCKS, 1.0F, 1.0F);
+            this.marioverse$dropCoin(world, pos, this);
+        } else {
+            world.playSound(null, pos, SoundRegistry.BLOCK_SMASH_FAIL.get(), SoundSource.BLOCKS, 1.0F, 1.0F);
+            this.marioverse$dropCoin(world, pos, this);
+        }
+    }
+
+    @Unique
+    private static void marioverse$hitEntityAbove(BlockPos pos, Level world) {
+        AABB boundingBox = new AABB(pos.above()).inflate(0.01);
+        List<Entity> entitiesAbove = world.getEntities(null, boundingBox);
+
+        if (!entitiesAbove.isEmpty()) {
+            for (Entity entityAbove : entitiesAbove) {
+                if (entityAbove instanceof LivingEntity livingEntity && livingEntity.onGround()) {
+                    // TODO: Add custom damage source
+                    entityAbove.setDeltaMovement(entityAbove.getDeltaMovement().add(0, 0.5, 0));
+                    livingEntity.hurt(world.damageSources().generic(), 4.0F);
+                }
+            }
+        }
+    }
+
     @Unique
     public void marioverse$superStarKillEntity(LivingEntity attackingEntity) {
         List<Entity> nearbyEntities = attackingEntity.level().getEntities(attackingEntity, attackingEntity.getBoundingBox());