Fixed nbsp characters in number formatting (again...)

Update fr_FR.lang

.gitignore

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

build.gradle

@@ -1,34 +1,50 @@
 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 = "1.2.0"
+file "build.properties" withReader {
+    def prop = new Properties()
+    prop.load(it)
+    ext.config = new ConfigSlurper().parse prop
+}
+
+if (project.hasProperty('forgeOverride')) {
+    config.forge.version = forgeOverride
+}
 
 if (project.hasProperty('buildnum')) {
-    project.version = project.version + '.' + project.buildnum
+    ext.simpleVersion = "${config.bdlib.version}.${project.buildnum}"
 } else {
-    project.version = "0-SNAPSHOT"
+    ext.simpleVersion = "${config.bdlib.version}-DEV"
 }
 
+version = simpleVersion + '-mc' + config.minecraft.version
+
 group = "net.bdew"
 archivesBaseName = "bdlib"
-ext.versuffix = "mc164"
 
 minecraft {
-    version = "1.6.4-9.11.1.964"
-    replace("BDLIB_VER", project.version)
+    version = "${config.minecraft.version}-${config.forge.version}"
+    replace("BDLIB_VER", simpleVersion.toString())
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -42,6 +58,7 @@ sourceSets {
         resources {
             srcDir 'resources'
         }
+        output.resourcesDir = output.classesDir // Hack for IDEA
     }
 }
 
@@ -58,15 +75,18 @@ processResources {
 }
 
 task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
+    classifier "sources"
 }
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
+    classifier "dev"
+    duplicatesStrategy "exclude"
 }
 
-jar {
-    appendix = project.versuffix
+afterEvaluate { project ->
+    // Fudge the inputs of source jars so we get the version after replacements
+    tasks.getByPath(":sourceJar").from(tasks.getByPath(":sourceMainScala").outputs.files)
 }
 
 artifacts {
@@ -80,10 +100,7 @@ publishing {
     publications {
         maven(MavenPublication) {
             artifact deobfJar
-
-            artifact sourceJar {
-                classifier "sources"
-            }
+            artifact sourceJar
         }
     }
     repositories {
@@ -91,4 +108,18 @@ publishing {
             url "file://var/www/maven"
         }
     }
+}
+
+apply plugin: 'curseforge'
+
+curse {
+    projectId = config.curseforge.id
+    apiKey = project.hasProperty("curseForgeApiKey") ? project.curseForgeApiKey : ""
+    releaseType = 'alpha'
+
+    artifact = jar
+    changelog = project.hasProperty("changelog") ? project.changelog : "No changelog available"
+
+    additionalArtifact deobfJar
+    additionalArtifact sourceJar
 }

build.properties

@@ -0,0 +1,5 @@
+bdlib.version=1.9.4
+curseforge.id=70496
+
+minecraft.version=1.7.10
+forge.version=10.13.4.1558-1.7.10

gradle/wrapper/gradle-wrapper.properties

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

resources/assets/bdlib/lang/cs_CZ.lang

@@ -0,0 +1,19 @@
+bdlib.multiblock.face.north=Sever
+bdlib.multiblock.face.south=Jih
+bdlib.multiblock.face.east=Západ
+bdlib.multiblock.face.west=Východ
+bdlib.multiblock.face.up=Vršek
+bdlib.multiblock.face.down=Spodek
+
+bdlib.multiblock.disabled=Zakázáno
+bdlib.multiblock.incomplete=Tento stroj není kompletní, ještě potřebuje alespoň:
+bdlib.multiblock.notconnected=Nepřipojeno ke správnému stroji
+bdlib.multiblock.toomanyoutputs=Připojeno příliš mnoho výstupů, nemohu získat nové připojení
+
+bdlib.rsmode.always=Vždy ZAPNUTO
+bdlib.rsmode.never=Zakázáno
+bdlib.rsmode.rs_on=Povoleno při ruditovém signálu
+bdlib.rsmode.rs_off=Zakázáno při ruditovém signálu
+
+bdlib.label.empty=Prázdný
+

resources/assets/bdlib/lang/en_US.lang

@@ -0,0 +1,30 @@
+bdlib.multiblock.face.north=North
+bdlib.multiblock.face.south=South
+bdlib.multiblock.face.east=East
+bdlib.multiblock.face.west=West
+bdlib.multiblock.face.up=Top
+bdlib.multiblock.face.down=Bottom
+
+bdlib.multiblock.disabled=Disabled
+bdlib.multiblock.incomplete=This machine is incomplete, it requires at least:
+bdlib.multiblock.notconnected=Not connected to a valid machine
+bdlib.multiblock.toomanyoutputs=Too many outputs connected, unable to attach new connection
+bdlib.multiblock.tip.module=Can be installed in:
+bdlib.multiblock.tip.controller=Possible modules:
+bdlib.multiblock.tip.module.range= * %s (%s - %s)
+bdlib.multiblock.tip.module.max= * %s (up to %s)
+
+bdlib.rsmode.always=Always ON
+bdlib.rsmode.never=Disabled
+bdlib.rsmode.rs_on=Enable on redstone
+bdlib.rsmode.rs_off=Disable on redstone
+
+bdlib.label.empty=Empty
+
+bdlib.oredistribution.usage=/oredistribution <radius> [<min height>] [<max height>] [--file]
+bdlib.oredistribution.start1=Checking ore distribution in (%s,%s,%s) to (%s,%s,%s) dim %s
+bdlib.oredistribution.start2=Server may lag for a while
+bdlib.oredistribution.entry=%s %s - %s (%s%%)
+bdlib.oredistribution.warn=%s Warning: %s has multiple variants generated:
+bdlib.oredistribution.saved=Ore distribution dumped to %s
+bdlib.oredistribution.error=Failed to save ore distribution dump: %s

resources/assets/bdlib/lang/fr_CA.lang

@@ -0,0 +1,18 @@
+bdlib.multiblock.face.north=Nord
+bdlib.multiblock.face.south=Sud
+bdlib.multiblock.face.east=Est
+bdlib.multiblock.face.west=Ouest
+bdlib.multiblock.face.up=Haut
+bdlib.multiblock.face.down=Bas
+
+bdlib.multiblock.disabled=Désactivé(e)
+bdlib.multiblock.incomplete=Cette machine est incomplète, elle requiert au moins :
+bdlib.multiblock.notconnected=Pas connecté(e) à une machine valide
+bdlib.multiblock.toomanyoutputs=Trop de sorties connectées, incapable d'attacher de nouvelles connexions
+
+bdlib.rsmode.always=Toujours en marche
+bdlib.rsmode.never=Désactivé(e)
+bdlib.rsmode.rs_on=Activer par la redstone
+bdlib.rsmode.rs_off=Désactiver par la redstone
+
+bdlib.label.empty=Vide

resources/assets/bdlib/lang/fr_FR.lang

@@ -0,0 +1,30 @@
+bdlib.multiblock.face.north=Nord
+bdlib.multiblock.face.south=Sud
+bdlib.multiblock.face.east=Est
+bdlib.multiblock.face.west=Ouest
+bdlib.multiblock.face.up=Dessus
+bdlib.multiblock.face.down=Dessous
+
+bdlib.multiblock.disabled=Désactivé
+bdlib.multiblock.incomplete=Cette machine est incomplète, elle exige au moins :
+bdlib.multiblock.notconnected=Pas connecté à une machine valide
+bdlib.multiblock.toomanyoutputs=Trop de sorties connectées, impossible d'ajouter une nouvelle connexion
+bdlib.multiblock.tip.module=Peut être installé dans :
+bdlib.multiblock.tip.controller=Modules possibles:
+bdlib.multiblock.tip.module.range= * %s (%s - %s)
+bdlib.multiblock.tip.module.max= * %s (plus de %s)
+
+bdlib.rsmode.always=Toujours actif
+bdlib.rsmode.never=Désactivé
+bdlib.rsmode.rs_on=Activé par redstone
+bdlib.rsmode.rs_off=Désactivé par redstone
+
+bdlib.label.empty=Vide
+
+bdlib.oredistribution.usage=/oredistribution <rayon> [<hauteur mini>] [<hauteur maxi>] [--file]
+bdlib.oredistribution.start1=Valide la distribution de minerai entre (%s,%s,%s) et (%s,%s,%s) dim %s
+bdlib.oredistribution.start2=Le server peut ralentir pendantun certain temps
+bdlib.oredistribution.entry=%s %s - %s (%s%%)
+bdlib.oredistribution.warn=%s Attention: %s fait produire des variantes multiples :
+bdlib.oredistribution.saved=Distribution de minerai déposée dans %s
+bdlib.oredistribution.error=Impossible d'enregistrer la distribution de minerai : %s

resources/assets/bdlib/lang/it_IT.lang

@@ -0,0 +1,18 @@
+bdlib.multiblock.face.north=Nord
+bdlib.multiblock.face.south=Sud
+bdlib.multiblock.face.east=Est
+bdlib.multiblock.face.west=Ovest
+bdlib.multiblock.face.up=Sopra
+bdlib.multiblock.face.down=Sotto
+
+bdlib.multiblock.disabled=Disattivo
+bdlib.multiblock.incomplete=Questa macchina è incompleta, richiede almeno:
+bdlib.multiblock.notconnected=Non connesso ad una macchina valida
+bdlib.multiblock.toomanyoutputs=Troppi Output collegati,impossibile inserire una nuova connessione
+
+bdlib.rsmode.always=Sempre Attivo
+bdlib.rsmode.never=Disattivo
+bdlib.rsmode.rs_on=Attivo su Impulso di Pietrarossa
+bdlib.rsmode.rs_off=Disattivo su Impulso di Pietrarossa
+
+bdlib.label.empty=Vuoto

resources/assets/bdlib/lang/ru_RU.lang

@@ -0,0 +1,18 @@
+bdlib.multiblock.face.north=Север
+bdlib.multiblock.face.south=Юг
+bdlib.multiblock.face.east=Восток
+bdlib.multiblock.face.west=Запад
+bdlib.multiblock.face.up=Верх
+bdlib.multiblock.face.down=Низ
+
+bdlib.multiblock.disabled=Отключено
+bdlib.multiblock.incomplete=Этот механизм не завершён, ему требуется как минимум:
+bdlib.multiblock.notconnected=Не подключено к верному механизму
+bdlib.multiblock.toomanyoutputs=Слишком много выходов подсоединено, нельзя установить новое соединение
+
+bdlib.rsmode.always=Всегда ВКЛ.
+bdlib.rsmode.never=Отключен
+bdlib.rsmode.rs_on=Включение по сигналу красного камня
+bdlib.rsmode.rs_off=Отключение по сигналу красного камня
+
+bdlib.label.empty=Пусто

resources/assets/bdlib/lang/zh_CN.lang

@@ -0,0 +1,18 @@
+bdlib.multiblock.face.north=北方
+bdlib.multiblock.face.south=南方
+bdlib.multiblock.face.east=东方
+bdlib.multiblock.face.west=西方
+bdlib.multiblock.face.up=顶部
+bdlib.multiblock.face.down=底部
+
+bdlib.multiblock.disabled=停用
+bdlib.multiblock.incomplete=这台多方块结构机器未搭建完成, 它至少需要安装一个:
+bdlib.multiblock.notconnected=未连接有效机器
+bdlib.multiblock.toomanyoutputs=连接的输出接口过多, 无法连接新的接口
+
+bdlib.rsmode.always=一直启用
+bdlib.rsmode.never=一直停用
+bdlib.rsmode.rs_on=接收到红石信号时启用
+bdlib.rsmode.rs_off=接收到红石信号时停用
+
+bdlib.label.empty=空

settings.gradle

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

src/net/bdew/lib/ApiReporter.scala

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib
+
+import java.util
+import java.util.Locale
+
+import cpw.mods.fml.common.{ICrashCallable, ModAPIManager, ModContainer}
+
+import scala.collection.JavaConversions._
+
+object ApiReporter extends ICrashCallable {
+  lazy val APIs = {
+    val mods = new util.ArrayList[ModContainer]
+    val nameLookup = new util.HashMap[String, ModContainer]
+    ModAPIManager.INSTANCE.injectAPIModContainers(mods, nameLookup)
+    (for (mod <- mods.sortBy(_.getModId.toLowerCase(Locale.US))) yield
+      "\t\t* %s (%s) from %s".format(mod.getModId, mod.getVersion,
+        if (mod.getSource.isDirectory)
+          mod.getSource
+        else
+          mod.getSource.getName
+      )).mkString(Misc.lineSeparator)
+  }
+  override def getLabel = "List of loaded APIs"
+  override def call() = Misc.lineSeparator + APIs
+}

src/net/bdew/lib/BdLib.scala

@@ -4,27 +4,55 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib
 
-import cpw.mods.fml.common.Mod
-import cpw.mods.fml.common.event.FMLPreInitializationEvent
-import java.util.logging.Logger
 import cpw.mods.fml.common.Mod.EventHandler
+import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent, FMLServerStoppingEvent}
+import cpw.mods.fml.common.{FMLCommonHandler, Mod}
+import net.bdew.lib.multiblock.network.NetHandler
+import net.bdew.lib.tooltip.TooltipHandler
+import net.minecraft.command.CommandHandler
+import org.apache.logging.log4j.Logger
 
 @Mod(modid = "bdlib", name = "BD lib", version = "BDLIB_VER", modLanguage = "scala")
 object BdLib {
   var log: Logger = null
 
+  def logDebug(msg: String, args: Any*) = log.debug(msg.format(args: _*))
   def logInfo(msg: String, args: Any*) = log.info(msg.format(args: _*))
-  def logWarn(msg: String, args: Any*) = log.warning(msg.format(args: _*))
-  def logError(msg: String, args: Any*) = log.severe(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)
+
+  val onServerStarting = Event[FMLServerStartingEvent]
+  val onServerStopping = Event[FMLServerStoppingEvent]
 
   @EventHandler
   def preInit(ev: FMLPreInitializationEvent) {
     log = ev.getModLog
     log.info("bdlib BDLIB_VER loaded")
+    log.debug("List of loaded APIs: " + ApiReporter.APIs)
+    FMLCommonHandler.instance().registerCrashCallable(ApiReporter)
+    NetHandler.init()
+    if (ev.getSide.isClient) {
+      TooltipHandler.init()
+    }
+  }
+
+  @EventHandler
+  def serverStarting(event: FMLServerStartingEvent) {
+    val commandHandler = event.getServer.getCommandManager.asInstanceOf[CommandHandler]
+    commandHandler.registerCommand(CommandDumpRegistry)
+    commandHandler.registerCommand(CommandOreDistribution)
+    onServerStarting.trigger(event)
+  }
+
+  @EventHandler
+  def serverStopping(event: FMLServerStoppingEvent) {
+    onServerStopping.trigger(event)
   }
 }

src/net/bdew/lib/Client.scala

@@ -4,23 +4,28 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib
 
-import org.lwjgl.input.Keyboard
 import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.texture.TextureMap
+import org.lwjgl.input.Keyboard
 
 /**
- * Misc functions and shortcuts for clientside code
+ * Misc functions and shortcuts for client-side code
  */
 object Client {
   def minecraft = Minecraft.getMinecraft
-  def fontRenederer = Minecraft.getMinecraft.fontRenderer
+  def fontRenderer = Minecraft.getMinecraft.fontRenderer
   def renderEngine = Minecraft.getMinecraft.renderEngine
   def world = Minecraft.getMinecraft.theWorld
   def player = Minecraft.getMinecraft.thePlayer
+  def textureManager = Minecraft.getMinecraft.getTextureManager
+
+  def blockMissingIcon = textureManager.getTexture(TextureMap.locationBlocksTexture).asInstanceOf[TextureMap].getAtlasSprite("missingno")
+  def itemMissingIcon = textureManager.getTexture(TextureMap.locationItemsTexture).asInstanceOf[TextureMap].getAtlasSprite("missingno")
 
   def shiftDown: Boolean = {
     return Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)

src/net/bdew/lib/CommandDumpRegistry.scala

@@ -0,0 +1,70 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib
+
+import java.io.{BufferedWriter, File, FileWriter}
+
+import com.google.common.collect.Table
+import cpw.mods.fml.common.registry.GameData
+import cpw.mods.fml.relauncher.FMLInjectionData
+import net.minecraft.command.{CommandBase, ICommandSender}
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fluids.FluidRegistry
+import net.minecraftforge.oredict.OreDictionary
+
+object CommandDumpRegistry extends CommandBase {
+  def getCommandName = "dumpregistry"
+  override def getRequiredPermissionLevel = 2
+  def getCommandUsage(c: 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 flatMap { name =>
+        List(name) ++
+          (OreDictionary.getOres(name) map { ore =>
+            " - " + ore.toString
+          })
+      }).mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      dumpWriter.write("==== FLUIDS ====\n")
+      dumpWriter.write(FluidRegistry.getRegisteredFluids.map(_._1).toList.sorted.mkString("\n"))
+      dumpWriter.write("\n\n")
+
+      CommandBase.func_152373_a(sender, this, "Registry dumped to " + dumpFile.getCanonicalPath)
+    } catch {
+      case e: Throwable =>
+        CommandBase.func_152373_a(sender, this, "Failed to save registry dump: " + e)
+        BdLib.logErrorException("Failed to save registry dump", e)
+    } finally {
+      dumpWriter.close()
+    }
+  }
+}

