diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index bf383d13..8d80177e 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -251,6 +251,9 @@ public class CarpetSettings @Rule( desc = "Explosions won't destroy blocks", category = {CREATIVE, TNT} ) public static boolean explosionNoBlockDamage = false; + @Rule( desc = "Experience will drop from all experience barring blocks with any explosion type", category = {SURVIVAL, FEATURE}) + public static boolean xpFromExplosions = false; + @Rule( desc = "Removes random TNT momentum when primed", category = {CREATIVE, TNT} ) public static boolean tntPrimerMomentumRemoved = false; diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index efc4eef9..263e8c2a 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -234,6 +234,8 @@ public class OptimizedExplosion ObjectArrayList> objectArrayList = new ObjectArrayList<>(); Util.shuffle((ObjectArrayList) e.getToBlow(), world.random); + boolean dropFromExplosions = CarpetSettings.xpFromExplosions || e.getSourceMob() instanceof Player; + for (BlockPos blockpos : e.getToBlow()) { BlockState state = world.getBlockState(blockpos); @@ -241,7 +243,7 @@ public class OptimizedExplosion if (state.getMaterial() != Material.AIR) { - if (block.dropFromExplosion(e) && world instanceof ServerLevel) + if (block.dropFromExplosion(e) && world instanceof ServerLevel serverLevel) { BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(blockpos) : null; //hasBlockEntity() @@ -255,6 +257,8 @@ public class OptimizedExplosion if (eAccess.getBlockInteraction() == Explosion.BlockInteraction.DESTROY) lootBuilder.withParameter(LootContextParams.EXPLOSION_RADIUS, eAccess.getRadius()); + state.spawnAfterBreak(serverLevel, blockpos, ItemStack.EMPTY, dropFromExplosions); + state.getDrops(lootBuilder).forEach((itemStackx) -> { method_24023(objectArrayList, itemStackx, blockpos.immutable()); }); diff --git a/src/main/java/carpet/mixins/Explosion_xpFromBlocksMixin.java b/src/main/java/carpet/mixins/Explosion_xpFromBlocksMixin.java new file mode 100644 index 00000000..1667c695 --- /dev/null +++ b/src/main/java/carpet/mixins/Explosion_xpFromBlocksMixin.java @@ -0,0 +1,24 @@ +package carpet.mixins; + +import carpet.CarpetSettings; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Explosion; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(Explosion.class) +public class Explosion_xpFromBlocksMixin { + + @Redirect(method = "finalizeExplosion", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/level/block/state/BlockState;spawnAfterBreak(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;Z)V" + )) + private void spawnXPAfterBreak(BlockState instance, ServerLevel serverLevel, BlockPos blockPos, ItemStack itemStack, boolean b) + { + instance.spawnAfterBreak(serverLevel, blockPos, itemStack, b || CarpetSettings.xpFromExplosions); + } +} diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 9128d54b..e570c4b0 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -119,6 +119,7 @@ "Explosion_optimizedTntMixin", "ExplosionAccessor", "Explosion_scarpetEventMixin", + "Explosion_xpFromBlocksMixin", "PrimedTntMixin", "AbstractArrowMixin", "FallingBlockEntityMixin",