fixed getConcreteStack in RecipeLoader ignoring size

Cleanup and update changes to 1.7.2
Merge remote-tracking branch 'remotes/origin/master' into mc172
2026-10-27 06:44:05 +00:00 · 2014-07-15 14:01:47 +03:00 · 2014-06-18 11:37:56 +03:00 · 2014-06-18 11:25:59 +03:00 · 2014-06-01 16:53:51 +03:00 · 2014-06-01 15:07:54 +03:00
102 changed files with 1700 additions and 474 deletions
@@ -1,9 +1,10 @@
-/.gradle
-/build
-/deps
-/eclipse
+/bin
 /out
-
-*.ipr
-*.iml
-*.iws
+/build
+/run
+/deps/run
+/eclipse
+/.gradle
+/*.iml
+/*.ipr
+/.idea
@@ -1,20 +1,27 @@
 buildscript {
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
    repositories {
        mavenCentral()
        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.4"
+version = "1.3.0"

 if (project.hasProperty('buildnum')) {
    project.version = project.version + '.' + project.buildnum
@@ -24,10 +31,10 @@ if (project.hasProperty('buildnum')) {

 group = "net.bdew"
 archivesBaseName = "bdlib"
-ext.versuffix = "mc164"
+ext.versuffix = "mc172"

 minecraft {
-    version = "1.6.4-9.11.1.964"
+    version = "1.7.2-10.12.2.1126"
    replace("BDLIB_VER", project.version)
 }

@@ -0,0 +1 @@
+rootProject.name='bdlib'
@@ -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,11 +10,30 @@
 package net.bdew.lib

 import cpw.mods.fml.common.Mod
-import cpw.mods.fml.common.event.FMLPreInitializationEvent
+import cpw.mods.fml.common.event.{FMLServerStartingEvent, FMLPreInitializationEvent}
+import org.apache.logging.log4j.Logger
+import cpw.mods.fml.common.Mod.EventHandler
+import net.minecraft.command.CommandHandler

@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 BDLIB_VER 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)
  }
 }
@@ -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 org.lwjgl.input.Keyboard
+import net.minecraft.client.Minecraft
+
+/**
+ * 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)
+  }
+
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.command.{CommandBase, ICommandSender}
+import cpw.mods.fml.relauncher.FMLInjectionData
+import java.io.{FileWriter, BufferedWriter, File}
+import cpw.mods.fml.common.registry.GameData
+import com.google.common.collect.Table
+import net.minecraft.item.ItemStack
+import net.minecraftforge.oredict.OreDictionary
+import net.minecraftforge.fluids.FluidRegistry
+
+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.notifyAdmins(sender, "Registry dumped to " + dumpFile.getCanonicalPath)
+    } catch {
+      case e: Throwable =>
+        CommandBase.notifyAdmins(sender, "Failed to save registry dump: " + e)
+        BdLib.logErrorException("Failed to save registry dump", e)
+    } finally {
+      dumpWriter.close()
+    }
+  }
+}
@@ -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
@@ -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,21 +10,27 @@
 package net.bdew.lib

 import cpw.mods.fml.common.registry.GameRegistry
-import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
+import net.minecraft.nbt.NBTTagCompound
 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 net.minecraftforge.oredict.ShapedOreRecipe
+import net.minecraft.world.biome.BiomeGenBase
+import net.minecraft.tileentity.TileEntity
+import net.minecraftforge.common.util.ForgeDirection

 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 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 {
@@ -34,7 +40,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]) =
@@ -53,6 +59,8 @@ object Misc {

  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).getOrElse(null)
+
  def haveModVersion(spec: String): Boolean = {
    val req = VersionParser.parseVersionReference(spec)
    val modid = req.getLabel
@@ -65,4 +73,16 @@ 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))
 }
+
@@ -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,19 +12,20 @@ package net.bdew.lib.block
 import net.minecraft.block.{ITileEntityProvider, Block}
 import net.minecraft.world.{IBlockAccess, World}
 import net.minecraft.tileentity.TileEntity
-import cpw.mods.fml.common.FMLCommonHandler
+import net.bdew.lib.BdLib

 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, 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")
      }
@@ -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,22 +13,24 @@ import net.minecraft.item.ItemStack
 import net.minecraft.block.Block
 import cpw.mods.fml.common.registry.GameRegistry
 import net.bdew.lib.block.HasTE
+import net.bdew.lib.Misc

-class BlockManager(val ids: IdManager) {
+class BlockManager() {

-  def regBlockCls[T <: Block](blockCls: Class[T], name: String, addStack: Boolean = true): T = {
-    val block = blockCls.getConstructor(classOf[Int]).newInstance(ids.getBlockId(name): Integer)
+  def regBlockCls[T <: Block](blockCls: Class[T], name: String, addStack: Boolean = false): T = {
+    val block = blockCls.newInstance()
    regBlock[T](block, name, addStack)
  }

-  def regBlock[T <: Block](block: T, name: String, addStack: Boolean = true): T = {
+  def regBlock[T <: Block](block: T, name: String, addStack: Boolean = false): T = {
    GameRegistry.registerBlock(block, name)

    if (addStack)
      GameRegistry.registerCustomItemStack(name, new ItemStack(block))

    if (block.isInstanceOf[HasTE[_]])
-      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, name)
+      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass,
+        "%s.%s".format(Misc.getActiveModId, name))

    return block
  }
@@ -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,7 +11,7 @@ package net.bdew.lib.config

 import net.minecraftforge.fluids.{FluidRegistry, Fluid}

-class FluidManager(val ids: IdManager) {
+class FluidManager() {
  def regFluid[T <: Fluid](fluid: T): T = {
    FluidRegistry.registerFluid(fluid)
    return fluid
@@ -1,46 +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.config
-
-import net.minecraft.block.Block
-import net.minecraft.item.Item
-import net.minecraftforge.common.Configuration
-
-class IdManager(cfg: Configuration, itemStart: Int, blockStart: Int) {
-
-  class MyIter(start: Int, check: Array[_], offset: Int = 0) {
-    var now = start
-    def next(): Int = {
-      while (check(now + offset) != null) now += 1
-      return now
-    }
-  }
-
-  def getBlockId(name: String, comment: String) = cfg.getBlock(name, blockIds.next(), comment).getInt
-  def getBlockId(name: String) = cfg.getBlock(name, blockIds.next()).getInt
-
-  def getItemId(name: String, comment: String) = cfg.getItem(name, itemIds.next(), comment).getInt
-  def getItemId(name: String) = cfg.getItem(name, itemIds.next()).getInt
-
-  val blockIds = new MyIter(blockStart, Block.blocksList)
-  val itemIds = new MyIter(itemStart, Item.itemsList, 256)
-
-  // figure out what's the max id we already use, because forge is stupid
-  // ignore ids in the top slots as they were probably assigned to resolve conflicts
-
-  import scala.collection.JavaConverters._
-
-  val maxBlock = (cfg.getCategory(Configuration.CATEGORY_BLOCK).values().asScala.map(_.getInt).filter(_ < Block.blocksList.length - 100) ++ Seq(0)).max + 1
-  val maxItem = (cfg.getCategory(Configuration.CATEGORY_ITEM).values().asScala.map(_.getInt).filter(_ < Item.itemsList.length - 1000) ++ Seq(0)).max + 1
-
-  if (maxBlock > blockIds.now) blockIds.now = maxBlock
-  if (maxItem > itemIds.now) itemIds.now = maxItem
-}
-
@@ -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,19 +11,19 @@ package net.bdew.lib.config

 import net.minecraft.item.{ItemStack, Item}
 import cpw.mods.fml.common.registry.GameRegistry
-import net.bdew.lib.items.SimpleItem
+import net.bdew.lib.items.{NamedItem, SimpleItem}

-class ItemManager(val ids: IdManager) {
-  def regSimpleItem(name: String): SimpleItem = regItem(new SimpleItem(ids.getItemId(name), name), name)
+class ItemManager() {
+  def regSimpleItem(name: String): SimpleItem = regItem(new SimpleItem(name), name)

-  def regItem[T <: SimpleItem](item: T): T = regItem[T](item, item.name)
+  def regItem[T <: NamedItem](item: T): T = regItem[T](item, item.name)

-  def regItemCls[T <: Item](itemCls: Class[T], name: String, addStack: Boolean = true): T = {
-    val item = itemCls.getConstructor(classOf[Int]).newInstance(ids.getItemId(name): Integer)
+  def regItemCls[T <: Item](itemCls: Class[T], name: String, addStack: Boolean = false): T = {
+    val item = itemCls.newInstance()
    regItem[T](item, name, addStack)
  }

-  def regItem[T <: Item](item: T, name: String, addStack: Boolean = true): T = {
+  def regItem[T <: Item](item: T, name: String, addStack: Boolean = false): T = {
    GameRegistry.registerItem(item, name)
    if (addStack)
      GameRegistry.registerCustomItemStack(name, new ItemStack(item))
@@ -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,12 +13,12 @@ import net.bdew.lib.recipes.gencfg.ConfigSection
 import net.bdew.lib.machine.Machine
 import net.bdew.lib.gui.{GuiProvider, GuiHandler}

-class MachineManager(ids: IdManager, val tuning: ConfigSection, guiHandler: GuiHandler) {
+class MachineManager(val tuning: ConfigSection, guiHandler: GuiHandler) {
  def registerMachine[R <: Machine[_]](machine: R): R = {
    machine.tuning = tuning.getSection(machine.name)
    if (machine.tuning.getBoolean("Enabled")) {
      machine.enabled = true
-      machine.regBlock(ids)
+      machine.regBlock()
      if (machine.isInstanceOf[GuiProvider])
        guiHandler.register(machine.asInstanceOf[GuiProvider])
    }
@@ -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.block.HasTE
+import net.minecraft.world.{IBlockAccess, World}
+import net.minecraft.entity.player.EntityPlayer
+import net.bdew.lib.Misc
+import net.bdew.lib.items.ItemUtils
+import net.minecraft.block.Block
+
+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)
+  }
+}
@@ -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.{ItemStack, Item}
+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
+}
@@ -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.data.base.{UpdateKind, TileDataSlots}
+import net.bdew.lib.data.DataSlotItemStack
+import net.bdew.lib.Misc
+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)
+}
@@ -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
@@ -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,8 +10,8 @@
 package net.bdew.lib.data

 import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal}
-import net.minecraftforge.common.ForgeDirection
 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
@@ -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
@@ -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
@@ -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
@@ -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))
 }
@@ -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
@@ -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
@@ -15,7 +15,6 @@ import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlot}

 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)
@@ -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,10 +10,10 @@
 package net.bdew.lib.data.base

 import net.minecraft.entity.player.EntityPlayerMP
-import net.bdew.lib.gui.BaseContainer
+import net.bdew.lib.gui.NoInvContainer
 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)
    }
  }
 }
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.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.network.play.server.S35PacketUpdateTileEntity
+import net.minecraft.network.Packet

 trait TileDataSlots extends TileExtended {
  val dataSlots = mutable.HashMap.empty[String, DataSlot]
@@ -31,6 +32,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 +43,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) {
@@ -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")
 }
@@ -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.inventory.IInventory
+import net.minecraft.entity.player.EntityPlayer
 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))
-  }

+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) {
@@ -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))
+}
@@ -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
+}
@@ -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,21 +12,21 @@ package net.bdew.lib.gui
 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 net.minecraft.client.Minecraft
 import org.lwjgl.opengl.GL11

 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 +34,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._

    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()
  }
 }
@@ -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
+  }
+}
@@ -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 org.lwjgl.opengl.GL11
+import net.bdew.lib.Misc
+
+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)
+}
@@ -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
@@ -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.renderer.Tessellator
+import net.minecraft.client.gui.FontRenderer
+
+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)
+}
@@ -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
@@ -24,8 +24,8 @@ class GuiHandler extends IGuiHandler {
  }

  def getServerGuiElement(ID: Int, player: EntityPlayer, world: World, x: Int, y: Int, z: Int): AnyRef =
-    guis(ID).getContainer(world.getBlockTileEntity(x, y, z), player)
+    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.getBlockTileEntity(x, y, z), player)
+    guis(ID).getGui(world.getTileEntity(x, y, z), player)
 }
@@ -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
@@ -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.minecraft.inventory.{Slot, Container}
+import net.bdew.lib.Misc
+import net.minecraft.entity.player.{EntityPlayer, InventoryPlayer, EntityPlayerMP}
+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
+}
@@ -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)
-}
@@ -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)
-}
@@ -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.item.ItemStack
+import net.minecraft.inventory.Slot
+import net.minecraft.entity.player.EntityPlayer

-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
 }
@@ -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)
 }
@@ -0,0 +1,85 @@
+/*
+ * 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.util.{IIcon, ResourceLocation}
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.texture.TextureMap
+
+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 = 256) = this(domain + ":" + path, scale)
+}
+
+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))
+}
@@ -0,0 +1,85 @@
+/*
+ * 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 scala.collection.mutable
+import net.bdew.lib.gui.widgets.BaseWidget
+import net.minecraft.client.gui.FontRenderer
+import org.lwjgl.opengl.GL11
+
+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)
+}
@@ -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 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)
+}
+
@@ -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,17 +10,26 @@
 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.{WidgetContainer, Point, Rect}

-trait Widget {
+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() {}
 }
@@ -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.minecraft.client.gui.GuiButton
+import net.bdew.lib.gui.{Point, Rect}
+import net.minecraft.client.Minecraft
+import net.minecraft.client.audio.PositionedSoundRecord
+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)
+}
@@ -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)
+  }
+}
@@ -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.gui._
 import net.bdew.lib.data.base.DataSlotNumeric

-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)
    }
  }
 }
@@ -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,15 +9,14 @@

 package net.bdew.lib.gui.widgets

-import net.bdew.lib.gui.{Point, TextureLocation, Rect}
+import net.bdew.lib.gui.{Texture, Point, 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 org.lwjgl.opengl.GL11

-class WidgetFluidGauge(val rect: Rect, overlay: TextureLocation, dslot: DataSlotTankBase) extends Widget {
+class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase) extends Widget {
  val formater = new DecimalFormat("#,###")

  override def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
@@ -29,23 +28,22 @@ class WidgetFluidGauge(val rect: Rect, overlay: TextureLocation, dslot: DataSlot
    }
  }

-  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 +52,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)
  }
 }
@@ -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)
  }
 }
@@ -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)
+}
@@ -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,10 @@

 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
+import net.bdew.lib.data.DataSlotFloat

-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) + "%"
 }
@@ -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._
+import net.bdew.lib.gui.Rect
+
+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
+}
@@ -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,8 +12,14 @@ package net.bdew.lib.gui.widgets
 import net.minecraft.client.gui.{FontRenderer, GuiTextField}
 import net.bdew.lib.gui.{Point, Rect}

-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()
 }
@@ -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.item.{ItemBlock, Item, ItemStack}
+import net.minecraft.block.Block
+
+/**
+ * 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)
+}
@@ -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,11 +10,13 @@
 package net.bdew.lib.items

 import net.minecraft.entity.item.EntityItem
-import net.minecraft.item.ItemStack
+import net.minecraft.item.{Item, ItemStack}
 import net.minecraft.world.World
 import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.inventory.IInventory
+import net.minecraft.inventory.{ISidedInventory, IInventory}
 import net.bdew.lib.Misc
+import java.util.Random
+import net.minecraftforge.common.util.ForgeDirection

 object ItemUtils {
  def throwItemAt(world: World, x: Int, y: Int, z: Int, stack: ItemStack) {
@@ -37,7 +39,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 +56,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 +78,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
+  }
 }
@@ -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,16 +10,20 @@
 package net.bdew.lib.items

 import net.minecraft.item.Item
-import net.minecraft.client.renderer.texture.IconRegister
+import net.minecraft.client.renderer.texture.IIconRegister
 import cpw.mods.fml.relauncher.{Side, SideOnly}
 import net.bdew.lib.Misc

-class SimpleItem(id: Int, val name: String) extends Item(id) {
+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: IconRegister) {
+  override def registerIcons(reg: IIconRegister) {
    itemIcon = reg.registerIcon(modId + ":" + name.toLowerCase)
  }
 }
@@ -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.minecraft.entity.player.EntityPlayer
+import net.bdew.lib.gui.BaseContainer
+import net.minecraft.item.ItemStack
+import net.minecraft.inventory.Slot
+
+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)
+  }
+}
@@ -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.minecraft.item.ItemStack
+import net.bdew.lib.tile.inventory.BaseInventory
+import net.bdew.lib.Misc
+import net.minecraft.nbt.{NBTTagList, NBTTagCompound}
+import net.minecraft.entity.player.EntityPlayer
+
+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)
+  }
+}
@@ -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 net.minecraft.item.Item
+import net.bdew.lib.gui.GuiProvider
+import cpw.mods.fml.common.Loader
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.minecraft.entity.player.EntityPlayer
+import net.bdew.lib.BdLib
+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)
+  }
+}
@@ -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,21 +12,18 @@ package net.bdew.lib.machine
 import net.bdew.lib.recipes.gencfg.ConfigSection
 import net.minecraft.block.Block
 import cpw.mods.fml.common.registry.GameRegistry
-import net.minecraft.item.ItemStack
 import net.bdew.lib.block.HasTE
-import net.bdew.lib.config.IdManager
 import net.bdew.lib.Misc

-abstract class Machine[T <: Block](val name: String, val blockConstruct: (Int) => T) {
+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(ids: IdManager) {
-    block = blockConstruct(ids.getBlockId(name))
+  def regBlock() {
+    block = blockConstruct
    GameRegistry.registerBlock(block, name)
-    GameRegistry.registerCustomItemStack(name, new ItemStack(block))
    if (block.isInstanceOf[HasTE[_]]) {
      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, "%s.%s".format(modId, name))
    }
@@ -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
@@ -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
@@ -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.network
+
+import io.netty.handler.codec.MessageToMessageCodec
+import cpw.mods.fml.common.network.internal.FMLProxyPacket
+import net.minecraft.nbt.{CompressedStreamTools, NBTTagCompound}
+import io.netty.channel.ChannelHandlerContext
+import java.util
+import java.io.{DataInputStream, DataOutputStream}
+import io.netty.buffer.{ByteBufInputStream, ByteBufOutputStream, Unpooled}
+import cpw.mods.fml.common.network.NetworkRegistry
+import io.netty.channel.ChannelHandler.Sharable
+import net.bdew.lib.BdLib
+
+@Sharable
+class NBTMessageToMessageCodec extends MessageToMessageCodec[FMLProxyPacket, NBTTagCompound] {
+  def encode(ctx: ChannelHandlerContext, msg: NBTTagCompound, out: util.List[AnyRef]) {
+    val buff = Unpooled.buffer()
+    val writer = new DataOutputStream(new ByteBufOutputStream(buff))
+    CompressedStreamTools.write(msg, writer)
+    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 stream = new DataInputStream(new ByteBufInputStream(msg.payload()))
+      out.add(CompressedStreamTools.read(stream))
+    } catch {
+      case e: Throwable => BdLib.log.error("Error decoding packet", e)
+    }
+  }
+}
@@ -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 cpw.mods.fml.common.network.{FMLOutboundHandler, NetworkRegistry}
+import cpw.mods.fml.relauncher.Side
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.entity.player.EntityPlayerMP
+import io.netty.channel.{ChannelHandler, ChannelFutureListener}
+
+class NetChannel(val name: String) {
+  val channels = NetworkRegistry.INSTANCE.newChannel(name, new NBTMessageToMessageCodec)
+
+  var serverHandlers = Map.empty[String, (NBTTagCompound, EntityPlayerMP) => Unit]
+  var clientHandlers = Map.empty[String, (NBTTagCompound) => Unit]
+
+  def regServerHandler(id: String, callable: (NBTTagCompound, EntityPlayerMP) => Unit) =
+    if (serverHandlers.contains(id))
+      sys.error("Command name already in use: %s".format(name))
+    else
+      serverHandlers += (id -> callable)
+
+  def regClientHandler(id: String, callable: (NBTTagCompound) => Unit) =
+    if (clientHandlers.contains(id))
+      sys.error("Command name already in use: %s".format(name))
+    else
+      clientHandlers += (id -> callable)
+
+  addHandler(Side.SERVER, new NetChannelServerHandler(this))
+  addHandler(Side.CLIENT, new NetChannelClientHandler(this))
+
+  def addHandler(side: Side, handler: ChannelHandler) {
+    val ch = channels.get(side)
+    val name = ch.findChannelHandlerNameForType(classOf[NBTMessageToMessageCodec])
+    ch.pipeline().addAfter(name, side + "Handler", handler)
+  }
+
+  def sendToAll(message: NBTTagCompound) {
+    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: NBTTagCompound, 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: NBTTagCompound, 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: NBTTagCompound, 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: NBTTagCompound) {
+    channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER)
+    channels.get(Side.CLIENT).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE)
+  }
+
+}
@@ -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.network
+
+import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
+import net.minecraft.nbt.NBTTagCompound
+import net.bdew.lib.BdLib
+
+class NetChannelClientHandler(ch: NetChannel) extends SimpleChannelInboundHandler[NBTTagCompound] {
+  def channelRead0(ctx: ChannelHandlerContext, msg: NBTTagCompound) {
+    val cmd = msg.getString("_cmd")
+    ch.clientHandlers.getOrElse(cmd, {
+      BdLib.log.error("Unknown command: '%s' from server".format(cmd))
+      return
+    })(msg)
+  }
+}
@@ -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.network
+
+import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler}
+import net.minecraft.nbt.NBTTagCompound
+import cpw.mods.fml.common.network.NetworkRegistry
+import net.minecraft.network.NetHandlerPlayServer
+import net.bdew.lib.BdLib
+
+class NetChannelServerHandler(ch: NetChannel) extends SimpleChannelInboundHandler[NBTTagCompound] {
+  def channelRead0(ctx: ChannelHandlerContext, msg: NBTTagCompound) {
+    val cmd = msg.getString("_cmd")
+    val nh = ctx.channel().attr(NetworkRegistry.NET_HANDLER).get.asInstanceOf[NetHandlerPlayServer].playerEntity
+    ch.serverHandlers.getOrElse(cmd, {
+      BdLib.log.error("Unknown command: '%s' from '%s'".format(cmd, nh.getCommandSenderName))
+      return
+    })(msg, nh)
+  }
+}
@@ -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
@@ -49,7 +49,7 @@ case class DataSlotPower(name: String, parent: TileDataSlots) extends DataSlot {
    tag.setFloat("stored", stored)
    if (kind == UpdateKind.GUI)
      tag.setFloat("capacity", capacity)
-    t.setCompoundTag(name, tag)
+    t.setTag(name, tag)
  }

  def load(t: NBTTagCompound, kind: UpdateKind.Value) {
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,19 +9,19 @@

 package net.bdew.lib.power

-import net.bdew.lib.gui.{Point, TextureLocation, Rect}
+import net.bdew.lib.gui.{Texture, Point, Rect}
 import scala.collection.mutable
 import java.text.DecimalFormat
-import net.minecraft.client.Minecraft
 import net.bdew.lib.gui.widgets.Widget

-class WidgetPowerGauge(val rect: Rect, texture: TextureLocation, dslot: DataSlotPower) extends Widget {
+class WidgetPowerGauge(val rect: Rect, texture: Texture, dslot: DataSlotPower) extends Widget {
  val formater = new DecimalFormat("#,###")

-  override def draw() {
-    Minecraft.getMinecraft.renderEngine.bindTexture(texture.resource)
-    val fill = (dslot.stored / dslot.capacity * rect.h).round
-    parent.drawTexturedModalRect(rect.x, rect.y + rect.h - fill, texture.x, texture.y + rect.h - fill, rect.w, fill)
+  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"
@@ -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
@@ -125,13 +127,14 @@ case class StIfHaveMod(mod: String, thn: List[Statement], els: List[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
@@ -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,13 +11,10 @@ package net.bdew.lib.recipes

 import java.io.Reader
 import net.minecraft.item.{Item, ItemStack}
-import net.bdew.lib.Misc
+import net.bdew.lib.{BdLib, Misc}
 import net.minecraft.block.Block
 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

 /**
 * Main recipe loader class
@@ -34,9 +31,6 @@ 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
   */
