move to silk fluids

This commit is contained in:
modmuss50 2019-07-23 21:30:57 +01:00
parent 85554bcfe2
commit 9b46e3237e
18 changed files with 52 additions and 50 deletions

View file

@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PowerAcceptorBlockEntity;
import reborncore.common.util.RebornInventory;
import reborncore.common.util.Tank;
import reborncore.common.fluid.FluidStack;
import io.github.prospector.silk.fluid.FluidInstance;
import techreborn.api.generator.EFluidGenerator;
import techreborn.api.generator.FluidGeneratorRecipe;
import techreborn.api.generator.FluidGeneratorRecipeList;
@ -137,7 +137,7 @@ public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEn
protected boolean acceptFluid() {
if (!inventory.getInvStack(0).isEmpty()) {
FluidStack stack = FluidUtils.getFluidStackInContainer(inventory.getInvStack(0));
FluidInstance stack = FluidUtils.getFluidStackInContainer(inventory.getInvStack(0));
if (stack != null)
return recipes.getRecipeForFluid(stack.getFluid()).isPresent();
}

View file

@ -134,7 +134,7 @@ public class QuantumTankBlockEntity extends MachineBaseBlockEntity
public void addInfo(final List<Text> info, final boolean isReal, boolean hasData) {
if (isReal | hasData) {
if (this.tank.getFluid() != null) {
info.add(new LiteralText(this.tank.getFluidAmount() + " of " + this.tank.getFluidType().getName()));
info.add(new LiteralText(this.tank.getFluidAmount() + " of " + this.tank.getFluidType()));
} else {
info.add(new LiteralText("Empty"));
}