added 'xpFromExplosions' for xp to always drop from exploding blocks

This commit is contained in:
gnembon committed 2022-04-27 20:16:56 +02:00
1 parent aaf8e7e803
commit fc8114b0c1
4 files changed
+33 -1

No files matched your search

+3
View File
@@ -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;
@@ -234,6 +234,8 @@ public class OptimizedExplosion
ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList = new ObjectArrayList<>();
Util.shuffle((ObjectArrayList<BlockPos>) 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());
});
@@ -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);
}
}