@@ -90,7 +84,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
@@ -165,6 +159,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
@@ -178,15 +174,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)
  }
@@ -203,7 +199,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)
@@ -216,29 +212,20 @@ class RecipeLoader {
  def processStatement(s: Statement): Unit = s match {
    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))
-        processStatementsSafe(els)
-      }
-
-    case StIfHaveOD(od, thn, els) =>
-      if (OreDictionary.getOres(od).size() > 0) {
-        log.info("ifOreDict: %s found".format(od))
-        processStatementsSafe(thn)
-      } else {
-        log.info("ifOreDict: %s not found".format(od))
+        BdLib.logInfo("ifMod: %s not found", mod)
        processStatementsSafe(els)
      }

    case StClearRecipes(res) =>
-      log.info("Clearing recipes that produce %s".format(res))
+      BdLib.logInfo("Clearing recipes that produce %s", res)
      delayedStatements = delayedStatements.filter({
        x =>
          if (x.isInstanceOf[CraftingStatement])
            if (x.asInstanceOf[CraftingStatement].result == res) {
-              log.info("Removing recipe %s".format(x))
+              BdLib.logInfo("Removing recipe %s", x)
              false
            } else true
          else true
@@ -248,7 +235,7 @@ class RecipeLoader {
      delayedStatements :+= x

    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)
  }

  /**
@@ -258,19 +245,19 @@ class RecipeLoader {
  def processDelayedStatement(st: DelayedStatement) = st match {
    case StCharAssign(c, r) =>
      currCharMap += (c -> r)
-      log.info("Added %s = %s".format(c, r))
+      BdLib.logInfo("Added %s = %s", c, r)

    case StClassMacro(id, cls) =>
      currClassMacros += (id -> cls)
-      log.info("Added def %s = %s".format(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)
      }

@@ -279,16 +266,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)
      }

@@ -297,46 +284,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 delayed statements, clear the list afterwards
+   * Process main delayed statements list, clear the list afterwards
   */
  def processDelayedStatements() {
-    log.info("Processing %d delayed statements".format(delayedStatements.size))
-    for (s <- delayedStatements) {
+    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 =>
-          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)
      }
    }