src/net/bdew/lib/CommandOreDistribution.scala

@@ -0,0 +1,148 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib
+
+import java.io.{BufferedWriter, File, FileWriter}
+
+import cpw.mods.fml.common.registry.GameData
+import cpw.mods.fml.relauncher.FMLInjectionData
+import net.minecraft.command.{CommandBase, ICommandSender, WrongUsageException}
+import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraft.item.Item
+import net.minecraft.util.EnumChatFormatting
+import net.minecraftforge.oredict.OreDictionary
+
+import scala.collection.mutable
+
+object CommandOreDistribution extends CommandBase {
+  def getCommandName = "oredistribution"
+  override def getRequiredPermissionLevel = 2
+  def getCommandUsage(c: ICommandSender) = "bdlib.oredistribution.usage"
+
+  def safeInt(s: String) =
+    try {
+      s.toInt
+    } catch {
+      case e: NumberFormatException => throw new WrongUsageException("bdlib.oredistribution.usage")
+    }
+
+  def wrapColor(s: String, c: EnumChatFormatting) = c + s + EnumChatFormatting.RESET
+
+  def processCommand(sender: ICommandSender, baseParams: Array[String]) {
+    val (flags, params) = baseParams.partition(_.startsWith("--"))
+
+    if (params.length < 1 || params.length > 3)
+      throw new WrongUsageException(getCommandUsage(sender))
+
+    val (startX, startZ, world) =
+      sender match {
+        case p: EntityPlayerMP => (p.posX.toInt, p.posZ.toInt, p.worldObj)
+        case _ => (0, 0, sender.getEntityWorld)
+      }
+
+    val radius = safeInt(params.head)
+    val minY = if (params.length >= 2) safeInt(params(1)) else 0
+    val maxY = if (params.length >= 3) safeInt(params(2)) else world.getHeight - 1
+
+    if (minY < 0 || radius <= 0 || minY > maxY || maxY > world.getHeight - 1)
+      throw new WrongUsageException(getCommandUsage(sender))
+
+    val toFile = flags.contains("--file")
+
+    // why java, WHY?
+    CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.start1",
+      Array[Integer](startX - radius, minY, startZ - radius, startX + radius, maxY, startZ + radius, world.provider.dimensionId): _*)
+
+    CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.start2")
+
+    import scala.collection.JavaConversions._
+
+    val ores = (OreDictionary.getOreNames.filter(x => x.startsWith("ore") || x.startsWith("denseore")) flatMap { name =>
+      val fixedName =
+        if (name.startsWith("ore"))
+          name.substring(3)
+        else if (name.startsWith("denseore"))
+          "Dense " + name.substring(8)
+        else name
+      for (s <- OreDictionary.getOres(name)) yield (s.getItem, s.getItemDamage) -> fixedName
+    }).toMap
+
+    val distribution = mutable.Map.empty[String, Int].withDefaultValue(0)
+    val kinds = mutable.Map.empty[String, Set[(Item, Int)]].withDefaultValue(Set.empty)
+
+    for {
+      x <- startX - radius to startX + radius
+      y <- minY to maxY
+      z <- startZ - radius to startZ + radius
+      if !world.isAirBlock(x, y, z)
+    } {
+      val key = (Item.getItemFromBlock(world.getBlock(x, y, z)), world.getBlockMetadata(x, y, z))
+      for (ore <- ores.get(key)) {
+        distribution(ore) += 1
+        kinds(ore) += key
+      }
+    }
+
+    val total = distribution.values.sum
+    val warnings = kinds.filter(_._2.size > 1)
+
+    if (toFile) {
+      // === OUTPUT TO FILE ===
+      val mcHome = FMLInjectionData.data()(6).asInstanceOf[File] //is there a better way to get this?
+      val dumpFile = new File(mcHome, "ore_distribution.txt")
+      val dumpWriter = new BufferedWriter(new FileWriter(dumpFile))
+      try {
+        dumpWriter.write("Ore distribution report - (%d,%d,%d) to (%d,%d,%d) dim %d".format(
+          startX - radius, minY, startZ - radius, startX + radius, maxY, startZ + radius, world.provider.dimensionId
+        ))
+        dumpWriter.newLine()
+        dumpWriter.newLine()
+        if (warnings.nonEmpty) {
+          for ((id, types) <- warnings.toList.sortBy(_._1)) {
+            dumpWriter.write("Warning: %s has multiple variants generated:".format(id))
+            dumpWriter.newLine()
+            for ((item, dmg) <- types) {
+              dumpWriter.write(" - %s@%s".format(GameData.getItemRegistry.getNameForObject(item), dmg))
+              dumpWriter.newLine()
+            }
+            dumpWriter.newLine()
+          }
+          dumpWriter.write("=================")
+          dumpWriter.newLine()
+          dumpWriter.newLine()
+        }
+        for ((id, num) <- distribution.filter(_._2 > 0).toList.sortBy(-_._2)) {
+          dumpWriter.write("%s - %s (%s%%)".format(id, DecFormat.round(num), DecFormat.short(100F * num / total)))
+          dumpWriter.newLine()
+        }
+        CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.saved", dumpFile.getCanonicalPath)
+      } catch {
+        case e: Throwable =>
+          CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.error", e.toString)
+          BdLib.logErrorException("Failed to save ore distribution dump", e)
+      } finally {
+        dumpWriter.close()
+      }
+    } else {
+      // === OUTPUT TO CHAT ===
+      for ((id, types) <- warnings.toList.sortBy(_._1)) {
+        CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.warn",
+          wrapColor(" !", EnumChatFormatting.RED), wrapColor(id, EnumChatFormatting.RED))
+        for ((item, dmg) <- types)
+          CommandBase.func_152373_a(sender, this, wrapColor(" - ", EnumChatFormatting.RED) + GameData.getItemRegistry.getNameForObject(item) + "@" + dmg)
+      }
+      for ((id, num) <- distribution.filter(_._2 > 0).toList.sortBy(-_._2)) {
+        CommandBase.func_152373_a(sender, this, "bdlib.oredistribution.entry",
+          " *", wrapColor(id, EnumChatFormatting.YELLOW),
+          DecFormat.round(num), DecFormat.short(100F * num / total))
+      }
+    }
+  }
+}

src/net/bdew/lib/CreativeTabContainer.scala

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

src/net/bdew/lib/DecFormat.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib
+
+import java.text.DecimalFormat
+
+object DecFormat {
+  val thousandsFmt = new DecimalFormat("#,##0")
+  val dec2Fmt = new DecimalFormat("#,##0.00")
+  val dec1Fmt = new DecimalFormat("#,##0.0")
+
+  def round(x: Double) = thousandsFmt.format(x).replace('\u00A0', ' ')
+  def round(x: Float) = thousandsFmt.format(x).replace('\u00A0', ' ')
+  def round(x: Int) = thousandsFmt.format(x).replace('\u00A0', ' ')
+
+  def dec2(x: Double) = dec2Fmt.format(x).replace('\u00A0', ' ')
+  def dec2(x: Float) = dec2Fmt.format(x).replace('\u00A0', ' ')
+  def dec2(x: Int) = dec2Fmt.format(x).replace('\u00A0', ' ')
+
+  def short(x: Double) = (if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)).replace('\u00A0', ' ')
+  def short(x: Float) = (if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)).replace('\u00A0', ' ')
+  def short(x: Int) = (if (x > 10) thousandsFmt.format(x) else if (x > 1) dec1Fmt.format(x) else dec2Fmt.format(x)).replace('\u00A0', ' ')
+}

