bump forge/mantle versions, restore waila integration

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 
 	}
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
@@ -31,6 +31,10 @@ repositories {
         name 'CB Maven FS'
         url "http://chickenbones.net/maven/"
     }
+	maven {
+         name "ProfMobius Maven FS"
+         url "http://mobiusstrip.eu/maven"
+     }
     maven {
         name 'DVS1 Maven FS'
         url 'http://dvs1.progwml6.com/files/maven'
@@ -65,6 +69,7 @@ dependencies {
     compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev"
 	compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
     compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev"
+	compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
 	deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
 }
 

build.properties

@@ -1,8 +1,9 @@
 minecraft_version=1.7.2
-forge_version=10.12.0.1027
-mantle_version=132.45b0b50
+forge_version=10.12.1.1074
+mantle_version=143.727db8b
 FMP_version=1.1.0.268
 CCLIB_version=1.1.0.77
 NEI_version=1.0.1
 ccc_version=1.0.0
 mod_version=1.6.0
+waila_version=1.5.2a

src/main/java/tconstruct/client/TProxyClient.java

@@ -7,7 +7,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import mantle.client.MProxyClient;
-import mantle.client.block.SmallFontRenderer;
+import mantle.client.SmallFontRenderer;
 import mantle.lib.client.MantleClientRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

returning_eventually/waila/BasinDataProvider.java → src/main/java/tconstruct/plugins/waila/BasinDataProvider.java

@@ -9,27 +9,31 @@
 
 import java.util.List;
 
-public class BasinDataProvider implements IWailaDataProvider {
+public class BasinDataProvider implements IWailaDataProvider
+{
 
     @Override
-    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+    public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
         if (accessor.getTileEntity() instanceof CastingBasinLogic)
         {
-            return ((CastingBasinLogic)accessor.getTileEntity()).getStackInSlot(0);
+            return ((CastingBasinLogic) accessor.getTileEntity()).getStackInSlot(0);
         }
         return null;
     }
 
     @Override
-    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+    public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
         return currenttip;
     }
 
     @Override
-    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+    public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
         if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true))
         {
-            CastingBasinLogic te = (CastingBasinLogic)accessor.getTileEntity();
+            CastingBasinLogic te = (CastingBasinLogic) accessor.getTileEntity();
             if (te.getFluidAmount() != 0)
             {
                 FluidStack fs = te.getFluid();
@@ -38,14 +42,23 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
             }
             else
             {
-                if (te.getStackInSlot(0) != null) {
+                if (te.getStackInSlot(0) != null)
+                {
                     currenttip.add("Contains: " + te.getStackInSlot(0).getDisplayName());
-                } else {
+                }
+                else
+                {
                     currenttip.add("§oEmpty"); // "§o" == Italics
                 }
             }
         }
         return currenttip;
     }
 
+    @Override
+    public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return currenttip;
+    }
+
 }

src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java

@@ -0,0 +1,77 @@
+package tconstruct.plugins.waila;
+
+import java.util.List;
+
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import tconstruct.blocks.logic.CastingChannelLogic;
+
+public class CastingChannelDataProvider implements IWailaDataProvider
+{
+
+    @Override
+    public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return null;
+    }
+
+    @Override
+    public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        if (accessor.getTileEntity() instanceof CastingChannelLogic)
+        {
+            CastingChannelLogic te = (CastingChannelLogic) accessor.getTileEntity();
+            FluidTankInfo internalTank = te.getTankInfo(null)[0];
+            FluidTankInfo northTank = te.getTankInfo(ForgeDirection.NORTH)[0];
+            FluidTankInfo southTank = te.getTankInfo(ForgeDirection.SOUTH)[0];
+            FluidTankInfo westTank = te.getTankInfo(ForgeDirection.WEST)[0];
+            FluidTankInfo eastTank = te.getTankInfo(ForgeDirection.EAST)[0];
+
+            if (internalTank.fluid != null && internalTank.fluid.amount > 0)
+            {
+                FluidStack fs = internalTank.fluid;
+                currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs));
+                currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + internalTank.capacity);
+            }
+            else
+            {
+                currenttip.add("§o" + StatCollector.translateToLocal("tconstruct.waila.empty")); // "§o" == Italics
+            }
+
+            currenttip.add(StatCollector.translateToLocal("tconstruct.waila.subtanks"));
+            String s1, s2, s3, s4;
+            s1 = s2 = s3 = s4 = "§o" + StatCollector.translateToLocal("tconstruct.waila.empty");
+
+            if (northTank.fluid != null)
+                s1 = northTank.fluid.amount + " / " + northTank.capacity;
+            if (southTank.fluid != null)
+                s2 = southTank.fluid.amount + " / " + southTank.capacity;
+            if (westTank.fluid != null)
+                s3 = westTank.fluid.amount + " / " + westTank.capacity;
+            if (eastTank.fluid != null)
+                s4 = eastTank.fluid.amount + " / " + eastTank.capacity;
+            currenttip.add(s1 + "; " + s2 + "; " + s3 + "; " + s4);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return currenttip;
+    }
+
+}

returning_eventually/waila/SearedTankDataProvider.java → src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java

@@ -43,4 +43,11 @@ public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
         }
         return currenttip;
     }
+
+    @Override
+    public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return currenttip;
+    }
+
 }

returning_eventually/waila/SmelteryDataProvider.java → src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java

@@ -55,4 +55,10 @@ public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip,
         return currenttip;
     }
 
+    @Override
+    public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
+    {
+        return currenttip;
+    }
+
 }