bump version

Also 2 new terms added at parser level - delayedStatement(s) - to separate lists that require delayed statements

.gitignore

@@ -1,9 +1,10 @@
-/.gradle
-/build
-/deps
-/eclipse
+/bin
 /out
-
-*.ipr
-*.iml
-*.iws
+/build
+/run
+/deps/run
+/eclipse
+/.gradle
+/*.iml
+/*.ipr
+/.idea

build.gradle

@@ -1,24 +1,27 @@
 buildscript {
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
     repositories {
         mavenCentral()
-        maven {
-            name = "bdew"
-            url = "http://jenkins.bdew.net/maven"
-        }
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
-apply plugin: 'forge'
 apply plugin: 'scala'
+apply plugin: 'forge'
 
-version = "0.9.2"
+version = "1.4.2"
 
 if (project.hasProperty('buildnum')) {
     project.version = project.version + '.' + project.buildnum
@@ -28,15 +31,15 @@ if (project.hasProperty('buildnum')) {
 
 group = "net.bdew"
 archivesBaseName = "bdlib"
-ext.versuffix = "mc164"
+ext.versuffix = "mc1710"
 
 minecraft {
-    version = "1.6.4-9.11.1.964"
+    version = "1.7.10-10.13.0.1180"
+    replace("BDLIB_VER", project.version)
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
 
-def myTokens = [BdLibVer: project.version]
 
 sourceSets {
     main {
@@ -47,30 +50,13 @@ sourceSets {
             srcDir 'resources'
         }
     }
-    processed {
-        scala {
-            srcDir 'build/stage'
-        }
-    }
-}
-
-task stage(type: Sync) {
-    inputs.property "tokens", myTokens
-    from sourceSets.main.scala
-    into 'build/stage'
-    filter(ReplaceTokens, tokens: myTokens)
-}
-
-compileScala {
-    source = sourceSets.processed.scala
-    dependsOn stage
 }
 
 processResources {
-    inputs.property "tokens", myTokens
+    inputs.property "tokens", minecraft.replacements
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-        filter(ReplaceTokens, tokens: myTokens)
+        filter(ReplaceTokens, tokens: minecraft.replacements)
     }
 
     from(sourceSets.main.resources.srcDirs) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Nov 28 11:30:59 IST 2013
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "bdlib",
   "name": "BD Lib",
   "description": "",
-  "version": "@BdLibVer@",
+  "version": "@BDLIB_VER@",
   "url": "bdew.net/mods/",
   "updateUrl": "",
   "authorList": [

settings.gradle

@@ -0,0 +1 @@
+rootProject.name='bdlib'

src/net/bdew/lib/BdLib.scala

@@ -1,11 +1,39 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
 package net.bdew.lib
 
 import cpw.mods.fml.common.Mod
-import cpw.mods.fml.common.event.FMLPreInitializationEvent
+import cpw.mods.fml.common.Mod.EventHandler
+import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent}
+import net.minecraft.command.CommandHandler
+import org.apache.logging.log4j.Logger
 
-@Mod(modid = "bdlib", version = "@BdLibVer@", modLanguage =  "scala")
+@Mod(modid = "bdlib", name = "BD lib", version = "BDLIB_VER", modLanguage = "scala")
 object BdLib {
+  var log: Logger = null
+
+  def logInfo(msg: String, args: Any*) = log.info(msg.format(args: _*))
+  def logWarn(msg: String, args: Any*) = log.warn(msg.format(args: _*))
+  def logError(msg: String, args: Any*) = log.error(msg.format(args: _*))
+  def logWarnException(msg: String, t: Throwable, args: Any*) = log.warn(msg.format(args: _*), t)
+  def logErrorException(msg: String, t: Throwable, args: Any*) = log.error(msg.format(args: _*), t)
+
+  @EventHandler
   def preInit(ev: FMLPreInitializationEvent) {
-    ev.getModLog.info("bdlib @BdLibVer@ loaded")
+    log = ev.getModLog
+    log.info("bdlib BDLIB_VER loaded")
+  }
+
+  @EventHandler
+  def serverStarting(event: FMLServerStartingEvent) {
+    val commandHandler = event.getServer.getCommandManager.asInstanceOf[CommandHandler]
+    commandHandler.registerCommand(new CommandDumpRegistry)
   }
 }

src/net/bdew/lib/Client.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib
+
+import net.minecraft.client.Minecraft
+import org.lwjgl.input.Keyboard
+
+/**
+ * Misc functions and shortcuts for clientside code
+ */
+object Client {
+  def minecraft = Minecraft.getMinecraft
+  def fontRenederer = Minecraft.getMinecraft.fontRenderer
+  def renderEngine = Minecraft.getMinecraft.renderEngine
+  def world = Minecraft.getMinecraft.theWorld
+  def player = Minecraft.getMinecraft.thePlayer
+
+  def shiftDown: Boolean = {
+    return Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)
+  }
+
+}