src/net/bdew/lib/Event.scala

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib
@@ -12,7 +12,7 @@ package net.bdew.lib
 class EventBase[T] extends {
   var listeners = Seq.empty[T]
   def listen(x: T) = listeners :+= x
-  def hasListeners = listeners.size > 0
+  def hasListeners = listeners.nonEmpty
 }
 
 class Event0 extends EventBase[() => Unit] {
@@ -28,7 +28,7 @@ class Event2[T, R] extends EventBase[(T, R) => Unit] {
 }
 
 object Event {
-  def apply(t: Unit) = new Event0
+  def apply() = new Event0
   def apply[T] = new Event1[T]
   def apply[T, R] = new Event2[T, R]
 }

src/net/bdew/lib/Misc.scala

@@ -4,38 +4,42 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib
 
+import java.util
+import java.util.Locale
+
 import cpw.mods.fml.common.registry.GameRegistry
-import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
-import net.minecraft.util.StatCollector
+import cpw.mods.fml.common.versioning.VersionParser
+import cpw.mods.fml.common.{Loader, ModAPIManager, ModContainer}
 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.nbt.NBTTagCompound
+import net.minecraft.tileentity.TileEntity
+import net.minecraft.util.{IIcon, StatCollector}
 import net.minecraft.world.biome.BiomeGenBase
+import net.minecraftforge.common.util.ForgeDirection
+import net.minecraftforge.fluids.{Fluid, FluidStack}
+import net.minecraftforge.oredict.ShapedOreRecipe
 
 object Misc {
-  def iterNbtList[X](list: NBTTagList) =
-    for (i <- 0 until list.tagCount()) yield list.tagAt(i).asInstanceOf[X]
-
-  def getActiveModId = Loader.instance().activeModContainer().getModId
+  def getActiveModId = Option(Loader.instance().activeModContainer().getModId) getOrElse "<UNKNOWN>"
 
   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 {
+    pattern ++ items.flatMap {
       case (k, v) => Seq(new Character(k), v)
-    }.flatten
+    }
 
   def wrapTag(n: String, f: (NBTTagCompound) => Any)(t: NBTTagCompound) {
     val p = t.getCompoundTag(n)
     f(p)
-    t.setCompoundTag(n, p)
+    t.setTag(n, p)
   }
 
   def addRecipe(result: ItemStack, pattern: Seq[String], items: Map[Char, AnyRef]) =
@@ -44,8 +48,8 @@ object Misc {
   def addRecipeOD(result: ItemStack, pattern: Seq[String], items: Map[Char, AnyRef]) =
     GameRegistry.addRecipe(new ShapedOreRecipe(result, flattenRecipe(pattern, items): _*))
 
-  def min[T](vals: T*)(implicit o: Ordering[T]): T = vals.min(o)
-  def max[T](vals: T*)(implicit o: Ordering[T]): T = vals.max(o)
+  def min[T: Ordering](values: T*) = values.min
+  def max[T: Ordering](values: T*) = values.max
 
   def clamp[T](value: T, min: T, max: T)(implicit o: Ordering[T]): T = if (o.gt(value, max)) max else if (o.lt(value, min)) min else value
 
@@ -54,18 +58,118 @@ object Misc {
 
   def filterType[T](from: Iterable[_], cls: Class[T]) = from.filter(cls.isInstance).asInstanceOf[Iterable[T]]
 
-  def getBiomeByName(name: String) = BiomeGenBase.biomeList.find(_.biomeName == name).getOrElse(null)
+  def getBiomeByName(name: String) = BiomeGenBase.getBiomeGenArray.find(x => x != null && x.biomeName == name).orNull
 
-  def haveModVersion(spec: String): Boolean = {
-    val req = VersionParser.parseVersionReference(spec)
-    val modid = req.getLabel
+  private lazy val modLookup = {
+    val mods = new util.ArrayList[ModContainer]
+    val nameLookup = new util.HashMap[String, ModContainer]
 
-    if (!Loader.instance.getIndexedModList.containsKey(modid)) return false
+    nameLookup.putAll(Loader.instance().getIndexedModList)
+    ModAPIManager.INSTANCE.injectAPIModContainers(mods, nameLookup)
 
-    val found: ArtifactVersion = Loader.instance.getIndexedModList.get(modid).getProcessedVersion
-
-    if (found == null || !req.containsVersion(found)) return false
-
-    return true
+    import scala.collection.JavaConverters._
+    nameLookup.asScala
   }
+
+  def haveModVersion(modId: String) = {
+    val spec = VersionParser.parseVersionReference(modId)
+    modLookup.contains(spec.getLabel) && spec.containsVersion(modLookup(spec.getLabel).getProcessedVersion)
+  }
+
+  def getModVersion(modId: String) =
+    modLookup.get(modId) map (_.getVersion)
+
+  def getModVersionString(modId: String): String = {
+    val cont = modLookup.getOrElse(modId, return "NOT FOUND")
+    cont.getModId + " " + cont.getVersion
+  }
+
+  // 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
+
+  // Same thing but in a way that's easier to use with map, etc.
+  def asInstanceOpt[T](cls: Class[T])(v: Any) =
+    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))
+
+  @inline def applyMutator[T](f: (T) => Unit, init: T): T = {
+    f(init)
+    init
+  }
+
+  @inline def applyMutator[T](init: T)(f: (T) => Unit) = {
+    f(init)
+    init
+  }
+
+  def nextInSeq[T](seq: Seq[T], elem: T) = {
+    val pos = seq.indexOf(elem)
+    if (pos < 0 || pos == seq.size - 1)
+      seq.head
+    else
+      seq(pos + 1)
+  }
+
+  def prevInSeq[T](seq: Seq[T], elem: T) = {
+    val pos = seq.indexOf(elem)
+    if (pos <= 0)
+      seq.last
+    else
+      seq(pos - 1)
+  }
+
+  def getFluidIcon(fs: FluidStack): IIcon =
+    if (fs != null && fs.getFluid != null && fs.getFluid.getIcon != null)
+      fs.getFluid.getIcon(fs)
+    else
+      Client.blockMissingIcon
+
+  def getFluidIcon(f: Fluid): IIcon =
+    if (f != null) getFluidIcon(new FluidStack(f, 1)) else Client.blockMissingIcon
+
+  def getFluidColor(fs: FluidStack): Int =
+    if (fs != null && fs.getFluid != null) fs.getFluid.getColor(fs) else 0xFFFFFF
+
+  def getFluidColor(f: Fluid): Int =
+    if (f != null) getFluidColor(new FluidStack(f, 1)) else 0xFFFFFF
+
+  lazy val lineSeparator = System.getProperty("line.separator")
+
+  /**
+   * Provides something like java try-with-resources in scala
+   */
+  def withAutoClose[T <: AutoCloseable, R](o: T)(f: T => R): R = {
+    val res = try {
+      f(o)
+    } catch {
+      case t1: Throwable =>
+        if (o != null) {
+          try {
+            o.close()
+          } catch {
+            case t2: Throwable =>
+              t1.addSuppressed(t2)
+          }
+        }
+        throw t1
+    }
+    if (o != null)
+      o.close()
+    res
+  }
+
+  def iconName(domain: String, name: String, path: String*) =
+    if (path.isEmpty)
+      "%s:%s".format(domain, name).toLowerCase(Locale.US)
+    else
+      "%s:%s/%s".format(domain, name, path.mkString("/")).toLowerCase(Locale.US)
+
 }
+

src/net/bdew/lib/async/Async.scala

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.async
+
+import scala.concurrent.{Future, Promise}
+
+object Async {
+  def inOtherThread[T](f: => T) = {
+    val p = Promise[T]()
+    val t = new Thread(new Runnable {
+      override def run(): Unit =
+        try {
+          p.success(f)
+        } catch {
+          case t: Throwable => p.failure(t)
+        }
+    })
+    t.start()
+    p.future
+  }
+
+  def inServerThread[T](f: => T) = Future(f)(ServerTickExecutionContext)
+}

src/net/bdew/lib/async/ServerTickExecutionContext.scala

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.async
+
+import cpw.mods.fml.common.FMLCommonHandler
+import cpw.mods.fml.common.eventhandler.SubscribeEvent
+import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent
+import net.bdew.lib.BdLib
+
+import scala.collection.mutable
+import scala.concurrent.ExecutionContext
+
+object ServerTickExecutionContext extends ExecutionContext {
+  private val queue = mutable.Queue.empty[Runnable]
+
+  FMLCommonHandler.instance.bus.register(this)
+
+  BdLib.logDebug("Installed ServerTickExecutionContext")
+
+  private def getNextBatch = this.synchronized {
+    if (queue.nonEmpty) {
+      val res = queue.toList
+      queue.clear()
+      res
+    } else List.empty
+  }
+
+  override def execute(runnable: Runnable): Unit =
+    this.synchronized {
+      queue += runnable
+    }
+
+  override def reportFailure(cause: Throwable): Unit =
+    BdLib.logErrorException("Error in execution context", cause)
+
+  def doSingleLoop(): Unit = {
+    for (r <- getNextBatch) {
+      try {
+        r.run()
+      } catch {
+        case t: Throwable => reportFailure(t)
+      }
+    }
+  }
+
+  @SubscribeEvent
+  def onTick(ev: ServerTickEvent): Unit = doSingleLoop()
+}

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

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

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

@@ -0,0 +1,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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.block
+
+import net.minecraft.block.Block
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.tileentity.TileEntity
+import net.minecraft.world.IBlockAccess
+import net.minecraftforge.common.util.ForgeDirection
+
+import scala.reflect.ClassTag
+
+case class BlockRef(x: Int, y: Int, z: Int) {
+  def isValid(w: IBlockAccess) = y >= 0 && y < 256 // hardcoded because getHeight is unavailable on servers :(
+
+  def block(w: IBlockAccess) = if (isValid(w)) Option(w.getBlock(x, y, z)) else None
+  def tile(w: IBlockAccess) = if (isValid(w)) Option(w.getTileEntity(x, y, z)) else None
+  def meta(w: IBlockAccess) = if (isValid(w)) w.getBlockMetadata(x, y, z) else 0
+
+  def blockIs(w: IBlockAccess, other: Block) = block(w).contains(other)
+
+  def neighbour(side: ForgeDirection) = BlockRef(x + side.offsetX, y + side.offsetY, z + side.offsetZ)
+  def neighbours = ForgeDirection.VALID_DIRECTIONS.map(x => x -> neighbour(x)).toMap
+
+  override def toString = "(x=%d y=%d z=%d)".format(x, y, z)
+
+  def getTile[T: ClassTag](w: IBlockAccess) = tile(w) flatMap { tile =>
+    val cls = implicitly[ClassTag[T]].runtimeClass
+    if (cls.isInstance(tile))
+      Some(tile.asInstanceOf[T])
+    else None
+  }
+
+  def ==(tx: Int, ty: Int, tz: Int) = x == tx && y == ty && z == tz
+
+  def getBlock[T: ClassTag](w: IBlockAccess) = block(w) flatMap { block =>
+    val cls = implicitly[ClassTag[T]].runtimeClass
+    if (cls.isInstance(block))
+      Some(block.asInstanceOf[T])
+    else None
+  }
+
+  def writeToNBT(tag: NBTTagCompound) {
+    tag.setInteger("x", x)
+    tag.setInteger("y", y)
+    tag.setInteger("z", z)
+  }
+}
+
+object BlockRef {
+  def fromTile(te: TileEntity) = BlockRef(te.xCoord, te.yCoord, te.zCoord)
+  def fromNBT(tag: NBTTagCompound) =
+    BlockRef(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"))
+}

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.block
+
+import net.minecraft.block.Block
+import net.minecraft.item.ItemBlock
+
+/**
+ * If defined on a block - defines a custom ItemBlock class that will be used when registering
+ * Supported by BlockManager and Machine
+ */
+trait HasItemBlock extends Block {
+  def ItemBlockClass: Class[_ <: ItemBlock]
+}

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

@@ -4,27 +4,31 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.block
 
-import net.minecraft.block.{ITileEntityProvider, Block}
-import net.minecraft.world.{IBlockAccess, World}
+import net.bdew.lib.BdLib
+import net.minecraft.block.{Block, ITileEntityProvider}
 import net.minecraft.tileentity.TileEntity
-import cpw.mods.fml.common.FMLCommonHandler
+import net.minecraft.world.{IBlockAccess, World}
 
 trait HasTE[T] extends Block with ITileEntityProvider {
   val TEClass: Class[_ <: TileEntity]
-  def createNewTileEntity(world: World): TileEntity = TEClass.newInstance()
+
+  def createNewTileEntity(world: World, meta: Int): TileEntity = TEClass.newInstance()
+
+  def getTE(w: IBlockAccess, ref: BlockRef): T = getTE(w, ref.x, ref.y, ref.z)
+
   def getTE(w: IBlockAccess, x: Int, y: Int, z: Int): T = {
-    var t = w.getBlockTileEntity(x, y, z)
+    var t = w.getTileEntity(x, y, z)
     if ((t == null) || !TEClass.isInstance(t)) {
-      FMLCommonHandler.instance().getFMLLogger.severe("Tile entity for block %s at (%d,%d,%d) is corrupt or missing - recreating".format(this, x, y, z))
+      BdLib.logError("Tile entity for block %s at (%d,%d,%d) is corrupt or missing - recreating", this, x, y, z)
       w match {
         case ww: World =>
-          t = createNewTileEntity(ww)
-          ww.setBlockTileEntity(x, y, z, t)
+          t = createNewTileEntity(ww, w.getBlockMetadata(x, y, z))
+          ww.setTileEntity(x, y, z, t)
         case _ =>
           sys.error("Unable to recreate TE")
       }

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.block
+
+import java.util
+
+import net.minecraft.block.Block
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.{ItemBlock, ItemStack}
+
+trait BlockTooltip extends Block with HasItemBlock {
+  override val ItemBlockClass: Class[_ <: ItemBlock] = classOf[ItemBlockTooltip]
+  def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String]
+}
+
+class ItemBlockTooltip(b: Block) extends ItemBlock(b) {
+  override def addInformation(stack: ItemStack, player: EntityPlayer, list: util.List[_], advanced: Boolean): Unit = {
+    import scala.collection.JavaConversions._
+    if (b.isInstanceOf[BlockTooltip])
+      list.asInstanceOf[util.List[String]].addAll(b.asInstanceOf[BlockTooltip].getTooltip(stack, player, advanced))
+  }
+}

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

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.block
+
+import java.util
+
+import net.bdew.lib.nbt.NBT
+import net.bdew.lib.tile.TileExtended
+import net.minecraft.block.Block
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.util.MovingObjectPosition
+import net.minecraft.world.World
+
+/**
+ * Mixin for blocks to keep their data when broken
+ * Must have a TileEntity that extends TileKeepData
+ */
+trait BlockKeepData extends Block with HasItemBlock {
+  this: HasTE[_ <: TileKeepData] =>
+
+  override val ItemBlockClass: Class[_ <: ItemBlockKeepData] = classOf[ItemBlockKeepData]
+
+  def getSavedBlock(world: World, x: Int, y: Int, z: Int, metadata: Int) = {
+    val stack = new ItemStack(getItemDropped(metadata, world.rand, 0), 1, damageDropped(metadata))
+    getTE(world, x, y, z).saveToItem(stack)
+    stack
+  }
+
+  override def getDrops(world: World, x: Int, y: Int, z: Int, metadata: Int, fortune: Int): util.ArrayList[ItemStack] = {
+    val drops = new util.ArrayList[ItemStack]()
+    drops.add(getSavedBlock(world, x, y, z, metadata))
+    drops
+  }
+
+  override def removedByPlayer(world: World, player: EntityPlayer, x: Int, y: Int, z: Int, willHarvest: Boolean): Boolean =
+    if (willHarvest)
+      true
+    else
+      super.removedByPlayer(world, player, x, y, z, willHarvest)
+
+  override def harvestBlock(world: World, player: EntityPlayer, x: Int, y: Int, z: Int, meta: Int): Unit = {
+    super.harvestBlock(world, player, x, y, z, meta)
+    world.setBlockToAir(x, y, z)
+  }
+
+  override def getPickBlock(target: MovingObjectPosition, world: World, x: Int, y: Int, z: Int, player: EntityPlayer): ItemStack = {
+    getSavedBlock(world, x, y, z, world.getBlockMetadata(x, y, z))
+  }
+
+  /**
+   * Override for special actions on placing
+   * ItemStack might or might not contain actual data
+   * Called with the TE created and added to world, after onBlockPlacedBy & co
+   */
+  def restoreTileEntity(world: World, x: Int, y: Int, z: Int, is: ItemStack, player: EntityPlayer) = getTE(world, x, y, z).loadFromItem(is)
+}
+
+/**
+ * Mixin for tile entities to keep their data when broken
+ * Block class has to extend BlockKeepData
+ */
+trait TileKeepData extends TileExtended {
+  /**
+   * Override to modify data that will be stored in an item
+   * @param t Automatically serialized data
+   * @return Modified serialized data
+   */
+  def afterTileBreakSave(t: NBTTagCompound) = t
+
+  /**
+   * Override to modify data that will be load from an item
+   * After the tile entity is fully constructed and added to world
+   * @param t Automatically serialized data
+   * @return Modified serialized data
+   */
+  def beforeTileBreakLoad(t: NBTTagCompound) = t
+
+  final def saveToItem(is: ItemStack): Unit = {
+    if (!is.hasTagCompound) is.setTagCompound(new NBTTagCompound)
+    is.getTagCompound.setTag("data", afterTileBreakSave(NBT.from(persistSave.trigger)))
+  }
+
+  final def loadFromItem(is: ItemStack): Unit = {
+    if (is.hasTagCompound && is.getTagCompound.hasKey("data")) {
+      persistLoad.trigger(beforeTileBreakLoad(is.getTagCompound.getCompoundTag("data")))
+    }
+  }
+}
+
+/**
+ * Custom ItemBlock that handles loading data to the Tile Entity
+ */
+class ItemBlockKeepData(b: Block) extends ItemBlockTooltip(b) {
+  override def placeBlockAt(stack: ItemStack, player: EntityPlayer, world: World, x: Int, y: Int, z: Int, side: Int, hitX: Float, hitY: Float, hitZ: Float, metadata: Int): Boolean = {
+    if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) {
+      if (!world.isRemote && b.isInstanceOf[BlockKeepData])
+        b.asInstanceOf[BlockKeepData].restoreTileEntity(world, x, y, z, stack, player)
+      true
+    } else false
+  }
+}

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

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

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

@@ -4,34 +4,54 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.config
 
-import net.minecraft.item.ItemStack
-import net.minecraft.block.Block
+import cpw.mods.fml.common.ObfuscationReflectionHelper
 import cpw.mods.fml.common.registry.GameRegistry
-import net.bdew.lib.block.HasTE
+import net.bdew.lib.Misc
+import net.bdew.lib.block.{HasItemBlock, HasTE, NamedBlock}
+import net.minecraft.block.Block
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.{ItemBlock, ItemStack}
+import net.minecraft.tileentity.TileEntity
 
-class BlockManager(val ids: IdManager) {
+class BlockManager(creativeTab: CreativeTabs) {
+  def regBlock[T <: NamedBlock](block: T): T = regBlock(block, block.name)
 
-  def regBlockCls[T <: Block](blockCls: Class[T], name: String, addStack: Boolean = true): T = {
-    val block = blockCls.getConstructor(classOf[Int]).newInstance(ids.getBlockId(name): Integer)
-    regBlock[T](block, name, addStack)
-  }
+  def regSpecial[T <: NamedBlock](block: T, addStack: Boolean = false, skipTileEntityReg: Boolean = false): T =
+    regBlock(block, block.name, addStack, skipTileEntityReg)
 
-  def regBlock[T <: Block](block: T, name: String, addStack: Boolean = true): T = {
-    GameRegistry.registerBlock(block, name)
+  def regBlock[T <: Block](block: T, name: String, addStack: Boolean = false, skipTileEntityReg: Boolean = false): T = {
+    val itemClass: Class[_ <: ItemBlock] = if (block.isInstanceOf[HasItemBlock])
+      block.asInstanceOf[HasItemBlock].ItemBlockClass
+    else
+      classOf[ItemBlock]
+
+    GameRegistry.registerBlock(block, itemClass, name)
+
+    block.setCreativeTab(creativeTab)
 
     if (addStack)
       GameRegistry.registerCustomItemStack(name, new ItemStack(block))
 
-    if (block.isInstanceOf[HasTE[_]])
-      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, name)
+    if (block.isInstanceOf[HasTE[_]] && !skipTileEntityReg)
+      GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass,
+        "%s.%s".format(Misc.getActiveModId, name))
 
     return block
   }
 
+  /**
+   * Registers a legacy TE name->class mapping. Stolen from GameRegistry.registerTileEntityWithAlternatives
+   */
+  def registerLegacyTileEntity(name: String, cls: Class[_ <: TileEntity]): Unit = {
+    val teMappings: java.util.Map[String, Class[_]] = ObfuscationReflectionHelper.getPrivateValue(classOf[TileEntity], null, "field_" + "145855_i", "nameToClassMap")
+    if (!teMappings.containsKey(name))
+      teMappings.put(name, cls)
+  }
+
   def load() {}
 }

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

@@ -4,14 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.config
 
-import net.minecraftforge.fluids.{FluidRegistry, Fluid}
+import net.minecraftforge.fluids.{Fluid, FluidRegistry}
 
-class FluidManager(val ids: IdManager) {
+class FluidManager() {
   def regFluid[T <: Fluid](fluid: T): T = {
     FluidRegistry.registerFluid(fluid)
     return fluid

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) bdew, 2013 - 2014
- * https://github.com/bdew/bdlib
- *
- * This mod is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt
- */
-
-package net.bdew.lib.config
-
-import net.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
-}
-

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

@@ -4,30 +4,28 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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}
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.{Item, ItemStack}
 
-class ItemManager(val ids: IdManager) {
-  def regSimpleItem(name: String): SimpleItem = regItem(new SimpleItem(ids.getItemId(name), name), name)
+class ItemManager(creativeTab: CreativeTabs) {
+  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)
-    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)
+    item.setCreativeTab(creativeTab)
     if (addStack)
       GameRegistry.registerCustomItemStack(name, new ItemStack(item))
     return item
   }
+
   def load() {}
 }

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

@@ -4,25 +4,51 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.config
 
-import net.bdew.lib.recipes.gencfg.ConfigSection
+import net.bdew.lib.Misc
+import net.bdew.lib.gui.{GuiHandler, GuiProvider}
 import net.bdew.lib.machine.Machine
-import net.bdew.lib.gui.{GuiProvider, GuiHandler}
+import net.bdew.lib.multiblock.MachineCore
+import net.bdew.lib.multiblock.block.BlockModule
+import net.bdew.lib.recipes.gencfg.ConfigSection
+import net.minecraft.creativetab.CreativeTabs
 
-class MachineManager(ids: IdManager, val tuning: ConfigSection, guiHandler: GuiHandler) {
+class MachineManager(val tuning: ConfigSection, guiHandler: GuiHandler, creativeTab: CreativeTabs) {
   def registerMachine[R <: Machine[_]](machine: R): R = {
     machine.tuning = tuning.getSection(machine.name)
     if (machine.tuning.getBoolean("Enabled")) {
       machine.enabled = true
-      machine.regBlock(ids)
+      machine.regBlock(creativeTab)
       if (machine.isInstanceOf[GuiProvider])
         guiHandler.register(machine.asInstanceOf[GuiProvider])
     }
     return machine
   }
+
   def load() {}
 }
+
+trait MachineManagerMultiblock extends MachineManager {
+  var controllers = Set.empty[MachineCore]
+
+  override def registerMachine[R <: Machine[_]](machine: R): R = {
+    super.registerMachine(machine)
+    if (machine.enabled) {
+      Misc.asInstanceOpt(machine, classOf[MachineCore]) foreach { controllerMachine =>
+        controllers += controllerMachine
+        controllerMachine.getController.machine = controllerMachine
+      }
+    }
+    machine
+  }
+
+  def getMachinesForBlock(b: BlockModule[_]): Map[MachineCore, (Int, Int)] = {
+    (for (machine <- controllers; max <- machine.modules.get(b.kind)) yield {
+      machine ->(machine.required.getOrElse(b.kind, 0), max)
+    }).toMap
+  }
+}

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

@@ -0,0 +1,124 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.covers
+
+import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.Misc
+import net.bdew.lib.block.{BlockRef, HasTE}
+import net.bdew.lib.items.ItemUtils
+import net.minecraft.block.Block
+import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP}
+import net.minecraft.item.ItemStack
+import net.minecraft.util.IIcon
+import net.minecraft.world.{IBlockAccess, World}
+import net.minecraftforge.common.util.ForgeDirection
+
+trait BlockCoverable[T <: TileCoverable] extends HasTE[T] {
+  @SideOnly(Side.CLIENT)
+  override def getRenderType = CoverRenderer.id
+
+  private def getCoverItem(w: IBlockAccess, x: Int, y: Int, z: Int, side: ForgeDirection): Option[(ItemCover, ItemStack, TileCoverable)] = {
+    val te = getTE(w, x, y, z)
+    for {
+      coverStack <- Option(te.covers(side).value)
+      coverItemMaybe <- Option(coverStack.getItem)
+      coverItem <- Misc.asInstanceOpt(coverItemMaybe, classOf[ItemCover])
+    } yield (coverItem, coverStack, te)
+  }
+
+  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)
+
+    // Shift+RightClick with empty hand should remove cover
+    if (player.getCurrentEquippedItem == null && player.isSneaking) {
+      for {
+        cover <- Option(te.covers(side).value)
+        coverItem <- Misc.asInstanceOpt(cover.getItem, classOf[ItemCover])
+      } {
+        if (!world.isRemote) {
+          te.covers(side) := null
+          te.onCoversChanged()
+          coverChanged(world, x, y, z, side)
+          ItemUtils.dropItemToPlayer(world, player, coverItem.onRemove(cover))
+        }
+        return true
+      }
+    }
+
+    // If held item is cover - try to install it
+    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 && player.isInstanceOf[EntityPlayerMP]) {
+        for {
+          oldCover <- Option(te.covers(side).value)
+          oldItem <- Misc.asInstanceOpt(oldCover.getItem, classOf[ItemCover])
+        } {
+          ItemUtils.throwItemAt(world, te.xCoord + side.offsetX, te.yCoord + side.offsetY, te.zCoord + side.offsetZ, oldItem.onRemove(oldCover))
+        }
+
+        te.covers(side) := coverItem.onInstall(te, side, activeStack.splitStack(1), player.asInstanceOf[EntityPlayerMP])
+
+        if (activeStack.stackSize <= 0)
+          player.inventory.setInventorySlotContents(player.inventory.currentItem, null)
+
+        te.onCoversChanged()
+        coverChanged(world, x, y, z, side)
+      }
+      return true
+    }
+
+    // If has cover - let it handle the click
+    for ((item, stack, te) <- getCoverItem(world, x, y, z, side)) {
+      if (item.clickCover(te, side, stack, player)) return true
+    }
+
+    super.onBlockActivated(world, x, y, z, player, face, xOffs, yOffs, zOffs)
+  }
+
+  override def canProvidePower = true
+
+  override def isProvidingWeakPower(w: IBlockAccess, x: Int, y: Int, z: Int, side: Int): Int = {
+    val direction = Misc.forgeDirection(side).getOpposite
+    for ((item, stack, te) <- getCoverItem(w, x, y, z, direction)) {
+      if (item.isEmittingSignal(te, direction, stack)) return 15
+    }
+    0
+  }
+
+  def coverChanged(w: World, x: Int, y: Int, z: Int, side: ForgeDirection): Unit = {
+    val pos = BlockRef(x, y, z).neighbour(side)
+    w.notifyBlockOfNeighborChange(pos.x, pos.y, pos.z, pos.block(w).orNull)
+  }
+
+  def getCoverIcon(w: IBlockAccess, x: Int, y: Int, z: Int, side: ForgeDirection): Option[IIcon] =
+    for ((item, stack, te) <- getCoverItem(w, x, y, z, side))
+      yield item.getCoverIcon(te, side, stack)
+
+  override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) {
+    if (!world.isRemote) {
+      val te = getTE(world, x, y, z)
+      for {
+        (dir, covOpt) <- te.covers
+        cover <- Option(covOpt.value)
+        item <- Misc.asInstanceOpt(cover.getItem, classOf[ItemCover])
+      } {
+        te.covers(dir) := null
+        ItemUtils.throwItemAt(world, x, y, z, item.onRemove(cover))
+        coverChanged(world, x, y, z, dir)
+      }
+    }
+    super.breakBlock(world, x, y, z, block, meta)
+  }
+}

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.covers
+
+import net.bdew.lib.Misc
+import net.bdew.lib.render.connected.ConnectedHelper
+import net.bdew.lib.render.{BaseBlockRenderHandler, RenderUtils}
+import net.minecraft.block.Block
+import net.minecraft.client.renderer.RenderBlocks
+import net.minecraft.world.IBlockAccess
+import net.minecraftforge.common.util.ForgeDirection
+
+object CoverRenderer extends BaseBlockRenderHandler {
+  override def renderInventoryBlock(block: Block, metadata: Int, modelId: Int, renderer: RenderBlocks) =
+    RenderUtils.renderSimpleBlockItem(block, metadata, renderer)
+
+  override def renderWorldBlock(world: IBlockAccess, x: Int, y: Int, z: Int, block: Block, modelId: Int, renderer: RenderBlocks) = {
+    renderer.renderStandardBlock(block, x, y, z)
+    if (!renderer.hasOverrideBlockTexture)
+      for {
+        blockCov <- Misc.asInstanceOpt(block, classOf[BlockCoverable[_]])
+        face <- ForgeDirection.VALID_DIRECTIONS
+        icon <- blockCov.getCoverIcon(world, x, y, z, face)
+        if block.shouldSideBeRendered(world, x + face.offsetX, y + face.offsetY, z + face.offsetZ, face.ordinal())
+      } ConnectedHelper.draw(face, 8).doDraw(ConnectedHelper.Vec3F(x, y, z), icon)
+    true
+  }
+}

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.covers
+
+import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP}
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.util.IIcon
+import net.minecraftforge.common.util.ForgeDirection
+
+trait ItemCover extends Item {
+  /**
+   * @return true if tickCover should be called
+   */
+  def isCoverTicking: Boolean
+
+  /**
+   * @param te Host TileEntity
+   * @param side Side the cover is installed on
+   * @param cover Cover ItemStack
+   * @return Icon to render, MUST be on terrain sprite sheet (0), not item!
+   */
+  def getCoverIcon(te: TileCoverable, side: ForgeDirection, cover: ItemStack): IIcon
+
+  /**
+   * Perform tick, called on server only
+   * @param te Host TileEntity
+   * @param side Side the cover is installed on
+   * @param cover Cover ItemStack
+   */
+  def tickCover(te: TileCoverable, side: ForgeDirection, cover: ItemStack): Unit = {}
+
+  /**
+   * Checks if this cover can be installed on a specific TE
+   * @param te Potential host TileEntity
+   * @param cover Cover ItemStack
+   * @return true if can be installed
+   */
+  def isValidTile(te: TileCoverable, cover: ItemStack): Boolean
+
+  /**
+   * Handle click on covered side - called on both client and server
+   * @param te Host TileEntity
+   * @param side Side the cover is installed on
+   * @param cover Cover ItemStack
+   * @param player Player clicking the cover
+   * @return true if click was handled by cover
+   */
+  def clickCover(te: TileCoverable, side: ForgeDirection, cover: ItemStack, player: EntityPlayer): Boolean = false
+
+  /**
+   * Check if cover is emitting RS signal
+   * @param te Host TileEntity
+   * @param side Side the cover is installed on
+   * @param cover Cover ItemStack
+   * @return true if cover is emitting RS signal
+   */
+  def isEmittingSignal(te: TileCoverable, side: ForgeDirection, cover: ItemStack): Boolean = false
+
+  /**
+   * Called when cover is installed on a block - called only on server
+   * @param te Host TileEntity
+   * @param side Side the cover is installed on
+   * @param cover Cover ItemStack - do not modify!
+   * @param player Player entity doing the installation
+   * @return cover ItemStack - copy if modified
+   */
+  def onInstall(te:TileCoverable, side: ForgeDirection, cover: ItemStack, player: EntityPlayerMP): ItemStack = cover
+
+  /**
+   * Called when cover is removed from block or block is destroyed - called only on server
+   * @param cover Cover ItemStack - do not modify!
+   * @return cover ItemStack - copy if modified
+   */
+  def onRemove(cover: ItemStack): ItemStack = cover
+}

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

