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

Transfer water bottle NBT data to the fluid placed in barrels

Browse Source
This commit is contained in:
AlexLavoie42 2025-03-21 16:10:51 -07:00
parent d59e3e207a
commit e9073da9ec
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,6 +246,11 @@ public class BarrelBlockEntity extends ETankBlockEntity {
var fluid = new FluidStack(Fluids.WATER, 250); var fluid = new FluidStack(Fluids.WATER, 250);
if (playerItem.getItem() == Items.POTION && PotionUtils.getPotion(playerItem) == Potions.WATER) { if (playerItem.getItem() == Items.POTION && PotionUtils.getPotion(playerItem) == Potions.WATER) {
// Transfer any extra NBT tags from other mods to the fluid
var nbt = playerItem.getTag().copy();
nbt.remove("Potion");
fluid = new FluidStack(Fluids.WATER, 250, nbt);
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)); player.setItemInHand(hand, new ItemStack(Items.GLASS_BOTTLE));
@ -257,6 +262,11 @@ public class BarrelBlockEntity extends ETankBlockEntity {
return InteractionResult.sidedSuccess(level.isClientSide); return InteractionResult.sidedSuccess(level.isClientSide);
} }
} else if (playerItem.getItem() == Items.GLASS_BOTTLE) { } else if (playerItem.getItem() == Items.GLASS_BOTTLE) {
// Check if current fluid is water and use any NBT data
var currentFluid = this.tank.getFluid();
if (currentFluid.getRawFluid() == Fluids.WATER) {
fluid.setTag(currentFluid.getTag());
}
if (this.tank.drain(fluid, IFluidHandler.FluidAction.SIMULATE).getAmount() == 250) { if (this.tank.drain(fluid, IFluidHandler.FluidAction.SIMULATE).getAmount() == 250) {
extractWaterBottle(this.tank, level, player, playerItem, fluid); extractWaterBottle(this.tank, level, player, playerItem, fluid);
@ -314,6 +324,8 @@ public class BarrelBlockEntity extends ETankBlockEntity {
playerItem.shrink(1); playerItem.shrink(1);
} }
var bottle = PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER); var bottle = PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER);
var nbt = bottle.getOrCreateTag();
nbt.merge(fluid.getOrCreateTag());
if (!player.addItem(bottle)) { if (!player.addItem(bottle)) {
player.drop(bottle, false); player.drop(bottle, false);
} }