src/net/bdew/lib/CommandDumpRegistry.scala

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib
+
+import java.io.{BufferedWriter, File, FileWriter}
+
+import com.google.common.collect.Table
+import cpw.mods.fml.common.registry.GameData
+import cpw.mods.fml.relauncher.FMLInjectionData
+import net.minecraft.command.{CommandBase, ICommandSender}
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fluids.FluidRegistry
+import net.minecraftforge.oredict.OreDictionary
+
+class CommandDumpRegistry extends CommandBase {
+  def getCommandName = "dumpregistry"
+  override def getRequiredPermissionLevel = 2
+  def getCommandUsage(icommandsender: ICommandSender) = "dumpregistry"
+
+  def processCommand(sender: ICommandSender, params: Array[String]) {
+    val mcHome = FMLInjectionData.data()(6).asInstanceOf[File] //is there a better way to get this?
+    val dumpFile = new File(mcHome, "registry.dump")
+    val dumpWriter = new BufferedWriter(new FileWriter(dumpFile))
+    import scala.collection.JavaConversions._
+    try {
+      dumpWriter.write("==== BLOCKS ====\n")
+      dumpWriter.write(GameData.getBlockRegistry.map(GameData.getBlockRegistry.getNameForObject).toList.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      dumpWriter.write("==== ITEMS ====\n")
+      dumpWriter.write(GameData.getItemRegistry.map(GameData.getItemRegistry.getNameForObject).toList.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      dumpWriter.write("==== CUSTOM STACKS ====\n")
+      val stacksField = classOf[GameData].getDeclaredField("customItemStacks")
+      stacksField.setAccessible(true)
+      val stacksData = stacksField.get(null).asInstanceOf[Table[String, String, ItemStack]]
+      dumpWriter.write(stacksData.cellSet().map(x => x.getRowKey + ":" + x.getColumnKey).toList.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      dumpWriter.write("==== ORE DICT ====\n")
+      dumpWriter.write(OreDictionary.getOreNames.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      dumpWriter.write("==== FLUIDS ====\n")
+      dumpWriter.write(FluidRegistry.getRegisteredFluids.map(_._1).toList.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      CommandBase.func_152373_a(sender, this, "Registry dumped to " + dumpFile.getCanonicalPath)
+    } catch {
+      case e: Throwable =>
+        CommandBase.func_152373_a(sender, this, "Failed to save registry dump: " + e)
+        BdLib.logErrorException("Failed to save registry dump", e)
+    } finally {
+      dumpWriter.close()
+    }
+  }
+}

src/net/bdew/lib/CreativeTabContainer.scala

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib
+
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.Item
+
+class CreativeTabContainer {
+
+  class Tab(name: String, item: => Item) extends CreativeTabs(name) {
+    override def getTabIconItem = item
+  }
+
+  BdLib.logInfo("Loaded creative tabs for %s", Misc.getActiveModId)
+
+  def init() {}
+}

src/net/bdew/lib/Event.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -28,7 +28,7 @@ class Event2[T, R] extends EventBase[(T, R) => Unit] {
 }
 
 object Event {
-  def apply(t: Unit) = new Event0
+  def apply() = new Event0
   def apply[T] = new Event1[T]
   def apply[T, R] = new Event2[T, R]
 }

src/net/bdew/lib/Misc.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,20 +9,33 @@
 
 package net.bdew.lib
 
-import cpw.mods.fml.common.registry.GameRegistry
-import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
-import net.minecraft.util.StatCollector
-import net.minecraft.item.ItemStack
-import cpw.mods.fml.common.versioning.{ArtifactVersion, VersionParser}
 import cpw.mods.fml.common.Loader
+import cpw.mods.fml.common.registry.GameRegistry
+import cpw.mods.fml.common.versioning.{ArtifactVersion, VersionParser}
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.tileentity.TileEntity
+import net.minecraft.util.StatCollector
+import net.minecraft.world.biome.BiomeGenBase
+import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.oredict.ShapedOreRecipe
 
 object Misc {
-  def iterNbtList[X](list: NBTTagList) =
-    for (i <- 0 until list.tagCount()) yield list.tagAt(i).asInstanceOf[X]
+  def iterNbtCompoundList(parent: NBTTagCompound, name: String): Iterable[NBTTagCompound] = {
+    val list = parent.getTagList(name, 10)
+    for (i <- 0 until list.tagCount()) yield list.getCompoundTagAt(i)
+  }
+
+  def iterNbtIntArray(parent: NBTTagCompound, name: String): Iterable[Array[Int]] = {
+    val list = parent.getTagList(name, 11)
+    for (i <- 0 until list.tagCount()) yield list.func_150306_c(i)
+  }
+
+  def getActiveModId = Loader.instance().activeModContainer().getModId
 
   def toLocal(s: String) = StatCollector.translateToLocal(s)
   def toLocalF(s: String, params: Any*) = StatCollector.translateToLocal(s).format(params: _*)
+  def hasLocal(s: String) = StatCollector.canTranslate(s)
 
   def flattenRecipe(pattern: Seq[String], items: Map[Char, AnyRef]) =
     pattern ++ items.map {
@@ -32,7 +45,7 @@ object Misc {
   def wrapTag(n: String, f: (NBTTagCompound) => Any)(t: NBTTagCompound) {
     val p = t.getCompoundTag(n)
     f(p)
-    t.setCompoundTag(n, p)
+    t.setTag(n, p)
   }
 
   def addRecipe(result: ItemStack, pattern: Seq[String], items: Map[Char, AnyRef]) =
@@ -44,13 +57,15 @@ object Misc {
   def min[T](vals: T*)(implicit o: Ordering[T]): T = vals.min(o)
   def max[T](vals: T*)(implicit o: Ordering[T]): T = vals.max(o)
 
-  def clamp[T](value: T, min: T, max: T)(implicit o: Ordering[T]): T = if (o.gt(value,max)) max else if (o.lt(value,min)) min else value
+  def clamp[T](value: T, min: T, max: T)(implicit o: Ordering[T]): T = if (o.gt(value, max)) max else if (o.lt(value, min)) min else value
 
   def iterSome[T](list: Seq[T], indexes: Iterable[Int]): Iterable[T] = for (i <- indexes) yield list(i)
   def iterSomeEnum[T](list: Seq[T], indexes: Iterable[Int]): Iterable[(Int, T)] = for (i <- indexes) yield i -> list(i)
 
   def filterType[T](from: Iterable[_], cls: Class[T]) = from.filter(cls.isInstance).asInstanceOf[Iterable[T]]
 
+  def getBiomeByName(name: String) = BiomeGenBase.getBiomeGenArray.find(x => x != null && x.biomeName == name).orNull
+
   def haveModVersion(spec: String): Boolean = {
     val req = VersionParser.parseVersionReference(spec)
     val modid = req.getLabel
@@ -63,4 +78,21 @@ object Misc {
 
     return true
   }
+
+  // Because writing this every time is awkward
+  def forgeDirection(i: Int) = ForgeDirection.values()(i)
+
+  // Easy replacement for various "if(foo.isInstanceOf[Bar]) foo.asInstanceOf[Bar]" constructs
+  def asInstanceOpt[T](v: Any, cls: Class[T]) =
+    if (cls.isInstance(v)) Some(v.asInstanceOf[T]) else None
+
+  def getNeighbourTile[T](origin: TileEntity, dir: ForgeDirection, cls: Class[T]) =
+    Option(origin.getWorldObj.getTileEntity(origin.xCoord + dir.offsetX,
+      origin.yCoord + dir.offsetY, origin.zCoord + dir.offsetZ)) flatMap (asInstanceOpt(_, cls))
+
+  def applyMutator[T](f: (T) => Unit, init: T): T = {
+    f(init)
+    init
+  }
 }
+

src/net/bdew/lib/block/BlockFace.scala

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.block
+
+import net.minecraftforge.common.util.ForgeDirection
+
+case class BlockFace(x: Int, y: Int, z: Int, face: ForgeDirection) {
+  def origin = BlockRef(x, y, z)
+  def target = origin.neighbour(face)
+  def opposite = face.getOpposite
+}
+
+object BlockFace {
+  def apply(bp: BlockRef, face: ForgeDirection) = new BlockFace(bp.x, bp.y, bp.z, face)
+}

src/net/bdew/lib/block/BlockRef.scala

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.block
+
+import net.minecraft.block.Block
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.tileentity.TileEntity
+import net.minecraft.world.IBlockAccess
+import net.minecraftforge.common.util.ForgeDirection
+
+import scala.reflect.ClassTag
+
+case class BlockRef(x: Int, y: Int, z: Int) {
+  def block(w: IBlockAccess) = Option(w.getBlock(x, y, z))
+  def tile(w: IBlockAccess) = Option(w.getTileEntity(x, y, z))
+  def meta(w: IBlockAccess) = w.getBlockMetadata(x, y, z)
+
+  def blockIs(w: IBlockAccess, other: Block) = block(w).contains(other)
+
+  def neighbour(side: ForgeDirection) = BlockRef(x + side.offsetX, y + side.offsetY, z + side.offsetZ)
+  def neighbours = ForgeDirection.VALID_DIRECTIONS.map(x => x -> neighbour(x)).toMap
+
+  override def toString = "(x=%d y=%d z=%d)".format(x, y, z)
+
+  def getTile[T: ClassTag](w: IBlockAccess) = tile(w) flatMap { tile =>
+    val cls = implicitly[ClassTag[T]].runtimeClass
+    if (cls.isInstance(tile))
+      Some(tile.asInstanceOf[T])
+    else None
+  }
+
+  def ==(tx: Int, ty: Int, tz: Int) = x == tx && y == ty && z == tz
+
+  def getBlock[T: ClassTag](w: IBlockAccess) = block(w) flatMap { block =>
+    val cls = implicitly[ClassTag[T]].runtimeClass
+    if (cls.isInstance(block))
+      Some(block.asInstanceOf[T])
+    else None
+  }
+
+  def writeToNBT(tag: NBTTagCompound) {
+    tag.setInteger("x", x)
+    tag.setInteger("y", y)
+    tag.setInteger("z", z)
+  }
+}
+
+object BlockRef {
+  def fromTile(te: TileEntity) = BlockRef(te.xCoord, te.yCoord, te.zCoord)
+  def fromNBT(tag: NBTTagCompound) =
+    BlockRef(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"))
+}

src/net/bdew/lib/block/HasTE.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,22 +9,26 @@
 
 package net.bdew.lib.block
 
-import net.minecraft.block.{ITileEntityProvider, Block}
-import net.minecraft.world.{IBlockAccess, World}
+import net.bdew.lib.BdLib
+import net.minecraft.block.{Block, ITileEntityProvider}
 import net.minecraft.tileentity.TileEntity
-import cpw.mods.fml.common.FMLCommonHandler
+import net.minecraft.world.{IBlockAccess, World}
 
 trait HasTE[T] extends Block with ITileEntityProvider {
   val TEClass: Class[_ <: TileEntity]
-  def createNewTileEntity(world: World): TileEntity = TEClass.newInstance()
+
+  def createNewTileEntity(world: World, meta: Int): TileEntity = TEClass.newInstance()
+
+  def getTE(w: IBlockAccess, ref: BlockRef): T = getTE(w, ref.x, ref.y, ref.z)
+
   def getTE(w: IBlockAccess, x: Int, y: Int, z: Int): T = {
-    var t = w.getBlockTileEntity(x, y, z)
+    var t = w.getTileEntity(x, y, z)
     if ((t == null) || !TEClass.isInstance(t)) {
-      FMLCommonHandler.instance().getFMLLogger.severe("Tile entity for block %s at (%d,%d,%d) is corrupt or missing - recreating".format(this, x, y, z))
+      BdLib.logError("Tile entity for block %s at (%d,%d,%d) is corrupt or missing - recreating", this, x, y, z)
       w match {
         case ww: World =>
-          t = createNewTileEntity(ww)
-          ww.setBlockTileEntity(x, y, z, t)
+          t = createNewTileEntity(ww, w.getBlockMetadata(x, y, z))
+          ww.setTileEntity(x, y, z, t)
         case _ =>
           sys.error("Unable to recreate TE")
       }

src/net/bdew/lib/block/SimpleBlock.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.block
+
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.Misc
+import net.minecraft.block.Block
+import net.minecraft.block.material.Material
+import net.minecraft.client.renderer.texture.IIconRegister
+
+trait NamedBlock extends Block {
+  def name: String
+}
+
+class SimpleBlock(val name: String, material: Material) extends Block(material) with NamedBlock {
+  val modId = Misc.getActiveModId
+  setBlockName(modId + "." + name)
+
+  @SideOnly(Side.CLIENT)
+  override def registerBlockIcons(reg: IIconRegister) {
+    blockIcon = reg.registerIcon(modId + ":" + name.toLowerCase)
+  }
+}

src/net/bdew/lib/config/BlockManager.scala

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.config
+
+import cpw.mods.fml.common.registry.GameRegistry
+import net.bdew.lib.Misc
+import net.bdew.lib.block.{HasTE, SimpleBlock}
+import net.minecraft.block.Block
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.ItemStack
+
+class BlockManager(creativeTab: CreativeTabs) {
+  def regBlock[T <: SimpleBlock](block: T): T = regBlock(block, block.name)
+
+  def regBlock[T <: Block](block: T, name: String, addStack: Boolean = false): T = {
+    GameRegistry.registerBlock(block, name)
+
+    block.setCreativeTab(creativeTab)
+
+    if (addStack)
+      GameRegistry.registerCustomItemStack(name, new ItemStack(block))
+
+    if (block.isInstanceOf[HasTE[_]])
+      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass,
+        "%s.%s".format(Misc.getActiveModId, name))
+
+    return block
+  }
+
+  def load() {}
+}

src/net/bdew/lib/config/FluidManager.scala

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.config
+
+import net.minecraftforge.fluids.{Fluid, FluidRegistry}
+
+class FluidManager() {
+  def regFluid[T <: Fluid](fluid: T): T = {
+    FluidRegistry.registerFluid(fluid)
+    return fluid
+  }
+  def load() {}
+}

src/net/bdew/lib/config/ItemManager.scala

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.config
+
+import cpw.mods.fml.common.registry.GameRegistry
+import net.bdew.lib.items.{NamedItem, SimpleItem}
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.{Item, ItemStack}
+
+class ItemManager(creativeTab: CreativeTabs) {
+  def regSimpleItem(name: String): SimpleItem = regItem(new SimpleItem(name), name)
+
+  def regItem[T <: NamedItem](item: T): T = regItem[T](item, item.name)
+
+  def regItem[T <: Item](item: T, name: String, addStack: Boolean = false): T = {
+    GameRegistry.registerItem(item, name)
+    item.setCreativeTab(creativeTab)
+    if (addStack)
+      GameRegistry.registerCustomItemStack(name, new ItemStack(item))
+    return item
+  }
+
+  def load() {}
+}

src/net/bdew/lib/config/MachineManager.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.config
+
+import net.bdew.lib.gui.{GuiHandler, GuiProvider}
+import net.bdew.lib.machine.Machine
+import net.bdew.lib.recipes.gencfg.ConfigSection
+import net.minecraft.creativetab.CreativeTabs
+
+class MachineManager(val tuning: ConfigSection, guiHandler: GuiHandler, creativeTab: CreativeTabs) {
+  def registerMachine[R <: Machine[_]](machine: R): R = {
+    machine.tuning = tuning.getSection(machine.name)
+    if (machine.tuning.getBoolean("Enabled")) {
+      machine.enabled = true
+      machine.regBlock(creativeTab)
+      if (machine.isInstanceOf[GuiProvider])
+        guiHandler.register(machine.asInstanceOf[GuiProvider])
+    }
+    return machine
+  }
+  def load() {}
+}

src/net/bdew/lib/covers/BlockCoverable.scala

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.covers
+
+import net.bdew.lib.Misc
+import net.bdew.lib.block.HasTE
+import net.bdew.lib.items.ItemUtils
+import net.minecraft.block.Block
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.world.{IBlockAccess, World}
+
+trait BlockCoverable[T <: TileCoverable] extends HasTE[T] {
+  override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, face: Int, xoffs: Float, yoffs: Float, zoffs: Float): Boolean = {
+    val te = getTE(world, x, y, z)
+    val side = Misc.forgeDirection(face)
+
+    if (player.getCurrentEquippedItem == null && player.isSneaking) {
+      for (cover <- Option(te.covers(side).cval)) {
+        if (!world.isRemote) {
+          te.covers(side) := null
+          te.onCoversChanged()
+          ItemUtils.dropItemToPlayer(world, player, cover)
+        }
+        return true
+      }
+    }
+
+    for {
+      activeStack <- Option(player.getCurrentEquippedItem)
+      activeItem <- Option(activeStack.getItem)
+      coverItem <- Misc.asInstanceOpt(activeItem, classOf[ItemCover])
+      if te.isValidCover(side, activeStack) && coverItem.isValidTile(te, activeStack)
+    } {
+      if (!world.isRemote) {
+        for (cover <- Option(te.covers(side).cval))
+          ItemUtils.throwItemAt(world, te.xCoord + side.offsetX, te.yCoord + side.offsetY, te.zCoord + side.offsetZ, cover.copy())
+
+        te.covers(side) := activeStack.splitStack(1)
+
+        if (activeStack.stackSize <= 0) player.inventory.setInventorySlotContents(player.inventory.currentItem, null)
+        te.onCoversChanged()
+      }
+      return true
+    }
+
+    super.onBlockActivated(world, x, y, z, player, face, xoffs, yoffs, zoffs)
+  }
+
+  override def getIcon(w: IBlockAccess, x: Int, y: Int, z: Int, side: Int) =
+    (for {
+      coverStack <- Option(getTE(w, x, y, z).covers(Misc.forgeDirection(side)).cval)
+      coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover]))
+    } yield coverItem.getCoverIcon(coverStack)
+      ) getOrElse super.getIcon(w, x, y, z, side)
+
+  override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) {
+    if (!world.isRemote)
+      for ((dir, covOpt) <- getTE(world, x, y, z).covers; cover <- Option(covOpt.cval))
+        ItemUtils.throwItemAt(world, x, y, z, cover)
+    super.breakBlock(world, x, y, z, block, meta)
+  }
+}

src/net/bdew/lib/covers/ItemCover.scala

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.covers
+
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.util.IIcon
+import net.minecraftforge.common.util.ForgeDirection
+
+trait ItemCover extends Item {
+  /**
+   * @return Icon to render, MUST be on terrain spritesheet (0), not item!
+   */
+  def getCoverIcon(stack: ItemStack): IIcon
+
+  /**
+   * Perform tick, called on server only
+   */
+  def tickCover(te: TileCoverable, side: ForgeDirection, cover: ItemStack)
+
+  /**
+   * Checks if this cover can be installed on a specific TE
+   */
+  def isValidTile(te: TileCoverable, cover: ItemStack): Boolean
+}

src/net/bdew/lib/covers/TileCoverable.scala

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.covers
+
+import net.bdew.lib.Misc
+import net.bdew.lib.data.DataSlotItemStack
+import net.bdew.lib.data.base.{TileDataSlots, UpdateKind}
+import net.minecraft.item.ItemStack
+import net.minecraftforge.common.util.ForgeDirection
+
+trait TileCoverable extends TileDataSlots {
+  val covers = (ForgeDirection.VALID_DIRECTIONS map { x =>
+    x -> DataSlotItemStack("cover_" + x.toString.toLowerCase, this).setUpdate(UpdateKind.SAVE, UpdateKind.WORLD, UpdateKind.RENDER)
+  }).toMap
+
+  /**
+   * Checks if a specific cover can be installed here
+   */
+  def isValidCover(side: ForgeDirection, cover: ItemStack): Boolean
+
+  /**
+   * Called when new covers are installed
+   */
+  def onCoversChanged() {}
+
+  def tickCovers() =
+    for {
+      (dir, coverSlot) <- covers
+      coverStack <- Option(coverSlot.cval)
+      coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover]))
+    } {
+      coverItem.tickCover(this, dir, coverStack)
+    }
+
+  serverTick.listen(tickCovers)
+}

src/net/bdew/lib/data/DataSlotBoolean.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,8 +9,8 @@
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal}
 
 case class DataSlotBoolean(name: String, parent: TileDataSlots, default: Boolean = false) extends DataSlotVal[Boolean] {
   var cval = default

src/net/bdew/lib/data/DataSlotDirection.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,9 +9,9 @@
 
 package net.bdew.lib.data
 
-import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal}
-import net.minecraftforge.common.ForgeDirection
+import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.common.util.ForgeDirection
 
 case class DataSlotDirection(name: String, parent: TileDataSlots) extends DataSlotVal[ForgeDirection] {
   var cval = ForgeDirection.UP

src/net/bdew/lib/data/DataSlotFloat.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,8 +9,8 @@
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric}
 
 case class DataSlotFloat(name: String, parent: TileDataSlots, default: Float = 0) extends DataSlotNumeric[Float](default) {
   def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setFloat(name, cval)

src/net/bdew/lib/data/DataSlotGameProfile.scala

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.data
+
+import java.util.UUID
+
+import com.mojang.authlib.GameProfile
+import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind}
+import net.minecraft.nbt.NBTTagCompound
+import org.apache.commons.lang3.StringUtils
+
+case class DataSlotGameProfile(name: String, parent: TileDataSlots) extends DataSlotVal[GameProfile] {
+  override var cval: GameProfile = null
+
+  override def load(t: NBTTagCompound, kind: UpdateKind.Value) = {
+    cval = if (t.hasKey(name + "_uid") || t.hasKey(name + "_name")) {
+      val uid = if (t.hasKey(name + "_uid")) UUID.fromString(t.getString(name + "_uid")) else null
+      val uname = if (t.hasKey(name + "_name")) t.getString(name + "_name") else null
+      new GameProfile(uid, uname)
+    } else null
+  }
+
+  override def save(t: NBTTagCompound, kind: UpdateKind.Value) = {
+    if (cval != null) {
+      Option(cval.getId) map (id => t.setString(name + "_uid", id.toString))
+      Option(cval.getName) filterNot (name => StringUtils.isBlank(name)) map (name => t.setString(name + "_name", name))
+    }
+  }
+}

src/net/bdew/lib/data/DataSlotInt.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,8 +9,8 @@
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric}
 
 case class DataSlotInt(name: String, parent: TileDataSlots, default: Int = 0) extends DataSlotNumeric[Int](default) {
   def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setInteger(name, cval)

src/net/bdew/lib/data/DataSlotItemStack.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,9 +9,9 @@
 
 package net.bdew.lib.data
 
-import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal}
-import net.minecraft.nbt.NBTTagCompound
+import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind}
 import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
 
 case class DataSlotItemStack(name: String, parent: TileDataSlots) extends DataSlotVal[ItemStack] {
   var cval: ItemStack = null
@@ -26,7 +26,7 @@ case class DataSlotItemStack(name: String, parent: TileDataSlots) extends DataSl
   def save(t: NBTTagCompound, kind: UpdateKind.Value) = {
     val tag = new NBTTagCompound()
     if (cval != null) cval.writeToNBT(tag)
-    t.setCompoundTag(name, tag)
+    t.setTag(name, tag)
   }
   def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = ItemStack.loadItemStackFromNBT(t.getCompoundTag(name))
 }

src/net/bdew/lib/data/DataSlotOption.scala

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.data
+
+import net.bdew.lib.data.base.DataSlotVal
+
+abstract class DataSlotOption[T] extends DataSlotVal[Option[T]] {
+  override var cval: Option[T] = None
+
+  def set(v: T) {
+    if (v == null) sys.error("Null should never be used with DataSlotOption")
+    cval = Some(v)
+  }
+
+  def unset() {
+    cval = None
+  }
+
+  override def isSame(v: Option[T]) = {
+    if (v == null) sys.error("Null should never be used with DataSlotOption")
+    super.isSame(v)
+  }
+  override def :=(that: Option[T]) = {
+    if (that == null) sys.error("Null should never be used with DataSlotOption")
+    super.:=(that)
+  }
+  override def :!=(that: Option[T]) = {
+    if (that == null) sys.error("Null should never be used with DataSlotOption")
+    super.:!=(that)
+  }
+  override def :==(that: Option[T]) = {
+    if (that == null) sys.error("Null should never be used with DataSlotOption")
+    super.:==(that)
+  }
+  override def update(v: Option[T]) = {
+    if (v == null) sys.error("Null should never be used with DataSlotOption")
+    super.update(v)
+  }
+}

src/net/bdew/lib/data/DataSlotString.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,8 +9,8 @@
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal}
 
 case class DataSlotString(name: String, parent: TileDataSlots, default: String = null) extends DataSlotVal[String] {
   var cval: String = default

src/net/bdew/lib/data/DataSlotTank.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,13 +9,12 @@
 
 package net.bdew.lib.data
 
-import net.minecraftforge.fluids.{IFluidTank, FluidTank, FluidStack}
+import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlot}
+import net.minecraftforge.fluids.{FluidStack, FluidTank, IFluidTank}
 
 abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank with DataSlot {
   var oldStack: FluidStack = null
-  var size: Int
 
   parent.serverTick.listen(checkUpdate)
 
@@ -38,19 +37,20 @@ abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank w
     val tag = new NBTTagCompound()
     writeToNBT(tag)
     if (k == UpdateKind.GUI)
-      tag.setInteger("size", size)
-    t.setCompoundTag(name, tag)
+      tag.setInteger("size", getCapacity)
+    t.setTag(name, tag)
   }
 
   def load(t: NBTTagCompound, k: UpdateKind.Value) {
+    setFluid(null)
     val tag = t.getCompoundTag(name)
     readFromNBT(tag)
     if (k == UpdateKind.GUI)
-      size = tag.getInteger("size")
+      setCapacity(tag.getInteger("size"))
   }
 }
 
