Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.8.8

build.gradle

@@ -75,6 +75,10 @@ repositories {
     maven {
         url "http://dvs1.progwml6.com/files/maven"
     }
+    maven {
+        name = "mobius"
+        url = "http://mobiusstrip.eu/maven"
+    }
     /*
     maven {
         name = "BluePower"
@@ -92,10 +96,6 @@ repositories {
         name = "IGW"
         url = "http://maven.k-4u.nl/"
     }
-    maven {
-        name = "mobius"
-        url = "http://mobiusstrip.eu/maven"
-    }
     maven {
         name = "dmodoomsirius"
         url = "http://api.dmodoomsirius.me/"
@@ -176,11 +176,11 @@ configurations {
 dependencies {
     deobfCompile "mezz.jei:jei_1.8.8:${config.jei.version}"
     deobfCompile "li.cil.tis3d:TIS-3D:${config.tis3d.version}"
+    deobfCompile "mcp.mobius.waila:Waila:${config.waila.version}"
 /*
     provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
     provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
     provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    provided "mcp.mobius.waila:Waila:${config.waila.version}"
     provided "appeng:RotaryCraft:${config.rotc.version}:api"
     provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
         exclude module: 'buildcraft'
@@ -192,7 +192,6 @@ dependencies {
     provided "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
     provided "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
     provided "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
-    provided "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
     provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
     provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
     provided "dev.modwarriors.notenoughkeys:NotEnoughKeys:${config.minecraft.version}-${config.nek.version}:deobf-dev"
@@ -262,7 +261,6 @@ sourceSets {
             exclude 'li/cil/oc/integration/thermalexpansion/**'
             exclude 'li/cil/oc/integration/thaumcraft/**'
             exclude 'li/cil/oc/integration/tmechworks/**'
-            exclude 'li/cil/oc/integration/waila/**'
             exclude 'li/cil/oc/integration/wrcbe/**'
             exclude 'li/cil/oc/integration/wrsve/**'
         }

build.properties

@@ -45,7 +45,7 @@ rotc.version=V5c
 tis3d.version=MC1.8.8-0.7.1.70
 tmech.version=75.0afb56c
 re.version=3.0.0.342
-waila.version=1.6.0_B1_1.8.1
+waila.version=1.6.0-B3_1.8.8
 wrcbe.version=1.4.1.2
 cofhcore.cf=2246/697
 cofhcore.version=[1.7.10]3.0.3B4-302-dev

src/main/scala/li/cil/oc/integration/Mods.scala

@@ -131,7 +131,7 @@ object Mods {
     //    integration.tmechworks.ModTMechworks,
     integration.vanilla.ModVanilla,
     integration.versionchecker.ModVersionChecker,
-    //    integration.waila.ModWaila,
+    integration.waila.ModWaila,
     //    integration.wrcbe.ModWRCBE,
     //    integration.wrsve.ModWRSVE,
 

src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala

@@ -1,5 +1,7 @@
 package li.cil.oc.integration.waila
 
+import java.util
+
 import li.cil.oc.Localization
 import li.cil.oc.OpenComputers
 import li.cil.oc.api.network.Component
@@ -10,13 +12,15 @@ import li.cil.oc.common.block.SimpleBlock
 import li.cil.oc.common.tileentity
 import li.cil.oc.common.tileentity.traits.NotAnalyzable
 import li.cil.oc.util.ExtendedNBT._
-import mcp.mobius.waila.api.ITaggedList.ITipList
 import mcp.mobius.waila.api._
+import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.nbt.NBTTagString
 import net.minecraft.tileentity.TileEntity
+import net.minecraft.util.BlockPos
 import net.minecraft.util.EnumFacing
+import net.minecraft.world.World
 import net.minecraftforge.common.util.Constants.NBT
 
 object BlockDataProvider extends IWailaDataProvider {
@@ -35,7 +39,7 @@ object BlockDataProvider extends IWailaDataProvider {
     registrar.addConfig(OpenComputers.Name, ConfigComponentName)
   }
 
-  override def getNBTData(tileEntity: TileEntity, tag: NBTTagCompound, accessor: IWailaDataAccessorServer): NBTTagCompound = {
+  override def getNBTData(player: EntityPlayerMP, tileEntity: TileEntity, tag: NBTTagCompound, world: World, pos: BlockPos): NBTTagCompound = {
     def writeNode(node: Node, tag: NBTTagCompound) = {
       if (node != null && node.reachability != Visibility.None && !tileEntity.isInstanceOf[NotAnalyzable]) {
         if (node.address != null) {
@@ -106,7 +110,7 @@ object BlockDataProvider extends IWailaDataProvider {
     tag
   }
 
-  override def getWailaBody(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = {
+  override def getWailaBody(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = {
     val tag = accessor.getNBTData
     if (tag == null || tag.hasNoTags) return tooltip
 
@@ -179,9 +183,9 @@ object BlockDataProvider extends IWailaDataProvider {
 
   override def getWailaStack(accessor: IWailaDataAccessor, config: IWailaConfigHandler) = accessor.getStack
 
-  override def getWailaHead(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = tooltip
+  override def getWailaHead(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = tooltip
 
-  override def getWailaTail(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = tooltip
+  override def getWailaTail(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = tooltip
 
   private def formatTime(seconds: Int) = {
     // Assembly times should not / rarely exceed one hour, so this is good enough.