-    delayedStatements = List.empty
  }

  /**
@@ -349,19 +347,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")
  }
 }
@@ -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
@@ -25,6 +25,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 +49,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 +62,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 +81,8 @@ 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 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 ^^ {
@@ -104,19 +107,21 @@ class RecipeParser extends JavaTokenParsers {

  def clearRecipes = "clearRecipes" ~> ":" ~> spec ^^ { case sp => StClearRecipes(sp) }

-  def statement: Parser[Statement] = (
+  def delayedStatement: Parser[DelayedStatement] = (
    charSpec
      | classMacro
-      | ifMod
+      | ifOreDict
      | recipeShaped3x3
      | recipeShaped2x2
      | recipeShaped9
      | recipeShapeless
      | recipeSmelting
-      | clearRecipes
    )

+  def statement: Parser[Statement] = delayedStatement | ifMod | clearRecipes
+
  def statements = statement.*
+  def delayedStatements = delayedStatement.*

  def doParse(r: Reader): List[Statement] = {
    parseAll(statements, r) match {
@@ -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
@@ -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,16 @@

 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)))

@@ -33,11 +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])
@@ -50,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))
+    }
 }


@@ -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
@@ -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,17 +10,18 @@
 package net.bdew.lib.recipes.gencfg

 import net.bdew.lib.recipes.{Statement, RecipeLoader}
+import net.bdew.lib.BdLib

 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)
@@ -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) }
 }
@@ -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
+
+
+
+
@@ -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.recipes.gencfg.GenericConfigLoader
+import net.minecraftforge.oredict.OreDictionary
+import net.bdew.lib.recipes.StackRef
+import net.minecraft.item.ItemStack
+import net.bdew.lib.BdLib
+
+/**
+ * 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
+}
@@ -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
+}
@@ -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 net.minecraft.client.renderer.texture.IIconRegister
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.client.event.TextureStitchEvent
+import net.bdew.lib.gui.{Texture, IconWrapper}
+import cpw.mods.fml.common.eventhandler.SubscribeEvent
+
+/**
+ * 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 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)
+    }
+  }
+}
@@ -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
@@ -14,12 +14,11 @@ import cpw.mods.fml.relauncher.SideOnly
 import net.minecraft.block.Block
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.item.ItemStack
-import net.minecraft.util.Icon
-import net.minecraft.util.MathHelper
+import net.minecraft.util.{IIcon, MathHelper}
 import net.minecraft.world.IBlockAccess
 import net.minecraft.world.World
-import net.minecraftforge.common.ForgeDirection
 import java.util.EnumSet
+import net.minecraftforge.common.util.ForgeDirection

 /**
 * Basic logic for block rotatation
@@ -29,12 +28,12 @@ trait BaseRotateableBlock extends Block {
  /**
   * Override this method to provide your textures, also called when rendering as item
   */
