From 1618931c6d95cbc9b146d9d2179d08c7dbccabf6 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 5 Nov 2014 16:29:59 +0200 Subject: [PATCH] Allow fluid gauge to have no overlay, fixed typo --- src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala | 3 ++- src/net/bdew/lib/multiblock/interact/CIFluidOutput.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala index 4e5b512..fc69e21 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala @@ -56,6 +56,7 @@ class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase GL11.glColor3d(1, 1, 1) GL11.glDisable(GL11.GL_BLEND) - parent.drawTexture(rect, overlay) + if (overlay != null) + parent.drawTexture(rect, overlay) } } diff --git a/src/net/bdew/lib/multiblock/interact/CIFluidOutput.scala b/src/net/bdew/lib/multiblock/interact/CIFluidOutput.scala index a90ea17..320f900 100644 --- a/src/net/bdew/lib/multiblock/interact/CIFluidOutput.scala +++ b/src/net/bdew/lib/multiblock/interact/CIFluidOutput.scala @@ -13,7 +13,7 @@ import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo} trait CIFluidOutput extends CIOutputFaces { def outputFluid(resource: FluidStack, doDrain: Boolean): FluidStack - def outputFluid(ammount: Int, doDrain: Boolean): FluidStack + def outputFluid(amount: Int, doDrain: Boolean): FluidStack def canOutputFluid(fluid: Fluid): Boolean def getTankInfo: Array[FluidTankInfo] }