@@ -0,0 +1,45 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.covers
+
+import java.util.Locale
+
+import net.bdew.lib.Misc
+import net.bdew.lib.data.DataSlotItemStack
+import net.bdew.lib.data.base.{TileDataSlots, UpdateKind}
+import net.minecraft.item.ItemStack
+import net.minecraftforge.common.util.ForgeDirection
+
+trait TileCoverable extends TileDataSlots {
+  val covers = (ForgeDirection.VALID_DIRECTIONS map { x =>
+    x -> DataSlotItemStack("cover_" + x.toString.toLowerCase(Locale.US), 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.value)
+      coverItem <- Option(coverStack.getItem) flatMap (Misc.asInstanceOpt(_, classOf[ItemCover]))
+    } {
+      coverItem.tickCover(this, dir, coverStack)
+    }
+
+  serverTick.listen(tickCovers)
+}

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

@@ -4,16 +4,16 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal}
 
-case class DataSlotBoolean(name: String, parent: TileDataSlots, default: Boolean = false) extends DataSlotVal[Boolean] {
-  var cval = default
-  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setBoolean(name, cval)
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = t.getBoolean(name)
+case class DataSlotBoolean(name: String, parent: DataSlotContainer, default: Boolean = false) extends DataSlotVal[Boolean] {
+  var value = default
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setBoolean(name, value)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getBoolean(name)
 }

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

@@ -4,17 +4,17 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
-import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal}
-import net.minecraftforge.common.ForgeDirection
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.common.util.ForgeDirection
 
