mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 15:18:34 +01:00
Allow the Coffee Machine to consume water (Fixing #1422)
This commit is contained in:
parent
90cecc8ed8
commit
5c4e584a73
1 changed files with 3 additions and 2 deletions
|
@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.api.ActuallyTags;
|
||||||
import de.ellpeck.actuallyadditions.mod.AASounds;
|
import de.ellpeck.actuallyadditions.mod.AASounds;
|
||||||
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
|
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
|
||||||
import de.ellpeck.actuallyadditions.mod.crafting.CoffeeIngredientRecipe;
|
import de.ellpeck.actuallyadditions.mod.crafting.CoffeeIngredientRecipe;
|
||||||
|
import de.ellpeck.actuallyadditions.mod.fluids.AATank;
|
||||||
import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine;
|
import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine;
|
||||||
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
|
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
|
||||||
import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
|
import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
|
||||||
|
@ -59,7 +60,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
|
||||||
|
|
||||||
public final CustomEnergyStorage storage = new CustomEnergyStorage(300000, 250, 0);
|
public final CustomEnergyStorage storage = new CustomEnergyStorage(300000, 250, 0);
|
||||||
|
|
||||||
public final FluidTank tank = new FluidTank(4 * FluidType.BUCKET_VOLUME) {
|
public final AATank tank = new AATank(4 * FluidType.BUCKET_VOLUME) {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public FluidStack drain(int maxDrain, FluidAction action) {
|
public FluidStack drain(int maxDrain, FluidAction action) {
|
||||||
|
@ -206,7 +207,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
|
||||||
this.inv.setStackInSlot(SLOT_OUTPUT, output.copy());
|
this.inv.setStackInSlot(SLOT_OUTPUT, output.copy());
|
||||||
this.inv.getStackInSlot(SLOT_INPUT).shrink(1);
|
this.inv.getStackInSlot(SLOT_INPUT).shrink(1);
|
||||||
this.coffeeCacheAmount -= CACHE_USE;
|
this.coffeeCacheAmount -= CACHE_USE;
|
||||||
this.tank.drain(WATER_USE, IFluidHandler.FluidAction.EXECUTE);
|
this.tank.drainInternal(WATER_USE, IFluidHandler.FluidAction.EXECUTE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue