Fixed DataSlotResource.drainFluid draining 2x (bdew/generators#21)

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 apply plugin: 'scala'
 apply plugin: 'forge'
 
-version = "1.6.0"
+version = "1.6.2"
 
 if (project.hasProperty('buildnum')) {
     project.version = project.version + '.' + project.buildnum
@@ -70,7 +70,8 @@ task sourceJar(type: Jar) {
 }
 
 task deobfJar(type: Jar) {
-    from sourceSets.main.output.classesDir
+    from sourceSets.main.output
+    duplicatesStrategy "exclude"
 }
 
 jar {

src/net/bdew/lib/DecFormat.scala

@@ -14,6 +14,7 @@ import java.text.DecimalFormat
 object DecFormat {
   val thousandsFmt = new DecimalFormat("#,##0")
   val dec2Fmt = new DecimalFormat("#,##0.00")
+  val dec1Fmt = new DecimalFormat("#,##0.0")
 
   def round(x: Double) = thousandsFmt.format(x)
   def round(x: Float) = thousandsFmt.format(x)
@@ -22,4 +23,8 @@ object DecFormat {
   def dec2(x: Double) = dec2Fmt.format(x)
   def dec2(x: Float) = dec2Fmt.format(x)
   def dec2(x: Int) = dec2Fmt.format(x)
+
+  def short(x: Double) = if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)
+  def short(x: Float) = if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)
+  def short(x: Int) = if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)
 }

src/net/bdew/lib/multiblock/data/SlotSet.scala

@@ -9,6 +9,7 @@
 
 package net.bdew.lib.multiblock.data
 
+import cpw.mods.fml.relauncher.{Side, SideOnly}
 import net.bdew.lib.gui.Texture
 
 abstract class SlotSet(val outputConfigId: String) {
@@ -16,13 +17,19 @@ abstract class SlotSet(val outputConfigId: String) {
 
   var slotMap = Map.empty[String, Slot]
 
-  case class Slot(id: String, name: String, texture: Texture) {
+  case class Slot(id: String, name: String) {
     slotMap += id -> this
     def next = order(this)
+
+    @SideOnly(Side.CLIENT)
+    def texture = textures(this)
   }
 
   def default: Slot
   val order: Map[Slot, Slot]
 
+  @SideOnly(Side.CLIENT)
+  def textures: Map[Slot, Texture]
+
   def get(id: String) = slotMap(id)
 }

src/net/bdew/lib/resource/DataSlotResource.scala

@@ -56,7 +56,7 @@ class DataSlotResource(val name: String, val parent: TileDataSlots, initCapacity
       if (onlyRound) canDrain = canDrain.floor
       if (doDrain) execWithChangeNotify {
         resource =
-          if (canDrain == res.amount)
+          if (res.amount - canDrain < 0.000001)
             None
           else
             Some(Resource(res.kind, res.amount - canDrain))
@@ -68,7 +68,7 @@ class DataSlotResource(val name: String, val parent: TileDataSlots, initCapacity
   def fillFluid(resource: FluidStack, doFill: Boolean): Int = rawFill(Resource.from(resource), onlyRound = true, doFill).toInt
   def drainFluid(maxDrain: Int, doDrain: Boolean): FluidStack = {
     (for {
-      res <- rawDrain(maxDrain, true, doDrain)
+      res <- rawDrain(maxDrain, true, false)
       rKind <- Misc.asInstanceOpt(res.kind, classOf[FluidResource])
     } yield {
       if (doDrain)