-case class DataSlotDirection(name: String, parent: TileDataSlots) extends DataSlotVal[ForgeDirection] {
-  var cval = ForgeDirection.UP
-  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setByte(name, cval.ordinal().toByte)
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = ForgeDirection.getOrientation(t.getByte(name))
+case class DataSlotDirection(name: String, parent: DataSlotContainer) extends DataSlotVal[ForgeDirection] {
+  var value = ForgeDirection.UP
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setByte(name, value.ordinal().toByte)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = ForgeDirection.getOrientation(t.getByte(name))
 }

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.data
+
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind}
+import net.minecraft.nbt.NBTTagCompound
+
+case class DataSlotDouble(name: String, parent: DataSlotContainer, default: Double = 0) extends DataSlotNumeric[Double](default) {
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setDouble(name, value)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getDouble(name)
+}

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

@@ -4,15 +4,15 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric}
 
-case class DataSlotFloat(name: String, parent: TileDataSlots, default: Float = 0) extends DataSlotNumeric[Float](default) {
-  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setFloat(name, cval)
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = t.getFloat(name)
+case class DataSlotFloat(name: String, parent: DataSlotContainer, default: Float = 0) extends DataSlotNumeric[Float](default) {
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setFloat(name, value)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getFloat(name)
 }

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.data
+
+import net.bdew.lib.data.base.{DataSlotContainer, UpdateKind}
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.fluids.{Fluid, FluidRegistry}
+
+case class DataSlotFluidOption(name: String, parent: DataSlotContainer) extends DataSlotOption[Fluid] {
+  setUpdate(UpdateKind.SAVE, UpdateKind.GUI)
+
+  override def save(t: NBTTagCompound, kind: UpdateKind.Value) {
+    value foreach { x => t.setString(name, x.getName) }
+  }
+
+  override def load(t: NBTTagCompound, kind: UpdateKind.Value): Unit = {
+    if (t.hasKey(name)) {
+      val fluidName = t.getString(name)
+      if (FluidRegistry.isFluidRegistered(fluidName)) {
+        value = Option(FluidRegistry.getFluid(fluidName))
+      } else unset()
+    } else unset()
+  }
+}

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

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

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

@@ -4,15 +4,15 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotNumeric}
 
-case class DataSlotInt(name: String, parent: TileDataSlots, default: Int = 0) extends DataSlotNumeric[Int](default) {
-  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setInteger(name, cval)
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = t.getInteger(name)
+case class DataSlotInt(name: String, parent: DataSlotContainer, default: Int = 0) extends DataSlotNumeric[Int](default) {
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setInteger(name, value)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getInteger(name)
 }

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) bdew, 2013 - 2014
+ * https://github.com/bdew/bdlib
+ *
+ * This mod is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.data
+
+import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind}
+import net.bdew.lib.tile.inventory.BaseInventory
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
+
+case class DataSlotInventory(name: String, parent: DataSlotContainer, size: Int) extends DataSlot with BaseInventory {
+  setUpdate(UpdateKind.SAVE)
+
+  override def getSizeInventory = size
+  override def markDirty() = parent.dataSlotChanged(this)
+
+  override def load(t: NBTTagCompound, kind: UpdateKind.Value) {
+    inv = new Array[ItemStack](getSizeInventory)
+    import net.bdew.lib.nbt._
+    for (nbtItem <- t.getList[NBTTagCompound](name)) {
+      val slot = nbtItem.getByte("Slot")
+      if (slot >= 0 && slot < inv.length) {
+        inv(slot) = ItemStack.loadItemStackFromNBT(nbtItem)
+      }
+    }
+  }
+
+  override def save(t: NBTTagCompound, kind: UpdateKind.Value) {
+    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)
+    }
+    t.setTag(name, itemList)
+  }
+}
+
+

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

@@ -4,29 +4,29 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
-import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlotVal}
-import net.minecraft.nbt.NBTTagCompound
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind}
 import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
 
-case class DataSlotItemStack(name: String, parent: TileDataSlots) extends DataSlotVal[ItemStack] {
-  var cval: ItemStack = null
+case class DataSlotItemStack(name: String, parent: DataSlotContainer) extends DataSlotVal[ItemStack] {
+  var value: ItemStack = null
 
   override def update(v: ItemStack) = {
-    if (!ItemStack.areItemStacksEqual(v, cval)) {
-      cval = if (v == null) null else v.copy()
+    if (!ItemStack.areItemStacksEqual(v, value)) {
+      value = if (v == null) null else v.copy()
       parent.dataSlotChanged(this)
     }
   }
 
   def save(t: NBTTagCompound, kind: UpdateKind.Value) = {
     val tag = new NBTTagCompound()
-    if (cval != null) cval.writeToNBT(tag)
-    t.setCompoundTag(name, tag)
+    if (value != null) value.writeToNBT(tag)
+    t.setTag(name, tag)
   }
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = ItemStack.loadItemStackFromNBT(t.getCompoundTag(name))
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = ItemStack.loadItemStackFromNBT(t.getCompoundTag(name))
 }

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.data
+
+import java.io.{ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, DataOutputStream}
+
+import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind}
+import net.minecraft.nbt.NBTTagCompound
+
+import scala.collection.mutable
+
+case class DataSlotMovingAverage(name: String, parent: DataSlotContainer, size: Int) extends DataSlot {
+  val values = mutable.Queue.empty[Double]
+  var average: Double = 0
+
+  setUpdate(UpdateKind.GUI, UpdateKind.SAVE)
+
+  def reset() {
+    values.clear()
+    average = 0
+  }
+
+  def update(v: Double) = {
+    values += v
+    if (values.length > size)
+      values.dequeue()
+    average = values.sum / values.length
+    parent.dataSlotChanged(this)
+  }
+  override def save(t: NBTTagCompound, kind: UpdateKind.Value) {
+    if (kind == UpdateKind.GUI) {
+      t.setDouble(name, average)
+    } else {
+      val b = new ByteArrayOutputStream()
+      val o = new DataOutputStream(b)
+      o.writeByte(values.size)
+      values.foreach(o.writeDouble)
+      t.setByteArray(name, b.toByteArray)
+      o.close()
+    }
+  }
+
+  override def load(t: NBTTagCompound, kind: UpdateKind.Value) {
+    if (kind == UpdateKind.GUI) {
+      average = t.getDouble(name)
+    } else {
+      values.clear()
+      if (t.hasKey(name)) {
+        val i = new DataInputStream(new ByteArrayInputStream(t.getByteArray(name)))
+        val len = i.readByte()
+        values ++= (for (x <- 0 until Math.min(len, size)) yield i.readDouble())
+        i.close()
+      }
+    }
+  }
+}

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

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

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

@@ -4,16 +4,16 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
+import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlotVal}
 
-case class DataSlotString(name: String, parent: TileDataSlots, default: String = null) extends DataSlotVal[String] {
-  var cval: String = default
-  def save(t: NBTTagCompound, kind: UpdateKind.Value) = if (cval != null) t.setString(name, cval)
-  def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = if (t.hasKey(name)) t.getString(name) else null
+case class DataSlotString(name: String, parent: DataSlotContainer, default: String = null) extends DataSlotVal[String] {
+  var value: String = default
+  def save(t: NBTTagCompound, kind: UpdateKind.Value) = if (value != null) t.setString(name, value)
+  def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = if (t.hasKey(name)) t.getString(name) else null
 }

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

@@ -4,22 +4,24 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data
 
-import net.minecraftforge.fluids.{IFluidTank, FluidTank, FluidStack}
+import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind}
 import net.minecraft.nbt.NBTTagCompound
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots, DataSlot}
+import net.minecraftforge.fluids._
 
 abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank with DataSlot {
   var oldStack: FluidStack = null
 
-  parent.serverTick.listen(checkUpdate)
+  parent.onServerTick(checkUpdate)
 
   updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE)
 
