R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #156 from pawjwp/1.20.1

Browse Source 
Tweaked some barrel item interaction logic to avoid overwriting item stacks
This commit is contained in:
thedarkcolour 2025-11-30 15:41:54 -08:00 committed by GitHub
commit 010bf6bcf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java
View File

@ -253,7 +253,11 @@ public class BarrelBlockEntity extends ETankBlockEntity {
if (this.tank.fill(fluid, IFluidHandler.FluidAction.SIMULATE) > 0) { if (this.tank.fill(fluid, IFluidHandler.FluidAction.SIMULATE) > 0) {
if (!player.getAbilities().instabuild) { if (!player.getAbilities().instabuild) {
player.setItemInHand(hand, new ItemStack(Items.GLASS_BOTTLE)); playerItem.shrink(1);
ItemStack emptyBottle = new ItemStack(Items.GLASS_BOTTLE);
if (!player.addItem(emptyBottle)) {
player.drop(emptyBottle, false);
}
} }
this.tank.fill(fluid, IFluidHandler.FluidAction.EXECUTE); this.tank.fill(fluid, IFluidHandler.FluidAction.EXECUTE);
level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F);
@ -293,7 +297,15 @@ public class BarrelBlockEntity extends ETankBlockEntity {
if (recipe.consumesAdditive) { if (recipe.consumesAdditive) {
itemFluidCap.drain(1000, IFluidHandler.FluidAction.EXECUTE); itemFluidCap.drain(1000, IFluidHandler.FluidAction.EXECUTE);
player.setItemInHand(hand, itemFluidCap.getContainer()); if (!player.getAbilities().instabuild) {
playerItem.shrink(1);
ItemStack container = itemFluidCap.getContainer();
if (!container.isEmpty()) {
if (!player.addItem(container)) {
player.drop(container, false);
}
}
}
} }
} }
// If a mix was successful, skip rest of logic // If a mix was successful, skip rest of logic