-  def getIcon(meta: Int, kind: IconType.Value): Icon
+  def getIcon(meta: Int, kind: IconType.Value): IIcon

  /**
   * Override this method to provide your textures, if you need to check other state
   */
-  def getIcon(world: IBlockAccess, x: Int, y: Int, z: Int, kind: IconType.Value): Icon = getIcon(world.getBlockMetadata(x, y, z), kind)
+  def getIcon(world: IBlockAccess, x: Int, y: Int, z: Int, kind: IconType.Value): IIcon = getIcon(world.getBlockMetadata(x, y, z), kind)

  /**
   * Set of valid rotations, default is all of them
@@ -63,10 +62,10 @@ trait BaseRotateableBlock extends Block {
  }

  @SideOnly(Side.CLIENT)
-  override def getIcon(side: Int, meta: Int): Icon = getIcon(meta, IconType.fromSideAndDir(side, getDefaultFacing))
+  override def getIcon(side: Int, meta: Int): IIcon = getIcon(meta, IconType.fromSideAndDir(side, getDefaultFacing))

  @SideOnly(Side.CLIENT)
-  override def getBlockTexture(world: IBlockAccess, x: Int, y: Int, z: Int, side: Int): Icon = getIcon(world, x, y, z, IconType.fromSideAndDir(side, getFacing(world, x, y, z)))
+  override def getIcon(world: IBlockAccess, x: Int, y: Int, z: Int, side: Int): IIcon = getIcon(world, x, y, z, IconType.fromSideAndDir(side, getFacing(world, x, y, z)))

  override def getValidRotations(worldObj: World, x: Int, y: Int, z: Int): Array[ForgeDirection] = getValidFacings.toArray(Array.empty[ForgeDirection])

@@ -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.rotate

-import net.minecraftforge.common.ForgeDirection
+import net.minecraftforge.common.util.ForgeDirection

 object IconType extends Enumeration {
  val BACK = Value(0, "BACK")
@@ -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
@@ -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,21 +12,21 @@ package net.bdew.lib.rotate
 import net.minecraft.block.ITileEntityProvider
 import net.minecraft.world.IBlockAccess
 import net.minecraft.world.World
-import net.minecraftforge.common.ForgeDirection
 import cpw.mods.fml.common.FMLCommonHandler
+import net.minecraftforge.common.util.ForgeDirection

 /**
 * Stores rotation data in tile entity. The TE should implement {@link RotateableTile}
 */
 trait RotateableTileBlock extends BaseRotateableBlock with ITileEntityProvider {
  def setFacing(world: World, x: Int, y: Int, z: Int, facing: ForgeDirection) {
-    world.getBlockTileEntity(x, y, z).asInstanceOf[RotateableTile].rotation := facing
+    world.getTileEntity(x, y, z).asInstanceOf[RotateableTile].rotation := facing
  }

  def getFacing(world: IBlockAccess, x: Int, y: Int, z: Int): ForgeDirection = {
-    val te: RotateableTile = world.getBlockTileEntity(x, y, z).asInstanceOf[RotateableTile]
+    val te: RotateableTile = world.getTileEntity(x, y, z).asInstanceOf[RotateableTile]
    if (te == null || te.rotation == null) {
-      FMLCommonHandler.instance().getFMLLogger.warning("Failed gettig rocation for block at %d, %d, %d".format(x, y, z))
+      FMLCommonHandler.instance().getFMLLogger.warn("Failed getting rocation for block at %d, %d, %d".format(x, y, z))
      return getDefaultFacing
    }
    return te.rotation
@@ -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
@@ -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,7 +11,7 @@ package net.bdew.lib.tile

 import net.minecraft.tileentity.TileEntity
 import net.minecraftforge.fluids._
-import net.minecraftforge.common.ForgeDirection
+import net.minecraftforge.common.util.ForgeDirection

 trait ExposeTank extends TileEntity with IFluidHandler {
  def getTankFromDirection(dir: ForgeDirection): IFluidTank
@@ -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,9 @@ package net.bdew.lib.tile

 import net.minecraft.tileentity.TileEntity
 import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.network.INetworkManager
-import net.minecraft.network.packet.Packet132TileEntityData
+import net.minecraft.network.{NetworkManager, Packet}
 import net.bdew.lib.Event
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity

 class TileExtended extends TileEntity {
  final val ACT_CLIENT = 1
@@ -39,18 +39,18 @@ class TileExtended extends TileEntity {
    persistLoad.trigger(tag)
  }

-  override final def getDescriptionPacket: Packet132TileEntityData = {
+  override final def getDescriptionPacket: Packet = {
    if (!sendClientUpdate.hasListeners) return null
    val tag = new NBTTagCompound
    sendClientUpdate.trigger(tag)
-    return new Packet132TileEntityData(this.xCoord, this.yCoord, this.zCoord, ACT_CLIENT, tag)
+    return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, ACT_CLIENT, tag)
  }

-  override final def onDataPacket(net: INetworkManager, pkt: Packet132TileEntityData) {
-    if (pkt.actionType == ACT_CLIENT)
-      handleClientUpdate.trigger(pkt.data)
+  override final def onDataPacket(net: NetworkManager, pkt: S35PacketUpdateTileEntity) {
+    if (pkt.func_148853_f == ACT_CLIENT)
+      handleClientUpdate.trigger(pkt.func_148857_g)
    else
-      extDataPacket(pkt.actionType, pkt.data)
+      extDataPacket(pkt.func_148853_f, pkt.func_148857_g)
  }

  override final def updateEntity() {
@@ -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
@@ -18,33 +18,33 @@ trait BaseInventory extends IInventory {

  def getStackInSlot(i: Int): ItemStack = inv(i)

-  def getInvName = ""
+  def getInventoryName = ""

-  def isInvNameLocalized = false
+  def hasCustomInventoryName = false

  def getInventoryStackLimit = 64

  def isUseableByPlayer(player: EntityPlayer) = true

-  def openChest() = Unit
+  def openInventory() {}

-  def closeChest() = Unit
+  def closeInventory() {}

  def isItemValidForSlot(slot: Int, stack: ItemStack) = true

  def decrStackSize(slot: Int, n: Int): ItemStack = {
-    var item = inv(slot)
+    val item = inv(slot)
    if (item != null) {
      if (item.stackSize <= n) {
        inv(slot) = null
-        onInventoryChanged()
+        markDirty()
        return item
      } else {
-        var newstack = item.splitStack(n)
+        val newstack = item.splitStack(n)
        if (item.stackSize == 0) {
          inv(slot) = null
        }
-        onInventoryChanged()
+        markDirty()
        return newstack
      }
    } else {
@@ -55,12 +55,12 @@ trait BaseInventory extends IInventory {
  def getStackInSlotOnClosing(slot: Int): ItemStack = {
    var tmp = inv(slot)
    inv(slot) = null
-    onInventoryChanged()
+    markDirty()
    return tmp
  }

  def setInventorySlotContents(slot: Int, stack: ItemStack) = {
    inv(slot) = stack
-    onInventoryChanged()
+    markDirty()
  }
 }
@@ -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,13 +13,13 @@ import net.minecraft.block.Block
 import net.minecraft.world.World

 trait BreakableInventoryBlock extends Block {
-  override def breakBlock(world: World, x: Int, y: Int, z: Int, blockId: Int, meta: Int) {
+  override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) {
    if (!world.isRemote) {
-      val te = world.getBlockTileEntity(x, y, z).asInstanceOf[BreakableInventoryTile]
+      val te = world.getTileEntity(x, y, z).asInstanceOf[BreakableInventoryTile]
      if (te != null) {
        te.dropItems()
      }
    }
-    super.breakBlock(world, x, y, z, blockId, meta)
+    super.breakBlock(world, x, y, z, block, meta)
  }
 }
@@ -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
@@ -15,9 +15,9 @@ import net.bdew.lib.items.ItemUtils

 trait BreakableInventoryTile extends TileEntity with BaseInventory {
  def dropItems() {
-    if (worldObj != null && !worldObj.isRemote) {
+    if (getWorldObj != null && !getWorldObj.isRemote) {
      for (stack <- inv if stack != null) {
-        ItemUtils.throwItemAt(worldObj, xCoord, yCoord, zCoord, stack)
+        ItemUtils.throwItemAt(getWorldObj, xCoord, yCoord, zCoord, stack)
      }
      inv = new Array[ItemStack](inv.size)
    }
Author	SHA1	Message	Date
bdew	e2c7940539	fixed getConcreteStack in RecipeLoader ignoring size	2014-07-15 14:01:47 +03:00
bdew	7a5982bf37	Cleanup and update changes to 1.7.2	2014-06-18 11:37:56 +03:00
bdew	5166576d30	Merge remote-tracking branch 'remotes/origin/master' into mc172	2014-06-18 11:25:59 +03:00
bdew	da3e58b44b	Reworked cover system to store full itemstack of the cover (for stuff like filter covers to have a place to store data)	2014-06-01 16:53:51 +03:00
bdew	5bac374211	Added cover upgrades system	2014-06-01 15:07:54 +03:00
bdew	e41e203b7e	Added Misc.forgeDirection, Misc.asInstanceOpt, Misc.getNeighbourTile and ItemUtils.getAccessibleSlotsFromSide helpers	2014-06-01 15:07:33 +03:00
bdew	0b87dd83e7	Fixed tile entity names not being scoped, should prevent collisions	2014-05-29 11:24:24 +03:00
bdew	49a2f0baec	Fix NPE in getBiomeByName (bdew/gendustry#22 )	2014-05-13 02:15:57 +03:00
bdew	35be9bff77	Merge remote-tracking branch 'remotes/origin/master' into mc172	2014-05-04 15:48:48 +03:00
bdew	2a995f1c05	Added Misc.hasLocal	2014-05-04 15:40:04 +03:00
bdew	423351bfee	Added ItemUtils.copyWithRandomSize (inspired by forestry)	2014-05-04 15:39:47 +03:00
bdew	d67bd24eda	added IStackBlock for pattern matching with ItemBlocks	2014-04-30 11:18:39 +03:00
bdew	a10e90a1e1	Merge remote-tracking branch 'remotes/origin/master' into mc172	2014-04-30 11:16:57 +03:00
bdew	517c3f347f	Fixed build script	2014-04-30 09:33:43 +03:00
bdew	0831386798	Added hex numbers support in config parser (0x12345678)	2014-04-29 16:10:41 +03:00
bdew	0b45c61c51	ConfigSection.getColor now accepts numeric values, added Color.fromInt	2014-04-29 16:10:15 +03:00
bdew	65aa8a0f66	Use the right logger in LootListLoader, added a version of resolve to use outside config sections	2014-04-28 13:39:43 +03:00
bdew	446f2b6e60	Added loot list sections to recipe parser	2014-04-24 16:49:57 +03:00
bdew	ecdcdfb05f	Added /dumpregistry command	2014-04-23 15:11:07 +03:00
bdew	d1d3df184f	Don't register custom item stacks from Machine.regBlock - not needed anymore	2014-04-23 14:09:01 +03:00
bdew	522ac5b57b	Proper exception logging in RecipeLoader statements	2014-04-23 13:37:09 +03:00
bdew	7acca5475f	Added NamedItem trait (which SimpleItem extends now)	2014-04-23 13:36:42 +03:00
bdew	1b86f5f7cc	Merge remote-tracking branch 'remotes/origin/mc172' into mc172	2014-04-20 13:46:06 +03:00
bdew	819197cf1e	Block and Item Manager should not register itemstacks by default in 1.7 since the normal block/item registry is now usable	2014-04-20 13:44:42 +03:00
bdew	1e71bf7dd9	Fixed RecipeLoader logging error	2014-04-20 13:44:10 +03:00
bdew	0549f95088	Fix project name	2014-04-14 09:50:22 +03:00
bdew	06f0007bca	oops wrong version	2014-04-14 09:36:21 +03:00
bdew	54499cdb2e	Update to Forge 1057 (FG 1.2)	2014-04-13 15:25:20 +03:00
bdew	d80d89acf1	Merge remote-tracking branch 'remotes/origin/master' into mc172	2014-04-13 15:24:45 +03:00
bdew	926f006f68	Bumped version number	2014-04-02 17:52:23 +03:00
bdew	4697c96cf2	Added ItemUtils.findItemInInventory	2014-04-02 17:47:57 +03:00
bdew	8891cfff06	Added extractor (for scala pattern matching) for ItemStack	2014-03-19 11:28:34 +02:00
bdew	971fd94532	Cleanup	2014-03-18 12:01:34 +02:00
bdew	a9e1e88ff2	Added object for misc clientside functions	2014-03-18 12:01:25 +02:00
bdew	c9c014a3a9	Added misc method to find biome by name	2014-03-17 17:23:35 +02:00
bdew	3001309a85	Config parser/loader changes: IfOreDict can now contain only delayed statements and is a delayed statement itself (will be evaluated when loadDealayed is called) Also 2 new terms added at parser level - delayedStatement(s) - to separate lists that require delayed statements	2014-03-13 12:02:48 +02:00
bdew	07fbbb0267	Workaround for ItemInventory crashing on servers (scala synthetic methods not keeping annotations)	2014-03-09 12:21:53 +02:00
bdew	561f176682	Added workaround for bug in GuiContainer - not resetting color when rendering background icon	2014-03-04 16:32:59 +02:00
bdew	5f9c311f41	Fixed BaseScreen not drawing the background in correct position	2014-02-27 11:13:40 +02:00
bdew	78c5ec1362	Merge branch 'master' of github.com:bdew/bdlib into mc172	2014-02-27 10:06:58 +02:00
bdew	c2a1cc09e3	Widget.bindTexture is useless now	2014-02-27 09:43:01 +02:00
bdew	273735a976	Widget(Dyn)Label should use DrawTarget.drawText	2014-02-27 09:35:43 +02:00
bdew	26137a88d7	Added a separate method to Widget that draws the background layer	2014-02-27 09:33:26 +02:00
bdew	81a0d00a8b	Why did i make that a double? 0.o (closes #2 )	2014-02-27 09:31:19 +02:00
bdew	5d7c0cd5e8	GUI/texture refactoring	2014-02-26 17:48:53 +02:00
bdew	4e2df02b8a	added alpha component to Color	2014-02-24 20:52:38 +02:00
bdew	82e88157f2	Fixed drawTextureScaled and made the code more readable	2014-02-24 20:52:00 +02:00
bdew	7b588d896d	Added some color constants	2014-02-24 11:43:38 +02:00
bdew	938ea4f3d5	EntryNumList can be converted used as color	2014-02-24 11:34:29 +02:00
bdew	1541b96a5a	Added support for number lists in config	2014-02-24 11:28:08 +02:00
bdew	17329115a2	made ItemPreloader easier to use	2014-02-20 18:03:34 +02:00
bdew	3966305a61	Added IconPreloader	2014-02-20 12:35:58 +02:00
bdew	31573cc8fc	Allow negative numbers in config (derp!)	2014-02-17 17:54:34 +02:00
bdew	563ae0a328	Use main logger as the parent for RecipeLoader	2014-02-17 17:54:13 +02:00
bdew	13cef01a2d	Added helper classes for items that have and inventory and a gui	2014-02-17 12:26:20 +02:00
bdew	1296b32110	Added log object, fixed missing annotation, fixed copyright headers	2014-02-17 12:25:56 +02:00
bdew	005c300d8f	Added experimental network stuff	2014-02-12 17:03:34 +02:00
bdew	4754c209ae	oops, i an annotation	2014-02-12 14:19:24 +02:00
bdew	b89d445b17	Updated Recipe Loader for 1.7.2 changes	2014-02-12 14:18:57 +02:00
bdew	7eefbb1a31	Updated HasTE, BaseInventory and Block/Item Manager for 1.7.2 changes	2014-02-12 12:39:10 +02:00
bdew	4268019935	Initial port to MC 1.7.2	2014-02-10 14:28:05 +02:00
bdew	78a69acc44	Bumping version	2014-02-01 13:06:39 +02:00
bdew	e3bf80e1c9	Added WidgetDynLabel	2014-02-01 12:25:00 +02:00
bdew	f4f126fed2	Added WidgetContainer.drawTextureScaled	2014-02-01 12:24:36 +02:00
bdew	97b3e0ea1d	added WidgetMultipane	2014-01-26 02:17:18 +02:00
bdew	9f6e2d7533	WidgetContainer draw functions now take color	2014-01-26 02:17:04 +02:00
bdew	9819600b15	Fixed wrong mouse offset in handleTooltip	2014-01-23 17:49:36 +02:00
bdew	12a1327e53	Refactoring widget system to allow containers, added button widget	2014-01-23 17:40:03 +02:00
bdew	c495fb8b33	Fixed WidgetFluidGauge not respecting it's width	2014-01-21 17:21:50 +02:00
bdew	0b94b006ec	Fixed DataSlotTank not changing to empty state	2014-01-18 19:00:07 +02:00
bdew	c4dbda8a20	Added ConfigSection.hasValue to check if a value is present	2014-01-17 21:41:20 +02:00
bdew	2698d93444	Split BaseContainer into NoInvContainer for stuff that doesn't need the tile to be an inventory	2014-01-17 21:40:54 +02:00
bdew	b4cc77d3cc	Removed redundant size field on DataSlotTank, fixed div by 0 crash with the widget	2014-01-17 21:39:25 +02:00
bdew	2c94505c97	Added UpdateKind.RENDER - data slots with this flag will cause the block to be re-rendered on the client after it's synced from the server	2014-01-15 18:08:09 +02:00
bdew	2c3607e113	Fixed config parser not recognizing ifOreDict	2014-01-14 23:49:54 +02:00
bdew	b34192d8c2	Updated copyright header	2014-01-13 20:40:45 +02:00
bdew	0212f20f69	Bump version for release	2014-01-13 19:56:54 +02:00
bdew	3b31e285d2	Added a slot trait that intercepts clicks	2013-12-31 12:35:34 +02:00