+  val sendCapacityOnUpdateKind = Set(UpdateKind.GUI)
+
   def checkUpdate() {
     if (!isSame(oldStack, fluid)) {
       oldStack = if (fluid == null) null else fluid.copy()
@@ -36,27 +38,42 @@ abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank w
   def save(t: NBTTagCompound, k: UpdateKind.Value) {
     val tag = new NBTTagCompound()
     writeToNBT(tag)
-    if (k == UpdateKind.GUI)
+    if (sendCapacityOnUpdateKind.contains(k))
       tag.setInteger("size", getCapacity)
-    t.setCompoundTag(name, tag)
+    t.setTag(name, tag)
   }
 
   def load(t: NBTTagCompound, k: UpdateKind.Value) {
     setFluid(null)
     val tag = t.getCompoundTag(name)
     readFromNBT(tag)
-    if (k == UpdateKind.GUI)
+    if (sendCapacityOnUpdateKind.contains(k))
       setCapacity(tag.getInteger("size"))
   }
+
+  override def setFluid(fluid: FluidStack) = execWithChangeNotify(super.setFluid(fluid))
+  override def setCapacity(capacity: Int) = execWithChangeNotify(super.setCapacity(capacity))
+
+  override def drain(maxDrain: Int, doDrain: Boolean) =
+    if (doDrain)
+      execWithChangeNotifyConditional[FluidStack](super.drain(maxDrain, true), _ != null)
+    else
+      super.drain(maxDrain, false)
+
+  override def fill(resource: FluidStack, doFill: Boolean) =
+    if (doFill)
+      execWithChangeNotifyConditional[Int](super.fill(resource, true), _ > 0)
+    else
+      super.fill(resource, false)
 }
 
-case class DataSlotTank(name: String, parent: TileDataSlots, size: Int) extends DataSlotTankBase(size)
+case class DataSlotTank(name: String, parent: DataSlotContainer, 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)
+case class DataSlotTankRestricted(name: String, parent: DataSlotContainer, var size: Int, filterFluid: Fluid) extends DataSlotTankBase(size) {
+  def fill(amount: Int, doFill: Boolean) = super.fill(new FluidStack(filterFluid, amount), doFill)
 
   override def fill(resource: FluidStack, doFill: Boolean): Int = {
-    if ((resource != null) && (resource.fluidID != fluidID)) return 0
+    if ((resource != null) && (resource.getFluid != filterFluid)) return 0
     return super.fill(resource, doFill)
   }
 }

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

@@ -4,13 +4,13 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
 
-import net.minecraft.entity.player.EntityPlayerMP
 import net.bdew.lib.gui.NoInvContainer
+import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.inventory.ICrafting
 
 trait ContainerDataSlots extends NoInvContainer {
@@ -21,19 +21,19 @@ trait ContainerDataSlots extends NoInvContainer {
     super.addCraftingToCrafters(crafter)
     if (crafter.isInstanceOf[EntityPlayerMP]) {
       val pkt = dataSource.getDataSlotPacket
-      crafter.asInstanceOf[EntityPlayerMP].playerNetServerHandler.sendPacketToPlayer(pkt)
+      crafter.asInstanceOf[EntityPlayerMP].playerNetServerHandler.sendPacket(pkt)
     }
   }
 
   override def detectAndSendChanges() {
     super.detectAndSendChanges()
     // only send updates every 10 ticks
-    if (dataSource.lastChange >= lastSentChange + 10 || (dataSource.lastChange > lastSentChange && lastSentChange + 10 < dataSource.worldObj.getTotalWorldTime)) {
+    if (dataSource.lastChange >= lastSentChange + 10 || (dataSource.lastChange > lastSentChange && lastSentChange + 10 < dataSource.getWorldObj.getTotalWorldTime)) {
       lastSentChange = dataSource.lastChange
       val pkt = dataSource.getDataSlotPacket
 
       for (player <- players)
-        player.playerNetServerHandler.sendPacketToPlayer(pkt)
+        player.playerNetServerHandler.sendPacket(pkt)
     }
   }
 }

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
@@ -19,7 +19,7 @@ trait DataSlot {
    * Tile Entity that owns this slot
    * Accessed in constructor, so should be in parameters or a lazy val, otherwise will crash
    */
-  val parent: TileDataSlots
+  val parent: DataSlotContainer
 
   /**
    * Unique name
@@ -35,6 +35,19 @@ trait DataSlot {
   def save(t: NBTTagCompound, kind: UpdateKind.Value)
   def load(t: NBTTagCompound, kind: UpdateKind.Value)
 
+  def execWithChangeNotify[T](f: => T): T = {
+    val v = f
+    parent.dataSlotChanged(this)
+    v
+  }
+
+  def execWithChangeNotifyConditional[T](f: => T, condition: T => Boolean): T = {
+    val v = f
+    if (condition(v))
+      parent.dataSlotChanged(this)
+    v
+  }
+
   def setUpdate(vals: UpdateKind.Value*): this.type = {
     updateKind = vals.toSet
     return this

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

@@ -0,0 +1,77 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.data.base
+
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.world.World
+
+import scala.collection.mutable
+
+/**
+ * Base Trait for objects that can contain Data Slots, this allows implementing them on things that aren't TEs
+ */
+trait DataSlotContainer {
+
+  // Can't use getWorldObj - it fails to get remapped and stuff breaks in obfuscated environment
+  def getWorldObject: World
+
+  /**
+   * Called when a dataslot value changes
+   */
+  def dataSlotChanged(slot: DataSlot): Unit
+
+  /**
+   * Register a function to run on every server tick
+   */
+  def onServerTick(f: () => Unit): Unit
+
+  /**
+   * List of dataslots in this container
+   */
+  val dataSlots = mutable.HashMap.empty[String, DataSlot]
+
+  /**
+   * The value of getTotalWorldTime when the last change happened
+   */
+  var lastChange = 0L
+
+  /**
+   * The value of getTotalWorldTime when the last GUI packet was sent happened
+   */
+  var lastGuiPacket = 0L
+
+  final val TRACE = false
+
+  def doSave(kind: UpdateKind.Value, t: NBTTagCompound) {
+    if (kind == UpdateKind.GUI)
+      t.setLong("BDLib_TS", getWorldObject.getTotalWorldTime)
+    for ((n, s) <- dataSlots if s.updateKind.contains(kind)) {
+      s.save(t, kind)
+      if (TRACE) printf("%s: %s S=> %s\n".format(kind, n, t.getTag(n)))
+    }
+  }
+
+  def doLoad(kind: UpdateKind.Value, t: NBTTagCompound) {
+    if (kind == UpdateKind.GUI) {
+      val ts = t.getLong("BDLib_TS")
+      if (ts > lastGuiPacket) {
+        lastGuiPacket = ts
+      } else {
+        return
+      }
+    }
+    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)
+    }
+  }
+}
+
+

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

@@ -4,19 +4,24 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
 
 /**
  * Base class for data slots that hold numeric values
- * adds convinience operators to modify the value
+ * adds convenience operators to modify the value
  */
 
 abstract class DataSlotNumeric[T](default: T)(implicit n: Numeric[T]) extends DataSlotVal[T] {
-  var cval = default
-  def +=(that: T) = update(n.plus(cval, that))
-  def -=(that: T) = update(n.minus(cval, that))
-  def *=(that: T) = update(n.times(cval, that))
+  var value = default
+  def +=(that: T) = update(n.plus(value, that))
+  def -=(that: T) = update(n.minus(value, that))
+  def *=(that: T) = update(n.times(value, that))
+
+  /* Special Int versions, using the conversion from numeric */
+  def +=(that: Int) = update(n.plus(value, n.fromInt(that)))
+  def -=(that: Int) = update(n.minus(value, n.fromInt(that)))
+  def *=(that: Int) = update(n.times(value, n.fromInt(that)))
 }

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

@@ -4,18 +4,18 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
 
 /**
- * Base class for data slots that hold values with ordering operators, adds more convinience operators
+ * Base class for data slots that hold values with ordering operators, adds more convenience operators
  * TODO: Do i need this? normal operators can be used with the implicit conversion
  */
 abstract class DataSlotOrdered[T](implicit n: Ordering[T]) extends DataSlotVal[T] {
-  def :>(that: T) = n.compare(cval, that) > 0
-  def :<(that: T) = n.compare(cval, that) < 0
-  def :>=(that: T) = n.compare(cval, that) >= 0
-  def :<=(that: T) = n.compare(cval, that) <= 0
+  def :>(that: T) = n.compare(value, that) > 0
+  def :<(that: T) = n.compare(value, that) < 0
+  def :>=(that: T) = n.compare(value, that) >= 0
+  def :<=(that: T) = n.compare(value, that) <= 0
 }

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

@@ -4,36 +4,36 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
 
-import language.implicitConversions
+import scala.language.implicitConversions
 
 /**
  * Base trait for data slots that hold primitive values
- * Defines some convinience operators to access the value and an implicit conversion to the value
+ * Defines some convenience operators to access the value and an implicit conversion to the value
  */
 
 trait DataSlotVal[T] extends DataSlot {
-  var cval: T
+  var value: T
 
-  def isSame(v: T) = v == cval
+  def isSame(v: T) = v == value
 
   def :=(that: T) = update(that)
 
-  def :!=(that: T) = cval != that
-  def :==(that: T) = cval == that
+  def :!=(that: T) = value != that
+  def :==(that: T) = value == that
 
   def update(v: T) {
     if (!isSame(v)) {
-      cval = v
+      value = v
       parent.dataSlotChanged(this)
     }
   }
 }
 
 object DataSlotVal {
-  implicit def slot2val[T](slot: DataSlotVal[T]): T = slot.cval
+  implicit def slot2val[T](slot: DataSlotVal[T]): T = slot.value
 }

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

@@ -1,61 +1,48 @@
 /*
- * Copyright (c) bdew, 2013 - 2014
+ * Copyright (c) bdew, 2013 - 2015
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base
 
-import net.minecraft.network.packet.Packet132TileEntityData
-import scala.collection.mutable
-import net.minecraft.nbt.NBTTagCompound
 import net.bdew.lib.tile.TileExtended
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraft.network.Packet
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity
 
-trait TileDataSlots extends TileExtended {
-  val dataSlots = mutable.HashMap.empty[String, DataSlot]
-  var lastChange = 0L
-
-  final val TRACE = false
-
-  def doSave(kind: UpdateKind.Value, t: NBTTagCompound) {
-    for ((n, s) <- dataSlots if s.updateKind.contains(kind)) {
-      s.save(t, kind)
-      if (TRACE) printf("%s: %s S=> %s\n".format(kind, n, t.getTag(n)))
-    }
-  }
-
-  def doLoad(kind: UpdateKind.Value, t: NBTTagCompound) {
-    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))
-        worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord)
-    }
-  }
-
+trait TileDataSlots extends TileExtended with DataSlotContainer {
   persistSave.listen(doSave(UpdateKind.SAVE, _))
   persistLoad.listen(doLoad(UpdateKind.SAVE, _))
   sendClientUpdate.listen(doSave(UpdateKind.WORLD, _))
-  handleClientUpdate.listen(doLoad(UpdateKind.WORLD, _))
+  handleClientUpdate.listen { tag =>
+    doLoad(UpdateKind.WORLD, tag)
+    if (dataSlots.values.exists(_.updateKind.contains(UpdateKind.RENDER)))
+      getWorldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord)
+  }
 
-  def dataSlotChanged(slot: DataSlot) {
-    if (worldObj != null) {
+  override def getWorldObject = getWorldObj
+
+  override def onServerTick(f: () => Unit) = serverTick.listen(f)
+
+  override def dataSlotChanged(slot: DataSlot) = {
+    if (getWorldObj != null) {
       if (slot.updateKind.contains(UpdateKind.GUI))
-        lastChange = worldObj.getTotalWorldTime
-      if (slot.updateKind.contains(UpdateKind.WORLD))
-        worldObj.markBlockForUpdate(xCoord, yCoord, zCoord)
+        lastChange = getWorldObj.getTotalWorldTime
+      if (!getWorldObj.isRemote && slot.updateKind.contains(UpdateKind.WORLD))
+        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(xCoord, yCoord, zCoord, ACT_GUI, tag)
   }
 
   override protected def extDataPacket(id: Int, data: NBTTagCompound) {

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.data.base

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

@@ -4,15 +4,15 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import net.minecraft.inventory.IInventory
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.item.ItemStack
 import net.bdew.lib.items.ItemUtils
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.IInventory
+import net.minecraft.item.ItemStack
 
 abstract class BaseContainer(te: IInventory) extends NoInvContainer {
   override def transferStackInSlot(player: EntityPlayer, slot: Int): ItemStack = {
@@ -28,5 +28,7 @@ abstract class BaseContainer(te: IInventory) extends NoInvContainer {
     getSlot(slot).putStack(stack)
     return null
   }
+
+  override def canInteractWith(player: EntityPlayer) = te.isUseableByPlayer(player)
 }
 

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
@@ -16,7 +16,7 @@ case class BaseRect[T: Numeric](x: T, y: T, w: T, h: T) {
 
   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 contains(p: BasePoint[T]) = n.gteq(p.x, x) && n.gteq(p.y, y) && n.lt(p.x, x2) && n.lt(p.y, y2)
 
   def origin = BasePoint(x, y)
 

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

@@ -4,16 +4,18 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
+import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.inventory.Container
-import scala.collection.mutable
 import org.lwjgl.opengl.GL11
 
+import scala.collection.mutable
+
 abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContainer(cont) {
   xSize = xSz
   ySize = ySz
@@ -24,7 +26,7 @@ abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContai
 
   def rect = new Rect(guiLeft, guiTop, xSize, ySize)
 
-  def getFontRenderer = fontRenderer
+  def getFontRenderer = Minecraft.getMinecraft.fontRenderer
   def getZLevel = zLevel
 
   override def initGui() {
@@ -52,10 +54,10 @@ abstract class BaseScreen(cont: Container, xSz: Int, ySz: Int) extends GuiContai
 
     widgets.handleTooltip(Point(x, y) - rect.origin, tip)
 
-    import collection.JavaConversions._
+    import scala.collection.JavaConversions._
 
-    if (tip.size > 0)
-      drawHoveringText(tip, x, y, fontRenderer)
+    if (tip.nonEmpty)
+      drawHoveringText(tip, x, y, getFontRenderer)
   }
 
   protected def drawGuiContainerBackgroundLayer(f: Float, x: Int, y: Int) {

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui

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

@@ -4,13 +4,13 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import org.lwjgl.opengl.GL11
 import net.bdew.lib.Misc
+import org.lwjgl.opengl.GL11
 
 case class Color(r: Float, g: Float, b: Float, a: Float = 1) {
   def this(c: (Float, Float, Float)) = this(c._1, c._2, c._3)
@@ -29,6 +29,11 @@ case class Color(r: Float, g: Float, b: Float, a: Float = 1) {
 
 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)
@@ -39,6 +44,6 @@ object Color {
   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)
+  final val lightGray = Color(0.75F, 0.75F, 0.75F)
+  final val darkGray = Color(0.25F, 0.25F, 0.25F)
 }

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui

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

@@ -4,13 +4,13 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import net.minecraft.client.renderer.Tessellator
 import net.minecraft.client.gui.FontRenderer
+import net.minecraft.client.renderer.Tessellator
 
 trait DrawTarget {
   def getZLevel: Float
@@ -20,7 +20,7 @@ trait DrawTarget {
   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))
+    drawTexture(r.interpolate(x1, y1, x2, y2), Texture.interpolate(t, x1, y1, x2, y2), color)
 }
 
 trait SimpleDrawTarget extends DrawTarget {

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

@@ -4,28 +4,29 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
 import cpw.mods.fml.common.network.IGuiHandler
-import scala.collection.mutable
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.world.World
 
+import scala.collection.mutable
+
 class GuiHandler extends IGuiHandler {
-  val guis = mutable.Map.empty[Int, GuiProvider]
+  val GUIs = mutable.Map.empty[Int, GuiProvider]
 
   def register(p: GuiProvider) = {
-    if (guis.isDefinedAt(p.guiId))
-      sys.error("GUI ID Collision - %d was registered for %s and attemted to register by %s".format(p.guiId, guis(p.guiId), p))
-    guis += (p.guiId -> p)
+    if (GUIs.isDefinedAt(p.guiId))
+      sys.error("GUI ID Collision - %d was registered for %s and attempted to register by %s".format(p.guiId, GUIs(p.guiId), p))
+    GUIs += (p.guiId -> p)
   }
 
   def getServerGuiElement(ID: Int, player: EntityPlayer, world: World, x: Int, y: Int, z: Int): AnyRef =
-    guis(ID).getContainer(world.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)
 }

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

@@ -4,14 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import net.minecraft.tileentity.TileEntity
-import net.minecraft.entity.player.EntityPlayer
 import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.tileentity.TileEntity
 
 trait GuiProvider {
   def guiId: Int
@@ -23,6 +23,13 @@ trait GuiProvider {
   def getContainer(te: TEClass, player: EntityPlayer): AnyRef
 
   @SideOnly(Side.CLIENT)
-  def getGui(te: TileEntity, player: EntityPlayer): AnyRef = getGui(te.asInstanceOf[TEClass], player)
-  def getContainer(te: TileEntity, player: EntityPlayer): AnyRef = getContainer(te.asInstanceOf[TEClass], player)
+  def getGui(te: TileEntity, player: EntityPlayer): AnyRef =
+    if (te != null)
+      getGui(te.asInstanceOf[TEClass], player)
+    else null
+
+  def getContainer(te: TileEntity, player: EntityPlayer): AnyRef =
+    if (te != null)
+      getContainer(te.asInstanceOf[TEClass], player)
+    else null
 }

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

@@ -4,14 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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.entity.player.{EntityPlayer, EntityPlayerMP, InventoryPlayer}
+import net.minecraft.inventory.{Container, Slot}
 import net.minecraft.item.ItemStack
 
 abstract class NoInvContainer extends Container {
@@ -28,13 +28,13 @@ abstract class NoInvContainer extends Container {
       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)
+  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)
+    return super.slotClick(slotNum, button, modifiers, player)
   }
 
   override def transferStackInSlot(player: EntityPlayer, slot: Int): ItemStack = null

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

@@ -4,14 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import net.minecraft.item.ItemStack
-import net.minecraft.inventory.Slot
 import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.Slot
+import net.minecraft.item.ItemStack
 
 trait SlotClickable extends Slot {
   def onClick(button: Int, mods: Int, player: EntityPlayer): ItemStack

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui

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

@@ -4,14 +4,15 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui
 
-import net.minecraft.util.{Icon, ResourceLocation}
+import net.bdew.lib.Client
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.texture.TextureMap
+import net.minecraft.util.{IIcon, ResourceLocation}
 
 trait Texture {
   def u1: Float
@@ -29,7 +30,13 @@ class InterpolatedTexture(val texture: Texture, rect: Rect) extends Texture {
   def v2 = rect.y2 * (texture.v2 - texture.v1) + texture.v1
 }
 
-class IconWrapper(val resource: ResourceLocation, val icon: Icon) extends Texture {
+class IconWrapper(val resource: ResourceLocation, aIcon: IIcon) extends Texture {
+  val icon = if (aIcon == null) {
+    if (resource == Texture.ITEMS) Client.itemMissingIcon
+    else if (resource == Texture.BLOCKS) Client.blockMissingIcon
+    else sys.error("Attempt to create IconWrapper for null IIcon")
+  } else aIcon
+
   def u1 = icon.getMinU
   def u2 = icon.getMaxU
   def v1 = icon.getMinV
@@ -47,7 +54,8 @@ class Sprite(val resource: ResourceLocation, r: Rect, scale: Int = 256) extends
 }
 
 class ScaledResourceLocation(path: String, val scale: Int = 256) extends ResourceLocation(path) {
-  def this(domain: String, path: String, scale: Int = 256) = this(domain + ":" + path, scale)
+  def this(domain: String, path: String, scale: Int) = this(domain + ":" + path, scale)
+  def this(domain: String, path: String) = this(domain + ":" + path, 256)
 }
 
 object Texture {
@@ -55,7 +63,7 @@ object Texture {
   val BLOCKS = TextureMap.locationBlocksTexture
 
   // From minecraft Icon
-  def apply(res: ResourceLocation, i: Icon) = new IconWrapper(res, i)
+  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)

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

@@ -4,16 +4,17 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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
 
+import scala.collection.mutable
+
 trait WidgetContainer extends DrawTarget {
   val rect: Rect
   val widgets = mutable.MutableList.empty[BaseWidget]

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib
@@ -13,15 +13,19 @@ package object gui {
   type Rect = BaseRect[Float]
   type Point = BasePoint[Float]
 
-  import language.implicitConversions
+  import scala.language.implicitConversions
 
-  implicit def awt2point(p: java.awt.Point) = BasePoint(p.x, p.y)
+  implicit def awt2point(p: java.awt.Point): BasePoint[Int] = 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)
+  implicit def tuple2point[T: Numeric](p: (T, T)): BasePoint[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))
+
+  implicit def pointConvert[T, R](a: BasePoint[R])(implicit f: R => T, n: Numeric[T]): BasePoint[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] =
+    BaseRect[T](f(a.x), f(a.y), f(a.w), f(a.h))
 
   def Rect(x: Float, y: Float, w: Float, h: Float) = BaseRect(x, y, w, h)
   def Point(x: Float, y: Float) = BasePoint(x, y)

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

@@ -4,13 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
+import net.bdew.lib.gui.{Point, Rect, WidgetContainer}
+
 import scala.collection.mutable
-import net.bdew.lib.gui.{WidgetContainer, Point, Rect}
 
 trait BaseWidget {
   val rect: Rect

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

@@ -4,20 +4,22 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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.client.gui.GuiButton
+import net.minecraft.util.ResourceLocation
 
 class WidgetButton(val rect: Rect, text: String, clicked: WidgetButton => Unit)
   extends GuiButton(0, rect.x.round, rect.y.round, rect.w.round, rect.h.round, text) with Widget {
 
   override def mouseClicked(p: Point, button: Int) {
-    Minecraft.getMinecraft.sndManager.playSoundFX("random.click", 1.0F, 1.0F)
+    Minecraft.getMinecraft.getSoundHandler.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F))
     clicked(this)
   }
 

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

@@ -0,0 +1,45 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui.{Point, Rect, Texture}
+import net.minecraft.client.Minecraft
+import net.minecraft.client.audio.PositionedSoundRecord
+import net.minecraft.util.ResourceLocation
+
+import scala.collection.mutable
+
+class WidgetButtonIcon(p: Point, clicked: WidgetButtonIcon => Unit, baseTex: Texture, hoverTex: Texture) extends Widget {
+  val rect = new Rect(p, 16, 16)
+  val iconRect = new Rect(p +(1, 1), 14, 14)
+
+  var icon: Texture = null
+  var hover: String = null
+
+  override def draw(mouse: Point) {
+    if (rect.contains(mouse))
+      parent.drawTexture(rect, hoverTex)
+    else
+      parent.drawTexture(rect, baseTex)
+
+    if (icon != null)
+      parent.drawTexture(iconRect, icon)
+  }
+
+  override def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
+    if (hover != null && hover > "")
+      tip += hover
+  }
+
+  override def mouseClicked(p: Point, button: Int) {
+    Minecraft.getMinecraft.getSoundHandler.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F))
+    clicked(this)
+  }
+}

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets

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

@@ -4,20 +4,20 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui._
 import net.bdew.lib.data.base.DataSlotNumeric
+import net.bdew.lib.gui._
 
-class WidgetFillDataslot[T](val rect: Rect, val texture: Texture, 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 {
 
   import num.mkNumericOps
 
   override def draw(mouse: Point) {
-    val fill = dslot.cval.toFloat() / maxval.toFloat()
+    val fill = dSlot.value.toFloat() / maxVal.toFloat()
     dir match {
       case Direction.UP =>
         parent.drawTextureInterpolate(rect, texture, 0, 1 - fill, 1, 1)

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

@@ -4,25 +4,23 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui.{Texture, Point, Rect}
 import net.bdew.lib.data.DataSlotTankBase
-import scala.collection.mutable
-import java.text.DecimalFormat
-import net.bdew.lib.Misc
+import net.bdew.lib.gui.{Color, Point, Rect, Texture}
+import net.bdew.lib.{DecFormat, Misc}
 import org.lwjgl.opengl.GL11
 
-class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase) extends Widget {
-  val formater = new DecimalFormat("#,###")
+import scala.collection.mutable
 
+class WidgetFluidGauge(val rect: Rect, overlay: Texture, dSlot: DataSlotTankBase) extends Widget {
   override def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
-    if (dslot.getFluid != null) {
-      tip += dslot.getFluid.getFluid.getLocalizedName
-      tip += "%s/%s mB".format(formater.format(dslot.getFluidAmount), formater.format(dslot.getCapacity))
+    if (dSlot.getFluid != null) {
+      tip += dSlot.getFluid.getFluid.getLocalizedName(dSlot.getFluid)
+      tip += "%s/%s mB".format(DecFormat.round(dSlot.getFluidAmount), DecFormat.round(dSlot.getCapacity))
     } else {
       tip += Misc.toLocal("bdlib.label.empty")
     }
@@ -32,26 +30,29 @@ class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase
     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 = Texture(Texture.BLOCKS, fstack.getFluid.getStillIcon)
-      var fillHeight = if (dslot.getCapacity > 0) rect.h * fstack.amount / dslot.getCapacity else 0
+    val fStack = dSlot.getFluid
+    if (fStack != null) {
+      val color = Color.fromInt(Misc.getFluidColor(fStack))
+      val icon = Texture(Texture.BLOCKS, Misc.getFluidIcon(fStack))
+      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.drawTexture(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon)
+          parent.drawTexture(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon, color)
           fillHeight -= 16
         } else {
-          parent.drawTextureInterpolate(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon, 0, 1 - fillHeight / 16, 1, 1)
+          parent.drawTextureInterpolate(new Rect(rect.x, rect.y2 - 16 - yStart, rect.w, 16), icon, 0, 1 - fillHeight / 16, 1, 1, color)
           fillHeight = 0
         }
         yStart = yStart + 16
       }
     }
 
+    GL11.glColor3d(1, 1, 1)
     GL11.glDisable(GL11.GL_BLEND)
 
-    parent.drawTexture(rect, overlay)
+    if (overlay != null)
+      parent.drawTexture(rect, overlay)
   }
 }

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets

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

@@ -4,14 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
 import net.bdew.lib.gui.Rect
 
-abstract class WidgetMultipane(rect: Rect) extends WidgetSubcontainer(rect) {
+abstract class WidgetMultiPane(rect: Rect) extends WidgetSubContainer(rect) {
   def getActivePane: BaseWidget
 
   def addPane[T <: BaseWidget](w: T): T = {

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

@@ -4,15 +4,16 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
-import net.bdew.lib.gui._
-import scala.collection.mutable
 import net.bdew.lib.data.DataSlotFloat
+import net.bdew.lib.gui._
 
-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) + "%"
+import scala.collection.mutable
+
+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.value * 100) + "%"
 }

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

@@ -0,0 +1,16 @@
+/*
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.gui.widgets
+
+import net.bdew.lib.gui._
+
+case class WidgetSimpleIcon(rect: Rect, icon: Texture) extends Widget {
+  override def draw(mouse: Point) = parent.drawTexture(rect, icon)
+}

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

@@ -4,15 +4,14 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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 {
+class WidgetSubContainer(val rect: Rect) extends BaseWidget with WidgetContainer with SimpleDrawTarget {
   def getZLevel = parent.getZLevel
   def getFontRenderer = parent.getFontRenderer
   def getOffsetFromWindow = parent.getOffsetFromWindow + rect.origin

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

@@ -4,13 +4,13 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.gui.widgets
 
-import net.minecraft.client.gui.{FontRenderer, GuiTextField}
 import net.bdew.lib.gui.{Point, Rect}
+import net.minecraft.client.gui.{FontRenderer, GuiTextField}
 
 class WidgetTextEdit(val rect: Rect, fr: FontRenderer) extends GuiTextField(fr, rect.x.round, rect.y.round, rect.w.round, rect.h.round) with Widget {
 

src/net/bdew/lib/helpers/ChatHelper.scala

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) bdew, 2013 - 2015
+ * 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
+ * http://bdew.net/minecraft-mod-public-license/
+ */
+
+package net.bdew.lib.helpers
+
+import net.minecraft.util._
+
+import scala.language.implicitConversions
+
+class RichChatComponent(v: IChatComponent) {
+  def &(that: IChatComponent) = v.appendSibling(that)
+
+  private def applyStyle(f: ChatStyle => Unit) = {
+    f(v.getChatStyle)
+    v
+  }
+
+  def setColor(c: EnumChatFormatting) = applyStyle(_.setColor(c))
+  def setBold(b: Boolean) = applyStyle(_.setBold(b))
+  def setItalic(b: Boolean) = applyStyle(_.setItalic(b))
+  def setObfuscated(b: Boolean) = applyStyle(_.setObfuscated(b))
+  def setStrikethrough(b: Boolean) = applyStyle(_.setStrikethrough(b))
+  def setUnderlined(b: Boolean) = applyStyle(_.setUnderlined(b))
+
+}
+
+object ChatHelper {
+
+  object Color {
+    val BLACK = EnumChatFormatting.BLACK
+    val DARK_BLUE = EnumChatFormatting.DARK_BLUE
+    val DARK_GREEN = EnumChatFormatting.DARK_GREEN
+    val DARK_AQUA = EnumChatFormatting.DARK_AQUA
+    val DARK_RED = EnumChatFormatting.DARK_RED
+    val DARK_PURPLE = EnumChatFormatting.DARK_PURPLE
+    val GOLD = EnumChatFormatting.GOLD
+    val GRAY = EnumChatFormatting.GRAY
+    val DARK_GRAY = EnumChatFormatting.DARK_GRAY
+    val BLUE = EnumChatFormatting.BLUE
+    val GREEN = EnumChatFormatting.GREEN
+    val AQUA = EnumChatFormatting.AQUA
+    val RED = EnumChatFormatting.RED
+    val LIGHT_PURPLE = EnumChatFormatting.LIGHT_PURPLE
+    val YELLOW = EnumChatFormatting.YELLOW
+    val WHITE = EnumChatFormatting.WHITE
+  }
+
+  implicit def str2chat(s: String): ChatComponentText = new ChatComponentText(s)
+  implicit def str2rich(s: String): RichChatComponent = new RichChatComponent(new ChatComponentText(s))
+  implicit def pimpIChatComponent(v: IChatComponent): RichChatComponent = new RichChatComponent(v)
+
+  def C(s: String) = new ChatComponentText(s)
+  def L(s: String, params: IChatComponent*) = new ChatComponentTranslation(s, params: _*)
+}

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

@@ -4,12 +4,13 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.items
 
-import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.block.Block
+import net.minecraft.item.{Item, ItemBlock, ItemStack}
 
 /**
  * Allows matching Items in ItemStacks in scala pattern matches
@@ -21,3 +22,14 @@ object IStack {
     else
       Some(x.getItem)
 }
+
+/**
+ * Allows matching Blocks in ItemStacks in scala pattern matches
+ */
+object IStackBlock {
+  def unapply(x: ItemStack): Option[Block] =
+    if (x == null || x.getItem == null || !x.getItem.isInstanceOf[ItemBlock])
+      None
+    else
+      Some(x.getItem.asInstanceOf[ItemBlock].field_150939_a)
+}

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

@@ -4,17 +4,20 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.items
 
-import net.minecraft.entity.item.EntityItem
-import net.minecraft.item.ItemStack
-import net.minecraft.world.World
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.inventory.IInventory
+import java.util.Random
+
 import net.bdew.lib.Misc
+import net.minecraft.entity.item.EntityItem
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.inventory.{IInventory, ISidedInventory}
+import net.minecraft.item.{Item, ItemStack}
+import net.minecraft.world.World
+import net.minecraftforge.common.util.ForgeDirection
 
 object ItemUtils {
   def throwItemAt(world: World, x: Int, y: Int, z: Int, stack: ItemStack) {
@@ -22,11 +25,11 @@ object ItemUtils {
     val dx = world.rand.nextFloat * 0.8
     val dy = world.rand.nextFloat * 0.8
     val dz = world.rand.nextFloat * 0.8
-    val entityitem: EntityItem = new EntityItem(world, x + dx, y + dy, z + dz, stack)
-    entityitem.motionX = world.rand.nextGaussian * 0.05
-    entityitem.motionY = world.rand.nextGaussian * 0.05 + 0.2
-    entityitem.motionZ = world.rand.nextGaussian * 0.05
-    world.spawnEntityInWorld(entityitem)
+    val entity = new EntityItem(world, x + dx, y + dy, z + dz, stack)
+    entity.motionX = world.rand.nextGaussian * 0.05
+    entity.motionY = world.rand.nextGaussian * 0.05 + 0.2
+    entity.motionZ = world.rand.nextGaussian * 0.05
+    world.spawnEntityInWorld(entity)
   }
 
   def dropItemToPlayer(world: World, player: EntityPlayer, stack: ItemStack) {
@@ -37,34 +40,34 @@ 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
     return ItemStack.areItemStackTagsEqual(stack2, stack1)
   }
 
-  def addStackToSlots(stack: ItemStack, inv: IInventory, slots: Iterable[Int], checkvalid: Boolean): ItemStack = {
+  def addStackToSlots(stack: ItemStack, inv: IInventory, slots: Iterable[Int], checkValid: Boolean): ItemStack = {
     if (stack == null) return null
 
     // Try merging into existing slots
-    for (slot <- slots if (!checkvalid || inv.isItemValidForSlot(slot, stack)) && isSameItem(stack, inv.getStackInSlot(slot))) {
+    for (slot <- slots if (!checkValid || inv.isItemValidForSlot(slot, stack)) && isSameItem(stack, inv.getStackInSlot(slot))) {
       val target = inv.getStackInSlot(slot)
       val toAdd = Misc.min(target.getMaxStackSize - target.stackSize, inv.getInventoryStackLimit - target.stackSize, stack.stackSize)
       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()
       }
     }
 
     // Now find empty slots and stick any leftovers there
-    for (slot <- slots if (!checkvalid || inv.isItemValidForSlot(slot, stack)) && inv.getStackInSlot(slot) == null) {
+    for (slot <- slots if (!checkValid || inv.isItemValidForSlot(slot, stack)) && inv.getStackInSlot(slot) == null) {
       if (inv.getInventoryStackLimit < stack.stackSize) {
         inv.setInventorySlotContents(slot, stack.splitStack(inv.getInventoryStackLimit))
       } else {
@@ -76,4 +79,27 @@ object ItemUtils {
 
     return stack
   }
+
+  def getAccessibleSlotsFromSide(inv: IInventory, side: ForgeDirection) =
+    (Misc.asInstanceOpt(inv, classOf[ISidedInventory])
+      map (_.getAccessibleSlotsFromSide(side.ordinal()).toList)
+      getOrElse (0 until inv.getSizeInventory))
+
+  def findItemInInventory(inv: IInventory, item: Item) =
+    Range(0, inv.getSizeInventory).map(x => x -> inv.getStackInSlot(x))
+      .find({ case (slot, stack) => stack != null && stack.getItem == item })
+      .map({ case (slot, stack) => slot })
+
+  def copyWithRandomSize(template: ItemStack, max: Int, rand: Random) = {
+    val newSize = rand.nextInt(max)
+    val newStack = template.copy()
+    newStack.stackSize =
+      if (newSize > newStack.getMaxStackSize)
+        newStack.getMaxStackSize
+      else if (newSize <= 0)
+        1
+      else
+        newSize
+    newStack
+  }
 }

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

@@ -4,22 +4,26 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.items
 
-import net.minecraft.item.Item
-import net.minecraft.client.renderer.texture.IconRegister
 import cpw.mods.fml.relauncher.{Side, SideOnly}
 import net.bdew.lib.Misc
+import net.minecraft.client.renderer.texture.IIconRegister
+import net.minecraft.item.Item
 
-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) {
-    itemIcon = reg.registerIcon(modId + ":" + name.toLowerCase)
+  override def registerIcons(reg: IIconRegister) {
+    itemIcon = reg.registerIcon(Misc.iconName(modId, name))
   }
 }

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

@@ -4,26 +4,24 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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.entity.player.EntityPlayer
 import net.minecraft.inventory.Slot
+import net.minecraft.item.ItemStack
 
 class ContainerItemInventory(inv: InventoryItemAdapter, player: EntityPlayer) extends BaseContainer(inv) {
-  def canInteractWith(entityplayer: EntityPlayer) = entityplayer == player
-
-  override def slotClick(slotnum: Int, button: Int, modifiers: Int, player: EntityPlayer): ItemStack = {
-    if (slotnum > 0 && slotnum < inventorySlots.size()) {
-      val slot = inventorySlots.asInstanceOf[java.util.List[Slot]].get(slotnum)
+  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)
+    return super.slotClick(slotNum, button, modifiers, player)
   }
 }

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

@@ -4,16 +4,15 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.{NBTTagCompound, NBTTagList}
 
 class InventoryItemAdapter(val player: EntityPlayer, val slot: Int, val size: Int, val tagName: String) extends BaseInventory {
   def getSizeInventory = size
@@ -23,16 +22,17 @@ class InventoryItemAdapter(val player: EntityPlayer, val slot: Int, val size: In
     load()
 
   def load() {
+    import net.bdew.lib.nbt._
     val tag = getStack.getTagCompound
-    for (nbtItem <- Misc.iterNbtList[NBTTagCompound](tag.getTagList(tagName))) {
+    for (nbtItem <- tag.getList[NBTTagCompound](tagName)) {
       val slot = nbtItem.getByte("Slot")
-      if (slot >= 0 && slot < inv.size) {
+      if (slot >= 0 && slot < inv.length) {
         inv(slot) = ItemStack.loadItemStackFromNBT(nbtItem)
       }
     }
   }
 
-  def onInventoryChanged() {
+  def markDirty() {
     if (!getStack.hasTagCompound) getStack.setTagCompound(new NBTTagCompound)
     val tag = getStack.getTagCompound
     val itemList = new NBTTagList

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

@@ -4,22 +4,22 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 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.bdew.lib.gui.GuiProvider
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.item.Item
 import net.minecraft.world.World
 
 /**
  * Mixin for items that have an internal inventory
- * Subclasses are responsible for registering themself with the GuiHandler of their mod
+ * Subclasses are responsible for registering themselves with the GuiHandler of their mod
  */
 trait ItemInventory extends Item with GuiProvider {
   type TEClass = Any

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

@@ -4,29 +4,36 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.machine
 
+import cpw.mods.fml.common.registry.GameRegistry
+import net.bdew.lib.Misc
+import net.bdew.lib.block.{HasItemBlock, HasTE}
 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
+import net.minecraft.creativetab.CreativeTabs
+import net.minecraft.item.ItemBlock
 
-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))
-    GameRegistry.registerBlock(block, name)
-    GameRegistry.registerCustomItemStack(name, new ItemStack(block))
+  def regBlock(creativeTab: CreativeTabs) {
+    block = blockConstruct
+
+    val itemClass: Class[_ <: ItemBlock] = if (block.isInstanceOf[HasItemBlock])
+      block.asInstanceOf[HasItemBlock].ItemBlockClass
+    else
+      classOf[ItemBlock]
+
+    GameRegistry.registerBlock(block, itemClass, name)
+
+    block.setCreativeTab(creativeTab)
     if (block.isInstanceOf[HasTE[_]]) {
       GameRegistry.registerTileEntity(block.asInstanceOf[HasTE[_]].TEClass, "%s.%s".format(modId, name))
     }

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.machine

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

@@ -4,7 +4,7 @@
  *
  * 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
+ * http://bdew.net/minecraft-mod-public-license/
  */
 
 package net.bdew.lib.machine