-case class DataSlotTank(name: String, parent: TileDataSlots, var size: Int) extends DataSlotTankBase(size)
+case class DataSlotTank(name: String, parent: TileDataSlots, size: Int) extends DataSlotTankBase(size)
 
 case class DataSlotTankRestricted(name: String, parent: TileDataSlots, var size: Int, fluidID: Int) extends DataSlotTankBase(size) {
   def fill(amount: Int, doFill: Boolean) = super.fill(new FluidStack(fluidID, amount), doFill)

src/net/bdew/lib/data/base/ContainerDataSlots.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,11 +9,11 @@
 
 package net.bdew.lib.data.base
 
+import net.bdew.lib.gui.NoInvContainer
 import net.minecraft.entity.player.EntityPlayerMP
-import net.bdew.lib.gui.BaseContainer
 import net.minecraft.inventory.ICrafting
 
-trait ContainerDataSlots extends BaseContainer {
+trait ContainerDataSlots extends NoInvContainer {
   val dataSource: TileDataSlots
   var lastSentChange = dataSource.lastChange
 
@@ -21,19 +21,19 @@ trait ContainerDataSlots extends BaseContainer {
     super.addCraftingToCrafters(crafter)
     if (crafter.isInstanceOf[EntityPlayerMP]) {
       val pkt = dataSource.getDataSlotPacket
-      crafter.asInstanceOf[EntityPlayerMP].playerNetServerHandler.sendPacketToPlayer(pkt)
+      crafter.asInstanceOf[EntityPlayerMP].playerNetServerHandler.sendPacket(pkt)
     }
   }
 
   override def detectAndSendChanges() {
     super.detectAndSendChanges()
     // only send updates every 10 ticks
-    if (dataSource.lastChange >= lastSentChange + 10 || (dataSource.lastChange > lastSentChange && lastSentChange + 10 < dataSource.worldObj.getTotalWorldTime)) {
+    if (dataSource.lastChange >= lastSentChange + 10 || (dataSource.lastChange > lastSentChange && lastSentChange + 10 < dataSource.getWorldObj.getTotalWorldTime)) {
       lastSentChange = dataSource.lastChange
       val pkt = dataSource.getDataSlotPacket
 
       for (player <- players)
-        player.playerNetServerHandler.sendPacketToPlayer(pkt)
+        player.playerNetServerHandler.sendPacket(pkt)
     }
   }
 }

src/net/bdew/lib/data/base/DataSlot.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public

src/net/bdew/lib/data/base/DataSlotNumeric.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public

src/net/bdew/lib/data/base/DataSlotOrdered.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public

src/net/bdew/lib/data/base/DataSlotVal.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,7 +9,7 @@
 
 package net.bdew.lib.data.base
 
-import language.implicitConversions
+import scala.language.implicitConversions
 
 /**
  * Base trait for data slots that hold primitive values

src/net/bdew/lib/data/base/TileDataSlots.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,10 +9,12 @@
 
 package net.bdew.lib.data.base
 
-import net.minecraft.network.packet.Packet132TileEntityData
-import scala.collection.mutable
-import net.minecraft.nbt.NBTTagCompound
 import net.bdew.lib.tile.TileExtended
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.network.Packet
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity
+
+import scala.collection.mutable
 
 trait TileDataSlots extends TileExtended {
   val dataSlots = mutable.HashMap.empty[String, DataSlot]
@@ -31,6 +33,8 @@ trait TileDataSlots extends TileExtended {
     for ((n, s) <- dataSlots if s.updateKind.contains(kind)) {
       if (TRACE) printf("%s: %s L<= %s\n".format(kind, n, t.getTag(n)))
       s.load(t, kind)
+      if (kind == UpdateKind.WORLD && s.updateKind.contains(UpdateKind.RENDER))
+        getWorldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord)
     }
   }
 
@@ -40,20 +44,20 @@ trait TileDataSlots extends TileExtended {
   handleClientUpdate.listen(doLoad(UpdateKind.WORLD, _))
 
   def dataSlotChanged(slot: DataSlot) {
-    if (worldObj != null) {
+    if (getWorldObj != null) {
       if (slot.updateKind.contains(UpdateKind.GUI))
-        lastChange = worldObj.getTotalWorldTime
+        lastChange = getWorldObj.getTotalWorldTime
       if (slot.updateKind.contains(UpdateKind.WORLD))
-        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord)
+        getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord)
       if (slot.updateKind.contains(UpdateKind.SAVE))
-        worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this)
+        getWorldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this)
     }
   }
 
-  def getDataSlotPacket: Packet132TileEntityData = {
+  def getDataSlotPacket: Packet = {
     val tag = new NBTTagCompound()
     doSave(UpdateKind.GUI, tag)
-    return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, ACT_GUI, tag)
+    return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, ACT_GUI, tag)
   }
 
   override protected def extDataPacket(id: Int, data: NBTTagCompound) {

src/net/bdew/lib/data/base/UpdateKind.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -13,4 +13,5 @@ object UpdateKind extends Enumeration {
   val WORLD = Value("WORLD")
   val GUI = Value("GUI")
   val SAVE = Value("SAVE")
+  val RENDER = Value("RENDER")
 }

src/net/bdew/lib/gui/BaseContainer.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,26 +9,12 @@
 
 package net.bdew.lib.gui
 
-import net.minecraft.inventory.{IInventory, Slot, Container}
-import net.minecraft.entity.player.{EntityPlayerMP, EntityPlayer, InventoryPlayer}
-import net.minecraft.item.ItemStack
 import net.bdew.lib.items.ItemUtils
-import net.bdew.lib.Misc
-
-abstract class BaseContainer(te: IInventory) extends Container {
-
-  import scala.collection.JavaConversions._
-
-  def players = Misc.filterType(crafters, classOf[EntityPlayerMP])
-
-  protected def bindPlayerInventory(inv: InventoryPlayer, xOffs: Int, yOffsInv: Int, yOffsHotbar: Int) {
-    for (i <- 0 until 3; j <- 0 until 9)
-      addSlotToContainer(new Slot(inv, j + i * 9 + 9, xOffs + j * 18, yOffsInv + i * 18))
-
-    for (i <- 0 until 9)
-      addSlotToContainer(new Slot(inv, i, xOffs + i * 18, yOffsHotbar))
-  }
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.IInventory
+import net.minecraft.item.ItemStack
 
+abstract class BaseContainer(te: IInventory) extends NoInvContainer {
   override def transferStackInSlot(player: EntityPlayer, slot: Int): ItemStack = {
     var stack = getSlot(slot).getStack
     if (getSlot(slot).inventory == player.inventory) {

src/net/bdew/lib/gui/BasePoint.scala

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+case class BasePoint[T: Numeric](x: T, y: T) {
+  val n = implicitly[Numeric[T]]
+
+  import n.mkNumericOps
+
+  def this(p: BasePoint[T]) = this(p.x, p.y)
+
+  def +(that: BasePoint[T]) = BasePoint(this.x + that.x, this.y + that.y)
+  def +(xOff: T, yOff: T) = BasePoint(this.x + xOff, this.y + yOff)
+  def -(that: BasePoint[T]) = BasePoint(this.x - that.x, this.y - that.y)
+  def -(xOff: T, yOff: T) = BasePoint(this.x - xOff, this.y - yOff)
+
+  def map[R: Numeric](f: T => R) = new BasePoint(f(x), f(y))
+}

src/net/bdew/lib/gui/BaseRect.scala

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+case class BaseRect[T: Numeric](x: T, y: T, w: T, h: T) {
+  val n = implicitly[Numeric[T]]
+
+  import n.mkNumericOps
+
+  def this(p: BasePoint[T], w: T, h: T) = this(p.x, p.y, w, h)
+
+  def contains(p: BasePoint[T]) = n.gteq(p.x, x) && n.gteq(p.y, y) && n.lteq(p.x, x2) && n.lteq(p.y, y2)
+
+  def origin = BasePoint(x, y)
+
+  def map[R: Numeric](f: T => R) = new BaseRect(f(x), f(y), f(w), f(h))
+
+  def interpolate(xf1: Float, yf1: Float, xf2: Float, yf2: Float) =
+    new BaseRect[Float](
+      xf1 * w.toFloat() + x.toFloat(),
+      yf1 * h.toFloat() + y.toFloat(),
+      (xf2 - xf1) * w.toFloat(),
+      (yf2 - yf1) * h.toFloat()
+    )
+
+  def +(p: BasePoint[T]) = new BaseRect(origin + p, w, h)
+  def -(p: BasePoint[T]) = new BaseRect(origin - p, w, h)
+
+  def x1 = x
+  def x2 = x + w
+  def y1 = y
+  def y2 = y + h
+}

src/net/bdew/lib/gui/BaseScreen.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,24 +9,25 @@
 
 package net.bdew.lib.gui
 
+import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.inventory.Container
-import scala.collection.mutable
-import net.minecraft.client.gui.GuiButton
-import net.bdew.lib.gui.widgets.Widget
-import net.minecraft.util.ResourceLocation
 import org.lwjgl.opengl.GL11
 
+import scala.collection.mutable
+
 abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContainer(cont) {
   xSize = xSz
   ySize = ySz
 
-  val widgets = mutable.MutableList.empty[Widget]
-  val texture: ResourceLocation
+  val widgets = new WidgetContainerWindow(this, xSz, ySz)
+
+  val background: Texture
 
   def rect = new Rect(guiLeft, guiTop, xSize, ySize)
 
-  def getFontRenderer = fontRenderer
+  def getFontRenderer = Minecraft.getMinecraft.fontRenderer
+  def getZLevel = zLevel
 
   override def initGui() {
     super.initGui()
@@ -34,56 +35,38 @@ abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContai
     buttonList.clear()
   }
 
-  def addButton[T <: GuiButton](w: T): T = {
-    buttonList.asInstanceOf[java.util.ArrayList[GuiButton]].add(w)
-    return w
-  }
-
-  def addWidget[T <: Widget](w: T): T = {
-    widgets += w
-    w.parent = this
-    return w
-  }
-
-  protected override def keyTyped(c: Char, i: Int) {
-    for (w <- widgets)
-      if (w.keyTyped(c, i))
-        return
-    super.keyTyped(c, i)
-  }
-
   protected override def mouseClicked(x: Int, y: Int, bt: Int) {
     super.mouseClicked(x, y, bt)
-    val p = new Point(x, y) - rect.origin
-    for (w <- widgets if w.rect.contains(p))
-      w.mouseClicked(p - w.rect.origin, bt)
+    widgets.mouseClicked(Point(x, y) - rect.origin, bt)
   }
 
-  protected override def drawGuiContainerForegroundLayer(x: Int, y: Int) {
-    for (w <- widgets)
-      w.draw()
-  }
+  protected override def keyTyped(c: Char, i: Int) =
+    if (!widgets.keyTyped(c, i))
+      super.keyTyped(c, i)
+
+  protected override def drawGuiContainerForegroundLayer(x: Int, y: Int) =
+    widgets.draw(Point(x, y) - rect.origin)
 
   protected override def drawScreen(x: Int, y: Int, f: Float) {
     super.drawScreen(x, y, f)
 
     val tip = mutable.MutableList.empty[String]
 
-    val p = new Point(x, y) - rect.origin
-    for (w <- widgets if w.rect.contains(p))
-      w.handleTooltip(p - w.rect.origin, tip)
+    widgets.handleTooltip(Point(x, y) - rect.origin, tip)
 
-    import collection.JavaConversions._
+    import scala.collection.JavaConversions._
 
     if (tip.size > 0)
-      drawHoveringText(tip, x, y, fontRenderer)
+      drawHoveringText(tip, x, y, getFontRenderer)
   }
 
-  protected def drawGuiContainerBackgroundLayer(f: Float, i: Int, j: Int) {
-    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F)
-    mc.renderEngine.bindTexture(texture)
-    val x = (width - xSize) / 2
-    val y = (height - ySize) / 2
-    this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize)
+  protected def drawGuiContainerBackgroundLayer(f: Float, x: Int, y: Int) {
+    if (background != null)
+      widgets.drawTexture(rect, background)
+
+    GL11.glPushMatrix()
+    GL11.glTranslatef(rect.x, rect.y, 0)
+    widgets.drawBackground(Point(x, y) - rect.origin)
+    GL11.glPopMatrix()
   }
 }

src/net/bdew/lib/gui/BaseSlot.scala

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.minecraft.inventory.{IInventory, Slot}
+import org.lwjgl.opengl.GL11
+
+class BaseSlot(inv: IInventory, slot: Int, x: Int, y: Int) extends Slot(inv, slot, x, y) {
+  override def getBackgroundIconIndex = {
+    // Workaround for bug in GuiContainer, color isn't reset if previous slot had an item with color.
+    GL11.glColor4d(1, 1, 1, 1)
+    super.getBackgroundIconIndex
+  }
+}

src/net/bdew/lib/gui/Color.scala

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.bdew.lib.Misc
+import org.lwjgl.opengl.GL11
+
+case class Color(r: Float, g: Float, b: Float, a: Float = 1) {
+  def this(c: (Float, Float, Float)) = this(c._1, c._2, c._3)
+  def this(c: (Float, Float, Float, Float)) = this(c._1, c._2, c._3, c._4)
+  def activate() = GL11.glColor4f(r, g, b, a)
+  def asARGB =
+    Misc.clamp((a * 255).round, 0, 255) << 24 |
+      Misc.clamp((r * 255).round, 0, 255) << 16 |
+      Misc.clamp((g * 255).round, 0, 255) << 8 |
+      Misc.clamp((b * 255).round, 0, 255)
+  def asRGB =
+    Misc.clamp((r * 255).round, 0, 255) << 16 |
+      Misc.clamp((g * 255).round, 0, 255) << 8 |
+      Misc.clamp((b * 255).round, 0, 255)
+}
+
+object Color {
+  def fromRGB(r: Int, g: Int, b: Int, a: Int = 255) = Color(r / 255F, g / 255F, b / 255F, a / 255F)
+  def fromInt(v: Int) = Color(
+    ((v >> 16) & 0xFF) / 255F,
+    ((v >> 8) & 0xFF) / 255F,
+    (v & 0xFF) / 255F
+  )
+  final val white = Color(1, 1, 1)
+  final val black = Color(0, 0, 0)
+  final val red = Color(1, 0, 0)
+  final val green = Color(0, 1, 0)
+  final val blue = Color(0, 0, 1)
+  final val yellow = Color(1, 1, 0)
+  final val cyan = Color(0, 1, 1)
+  final val magenta = Color(1, 0, 1)
+
+  final val gray = Color(0.5F, 0.5F, 0.5F)
+  final val lightgray = Color(0.75F, 0.75F, 0.75F)
+  final val darkgray = Color(0.25F, 0.25F, 0.25F)
+}

src/net/bdew/lib/gui/Direction.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -12,7 +12,7 @@ package net.bdew.lib.gui
 object Direction extends Enumeration {
   type Direction = Value
   val UP = Value("UP")
-  val DOWN = Value("UP")
-  val LEFT = Value("UP")
-  val RIGHT = Value("UP")
+  val DOWN = Value("DOWN")
+  val LEFT = Value("LEFT")
+  val RIGHT = Value("RIGHT")
 }

src/net/bdew/lib/gui/DrawTarget.scala

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.minecraft.client.gui.FontRenderer
+import net.minecraft.client.renderer.Tessellator
+
+trait DrawTarget {
+  def getZLevel: Float
+  def getFontRenderer: FontRenderer
+  def drawTexture(r: Rect, t: Texture, color: Color = Color.white)
+  def drawText(text: String, p: Point, color: Color, shadow: Boolean)
+  def drawTextMultiline(text: String, r: Rect, color: Color)
+
+  def drawTextureInterpolate(r: Rect, t: Texture, x1: Float, y1: Float, x2: Float, y2: Float, color: Color = Color.white) =
+    drawTexture(r.interpolate(x1, y1, x2, y2), Texture.interpolate(t, x1, y1, x2, y2))
+}
+
+trait SimpleDrawTarget extends DrawTarget {
+  private final val T = Tessellator.instance
+
+  def drawTexture(r: Rect, t: Texture, color: Color = Color.white) {
+    val z = getZLevel
+    t.bind()
+    color.activate()
+    T.startDrawingQuads()
+    T.addVertexWithUV(r.x1, r.y2, z, t.u1, t.v2)
+    T.addVertexWithUV(r.x2, r.y2, z, t.u2, t.v2)
+    T.addVertexWithUV(r.x2, r.y1, z, t.u2, t.v1)
+    T.addVertexWithUV(r.x1, r.y1, z, t.u1, t.v1)
+    T.draw()
+  }
+
+  def drawText(text: String, p: Point, color: Color, shadow: Boolean) =
+    getFontRenderer.drawString(text, p.x.round, p.y.round, color.asARGB, shadow)
+
+  def drawTextMultiline(text: String, r: Rect, color: Color) =
+    getFontRenderer.drawSplitString(text, r.x.round, r.y.round, r.w.round, color.asARGB)
+}

src/net/bdew/lib/gui/GuiHandler.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import cpw.mods.fml.common.network.IGuiHandler
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.world.World
+
+import scala.collection.mutable
+
+class GuiHandler extends IGuiHandler {
+  val guis = mutable.Map.empty[Int, GuiProvider]
+
+  def register(p: GuiProvider) = {
+    if (guis.isDefinedAt(p.guiId))
+      sys.error("GUI ID Collision - %d was registered for %s and attemted to register by %s".format(p.guiId, guis(p.guiId), p))
+    guis += (p.guiId -> p)
+  }
+
+  def getServerGuiElement(ID: Int, player: EntityPlayer, world: World, x: Int, y: Int, z: Int): AnyRef =
+    guis(ID).getContainer(world.getTileEntity(x, y, z), player)
+
+  def getClientGuiElement(ID: Int, player: EntityPlayer, world: World, x: Int, y: Int, z: Int): AnyRef =
+    guis(ID).getGui(world.getTileEntity(x, y, z), player)
+}

src/net/bdew/lib/gui/GuiProvider.scala

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.tileentity.TileEntity
+
+trait GuiProvider {
+  def guiId: Int
+
+  type TEClass
+
+  @SideOnly(Side.CLIENT)
+  def getGui(te: TEClass, player: EntityPlayer): AnyRef
+  def getContainer(te: TEClass, player: EntityPlayer): AnyRef
+
+  @SideOnly(Side.CLIENT)
+  def getGui(te: TileEntity, player: EntityPlayer): AnyRef = getGui(te.asInstanceOf[TEClass], player)
+  def getContainer(te: TileEntity, player: EntityPlayer): AnyRef = getContainer(te.asInstanceOf[TEClass], player)
+}

src/net/bdew/lib/gui/NoInvContainer.scala

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.bdew.lib.Misc
+import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP, InventoryPlayer}
+import net.minecraft.inventory.{Container, Slot}
+import net.minecraft.item.ItemStack
+
+abstract class NoInvContainer extends Container {
+
+  import scala.collection.JavaConversions._
+
+  def players = Misc.filterType(crafters, classOf[EntityPlayerMP])
+
+  protected def bindPlayerInventory(inv: InventoryPlayer, xOffs: Int, yOffsInv: Int, yOffsHotbar: Int) {
+    for (i <- 0 until 3; j <- 0 until 9)
+      addSlotToContainer(new Slot(inv, j + i * 9 + 9, xOffs + j * 18, yOffsInv + i * 18))
+
+    for (i <- 0 until 9)
+      addSlotToContainer(new Slot(inv, i, xOffs + i * 18, yOffsHotbar))
+  }
+
+  override def slotClick(slotnum: Int, button: Int, modifiers: Int, player: EntityPlayer): ItemStack = {
+    if (inventorySlots.isDefinedAt(slotnum)) {
+      val slot = getSlot(slotnum)
+      if (slot != null && slot.isInstanceOf[SlotClickable])
+        return slot.asInstanceOf[SlotClickable].onClick(button, modifiers, player)
+    }
+    return super.slotClick(slotnum, button, modifiers, player)
+  }
+
+  override def transferStackInSlot(player: EntityPlayer, slot: Int): ItemStack = null
+}

src/net/bdew/lib/gui/Point.scala

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/bdlib
- *
- * This mod is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
- */
-
-package net.bdew.lib.gui
-
-class Point(val x: Int, val y: Int) {
-  def this(p: Point) = this(p.x, p.y)
-  def +(that: Point) = new Point(this.x + that.x, this.y + that.y)
-  def -(that: Point) = new Point(this.x - that.x, this.y - that.y)
-}
-
-object Point {
-
-  import language.implicitConversions
-
-  implicit def awt2point(p: java.awt.Point): Point = new Point(p.x, p.y)
-  implicit def point2awt(p: Point): java.awt.Point = new java.awt.Point(p.x, p.y)
-  implicit def tuple2point(p: (Int, Int)): Point = new Point(p._1, p._2)
-}

src/net/bdew/lib/gui/Rect.scala

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/bdlib
- *
- * This mod is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
- */
-
-package net.bdew.lib.gui
-
-class Rect(val x: Int, val y: Int, val w: Int, val h: Int) {
-  def this(p: Point, w: Int, h: Int) = this(p.x, p.y, w, h)
-  def contains(p: Point) = p.x >= x && p.y >= y && p.x <= x + w && p.y <= y + h
-  def origin = new Point(x, y)
-  def +(p: Point) = new Rect(origin + p, w, h)
-  def -(p: Point) = new Rect(origin - p, w, h)
-}

src/net/bdew/lib/gui/SlotClickable.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,8 +9,10 @@
 
 package net.bdew.lib.gui
 
-import net.minecraft.util.ResourceLocation
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.Slot
+import net.minecraft.item.ItemStack
 
-class TextureLocation(val resource: ResourceLocation, val p: Point) extends Point(p.x, p.y) {
-  def this(resource: ResourceLocation, x: Int, y: Int) = this(resource, new Point(x, y))
+trait SlotClickable extends Slot {
+  def onClick(button: Int, mods: Int, player: EntityPlayer): ItemStack
 }

src/net/bdew/lib/gui/SlotValidating.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -10,9 +10,8 @@
 package net.bdew.lib.gui
 
 import net.minecraft.inventory.IInventory
-import net.minecraft.inventory.Slot
 import net.minecraft.item.ItemStack
 
-class SlotValidating(inv: IInventory, slot: Int, x: Int, y: Int) extends Slot(inv, slot, x, y) {
+class SlotValidating(inv: IInventory, slot: Int, x: Int, y: Int) extends BaseSlot(inv, slot, x, y) {
   override def isItemValid(stack: ItemStack) = inventory.isItemValidForSlot(getSlotIndex, stack)
 }

src/net/bdew/lib/gui/Texture.scala

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.texture.TextureMap
+import net.minecraft.util.{IIcon, ResourceLocation}
+
+trait Texture {
+  def u1: Float
+  def u2: Float
+  def v1: Float
+  def v2: Float
+  def bind(): Unit
+}
+
+class InterpolatedTexture(val texture: Texture, rect: Rect) extends Texture {
+  def bind() = texture.bind()
+  def u1 = rect.x1 * (texture.u2 - texture.u1) + texture.u1
+  def u2 = rect.x2 * (texture.u2 - texture.u1) + texture.u1
+  def v1 = rect.y1 * (texture.v2 - texture.v1) + texture.v1
+  def v2 = rect.y2 * (texture.v2 - texture.v1) + texture.v1
+}
+
+class IconWrapper(val resource: ResourceLocation, val icon: IIcon) extends Texture {
+  def u1 = icon.getMinU
+  def u2 = icon.getMaxU
+  def v1 = icon.getMinV
+  def v2 = icon.getMaxV
+  def bind() = Minecraft.getMinecraft.renderEngine.bindTexture(resource)
+}
+
+class Sprite(val resource: ResourceLocation, r: Rect, scale: Int = 256) extends Texture {
+  val rect = Rect(r.x / scale, r.y / scale, r.w / scale, r.h / scale)
+  def u1 = rect.x1
+  def u2 = rect.x2
+  def v1 = rect.y1
+  def v2 = rect.y2
+  def bind() = Minecraft.getMinecraft.renderEngine.bindTexture(resource)
+}
+
+class ScaledResourceLocation(path: String, val scale: Int = 256) extends ResourceLocation(path) {
+  def this(domain: String, path: String, scale: Int) = this(domain + ":" + path, scale)
+  def this(domain: String, path: String) = this(domain + ":" + path, 256)
+}
+
+object Texture {
+  val ITEMS = TextureMap.locationItemsTexture
+  val BLOCKS = TextureMap.locationBlocksTexture
+
+  // From minecraft Icon
+  def apply(res: ResourceLocation, i: IIcon) = new IconWrapper(res, i)
+
+  // From a ResourceLocation and position, scale optional
+  def apply(res: ResourceLocation, r: Rect) = new Sprite(res, r)
+  def apply(res: ResourceLocation, r: Rect, scale: Int) = new Sprite(res, r, scale)
+  def apply(res: ResourceLocation, u1: Float, v1: Float, w: Float, h: Float) = new Sprite(res, Rect(u1, v1, w, h))
+  def apply(res: ResourceLocation, u1: Float, v1: Float, w: Float, h: Float, scale: Int) = new Sprite(res, Rect(u1, v1, w, h), scale)
+
+  // From a path (with optional domain) and position, no scale
+  def apply(path: String, r: Rect) = new Sprite(new ResourceLocation(path), r)
+  def apply(path: String, u1: Float, v1: Float, w: Float, h: Float) = new Sprite(new ResourceLocation(path), Rect(u1, v1, w, h))
+  def apply(domain: String, path: String, r: Rect) = new Sprite(new ResourceLocation(domain, path), r)
+  def apply(domain: String, path: String, u1: Float, v1: Float, w: Float, h: Float) = new Sprite(new ResourceLocation(domain, path), Rect(u1, v1, w, h))
+
+  // From a path (with optional domain), position and scale
+  def apply(path: String, r: Rect, scale: Int) = new Sprite(new ResourceLocation(path), r, scale)
+  def apply(path: String, u1: Float, v1: Float, w: Float, h: Float, scale: Int) = new Sprite(new ResourceLocation(path), Rect(u1, v1, w, h), scale)
+  def apply(domain: String, path: String, r: Rect, scale: Int) = new Sprite(new ResourceLocation(domain, path), r, scale)
+  def apply(domain: String, path: String, u1: Float, v1: Float, w: Float, h: Float, scale: Int) = new Sprite(new ResourceLocation(domain, path), Rect(u1, v1, w, h), scale)
+
+  // From a ScaledResourceLocation and position
+  def apply(res: ScaledResourceLocation, r: Rect) = new Sprite(res, r, res.scale)
+  def apply(res: ScaledResourceLocation, u1: Float, v1: Float, w: Float, h: Float) = new Sprite(res, Rect(u1, v1, w, h), res.scale)
+
+  // A fraction of another Texture, parameters should be between 0 and 1
+  def interpolate(texture: Texture, rect: Rect) = new InterpolatedTexture(texture, rect)
+  def interpolate(texture: Texture, u1: Float, v1: Float, u2: Float, v2: Float) = new InterpolatedTexture(texture, Rect(u1, v1, u2 - u1, v2 - v1))
+}

src/net/bdew/lib/gui/WidgetContainer.scala

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui
+
+import net.bdew.lib.gui.widgets.BaseWidget
+import net.minecraft.client.gui.FontRenderer
+import org.lwjgl.opengl.GL11
+
+import scala.collection.mutable
+
+trait WidgetContainer extends DrawTarget {
+  val rect: Rect
+  val widgets = mutable.MutableList.empty[BaseWidget]
+
+  def activeWidgets: Iterable[BaseWidget] = widgets
+
+  def getFontRenderer: FontRenderer
+
+  def clear() = widgets.clear()
+
+  def add[T <: BaseWidget](w: T): T = {
+    widgets += w
+    w.init(this)
+    return w
+  }
+
+  def mouseClicked(p: Point, bt: Int) {
+    for (w <- activeWidgets)
+      if (w.rect.contains(p))
+        w.mouseClicked(p - w.rect.origin, bt)
+      else
+        w.looseFocus()
+  }
+
+  def keyTyped(c: Char, i: Int): Boolean = {
+    for (w <- activeWidgets)
+      if (w.keyTyped(c, i))
+        return true
+    return false
+  }
+
+  def drawBackground(mouse: Point) {
+    val p = mouse - rect.origin
+    GL11.glPushMatrix()
+    GL11.glTranslatef(rect.origin.x, rect.origin.y, 0)
+    for (w <- activeWidgets) {
+      w.drawBackground(p)
+    }
+    GL11.glPopMatrix()
+  }
+
+  def draw(mouse: Point) {
+    val p = mouse - rect.origin
+    GL11.glPushMatrix()
+    GL11.glTranslatef(rect.origin.x, rect.origin.y, 0)
+    for (w <- activeWidgets) {
+      w.draw(p)
+    }
+    GL11.glPopMatrix()
+  }
+
+  def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
+    for (w <- activeWidgets if w.rect.contains(p))
+      w.handleTooltip(p - w.rect.origin, tip)
+  }
+
+  def looseFocus() =
+    for (w <- activeWidgets)
+      w.looseFocus()
+
+  def getOffsetFromWindow: Point
+}
+
+class WidgetContainerWindow(val parent: BaseScreen, xSz: Int, ySz: Int) extends WidgetContainer with SimpleDrawTarget {
+  def getZLevel = parent.getZLevel
+  def getFontRenderer = parent.getFontRenderer
+  def getOffsetFromWindow = Point(0, 0)
+  val rect = Rect(0, 0, xSz, ySz)
+}

src/net/bdew/lib/gui/package.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib
+
+package object gui {
+  type Rect = BaseRect[Float]
+  type Point = BasePoint[Float]
+
+  import scala.language.implicitConversions
+
+  implicit def awt2point(p: java.awt.Point) = BasePoint(p.x, p.y)
+  implicit def point2awt(p: BasePoint[Int]): java.awt.Point = new java.awt.Point(p.x, p.y)
+  implicit def tuple2point[T: Numeric](p: (T, T)) = BasePoint(p._1, p._2)
+
+  // Converts different kinds of Point/Rect as long as there's an implicit for the underlying type
+  implicit def pointconvert[T, R](a: BasePoint[R])(implicit f: R => T, n: Numeric[T]) = BasePoint[T](f(a.x), f(a.y))
+  implicit def rectconvert[T, R](a: BaseRect[R])(implicit f: R => T, n: Numeric[T]) = BaseRect[T](f(a.x), f(a.y), f(a.w), f(a.h))
+
+  def Rect(x: Float, y: Float, w: Float, h: Float) = BaseRect(x, y, w, h)
+  def Point(x: Float, y: Float) = BasePoint(x, y)
+}
+

src/net/bdew/lib/gui/widgets/Widget.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,18 +9,28 @@
 
 package net.bdew.lib.gui.widgets
 
-import scala.collection.mutable
-import net.bdew.lib.gui.{Point, BaseScreen, Rect}
-import net.minecraft.util.ResourceLocation
-import net.minecraft.client.Minecraft
+import net.bdew.lib.gui.{Point, Rect, WidgetContainer}
 
-trait Widget {
+import scala.collection.mutable
+
+trait BaseWidget {
+  val rect: Rect
+  var parent: WidgetContainer = null
+  def init(p: WidgetContainer) = parent = p
+  def handleTooltip(p: Point, tip: mutable.MutableList[String])
+  def mouseClicked(p: Point, button: Int)
+  def keyTyped(c: Char, i: Int): Boolean
+  def draw(mouse: Point)
+  def drawBackground(mouse: Point)
+  def looseFocus()
+}
+
+trait Widget extends BaseWidget {
   val rect: Rect
-  var parent: BaseScreen = null
   def handleTooltip(p: Point, tip: mutable.MutableList[String]) {}
   def mouseClicked(p: Point, button: Int) {}
   def keyTyped(c: Char, i: Int): Boolean = false
-  def draw() {}
-
-  def bindTexture(res: ResourceLocation) = Minecraft.getMinecraft.renderEngine.bindTexture(res)
+  def draw(mouse: Point) {}
+  def drawBackground(mouse: Point) {}
+  def looseFocus() {}
 }

src/net/bdew/lib/gui/widgets/WidgetButton.scala

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui.{Point, Rect}
+import net.minecraft.client.Minecraft
+import net.minecraft.client.audio.PositionedSoundRecord
+import net.minecraft.client.gui.GuiButton
+import net.minecraft.util.ResourceLocation
+
+class WidgetButton(val rect: Rect, text: String, clicked: WidgetButton => Unit)
+  extends GuiButton(0, rect.x.round, rect.y.round, rect.w.round, rect.h.round, text) with Widget {
+
+  override def mouseClicked(p: Point, button: Int) {
+    Minecraft.getMinecraft.getSoundHandler.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F))
+    clicked(this)
+  }
+
+  override def draw(mouse: Point) = drawButton(Minecraft.getMinecraft, mouse.x.round, mouse.y.round)
+}

src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui.{Color, Point, Rect}
+
+class WidgetDynLabel(text: => String, x: Int, y: Int, color: Color) extends Widget {
+  val rect = new Rect(x, y, 0, 0)
+  override def draw(mouse: Point) {
+    parent.drawText(text, rect.origin, color, false)
+  }
+}

src/net/bdew/lib/gui/widgets/WidgetFillDataslot.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,29 +9,24 @@
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui.{TextureLocation, Rect}
-import net.bdew.lib.gui.Direction
 import net.bdew.lib.data.base.DataSlotNumeric
+import net.bdew.lib.gui._
 
-class WidgetFillDataslot[T](val rect: Rect, val texture: TextureLocation, dir: Direction.Direction, dslot: DataSlotNumeric[T], maxval: T)(implicit num: Numeric[T]) extends Widget {
+class WidgetFillDataslot[T](val rect: Rect, val texture: Texture, dir: Direction.Direction, dslot: DataSlotNumeric[T], maxval: T)(implicit num: Numeric[T]) extends Widget {
 
-  def getFillArea(max: Int): Int = (num.toFloat(dslot) / num.toFloat(maxval) * max).round
+  import num.mkNumericOps
 
-  override def draw() {
-    bindTexture(texture.resource)
+  override def draw(mouse: Point) {
+    val fill = dslot.cval.toFloat() / maxval.toFloat()
     dir match {
       case Direction.UP =>
-        val fill = getFillArea(rect.h)
-        parent.drawTexturedModalRect(rect.x, rect.y + rect.h - fill, texture.x, texture.y + rect.h - fill, rect.w, fill)
+        parent.drawTextureInterpolate(rect, texture, 0, 1 - fill, 1, 1)
       case Direction.DOWN =>
-        val fill = getFillArea(rect.h)
-        parent.drawTexturedModalRect(rect.x, rect.y, texture.x, texture.y, rect.w, fill)
+        parent.drawTextureInterpolate(rect, texture, 0, 0, 1, fill)
       case Direction.LEFT =>
-        val fill = getFillArea(rect.w)
-        parent.drawTexturedModalRect(rect.x + rect.w - fill, rect.y, texture.x + rect.w - fill, texture.y, fill, rect.h)
+        parent.drawTextureInterpolate(rect, texture, 1 - fill, 0, 1, 1)
       case Direction.RIGHT =>
-        val fill = getFillArea(rect.w)
-        parent.drawTexturedModalRect(rect.x, rect.y, texture.x, texture.y, fill, rect.h)
+        parent.drawTextureInterpolate(rect, texture, 0, 0, fill, 1)
     }
   }
 }

src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,43 +9,43 @@
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui.{Point, TextureLocation, Rect}
-import net.bdew.lib.data.DataSlotTankBase
-import scala.collection.mutable
-import net.minecraft.client.renderer.texture.TextureMap
 import java.text.DecimalFormat
+
 import net.bdew.lib.Misc
+import net.bdew.lib.data.DataSlotTankBase
+import net.bdew.lib.gui.{Point, Rect, Texture}
 import org.lwjgl.opengl.GL11
 
-class WidgetFluidGauge(val rect: Rect, overlay: TextureLocation, dslot: DataSlotTankBase) extends Widget {
+import scala.collection.mutable
+
+class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase) extends Widget {
   val formater = new DecimalFormat("#,###")
 
   override def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
     if (dslot.getFluid != null) {
-      tip += dslot.getFluid.getFluid.getLocalizedName
+      tip += dslot.getFluid.getFluid.getLocalizedName(dslot.getFluid)
       tip += "%s/%s mB".format(formater.format(dslot.getFluidAmount), formater.format(dslot.getCapacity))
     } else {
-      tip += Misc.toLocal("gendustry.label.empty")
+      tip += Misc.toLocal("bdlib.label.empty")
     }
   }
 
-  override def draw() {
+  override def draw(mouse: Point) {
     GL11.glEnable(GL11.GL_BLEND)
     GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
 
     val fstack = dslot.getFluid
     if (fstack != null && fstack.getFluid.getStillIcon != null) {
-      val icon = fstack.getFluid.getStillIcon
-      bindTexture(TextureMap.locationBlocksTexture)
-      var fillHeight: Int = (rect.h * fstack.amount / dslot.getCapacity).round
+      val icon = Texture(Texture.BLOCKS, fstack.getFluid.getStillIcon)
+      var fillHeight = if (dslot.getCapacity > 0) rect.h * fstack.amount / dslot.getCapacity else 0
       var yStart: Int = 0
 
       while (fillHeight > 0) {
         if (fillHeight > 16) {
-          parent.drawTexturedModelRectFromIcon(rect.x, rect.y + rect.h - 16 - yStart, icon, 16, 16)
+          parent.drawTexture(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon)
           fillHeight -= 16
         } else {
-          parent.drawTexturedModelRectFromIcon(rect.x, rect.y + rect.h - fillHeight - yStart, icon, 16, fillHeight)
+          parent.drawTextureInterpolate(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon, 0, 1 - fillHeight / 16, 1, 1)
           fillHeight = 0
         }
         yStart = yStart + 16
@@ -54,7 +54,6 @@ class WidgetFluidGauge(val rect: Rect, overlay: TextureLocation, dslot: DataSlot
 
     GL11.glDisable(GL11.GL_BLEND)
 
-    bindTexture(overlay.resource)
-    parent.drawTexturedModalRect(rect.x, rect.y, overlay.x, overlay.y, rect.w, rect.h)
+    parent.drawTexture(rect, overlay)
   }
 }

src/net/bdew/lib/gui/widgets/WidgetLabel.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,11 +9,11 @@
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui.Rect
+import net.bdew.lib.gui.{Color, Point, Rect}
 
-class WidgetLabel(text: String, x: Int, y: Int, color: Int) extends Widget {
-  val rect: Rect = new Rect(x, y, 0, 0)
-  override def draw() {
-    parent.getFontRenderer.drawString(text, x, y, color)
+class WidgetLabel(text: String, x: Int, y: Int, color: Color) extends Widget {
+  val rect = new Rect(x, y, 0, 0)
+  override def draw(mouse: Point) {
+    parent.drawText(text, rect.origin, color, false)
   }
 }

src/net/bdew/lib/gui/widgets/WidgetMultipane.scala

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui.Rect
+
+abstract class WidgetMultipane(rect: Rect) extends WidgetSubcontainer(rect) {
+  def getActivePane: BaseWidget
+
+  def addPane[T <: BaseWidget](w: T): T = {
+    w.init(this)
+    return w
+  }
+  override def activeWidgets = super.activeWidgets ++: List(getActivePane)
+}

src/net/bdew/lib/gui/widgets/WidgetProgressBar.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,10 +9,11 @@
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui.{Point, Direction, TextureLocation, Rect}
 import net.bdew.lib.data.DataSlotFloat
+import net.bdew.lib.gui._
+
 import scala.collection.mutable
 
-class WidgetProgressBar(rect: Rect, texture: TextureLocation, dslot: DataSlotFloat) extends WidgetFillDataslot[Float](rect, texture, Direction.RIGHT, dslot, 1) {
+class WidgetProgressBar(rect: Rect, texture: Texture, dslot: DataSlotFloat) extends WidgetFillDataslot[Float](rect, texture, Direction.RIGHT, dslot, 1) {
   override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += "%.0f".format(dslot.cval * 100) + "%"
 }

src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui._
+
+class WidgetSubcontainer(val rect: Rect) extends BaseWidget with WidgetContainer with SimpleDrawTarget {
+  def getZLevel = parent.getZLevel
+  def getFontRenderer = parent.getFontRenderer
+  def getOffsetFromWindow = parent.getOffsetFromWindow + rect.origin
+}

src/net/bdew/lib/gui/widgets/WidgetTextEdit.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,11 +9,17 @@
 
 package net.bdew.lib.gui.widgets
 
-import net.minecraft.client.gui.{FontRenderer, GuiTextField}
 import net.bdew.lib.gui.{Point, Rect}
+import net.minecraft.client.gui.{FontRenderer, GuiTextField}
 
-class WidgetTextEdit(val rect: Rect, fr: FontRenderer) extends GuiTextField(fr, rect.x, rect.y, rect.w, rect.h) with Widget {
-  override def mouseClicked(p: Point, button: Int) = super.mouseClicked(p.x + rect.x, p.y + rect.y, button)
+class WidgetTextEdit(val rect: Rect, fr: FontRenderer) extends GuiTextField(fr, rect.x.round, rect.y.round, rect.w.round, rect.h.round) with Widget {
+
+  override def mouseClicked(p: Point, button: Int) = {
+    val pp = p + rect.origin
+    super.mouseClicked(pp.x.round, pp.y.round, button)
+  }
+
+  override def looseFocus() = setFocused(false)
   override def keyTyped(c: Char, i: Int): Boolean = super.textboxKeyTyped(c, i)
-  override def draw() = super.drawTextBox()
+  override def draw(mouse: Point) = super.drawTextBox()
 }

src/net/bdew/lib/items/IStack.scala

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.items
+
+import net.minecraft.block.Block
+import net.minecraft.item.{Item, ItemBlock, ItemStack}
+
+/**
+ * Allows matching Items in ItemStacks in scala pattern matches
+ */
+object IStack {
+  def unapply(x: ItemStack): Option[Item] =
+    if (x == null || x.getItem == null)
+      None
+    else
+      Some(x.getItem)
+}
+
+/**
+ * Allows matching Blocks in ItemStacks in scala pattern matches
+ */
+object IStackBlock {
+  def unapply(x: ItemStack): Option[Block] =
+    if (x == null || x.getItem == null || !x.getItem.isInstanceOf[ItemBlock])
+      None
+    else
+      Some(x.getItem.asInstanceOf[ItemBlock].field_150939_a)
+}

src/net/bdew/lib/items/ItemUtils.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,12 +9,15 @@
 
 package net.bdew.lib.items
 
-import net.minecraft.entity.item.EntityItem
-import net.minecraft.item.ItemStack
-import net.minecraft.world.World
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.inventory.IInventory
+import java.util.Random
+
 import net.bdew.lib.Misc
+import net.minecraft.entity.item.EntityItem
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.{IInventory, ISidedInventory}
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.world.World
+import net.minecraftforge.common.util.ForgeDirection
 
 object ItemUtils {
   def throwItemAt(world: World, x: Int, y: Int, z: Int, stack: ItemStack) {
@@ -37,7 +40,7 @@ object ItemUtils {
   def isSameItem(stack1: ItemStack, stack2: ItemStack): Boolean = {
     if (stack1 == null || stack2 == null)
       return stack1 == stack2
-    if (stack1.itemID != stack2.itemID)
+    if (stack1.getItem != stack2.getItem)
       return false
     if (stack1.getHasSubtypes && stack2.getItemDamage != stack1.getItemDamage)
       return false
@@ -54,12 +57,12 @@ object ItemUtils {
       if (toAdd >= stack.stackSize) {
         target.stackSize += stack.stackSize
         stack.stackSize = 0
-        inv.onInventoryChanged()
+        inv.markDirty()
         return null
       } else if (toAdd > 0) {
         target.stackSize += toAdd
         stack.stackSize -= toAdd
-        inv.onInventoryChanged()
+        inv.markDirty()
       }
     }
 
@@ -76,4 +79,27 @@ object ItemUtils {
 
     return stack
   }
+
+  def getAccessibleSlotsFromSide(inv: IInventory, side: ForgeDirection) =
+    (Misc.asInstanceOpt(inv, classOf[ISidedInventory])
+      map (_.getAccessibleSlotsFromSide(side.ordinal()).toList)
+      getOrElse (0 until inv.getSizeInventory))
+
+  def findItemInInventory(inv: IInventory, item: Item) =
+    Range(0, inv.getSizeInventory).map(x => x -> inv.getStackInSlot(x))
+      .find({ case (slot, stack) => stack != null && stack.getItem == item })
+      .map({ case (slot, stack) => slot })
+
+  def copyWithRandomSize(template: ItemStack, max: Int, rand: Random) = {
+    val newSize = rand.nextInt(max)
+    val newStack = template.copy()
+    newStack.stackSize =
+      if (newSize > newStack.getMaxStackSize)
+        newStack.getMaxStackSize
+      else if (newSize <= 0)
+        1
+      else
+        newSize
+    newStack
+  }
 }

src/net/bdew/lib/items/SimpleItem.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.items
+
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.Misc
+import net.minecraft.client.renderer.texture.IIconRegister
+import net.minecraft.item.Item
+
+trait NamedItem extends Item {
+  def name: String
+}
+
+class SimpleItem(val name: String) extends Item with NamedItem {
+  val modId = Misc.getActiveModId
+  setUnlocalizedName(modId + "." + name)
+
+  @SideOnly(Side.CLIENT)
+  override def registerIcons(reg: IIconRegister) {
+    itemIcon = reg.registerIcon(modId + ":" + name.toLowerCase)
+  }
+}

src/net/bdew/lib/items/inventory/ContainerItemInventory.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.items.inventory
+
+import net.bdew.lib.gui.BaseContainer
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.Slot
+import net.minecraft.item.ItemStack
+
+class ContainerItemInventory(inv: InventoryItemAdapter, player: EntityPlayer) extends BaseContainer(inv) {
+  def canInteractWith(entityplayer: EntityPlayer) = entityplayer == player
+
+  override def slotClick(slotnum: Int, button: Int, modifiers: Int, player: EntityPlayer): ItemStack = {
+    if (slotnum > 0 && slotnum < inventorySlots.size()) {
+      val slot = inventorySlots.asInstanceOf[java.util.List[Slot]].get(slotnum)
+      if (slot.isSlotInInventory(inv.player.inventory, inv.slot))
+        return null
+    }
+    if (modifiers == 2 && button == inv.slot) return null
+    return super.slotClick(slotnum, button, modifiers, player)
+  }
+}

src/net/bdew/lib/items/inventory/InventoryItemAdapter.scala

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.items.inventory
+
+import net.bdew.lib.Misc
+import net.bdew.lib.tile.inventory.BaseInventory
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
+
+class InventoryItemAdapter(val player: EntityPlayer, val slot: Int, val size: Int, val tagName: String) extends BaseInventory {
+  def getSizeInventory = size
+  def getStack = player.inventory.getStackInSlot(slot)
+
+  if (getStack.hasTagCompound)
+    load()
+
+  def load() {
+    val tag = getStack.getTagCompound
+    for (nbtItem <- Misc.iterNbtCompoundList(tag, tagName)) {
+      val slot = nbtItem.getByte("Slot")
+      if (slot >= 0 && slot < inv.size) {
+        inv(slot) = ItemStack.loadItemStackFromNBT(nbtItem)
+      }
+    }
+  }
+
+  def markDirty() {
+    if (!getStack.hasTagCompound) getStack.setTagCompound(new NBTTagCompound)
+    val tag = getStack.getTagCompound
+    val itemList = new NBTTagList
+    for ((item, i) <- inv.view.zipWithIndex if item != null) {
+      val itemNbt: NBTTagCompound = new NBTTagCompound
+      itemNbt.setByte("Slot", i.asInstanceOf[Byte])
+      item.writeToNBT(itemNbt)
+      itemList.appendTag(itemNbt)
+    }
+    tag.setTag(tagName, itemList)
+  }
+}

src/net/bdew/lib/items/inventory/ItemInventory.scala

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.items.inventory
+
+import cpw.mods.fml.common.Loader
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.BdLib
+import net.bdew.lib.gui.GuiProvider
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.Item
+import net.minecraft.world.World
+
+/**
+ * Mixin for items that have an internal inventory
+ * Subclasses are responsible for registering themself with the GuiHandler of their mod
+ */
+trait ItemInventory extends Item with GuiProvider {
+  type TEClass = Any
+  def guiId: Int
+  val invSize: Int
+  val invTagName: String
+  val modObj = Loader.instance().activeModContainer().getMod
+
+  @SideOnly(Side.CLIENT)
+  def makeGui(inv: InventoryItemAdapter, player: EntityPlayer): AnyRef
+  def makeContainer(inv: InventoryItemAdapter, player: EntityPlayer): ContainerItemInventory
+
+  def makeAdaptor(player: EntityPlayer) = new InventoryItemAdapter(player, player.inventory.currentItem, invSize, invTagName)
+
+  @SideOnly(Side.CLIENT)
+  def getGui(te: TEClass, player: EntityPlayer) = {
+    val stack = player.inventory.getCurrentItem
+    if (stack.getItem == this) {
+      makeGui(makeAdaptor(player), player)
+    } else {
+      BdLib.logWarn("Attempt to open item container GUI without active item (%s)", this)
+      null
+    }
+  }
+
+  def getContainer(te: TEClass, player: EntityPlayer) = {
+    val stack = player.inventory.getCurrentItem
+    if (stack.getItem == this) {
+      makeContainer(makeAdaptor(player), player)
+    } else {
+      BdLib.logWarn("Attempt to open item container GUI without active item by '%s' (%s)", player.getCommandSenderName, this)
+      null
+    }
+  }
+
+  def doOpenGui(player: EntityPlayer, world: World) {
+    player.openGui(modObj, guiId, world, player.posX.toInt, player.posY.toInt, player.posZ.toInt)
+  }
+}

src/net/bdew/lib/machine/Machine.scala

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.machine
+
+import cpw.mods.fml.common.registry.GameRegistry
+import net.bdew.lib.Misc
+import net.bdew.lib.block.HasTE
+import net.bdew.lib.recipes.gencfg.ConfigSection
+import net.minecraft.block.Block
+import net.minecraft.creativetab.CreativeTabs
+
+abstract class Machine[T <: Block](val name: String, blockConstruct: => T) {
+  var block: T = null.asInstanceOf[T]
+  var tuning: ConfigSection = null
+  var enabled = false
+  val modId = Misc.getActiveModId
+
+  def regBlock(creativeTab: CreativeTabs) {
+    block = blockConstruct
+    GameRegistry.registerBlock(block, name)
+    block.setCreativeTab(creativeTab)
+    if (block.isInstanceOf[HasTE[_]]) {
+      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, "%s.%s".format(modId, name))
+    }
+
+  }
+}

src/net/bdew/lib/machine/PoweredMachine.scala

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.machine
+
+import net.bdew.lib.recipes.gencfg.ConfigSection
+
+trait PoweredMachine {
+  def tuning: ConfigSection
+  lazy val maxReceivedEnergy = tuning.getFloat("MaxReceivedEnergy")
+  lazy val activationEnergy = tuning.getFloat("ActivationEnergy")
+  lazy val maxStoredEnergy = tuning.getFloat("MaxStoredEnergy")
+}

src/net/bdew/lib/machine/ProcessorMachine.scala

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.machine
+
+trait ProcessorMachine extends PoweredMachine {
+  lazy val mjPerItem = tuning.getFloat("MjPerItem")
+  lazy val powerUseRate = tuning.getFloat("PowerUseRate")
+}

src/net/bdew/lib/network/Message.scala

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.network
+
+abstract class Message extends Serializable

src/net/bdew/lib/network/NetChannel.scala

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.network
+
+import java.util
+
+import cpw.mods.fml.common.network.{FMLEmbeddedChannel, FMLOutboundHandler, NetworkRegistry}
+import cpw.mods.fml.relauncher.Side
+import io.netty.channel.{ChannelFutureListener, ChannelHandler}
+import net.bdew.lib.{BdLib, Misc}
+import net.minecraft.entity.player.EntityPlayerMP
+
+class NetChannel(val name: String) {
+  var channels: util.EnumMap[Side, FMLEmbeddedChannel] = null
+
+  def init() {
+    channels = NetworkRegistry.INSTANCE.newChannel(name, new SerializedMessageCodec)
+    BdLib.logInfo("Initialized network channel '%s' for mod '%s'", name, Misc.getActiveModId)
+    addHandler(Side.SERVER, new NetChannelServerHandler(this))
+    addHandler(Side.CLIENT, new NetChannelClientHandler(this))
+  }
+
+  var clientChain = PartialFunction.empty[Message, Unit]
+  var serverChain = PartialFunction.empty[(Message, EntityPlayerMP), Unit]
+
+  def regServerHandler(f: PartialFunction[(Message, EntityPlayerMP), Unit]) =
+    serverChain = serverChain.orElse(f)
+
+  def regClientHandler(f: PartialFunction[Message, Unit]) =
+    clientChain = clientChain.orElse(f)
+
+  private def addHandler(side: Side, handler: ChannelHandler) {
+    val ch = channels.get(side)
+    val name = ch.findChannelHandlerNameForType(classOf[SerializedMessageCodec])
+    ch.pipeline().addAfter(name, side + "Handler", handler)
+  }
+
+  def sendToAll(message: Message) {
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL)
+    channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+  def sendTo(message: Message, player: EntityPlayerMP) {
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER)
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player)
+    channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+  def sendToAllAround(message: Message, point: NetworkRegistry.TargetPoint) {
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT)
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point)
+    channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+  def sendToDimension(message: Message, dimensionId: Int) {
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.DIMENSION)
+    channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(new Integer(dimensionId))
+    channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+  def sendToServer(message: Message) {
+    channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER)
+    channels.get(Side.CLIENT).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+}

src/net/bdew/lib/network/NetChannelClientHandler.scala

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.network
+
+import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
+import net.bdew.lib.BdLib
+
+class NetChannelClientHandler(ch: NetChannel) extends SimpleChannelInboundHandler[Message] {
+  def channelRead0(ctx: ChannelHandlerContext, msg: Message) {
+    try {
+      if (ch.clientChain.isDefinedAt(msg))
+        ch.clientChain(msg)
+      else
+        BdLib.logWarn("Unable to handle message from server: %s", msg)
+    } catch {
+      case e: Throwable => BdLib.logErrorException("Error handling packet", e)
+    }
+  }
+}

src/net/bdew/lib/network/NetChannelServerHandler.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.network
+
+import cpw.mods.fml.common.network.NetworkRegistry
+import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
+import net.bdew.lib.BdLib
+import net.minecraft.network.NetHandlerPlayServer
+
+class NetChannelServerHandler(ch: NetChannel) extends SimpleChannelInboundHandler[Message] {
+  def channelRead0(ctx: ChannelHandlerContext, msg: Message) {
+    try {
+      val player = ctx.channel().attr(NetworkRegistry.NET_HANDLER).get.asInstanceOf[NetHandlerPlayServer].playerEntity
+      if (ch.serverChain.isDefinedAt(msg, player))
+        ch.serverChain(msg, player)
+      else
+        BdLib.logWarn("Unable to handle message from user %s: %s", player.getDisplayName, msg)
+    } catch {
+      case e: Throwable => BdLib.logErrorException("Error handling packet", e)
+    }
+  }
+}

src/net/bdew/lib/network/SerializedMessageCodec.scala

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.network
+
+import java.io.{ObjectInputStream, ObjectOutputStream}
+import java.util
+
+import cpw.mods.fml.common.network.NetworkRegistry
+import cpw.mods.fml.common.network.internal.FMLProxyPacket
+import io.netty.buffer.{ByteBufInputStream, ByteBufOutputStream, Unpooled}
+import io.netty.channel.ChannelHandler.Sharable
+import io.netty.channel.ChannelHandlerContext
+import io.netty.handler.codec.MessageToMessageCodec
+import net.bdew.lib.BdLib
+
+@Sharable
+class SerializedMessageCodec extends MessageToMessageCodec[FMLProxyPacket, Message] {
+  def encode(ctx: ChannelHandlerContext, msg: Message, out: util.List[AnyRef]) {
+    val buff = Unpooled.buffer()
+    val writer = new ObjectOutputStream(new ByteBufOutputStream(buff))
+    writer.writeObject(msg)
+    val pkt = new FMLProxyPacket(buff, ctx.channel.attr(NetworkRegistry.FML_CHANNEL).get)
+    out.add(pkt)
+  }
+
+  def decode(ctx: ChannelHandlerContext, msg: FMLProxyPacket, out: util.List[AnyRef]) {
+    try {
+      val reader = new ObjectInputStream(new ByteBufInputStream(msg.payload()))
+      out.add(reader.readObject())
+    } catch {
+      case e: Throwable => BdLib.log.error("Error decoding packet", e)
+    }
+  }
+}

src/net/bdew/lib/power/DataSlotPower.scala

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import net.bdew.lib.Misc
+import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind}
+import net.bdew.lib.machine.PoweredMachine
+import net.minecraft.nbt.NBTTagCompound
+
+case class DataSlotPower(name: String, parent: TileDataSlots) extends DataSlot {
+  updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE)
+
+  var stored = 0F
+  var capacity = 0F
+  var maxReceive = 0F
+
+  def inject(v: Float, simulate: Boolean): Float = {
+    val canAdd = Misc.clamp(v, 0F, Misc.min(capacity - stored, maxReceive))
+    if ((canAdd > 0) && !simulate) {
+      stored += canAdd
+      parent.dataSlotChanged(this)
+    }
+    return canAdd
+  }
+
+  def extract(v: Float, simulate: Boolean): Float = {
+    val canExtract = Misc.clamp(v, 0F, stored)
+    if ((canExtract > 0) && !simulate) {
+      stored -= canExtract
+      parent.dataSlotChanged(this)
+    }
+    return canExtract
+  }
+
+  def configure(cfg: PoweredMachine) {
+    capacity = cfg.maxStoredEnergy
+    maxReceive = cfg.maxReceivedEnergy
+  }
+
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) {
+    val tag = new NBTTagCompound()
+    tag.setFloat("stored", stored)
+    if (kind == UpdateKind.GUI)
+      tag.setFloat("capacity", capacity)
+    t.setTag(name, tag)
+  }
+
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) {
+    if (t.hasKey(name)) {
+      val tag = t.getCompoundTag(name)
+      stored = tag.getFloat("stored")
+      if (kind == UpdateKind.GUI)
+        capacity = tag.getFloat("capacity")
+    }
+  }
+}
+
+

src/net/bdew/lib/power/ItemPoweredBase.scala

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import net.bdew.lib.Misc
+import net.minecraft.entity.EntityLivingBase
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.nbt.NBTTagCompound
+
+trait ItemPoweredBase extends Item {
+  def maxCharge: Int
+  def mjPerCharge: Int
+
+  def getCharge(stack: ItemStack): Int = {
+    if (!stack.hasTagCompound) setCharge(stack, 0)
+    return Misc.clamp(stack.getTagCompound.getInteger("charge"), 0, maxCharge)
+  }
+
+  def useCharge(stack: ItemStack, uses: Int = 1, player: EntityLivingBase) {
+    setCharge(stack, Misc.clamp(getCharge(stack) - uses * mjPerCharge, 0, maxCharge))
+  }
+
+  def hasCharges(stack: ItemStack) = getCharge(stack) >= mjPerCharge
+
+  def setCharge(stack: ItemStack, charge: Int) {
+    if (!stack.hasTagCompound) stack.setTagCompound(new NBTTagCompound())
+    stack.getTagCompound.setInteger("charge", charge)
+    updateDamage(stack)
+  }
+
+  def updateDamage(stack: ItemStack) {
+    setDamage(stack, Misc.clamp((100 * (1 - getCharge(stack).toFloat / maxCharge)).round, 1, 100))
+  }
+
+  def stackWithCharge(charge: Int): ItemStack = {
+    val n = new ItemStack(this)
+    setCharge(n, charge)
+    return n
+  }
+
+  override def setDamage(stack: ItemStack, damage: Int) = super.setDamage(stack, Misc.clamp(damage, 1, 100))
+}

src/net/bdew/lib/power/TileBaseProcessor.scala

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import net.bdew.lib.data.DataSlotFloat
+import net.bdew.lib.data.base.{TileDataSlots, UpdateKind}
+import net.bdew.lib.machine.ProcessorMachine
+import net.bdew.lib.tile.TileExtended
+import net.bdew.lib.tile.inventory.{BreakableInventoryTile, PersistentInventoryTile, SidedInventory}
+
+abstract class TileBaseProcessor extends TileExtended
+with TileDataSlots
+with PersistentInventoryTile
+with BreakableInventoryTile
+with SidedInventory
+with TilePoweredBase {
+  def cfg: ProcessorMachine
+  val power = DataSlotPower("power", this)
+  val progress = DataSlotFloat("progress", this).setUpdate(UpdateKind.SAVE, UpdateKind.GUI)
+
+  configurePower(cfg)
+
+  override def tickServer() {
+    if (power.stored > cfg.activationEnergy) {
+
+      if (!isWorking)
+        if (tryStart())
+          progress := 0
+
+      if (isWorking) {
+
+        if ((progress < 1) && (power.stored > cfg.activationEnergy)) {
+          val maxConsume = Math.min(Math.max(cfg.powerUseRate * power.stored, cfg.activationEnergy), cfg.mjPerItem * (1 - progress))
+          val consumed = power.extract(maxConsume, false)
+          progress += consumed / cfg.mjPerItem
+        }
+
+        if (progress >= 1) {
+          if (tryFinish())
+            progress := 0
+        }
+      }
+    }
+  }
+
+  /**
+   * Return true when an operation is in progress
+   */
+  def isWorking: Boolean
+
+  /**
+   * Try starting a new operation, return true if succesful
+   */
+  def tryStart(): Boolean
+
+  /**
+   * Perform output when operation is done, return true if succesful
+   */
+  def tryFinish(): Boolean
+}

src/net/bdew/lib/power/TileItemProcessor.scala

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import net.bdew.lib.data.DataSlotItemStack
+import net.bdew.lib.data.base.UpdateKind
+import net.bdew.lib.items.ItemUtils
+
+abstract class TileItemProcessor extends TileBaseProcessor {
+  val output = DataSlotItemStack("output", this).setUpdate(UpdateKind.SAVE)
+  val outputSlots: Seq[Int]
+
+  def isWorking = output :!= null
+
+  def tryFinish(): Boolean = {
+    output := ItemUtils.addStackToSlots(output, this, outputSlots, false)
+    return output :== null
+  }
+}

src/net/bdew/lib/power/TilePoweredBase.scala

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import net.bdew.lib.machine.PoweredMachine
+import net.bdew.lib.tile.TileExtended
+
+trait TilePoweredBase extends TileExtended {
+  def power: DataSlotPower
+  def configurePower(cfg: PoweredMachine) = power.configure(cfg)
+}

src/net/bdew/lib/power/WidgetPowerGauge.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.power
+
+import java.text.DecimalFormat
+
+import net.bdew.lib.gui.widgets.Widget
+import net.bdew.lib.gui.{Point, Rect, Texture}
+
+import scala.collection.mutable
+
+class WidgetPowerGauge(val rect: Rect, texture: Texture, dslot: DataSlotPower) extends Widget {
+  val formater = new DecimalFormat("#,###")
+
+  val a = rect.map(_.round)
+
+  override def draw(mouse: Point) {
+    val fill = dslot.stored / dslot.capacity
+    parent.drawTextureInterpolate(rect, texture, 0, 1 - fill, 1, 1)
+  }
+
+  override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += formater.format(dslot.stored) + "/" + formater.format(dslot.capacity) + " MJ"
+}

src/net/bdew/lib/recipes/DataClasses.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -28,31 +28,33 @@ abstract class StackRef
 case class StackOreDict(id: String) extends StackRef
 
 /**
- * Mod item reference [[cpw.mods.fml.common.registry.GameRegistry.findItemStack]]
- * Syntax: {modID}:{name}
- * Parser: [[net.bdew.lib.recipes.RecipeParser.specModStack]]
+ * Generic Referende
+ * Syntax: S:{modid}:{name}
+ * Parser: [[net.bdew.lib.recipes.RecipeParser.specGenericStack]]
  * @param mod modId of owner mod
- * @param id name of the stack
+ * @param name name of the stack
  */
-case class StackMod(mod: String, id: String) extends StackRef
+case class StackGeneric(mod: String, name: String) extends StackRef
 
 /**
- * Vanilla block reference
- * Syntax: B:{name} [@ {meta}]
- * Parser: [[net.bdew.lib.recipes.RecipeParser.specMcBlock]]
- * @param name Unlocalized name (without "tile.")
+ * Block reference
+ * Syntax: B:[{modid}:]{name} [@ {meta}]
+ * Parser: [[net.bdew.lib.recipes.RecipeParser.specBlock]]
+ * @param mod modId of owner mod, default is "minecraft"
+ * @param name Registered name
  * @param meta Metadata / Damage
  */
-case class StackMCBlock(name: String, meta: Int) extends StackRef
+case class StackBlock(mod: String, name: String, meta: Int) extends StackRef
 
 /**
- * Vanilla item reference
- * Syntax: I:{name} [@ {meta}]
- * Parser: [[net.bdew.lib.recipes.RecipeParser.specMcItem]]
- * @param name Unlocalized name (without "item.")
+ * Item reference
+ * Syntax: I:[{modid}:]{name} [@ {meta}]
+ * Parser: [[net.bdew.lib.recipes.RecipeParser.specItem]]
+ * @param mod modId of owner mod, default is "minecraft"
+ * @param name Registered name
  * @param meta Metadata / Damage
  */
-case class StackMCItem(name: String, meta: Int) extends StackRef
+case class StackItem(mod: String, name: String, meta: Int) extends StackRef
 
 /**
  * Reference to an Item/Block/ItemStack pulic static field
@@ -89,6 +91,12 @@ case class StackMacro(id: Char) extends StackRef
  */
 abstract class Statement
 
+/**
+ * Base class for delayed statements (executed after everything is parsed)
+ * Actual processing is in [[net.bdew.lib.recipes.RecipeLoader.processDelayedStatements]]
+ */
+abstract class DelayedStatement extends Statement
+
 /**
  * Character assignment
  * Syntax: {char} = {ref}
@@ -96,7 +104,7 @@ abstract class Statement
  * @param char Character to assign
  * @param spec ItemStack Reference
  */
-case class StCharAssign(char: Char, spec: StackRef) extends Statement
+case class StCharAssign(char: Char, spec: StackRef) extends DelayedStatement
 
 /**
  * Define class macro
@@ -105,7 +113,7 @@ case class StCharAssign(char: Char, spec: StackRef) extends Statement
  * @param id Macro identifier
  * @param cls Class name
  */
-case class StClassMacro(id: String, cls: String) extends Statement
+case class StClassMacro(id: String, cls: String) extends DelayedStatement
 
 /**
  * Conditional block - checks if mod is loaded
@@ -117,15 +125,39 @@ case class StClassMacro(id: String, cls: String) extends Statement
  */
 case class StIfHaveMod(mod: String, thn: List[Statement], els: List[Statement]) extends Statement
 
+/**
+ * Conditional block - checks if api is loaded
+ * Syntax: ifAPI {string} { {statements} } [else { {statements} }]
+ * Parser: [[net.bdew.lib.recipes.RecipeParser.ifApi]]
+ * @param mod API modid
+ * @param thn Statements to run if present
+ * @param els Statements to run otherwise
+ */
+case class StIfHaveAPI(mod: String, thn: List[Statement], els: List[Statement]) extends Statement
+
 /**
  * Conditional block - checks if mod is loaded
+ * Can contain only delayed statements
  * Syntax: ifOreDict {string} { {statements} } [else { {statements} }]
  * Parser: [[net.bdew.lib.recipes.RecipeParser.ifOreDict]]
  * @param id Ore Dictionary Entry
  * @param thn Statements to run if present
  * @param els Statements to run otherwise
  */
-case class StIfHaveOD(id: String, thn: List[Statement], els: List[Statement]) extends Statement
+case class StIfHaveOD(id: String, thn: List[DelayedStatement], els: List[DelayedStatement]) extends DelayedStatement
+
+/**
+ * Removes previously defined recieps for a specific result
+ * @param res Recipes that produce this result will be cleared
+ */
+case class StClearRecipes(res: StackRef) extends Statement
+
+/**
+ * Base class for staments that represent a crafting recipe
+ */
+abstract class CraftingStatement extends DelayedStatement {
+  def result: StackRef
+}
 
 /**
  * Shaped recipe definition
@@ -147,10 +179,10 @@ case class StIfHaveOD(id: String, thn: List[Statement], els: List[Statement]) ex
  * Parser: [[net.bdew.lib.recipes.RecipeParser.recipeShaped9]]
  *
  * @param rec Recipe pattern
- * @param res Result reference
+ * @param result Result reference
  * @param cnt Number of output items
  */
-case class StRecipeShaped(rec: Seq[String], res: StackRef, cnt: Int) extends Statement
+case class StRecipeShaped(rec: Seq[String], result: StackRef, cnt: Int) extends CraftingStatement
 
 /**
  * Shapeless recipe definition
@@ -158,10 +190,10 @@ case class StRecipeShaped(rec: Seq[String], res: StackRef, cnt: Int) extends Sta
  * Parser: [[net.bdew.lib.recipes.RecipeParser.recipeShapeless]]
  *
  * @param rec Recipe pattehrn
- * @param res Result reference
+ * @param result Result reference
  * @param cnt Number of output items
  */
-case class StRecipeShapeless(rec: String, res: StackRef, cnt: Int) extends Statement
+case class StRecipeShapeless(rec: String, result: StackRef, cnt: Int) extends CraftingStatement
 
 /**
  * Smelting recipe definition
@@ -169,11 +201,11 @@ case class StRecipeShapeless(rec: String, res: StackRef, cnt: Int) extends State
  * Parser [[net.bdew.lib.recipes.RecipeParser.recipeSmelting]]
  *
  * @param in Input Stack
- * @param out Output Stack
+ * @param result Output Stack
  * @param cnt Output Count
  * @param xp XP for smelting
  */
-case class StSmeltRecipe(in: StackRef, out: StackRef, cnt: Int, xp: Float) extends Statement
+case class StSmeltRecipe(in: StackRef, result: StackRef, cnt: Int, xp: Float) extends CraftingStatement
 
 /**
  * Used in statement processing to abort the current statement and show an error without a stack trace

src/net/bdew/lib/recipes/RecipeLoader.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -10,14 +10,13 @@
 package net.bdew.lib.recipes
 
 import java.io.Reader
-import net.minecraft.item.{Item, ItemStack}
-import net.bdew.lib.Misc
-import net.minecraft.block.Block
+
+import cpw.mods.fml.common.ModAPIManager
 import cpw.mods.fml.common.registry.GameRegistry
-import net.minecraftforge.oredict.{ShapelessOreRecipe, OreDictionary}
-import java.util.logging.Logger
-import cpw.mods.fml.common.FMLLog
-import net.minecraft.item.crafting.FurnaceRecipes
+import net.bdew.lib.{BdLib, Misc}
+import net.minecraft.block.Block
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe}
 
 /**
  * Main recipe loader class
@@ -34,24 +33,26 @@ class RecipeLoader {
    */
   def newParser() = new RecipeParser()
 
-  val log: Logger = Logger.getLogger("RecipeLoader")
-  log.setParent(FMLLog.getLogger)
-
   /**
    * Current map of recipe characters to parser item references
    */
-  val currCharMap = collection.mutable.Map.empty[Char, StackRef].withDefault(x => error("Undefined recipe character '%s'", x))
+  var currCharMap = Map.empty[Char, StackRef].withDefault(x => error("Undefined recipe character '%s'", x))
 
   /**
    * Current map of class macros
    */
-  val currClassMacros = collection.mutable.Map.empty[String, String].withDefault(x => error("Undefined class macro '%s'", x))
+  var currClassMacros = Map.empty[String, String].withDefault(x => error("Undefined class macro '%s'", x))
 
   /**
    * Triggers an error with formatted string
    */
   def error(msg: String, params: Any*) = throw new StatementError(msg.format(params: _*))
 
+  /**
+   * List of unprocessed delayed statements
+   */
+  var delayedStatements = List.empty[DelayedStatement]
+
   /**
    * Looks up a recipe component
    * @param s Parser ItemStack reference
@@ -85,7 +86,7 @@ class RecipeLoader {
       val l = x.copy()
       l.stackSize = cnt
       if (meta != OreDictionary.WILDCARD_VALUE && meta != l.getItemDamage) {
-        log.warning("%s requested with meta %d but specifies %d".format(source, meta, l.getItemDamage))
+        BdLib.logWarn("%s requested with meta %d but specifies %d", source, meta, l.getItemDamage)
         l.setItemDamage(meta)
       }
       return l
@@ -160,6 +161,8 @@ class RecipeLoader {
     case _ => Seq(getConcreteStack(s))
   }
 
+  def notNull[T](v: T, err: => String) = if (v == null) error(err) else v
+
   /**
    * Returns an ItemStack that match a reference
    * This is the main StackRef resolution method
@@ -173,15 +176,15 @@ class RecipeLoader {
       if (l.size == 0) error("Concrete ItemStack requested for OD entry '%s' that is empty", id)
       val s = l.get(0).copy()
       s.stackSize = cnt
-      log.info("Concrete ItemStack for OD entry '%s' -> %s".format(id, s))
+      BdLib.logInfo("Concrete ItemStack for OD entry '%s' -> %s", id, s)
       return s
     case StackMacro(ch) => getConcreteStack(currCharMap(ch), cnt)
-    case StackMod(mod, id) =>
-      val i = GameRegistry.findItemStack(mod, id, cnt)
-      if (i == null) error("Item %s:%s not found", mod, id)
-      i
-    case StackMCBlock(id, meta) => new ItemStack(Vanilla.blocks(id), cnt, meta)
-    case StackMCItem(id, meta) => new ItemStack(Vanilla.items(id), cnt, meta)
+    case StackGeneric(mod, id) =>
+      notNull(GameRegistry.findItemStack(mod, id, cnt), "Stack not found %s:%s".format(mod, id))
+    case StackBlock(mod, id, meta) =>
+      new ItemStack(notNull(GameRegistry.findBlock(mod, id), "Block not found %s:%s".format(mod, id)), cnt, meta)
+    case StackItem(mod, id, meta) =>
+      new ItemStack(notNull(GameRegistry.findItem(mod, id), "Item not found %s:%s".format(mod, id)), cnt, meta)
     case StackReflect(cls, field, meta) => reflectStack(cls, field, meta, cnt)
     case StackGetter(cls, method, param, meta) => reflectStackGetter(cls, method, param, meta, cnt)
   }
@@ -198,7 +201,7 @@ class RecipeLoader {
       if (!currCharMap.contains(x)) error("Character %s is undefined", x)
       val r = getRecipeComponent(currCharMap(x))
       if (r.isInstanceOf[String]) needOd = true
-      log.info("%s -> %s".format(x, r))
+      BdLib.logInfo("%s -> %s", x, r)
       comp += (x -> r)
     }
     return (comp, needOd)
@@ -209,39 +212,63 @@ class RecipeLoader {
    * @param s The statement
    */
   def processStatement(s: Statement): Unit = s match {
-    case StCharAssign(c, r) =>
-      currCharMap(c) = r
-      log.info("Added %s = %s".format(c, r))
-
-    case StClassMacro(id, cls) =>
-      currClassMacros(id) = cls
-      log.info("Added def %s = %s".format(id, cls))
-
     case StIfHaveMod(mod, thn, els) =>
       if (Misc.haveModVersion(mod)) {
-        log.info("ifMod: %s found".format(mod))
+        BdLib.logInfo("ifMod: %s found", mod)
         processStatementsSafe(thn)
       } else {
-        log.info("ifMod: %s not found".format(mod))
+        BdLib.logInfo("ifMod: %s not found", mod)
         processStatementsSafe(els)
       }
 
-    case StIfHaveOD(od, thn, els) =>
-      if (OreDictionary.getOres(od).size() > 0) {
-        log.info("ifOreDict: %s found".format(od))
+    case StIfHaveAPI(mod, thn, els) =>
+      if (ModAPIManager.INSTANCE.hasAPI(mod)) {
+        BdLib.logInfo("ifAPI: %s found", mod)
         processStatementsSafe(thn)
       } else {
-        log.info("ifOreDict: %s not found".format(od))
+        BdLib.logInfo("ifAPI: %s not found", mod)
         processStatementsSafe(els)
       }
 
+    case StClearRecipes(res) =>
+      BdLib.logInfo("Clearing recipes that produce %s", res)
+      delayedStatements = delayedStatements.filter({
+        x =>
+          if (x.isInstanceOf[CraftingStatement])
+            if (x.asInstanceOf[CraftingStatement].result == res) {
+              BdLib.logInfo("Removing recipe %s", x)
+              false
+            } else true
+          else true
+      })
+
+    case x: DelayedStatement =>
+      delayedStatements :+= x
+
+    case x =>
+      BdLib.logError("Can't process %s - this is a programing bug!", x)
+  }
+
+  /**
+   * Process a single delayed statement
+   * @param st The statement
+   */
+  def processDelayedStatement(st: DelayedStatement) = st match {
+    case StCharAssign(c, r) =>
+      currCharMap += (c -> r)
+      BdLib.logInfo("Added %s = %s", c, r)
+
+    case StClassMacro(id, cls) =>
+      currClassMacros += (id -> cls)
+      BdLib.logInfo("Added def %s = %s", id, cls)
+
     case StRecipeShaped(rec, res, cnt) =>
-      log.info("Adding shaped recipe %s => %s * %d".format(rec, res, cnt))
+      BdLib.logInfo("Adding shaped recipe %s => %s * %d", rec, res, cnt)
       val (comp, needOd) = resolveRecipeComponents(rec.mkString(""))
       val resStack = getConcreteStack(res, cnt)
 
       if (resStack.getItemDamage == OreDictionary.WILDCARD_VALUE) {
-        log.info("Result meta is unset, defaulting to 0")
+        BdLib.logInfo("Result meta is unset, defaulting to 0")
         resStack.setItemDamage(0)
       }
 
@@ -250,16 +277,16 @@ class RecipeLoader {
       else
         Misc.addRecipe(resStack, rec, comp)
 
-      log.info("Done... result=%s, od=%s".format(resStack, needOd))
+      BdLib.logInfo("Done... result=%s, od=%s", resStack, needOd)
 
     case StRecipeShapeless(rec, res, cnt) =>
-      log.info("Adding shapeless recipe %s => %s * %d".format(rec, res, cnt))
+      BdLib.logInfo("Adding shapeless recipe %s => %s * %d", rec, res, cnt)
       val (comp, needOd) = resolveRecipeComponents(rec)
       val resStack = getConcreteStack(res, cnt)
       val recTrans = rec.toCharArray.map(comp(_))
 
       if (resStack.getItemDamage == OreDictionary.WILDCARD_VALUE) {
-        log.info("Result meta is unset, defaulting to 0")
+        BdLib.logInfo("Result meta is unset, defaulting to 0")
         resStack.setItemDamage(0)
       }
 
@@ -268,27 +295,57 @@ class RecipeLoader {
       else
         GameRegistry.addShapelessRecipe(resStack, recTrans: _*)
 
-      log.info("Done... result=%s, od=%s".format(resStack, needOd))
+      BdLib.logInfo("Done... result=%s, od=%s", resStack, needOd)
 
     case StSmeltRecipe(in, out, cnt, xp) =>
-      log.info("Adding smelting recipe %s => %s * %d (%f xp)".format(in, out, cnt, xp))
+      BdLib.logInfo("Adding smelting recipe %s => %s * %d (%f xp)", in, out, cnt, xp)
       val outStack = getConcreteStack(out, cnt)
       if (outStack.getItemDamage == OreDictionary.WILDCARD_VALUE) {
-        log.info("Result meta is unset, defaulting to 0")
+        BdLib.logInfo("Result meta is unset, defaulting to 0")
         outStack.setItemDamage(0)
       }
       for (inStack <- getAllConcreteStacks(in, 1)) {
-        if (inStack.getItemDamage == OreDictionary.WILDCARD_VALUE) {
-          FurnaceRecipes.smelting.addSmelting(inStack.itemID, outStack, xp)
-          log.info("added %d -> %s".format(inStack.itemID, outStack))
-        } else {
-          FurnaceRecipes.smelting.addSmelting(inStack.itemID, inStack.getItemDamage, outStack, xp)
-          log.info("added %d@%d -> %s".format(inStack.itemID, inStack.getItemDamage, outStack))
-        }
+        GameRegistry.addSmelting(inStack, outStack, xp)
+        BdLib.logInfo("added %s -> %s", inStack, outStack)
+      }
+
+    case StIfHaveOD(od, thn, els) =>
+      if (OreDictionary.getOres(od).size() > 0) {
+        BdLib.logInfo("ifOreDict: %s found".format(od))
+        processDelayedStatementsSafe(thn)
+      } else {
+        BdLib.logInfo("ifOreDict: %s not found".format(od))
+        processDelayedStatementsSafe(els)
       }
 
     case x =>
-      log.severe("Can't process %s - this is a programing bug!".format(x))
+      BdLib.logError("Can't process %s - this is a programing bug!", x)
+  }
+
+  /**
+   * Process main delayed statements list, clear the list afterwards
+   */
+  def processDelayedStatements() {
+    BdLib.logInfo("Processing %d delayed statements", delayedStatements.size)
+    processDelayedStatementsSafe(delayedStatements)
+    delayedStatements = List.empty
+  }
+
+  /**
+   * Process a list of delayed statements and catch all exceptions
+   * @param list The list to process
+   */
+  def processDelayedStatementsSafe(list: List[DelayedStatement]) {
+    for (s <- list) {
+      try {
+        processDelayedStatement(s)
+      } catch {
+        case e: StatementError =>
+          BdLib.logError("Error while processing %s: %s", s, e.getMessage)
+        case e: Throwable =>
+          BdLib.logErrorException("Error while processing %s", e, s)
+      }
+    }
   }
 
   /**
@@ -301,19 +358,18 @@ class RecipeLoader {
         processStatement(s)
       } catch {
         case e: StatementError =>
-          log.severe("Error while processing %s: %s".format(s, e.getMessage))
+          BdLib.logError("Error while processing %s: %s", s, e.getMessage)
         case e: Throwable =>
-          log.severe("Error while processing %s: %s".format(s, e))
-          e.printStackTrace()
+          BdLib.logErrorException("Error while processing %s", e, s)
       }
     }
   }
 
   def load(f: Reader) {
-    log.info("Starting parsing")
+    BdLib.logInfo("Starting parsing")
     val r = newParser().doParse(f)
-    log.info("Processing %d statements".format(r.size))
+    BdLib.logInfo("Processing %d statements", r.size)
     processStatementsSafe(r)
-    log.info("Done")
+    BdLib.logInfo("Done")
   }
 }

src/net/bdew/lib/recipes/RecipeParser.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -11,9 +11,10 @@ package net.bdew.lib.recipes
 
 import java.io.Reader
 
-import scala.util.parsing.combinator._
-import org.apache.commons.lang3.StringEscapeUtils
 import net.minecraftforge.oredict.OreDictionary
+import org.apache.commons.lang3.StringEscapeUtils
+
+import scala.util.parsing.combinator._
 
 class RecipeParser extends JavaTokenParsers {
   // Allows C-style comments
@@ -25,6 +26,9 @@ class RecipeParser extends JavaTokenParsers {
   // Possible metadata suffix (defaults to wildcard value)
   def maybeMeta = ("@" ~> int).? ^^ (_.getOrElse(OreDictionary.WILDCARD_VALUE))
 
+  // Possible modid prefix (defaults to minecraft)
+  def maybeModid = (str <~ ":").? ^^ (_.getOrElse("minecraft"))
+
   // Qualified class name
   def clsPath = (ident <~ ".").* ~ ident
 
@@ -46,9 +50,9 @@ class RecipeParser extends JavaTokenParsers {
   // === Item references ===
 
   def specOD = "OD" ~> ":" ~> ident ^^ StackOreDict
-  def specMcBlock = "B" ~> ":" ~> ident ~ maybeMeta ^^ { case b ~ m => StackMCBlock(b, m) }
-  def specMcItem = "I" ~> ":" ~> ident ~ maybeMeta ^^ { case b ~ m => StackMCItem(b, m) }
-  def specModStack = str ~ ":" ~ str ^^ { case m ~ c ~ n => StackMod(m, n) }
+  def specBlock = "B" ~> ":" ~> maybeModid ~ str ~ maybeMeta ^^ { case m ~ n ~ i => StackBlock(m, n, i) }
+  def specItem = "I" ~> ":" ~> maybeModid ~ str ~ maybeMeta ^^ { case m ~ n ~ i => StackItem(m, n, i) }
+  def specGenericStack = "S" ~> ":" ~> str ~ ":" ~ str ^^ { case m ~ c ~ n => StackGeneric(m, n) }
   def specMacro = "$" ~> recipeChar ^^ StackMacro
 
   def specReflect = clsPath ~ ("[" ~> ident <~ "]") ~ maybeMeta ^^ {
@@ -59,7 +63,7 @@ class RecipeParser extends JavaTokenParsers {
     case (p ~ cl) ~ n ~ m => StackGetter(p.mkString("."), cl, n, m)
   }
 
-  def spec = specMcBlock | specMcItem | specOD | specModStack | specGetter | specReflect | specMacro
+  def spec = specBlock | specItem | specOD | specGenericStack | specGetter | specReflect | specMacro
 
   // Spec with possible number of items
   def specWithCount = spec ~ ("*" ~> int).?
@@ -78,8 +82,12 @@ class RecipeParser extends JavaTokenParsers {
     case mod ~ thn ~ els => new StIfHaveMod(mod, thn, els.getOrElse(List.empty[Statement]))
   }
 
-  def ifOreDict = ("ifOreDict" ~> str) ~ ("{" ~> statements <~ "}") ~ ("else" ~> "{" ~> statements <~ "}").? ^^ {
-    case id ~ thn ~ els => new StIfHaveOD(id, thn, els.getOrElse(List.empty[Statement]))
+  def ifAPI = ("ifAPI" ~> str) ~ ("{" ~> statements <~ "}") ~ ("else" ~> "{" ~> statements <~ "}").? ^^ {
+    case mod ~ thn ~ els => new StIfHaveAPI(mod, thn, els.getOrElse(List.empty[Statement]))
+  }
+
+  def ifOreDict = ("ifOreDict" ~> str) ~ ("{" ~> delayedStatements <~ "}") ~ ("else" ~> "{" ~> delayedStatements <~ "}").? ^^ {
+    case id ~ thn ~ els => new StIfHaveOD(id, thn, els.getOrElse(List.empty[DelayedStatement]))
   }
 
   def recipeShaped3x3 = recipeTriplet ~ recipeTriplet ~ ("=>" ~> specWithCount) ~ recipeTriplet ^^ {
@@ -102,10 +110,12 @@ class RecipeParser extends JavaTokenParsers {
     case in ~ (out ~ n) ~ xp => StSmeltRecipe(in, out, n.getOrElse(1), xp.getOrElse("0").toFloat)
   }
 
-  def statement: Parser[Statement] = (
+  def clearRecipes = "clearRecipes" ~> ":" ~> spec ^^ { case sp => StClearRecipes(sp) }
+
+  def delayedStatement: Parser[DelayedStatement] = (
     charSpec
       | classMacro
-      | ifMod
+      | ifOreDict
       | recipeShaped3x3
       | recipeShaped2x2
       | recipeShaped9
@@ -113,7 +123,10 @@ class RecipeParser extends JavaTokenParsers {
       | recipeSmelting
     )
 
+  def statement: Parser[Statement] = delayedStatement | ifMod | ifAPI | clearRecipes
+
   def statements = statement.*
+  def delayedStatements = delayedStatement.*
 
   def doParse(r: Reader): List[Statement] = {
     parseAll(statements, r) match {

src/net/bdew/lib/recipes/Vanilla.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,10 +9,12 @@
 
 package net.bdew.lib.recipes
 
+import java.lang.reflect.Modifier
+
 import net.minecraft.block.Block
 import net.minecraft.item.Item
+
 import scala.reflect.ClassTag
-import java.lang.reflect.Modifier
 
 object Vanilla {
 

src/net/bdew/lib/recipes/gencfg/ConfigSection.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,17 +9,21 @@
 
 package net.bdew.lib.recipes.gencfg
 
+import net.bdew.lib.gui.Color
+
 abstract class CfgEntry
 
 case class EntryDouble(v: Double) extends CfgEntry
 
 case class EntryStr(v: String) extends CfgEntry
 
+case class EntryNumList(v: List[Double]) extends CfgEntry
+
 case class ConfigSection(pfx: String = "") extends CfgEntry with Iterable[(String, CfgEntry)] {
-  var raw = Map.empty[String, CfgEntry].withDefault(x => sys.error("Config value '%s%s' is missing".format(pfx,x)))
+  var raw = Map.empty[String, CfgEntry].withDefault(x => sys.error("Config value '%s%s' is missing".format(pfx, x)))
 
   def iterator: Iterator[(String, CfgEntry)] = raw.iterator
-  def filterType[T<:CfgEntry](cls: Class[T]): Iterable[(String,T)] = raw.filter(x=>cls.isInstance(x._2)).map(x=>x.asInstanceOf[(String,T)])
+  def filterType[T <: CfgEntry](cls: Class[T]): Iterable[(String, T)] = raw.filter(x => cls.isInstance(x._2)).map(x => x.asInstanceOf[(String, T)])
 
   def rawget[T](id: String, t: Class[T]): T = {
     val v = raw(id)
@@ -33,12 +37,14 @@ case class ConfigSection(pfx: String = "") extends CfgEntry with Iterable[(Strin
 
   def getDouble(id: String) = rawget(id, classOf[EntryDouble]).v
   def getString(id: String) = rawget(id, classOf[EntryStr]).v
+  def getDoubleList(id: String) = rawget(id, classOf[EntryNumList]).v
   def getSection(id: String) = rawget(id, classOf[ConfigSection])
 
-
   final val trueVals = Set("y", "true", "yes", "on")
   def getBoolean(id: String) = trueVals.contains(getString(id).toLowerCase)
 
+  def hasValue(id: String) = raw.isDefinedAt(id)
+
   def getOrAddSection(id: String) = {
     if (raw.isDefinedAt(id)) {
       rawget(id, classOf[ConfigSection])
@@ -51,6 +57,15 @@ case class ConfigSection(pfx: String = "") extends CfgEntry with Iterable[(Strin
 
   def getInt(id: String) = getDouble(id).round.toInt
   def getFloat(id: String) = getDouble(id).toFloat
+  def getIntList(id: String) = getDoubleList(id).map(_.round.toInt).toList
+  def getFloatList(id: String) = getDoubleList(id).map(_.toFloat).toList
+
+  def getColor(id: String) =
+    raw(id) match {
+      case EntryDouble(c) => Color.fromInt(c.toInt)
+      case EntryNumList(r :: g :: b :: Nil) => Color(r.toFloat, g.toFloat, b.toFloat)
+      case x => sys.error("Invalid color definition: %s".format(x))
+    }
 }
 
 

src/net/bdew/lib/recipes/gencfg/DataClasses.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public

src/net/bdew/lib/recipes/gencfg/GenericConfigLoader.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -9,18 +9,19 @@
 
 package net.bdew.lib.recipes.gencfg
 
-import net.bdew.lib.recipes.{Statement, RecipeLoader}
+import net.bdew.lib.BdLib
+import net.bdew.lib.recipes.{RecipeLoader, Statement}
 
 trait GenericConfigLoader extends RecipeLoader {
   val cfgStore: ConfigSection
 
   def processConfigStatement(section: ConfigSection, s: CfgStatement): Unit = s match {
     case CfgVal(id, v) =>
-      log.info("Config: %s%s = %s".format(section.pfx, id, v))
+      BdLib.logInfo("Config: %s%s = %s", section.pfx, id, v)
       section.set(id, v)
     case CfgSub(id, st) => processConfigBlock(section.getOrAddSection(id), st)
     case x =>
-      log.severe("Can't process %s - this is a programing bug!".format(x))
+      BdLib.logError("Can't process %s - this is a programing bug!", x)
   }
 
   def processConfigBlock(view: ConfigSection, block: List[CfgStatement]) = for (s <- block) processConfigStatement(view, s)

src/net/bdew/lib/recipes/gencfg/GenericConfigParser.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) bdew, 2013
+ * Copyright (c) bdew, 2013 - 2014
  * https://github.com/bdew/bdlib
  *
  * This mod is distributed under the terms of the Minecraft Mod Public
@@ -13,14 +13,25 @@ import net.bdew.lib.recipes.RecipeParser
 
 trait GenericConfigParser extends RecipeParser {
   override def statement = statementCfg | super.statement
-  def cfgStatementNum = ident ~ "=" ~ decimalNumber ^^ { case id ~ eq ~ n => CfgVal(id, EntryDouble(n.toDouble)) }
+
+  // Hex variant must come before decimalNumber, otherwise the parser breaks
+  def signedNumber = (
+    ("0x" ~> "[0-9A-Fa-f]+".r) ^^ { case x => Integer.parseInt(x, 16).toDouble }
+      | decimalNumber ^^ { case x => x.toDouble }
+      | ("-" ~> decimalNumber) ^^ { case x => -x.toDouble }
+    )
+
+  def cfgStatementNum = ident ~ "=" ~ signedNumber ^^ { case id ~ eq ~ n => CfgVal(id, EntryDouble(n.toDouble)) }
   def cfgStatementStr = ident ~ "=" ~ str ^^ { case id ~ eq ~ s => CfgVal(id, EntryStr(s)) }
+  def cfgStatementNumList = ident ~ ("=" ~> "{" ~> signedNumber.* <~ "}") ^^ { case id ~ l => CfgVal(id, EntryNumList(l)) }
   def cfgStatementSub = cfgBlock ^^ { case (id, st) => CfgSub(id, st) }
 
-  def cfgStatement = cfgStatementNum | cfgStatementStr | cfgStatementSub
+  def cfgStatement = cfgStatementNum | cfgStatementStr | cfgStatementSub | cfgStatementNumList
 
-  // A bit of type acrobatics because this is recursive (via cfgStatementSub), the tuple is translated into the proper class in either cfgStatementSub or cfg
-  def cfgBlock: Parser[(String, List[CfgStatement])] = "cfg" ~> ident ~ ("{" ~> cfgStatement.* <~ "}") ^^ { case id ~ st => (id, st) }
+  // A bit of type acrobatics because this is recursive (via cfgStatementSub)
+  // the tuple is translated into the proper class in either cfgStatementSub or cfg
+  def cfgBlock: Parser[(String, List[CfgStatement])] =
+    "cfg" ~> ident ~ ("{" ~> cfgStatement.* <~ "}") ^^ { case id ~ st => (id, st) }
 
   def statementCfg = cfgBlock ^^ { case (id, st) => StCfg(id, st) }
 }

src/net/bdew/lib/recipes/lootlist/EntryLootList.scala

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.recipes.lootlist
+
+import net.bdew.lib.recipes.StackRef
+import net.bdew.lib.recipes.gencfg.CfgEntry
+
+/**
+ * Allos definition of random-weighted loot/drop lists in config sections
+ * @param list List on (chance percent, stack reference) pairs, resolve to
+ *             real ItemStacks with LootListLoader.resolveLootList
+ */
+case class EntryLootList(list: List[(Int, StackRef)]) extends CfgEntry
+
+
+
+

src/net/bdew/lib/recipes/lootlist/LootListLoader.scala

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.recipes.lootlist
+
+import net.bdew.lib.BdLib
+import net.bdew.lib.recipes.StackRef
+import net.bdew.lib.recipes.gencfg.GenericConfigLoader
+import net.minecraft.item.ItemStack
+import net.minecraftforge.oredict.OreDictionary
+
+/**
+ * Loader mixin for loot lists
+ */
+trait LootListLoader extends GenericConfigLoader {
+  def resolveLootList(entry: EntryLootList): List[(Int, ItemStack)] = resolveLootList(entry.list)
+  def resolveLootList(list: List[(Int, StackRef)]) =
+    (for ((chance, ref) <- list) yield {
+      try {
+        val itemStack = getConcreteStack(ref)
+        if (itemStack == null) {
+          BdLib.logWarn("Unable to resolve %s: null returned", ref)
+          None
+        } else {
+          if (itemStack.getItemDamage == OreDictionary.WILDCARD_VALUE) {
+            BdLib.logInfo("meta/damage is unset in %s, defaulting to 0", ref)
+            itemStack.setItemDamage(0)
+          }
+          Some((chance, itemStack))
+        }
+      } catch {
+        case e: Throwable =>
+          BdLib.logWarn("Unable to resolve %s: %s", ref, e.getMessage)
+          None
+      }
+    }).flatten
+}

src/net/bdew/lib/recipes/lootlist/LootListParser.scala

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.recipes.lootlist
+
+import net.bdew.lib.recipes.gencfg.{CfgVal, GenericConfigParser}
+
+/**
+ * Parser mixin for loot lists
+ * ident: DropsList(
+ * {chance}% {stackRef}
+ * ...
+ * )
+ */
+trait LootListParser extends GenericConfigParser {
+  def dropsEntry = (wholeNumber <~ "%") ~ spec ^^ { case n ~ s => (n.toInt, s) }
+  def cfgDrops = ident ~ (":" ~> "DropsList" ~> "(" ~> dropsEntry.* <~ ")") ^^ { case id ~ a => CfgVal(id, EntryLootList(a)) }
+  override def cfgStatement = cfgDrops | super.cfgStatement
+}

src/net/bdew/lib/render/IconPreloader.scala

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.render
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent
+import net.bdew.lib.gui.{IconWrapper, Texture}
+import net.minecraft.client.renderer.texture.IIconRegister
+import net.minecraftforge.client.event.TextureStitchEvent
+import net.minecraftforge.common.MinecraftForge
+
+/**
+ * Allows loading of texture that don't belong to specific block or item into vanilla block/item atlas
+ * @param kind 0=Blocks / 1=Items
+ */
+class IconPreloader(kind: Int) {
+  var icons = Set.empty[TextureLoc]
+
+  val sheet = kind match {
+    case 0 => Texture.BLOCKS
+    case 1 => Texture.ITEMS
+    case x => sys.error("Invalid spritesheet number: %d".format(x))
+  }
+
+  case class TextureLoc(loc: String) {
+    var texture: IconWrapper = null
+    icons += this
+  }
+
+  import scala.language.implicitConversions
+
+  implicit def entry2icon(v: TextureLoc) = v.texture.icon
+  implicit def entry2texture(v: TextureLoc) = v.texture
+
+  def registerIcons(reg: IIconRegister) {}
+
+  def init() {
+    MinecraftForge.EVENT_BUS.register(this)
+  }
+
+  @SubscribeEvent
+  def preTextureStitch(ev: TextureStitchEvent.Pre) {
+    if (ev.map.getTextureType == kind) {
+      for (x <- icons) x.texture = Texture(sheet, ev.map.registerIcon(x.loc))
+      registerIcons(ev.map)
+    }
+  }
+}

src/net/bdew/lib/render/connected/BlockAdditionalRender.scala

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
+ */
+
+package net.bdew.lib.render.connected
+
+import net.bdew.lib.gui.Color
+import net.minecraft.util.IIcon
+import net.minecraft.world.IBlockAccess
+import net.minecraftforge.common.util.ForgeDirection
+
+case class FaceOverlay(icon: IIcon, color: Color) {
+  def this(icon: IIcon, color: (Float, Float, Float)) = this(icon, new Color(color._1, color._2, color._3))
+}
+
+trait BlockAdditionalRender {
+  def getFaceOverlays(world: IBlockAccess, x: Int, y: Int, z: Int, face: ForgeDirection): List[FaceOverlay]
+}