Fixed wrong msgs on empty and microblocks.

assets/waila/lang/de_DE.lang

@@ -132,3 +132,6 @@ option.bcapi.consump=Zeige maximale Energie
 option.bcapi.trigger=Zeige Startenergie
 option.pr.showio=Zeige Gatter IO
 option.pr.showdata=Zeige Gatterdaten
+option.extrautilities.fluidamount=Zeige Flüssigk.-Menge
+option.openblocks.fluidamount=Zeige Flüssigk.-Menge
+option.railcraft.fluidamount=Zeige Flüssigk.-Menge

assets/waila/lang/en_US.lang

@@ -132,3 +132,6 @@ option.bcapi.consump=Show maximum power
 option.bcapi.trigger=Show triggering energy
 option.pr.showio=Show gates IO
 option.pr.showdata=Show gates data
+option.extrautilities.fluidamount=Show fluid amount
+option.openblocks.fluidamount=Show fluid amount
+option.railcraft.fluidamount=Show fluid amount

assets/waila/lang/fr_FR.lang

@@ -130,4 +130,7 @@ option.bcapi.storage=Afficher MJ stocké
 option.bcapi.consump=Afficher puissance maximale
 option.bcapi.trigger=Energie déclanchement
 option.pr.showio=Afficher plaques IO
-option.pr.showdata=Afficher plaques data
+option.pr.showdata=Afficher plaques data
+option.extrautilities.fluidamount=Afficher niveau fluides
+option.openblocks.fluidamount=Afficher niveau fluides
+option.railcraft.fluidamount=Afficher niveau fluides

assets/waila/lang/nl_NL.lang

@@ -111,4 +111,7 @@ option.vanilla.leverstate=Hendel status
 option.vanilla.repeater=Herhaler vertraging
 option.vanilla.comparator=Vergelijker modus
 option.vanilla.redstone=Redstone vermogen
-option.vanilla.jukebox=Jukebox schijf
+option.vanilla.jukebox=Jukebox schijf
+option.extrautilities.fluidamount=Toon vloeistofhoeveelheid
+option.openblocks.fluidamount=Toon vloeistofhoeveelheid
+option.railcraft.fluidamount=Toon vloeistofhoeveelheid

assets/waila/lang/ru_RU.lang

@@ -126,3 +126,6 @@ option.bcapi.consump=Показывать макс. энергию
 option.bcapi.trigger=Показывать энергию активации
 option.pr.showio=Показывать ввод/вывод схем
 option.pr.showdata=Показывать инф. о схемах
+option.extrautilities.fluidamount=Показывать кол-во жидкости
+option.openblocks.fluidamount=Показывать кол-во жидкости
+option.railcraft.fluidamount=Показывать кол-во жидкости

mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java

@@ -0,0 +1,34 @@
+package mcp.mobius.waila.addons.exu;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+
+public class ExtraUtilitiesModule {
+
+	public static Class ModExtraUtilities = null;
+	public static Class TileEntityDrum    = null;	
+	
+	public static void register(){
+		
+
+		try{
+			Class ModExtraUtilities = Class.forName("extrautils.ExtraUtils");
+			mod_Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
+			return;
+		}
+		
+		ExternalModulesHandler.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");		
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);			
+	}
+}

mcp/mobius/waila/addons/exu/HUDHandlerDrum.java

@@ -0,0 +1,53 @@
+package mcp.mobius.waila.addons.exu;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerDrum 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 (!config.getConfig("extrautilities.fluidamount")) return currenttip;
+		
+		int amount = 0;
+		
+		NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank");
+		if (subtag.hasKey("Amount"))
+			amount = accessor.getNBTInteger(subtag, "Amount");
+		
+		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
+		if (handler == null) return currenttip;
+		
+		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+		if (tanks.length != 1) return currenttip;
+		
+		currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity));
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java

@@ -0,0 +1,69 @@
+package mcp.mobius.waila.addons.openblocks;
+
+import java.util.List;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerTank 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) {
+		if (!config.getConfig("openblocks.fluidamount")) return currenttip;		
+	
+		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
+		if (handler == null) return currenttip;
+		
+		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+		if (tanks.length != 1) return currenttip;
+		
+		FluidStack  fluid = tanks[0].fluid; 
+		String name       = currenttip.get(0);
+		
+		try{
+			name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
+		} catch (NullPointerException f){
+			name += " " + LangUtil.translateG("hud.msg.empty");
+		}			
+		
+		currenttip.set(0, name);		
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("openblocks.fluidamount")) return currenttip;
+		
+		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
+		if (handler == null) return currenttip;
+		
+		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+		if (tanks.length != 1) return currenttip;
+		
+		if(tanks[0].fluid != null)
+			currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity));
+		else
+			currenttip.add(String.format("0 / %d mB", tanks[0].capacity));
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java

@@ -0,0 +1,33 @@
+package mcp.mobius.waila.addons.openblocks;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+
+public class OpenBlocksModule {
+	
+	public static Class ModOpenBlocks  = null;
+	public static Class TileEntityTank = null;	
+	
+	public static void register(){
+		try{
+			Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks");
+			mod_Waila.log.log(Level.INFO, "OpenBlocks mod found.");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e);
+			return;
+		}
+		
+		ExternalModulesHandler.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");		
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTank(),  TileEntityTank);
+		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerTank(),  TileEntityTank);		
+	}
+}

mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java

@@ -0,0 +1,74 @@
+package mcp.mobius.waila.addons.railcraft;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidTank;
+import mcp.mobius.waila.WailaExceptionHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerTank 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) {
+		if (!config.getConfig("railcraft.fluidamount")) return currenttip;	
+		try {
+			IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
+			if (tank == null) return currenttip;
+			
+			FluidStack fluid = tank.getFluid();
+
+			String name = currenttip.get(0);
+			
+			try{
+				name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
+			} catch (NullPointerException f){
+				name += " " + LangUtil.translateG("hud.msg.empty");
+			}			
+			
+			currenttip.set(0, name);			
+			
+		} catch (Exception e){    
+			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+		} 		
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("railcraft.fluidamount")) return currenttip;	
+		
+		try {
+			IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
+			if (tank == null) return currenttip;			
+			
+			FluidStack fluid = tank.getFluid();
+			if (fluid != null)
+				currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity));
+			else
+				currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity));
+			
+		} catch (Exception e){    
+			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+		} 		
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

mcp/mobius/waila/addons/railcraft/RailcraftModule.java

@@ -0,0 +1,42 @@
+package mcp.mobius.waila.addons.railcraft;
+
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+
+public class RailcraftModule {
+	public static Class  TileTankBase = null;	
+	public static Class  ITankTile = null;
+	public static Method ITankTile_getTank = null;
+	//public static Class  StandardTank = null;	
+	
+	public static void register(){
+		try{
+			Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft");
+			mod_Waila.log.log(Level.INFO, "Railcraft mod found.");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
+			return;
+		}			
+		
+		try{
+			TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase");
+			ITankTile    = Class.forName("mods.railcraft.common.blocks.machine.ITankTile");
+			ITankTile_getTank = ITankTile.getMethod("getTank");
+			//StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
+			
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
+			return;
+		} catch (NoSuchMethodException e){
+			mod_Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
+			return;			
+		}
+		
+		ExternalModulesHandler.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");		
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTank(),  TileTankBase);
+		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerTank(),  TileTankBase);
+	}
+}

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.fluids.FluidStack;
 import mcp.mobius.waila.WailaExceptionHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -25,22 +27,31 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 
-		if (config.getConfig("thermalexpansion.fluidtype")){
+		if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip;
 		
-			try {
-				FluidStack fluid = (FluidStack)ThermalExpansionModule.TileConduitFluid_getRenderFluid.invoke(accessor.getTileEntity());
-				
-				try{
-					currenttip.add(fluid.getFluid().getLocalizedName());
-				} catch (NullPointerException f){
-					currenttip.add(LangUtil.translateG("hud.msg.empty"));
-				}
-				
-			} catch (Exception e){    
-				currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-			} 	
+		boolean found   = false;
+		FluidStack fluid = null;
+		
+		if (!accessor.getNBTData().hasKey("parts")) return currenttip;
+		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
+		for (int i = 0; i < parts.tagCount(); i++){
+			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
+			String id = subtag.getString("id");
 			
-		}
+			if (id.contains("ConduitFluid")){
+				found  = true;
+				NBTTagCompound fluidTag = subtag.getCompoundTag("ConnFluid");
+				fluid = FluidStack.loadFluidStackFromNBT(fluidTag);
+			}
+		}			
+
+		if (!found) return currenttip;	
+		
+		if (fluid != null)
+			currenttip.add(fluid.getFluid().getLocalizedName());			
+		else
+			currenttip.add(LangUtil.translateG("hud.msg.empty"));
+		
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java

@@ -3,6 +3,8 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -22,18 +24,35 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 		
-		if (accessor.getNBTData().hasKey("Mode") && accessor.getNBTInteger(accessor.getNBTData(), "Mode") != 0){
-			int mode = accessor.getNBTInteger(accessor.getNBTData(), "Mode");
+		if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip;
+		
+		boolean found = false;
+		int      mode  = -1;
+		
+		if (!accessor.getNBTData().hasKey("parts")) return currenttip;
+		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
+		for (int i = 0; i < parts.tagCount(); i++){
+			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
+			String id = subtag.getString("id");
 			
-			if (mode == 1)
-				currenttip.add("Mode : \u00a7fDense");
-			else if (mode == 2)
-				currenttip.add("Mode : \u00a7fVacuum");
-			else if (mode == 3)
-				currenttip.add("Mode : \u00a7fRound-Robin");			
-			else
-				currenttip.add("Mode : <UNKNOWN>");
-		}
+			if (id.contains("ConduitItem")){
+				mode   = accessor.getNBTInteger(subtag, "Mode");
+				found  = true;
+			}
+		}	
+		
+		if (!found) return currenttip;		
+		
+		if (mode == 0){}
+		else if (mode == 1)
+			currenttip.add("Mode : \u00a7fDense");
+		else if (mode == 2)
+			currenttip.add("Mode : \u00a7fVacuum");
+		else if (mode == 3)
+			currenttip.add("Mode : \u00a7fRound-Robin");			
+		else
+			currenttip.add("Mode : <UNKNOWN>");
+
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java

@@ -20,16 +20,18 @@ public class ThermalExpansionModule {
 	public static Method TileTank_getTankCapacity = null;
 	public static Field  TileTank_mode = null;
 
-	public static Class  TileConduitFluid = null;
-	public static Method TileConduitFluid_getRenderFluid = null;
-	public static Method TileConduitFluid_getRenderFluidLevel = null;
+	//public static Class  TileConduitFluid = null;
+	//public static Method TileConduitFluid_getRenderFluid = null;
+	//public static Method TileConduitFluid_getRenderFluidLevel = null;
 	
-	public static Class  TileConduitItems = null;
+	//public static Class  TileConduitItems = null;
 	
 	public static Class  TileTesseract = null;
 	
 	public static Class  ISecureTile = null;
 	
+	public static Class BlockMultipart = null;
+	
 	//public static Field  TileTesseract_modItem   = null;
 	//public static Field  TileTesseract_modFluid  = null;
 	//public static Field  TileTesseract_modEnergy = null;	
@@ -59,16 +61,17 @@ public class ThermalExpansionModule {
 			TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
 			TileTank_mode            = TileTank.getField("mode");
 
-			TileConduitFluid = Class.forName("thermalexpansion.block.conduit.fluid.TileConduitFluid");			
-			TileConduitFluid_getRenderFluid      = TileConduitFluid.getMethod("getRenderFluid");
-			TileConduitFluid_getRenderFluidLevel = TileConduitFluid.getMethod("getRenderFluidLevel");
-
-			TileConduitItems = Class.forName("thermalexpansion.block.conduit.item.TileConduitItem");				
+			//TileConduitFluid = Class.forName("thermalexpansion.block.conduit.fluid.TileConduitFluid");			
+			//TileConduitFluid_getRenderFluid      = TileConduitFluid.getMethod("getRenderFluid");
+			//TileConduitFluid_getRenderFluidLevel = TileConduitFluid.getMethod("getRenderFluidLevel");
+			//TileConduitItems = Class.forName("thermalexpansion.block.conduit.item.TileConduitItem");				
 			
 			TileTesseract = Class.forName("thermalexpansion.block.tesseract.TileTesseract");
 			
 			ISecureTile   = Class.forName("cofh.api.tileentity.ISecureTile");
 			
+			BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart");
+			
 			//TileTesseract_modItem   = TileTesseract.getField("modItem");
 			//TileTesseract_modFluid  = TileTesseract.getField("modFluid");
 			//TileTesseract_modEnergy = TileTesseract.getField("modEnergy");			
@@ -96,7 +99,7 @@ public class ThermalExpansionModule {
 		
 		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
 		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
-		ExternalModulesHandler.instance().addConfig("Thermal Expansion", "thermalexpansion.fluidtype");
+		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
 		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
 		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.conditemmode");		
 		ExternalModulesHandler.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
@@ -105,19 +108,17 @@ public class ThermalExpansionModule {
 		ExternalModulesHandler.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner");		
 		
 		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler);
-		//ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), TileEnergyCell);
 		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
 		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
 		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);
 		
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitFluid(), TileConduitFluid);
 		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
 		
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitItem(), TileConduitItems);		
-		
 		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
-		
-		//ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitBase(), TileConduitBase);				
+
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitFluid(), BlockMultipart);		
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerConduitItem(),  BlockMultipart);		
+			
 		
 	}
 	

mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import codechicken.lib.lang.LangUtil;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockSilverfish;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
@@ -31,11 +32,29 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 	static int jukebox       = Block.jukebox.blockID;
 	static int cocoa		 = Block.cocoaPlant.blockID;
 	static int netherwart    = Block.netherStalk.blockID;
+	static int silverfish    = Block.silverfish.blockID;
 	
 	
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		int blockID       = accessor.getBlockID();
+		
+		if (blockID == silverfish){
+			int metadata = accessor.getMetadata();
+			switch(metadata){
+			case 0:
+				return new ItemStack(Block.stone);
+			case 1:
+				return new ItemStack(Block.cobblestone);
+			case 2:
+				return new ItemStack(Block.stoneBrick);
+			default:
+				return null;
+			}
+		}
+		
 		return null;
+		
 	}
 
 	@Override
@@ -149,23 +168,27 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.repeater");
 		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.comparator");
 		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.redstone");
-		ExternalModulesHandler.instance().addConfigRemote("VanillaMC", "vanilla.jukebox");		
-		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), mobSpawnerID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), cropsID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), melonStemID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), pumpkinStemID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), carrotID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), potatoID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), leverID);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterIdle);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterActv);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorIdl);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorAct);
-		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), redstone);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), redstone);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), jukebox);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), cocoa);
-		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), netherwart);			
+		ExternalModulesHandler.instance().addConfigRemote("VanillaMC", "vanilla.jukebox");
+		
+		IWailaDataProvider provider = new HUDHandlerVanilla();
+		
+		ExternalModulesHandler.instance().registerStackProvider(provider, silverfish);		
+		ExternalModulesHandler.instance().registerHeadProvider(provider, mobSpawnerID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, cropsID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, melonStemID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, pumpkinStemID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, carrotID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, potatoID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, leverID);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, repeaterIdle);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, repeaterActv);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, comparatorIdl);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, comparatorAct);
+		ExternalModulesHandler.instance().registerHeadProvider(provider, redstone);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, redstone);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, jukebox);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, cocoa);
+		ExternalModulesHandler.instance().registerBodyProvider(provider, netherwart);			
 		
 		ExternalModulesHandler.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
 		

mcp/mobius/waila/client/ProxyClient.java

@@ -8,9 +8,12 @@ import mcp.mobius.waila.addons.buildcraft.BCPowerAPIModule;
 import mcp.mobius.waila.addons.enderio.EnderIOModule;
 import mcp.mobius.waila.addons.enderstorage.EnderStorageModule;
 import mcp.mobius.waila.addons.etb.ETBModule;
+import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule;
 import mcp.mobius.waila.addons.gravestone.GravestoneModule;
 import mcp.mobius.waila.addons.ic2.IC2Module;
+import mcp.mobius.waila.addons.openblocks.OpenBlocksModule;
 import mcp.mobius.waila.addons.projectred.ProjectRedModule;
+import mcp.mobius.waila.addons.railcraft.RailcraftModule;
 import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule;
 import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule;
 import mcp.mobius.waila.addons.twilightforest.TwilightForestModule;
@@ -115,7 +118,16 @@ public class ProxyClient extends ProxyServer {
 		BCPowerAPIModule.register();
 		
 		/* ProjectRed API */
-		ProjectRedModule.register();		
+		ProjectRedModule.register();
+		
+		/* ExtraUtilities */
+		ExtraUtilitiesModule.register();	
+		
+		/* OpenBlocks */
+		OpenBlocksModule.register();
+		
+		/* Railcraft */
+		RailcraftModule.register();			
 	}	
 	
 	@Override

mcp/mobius/waila/mod_Waila.java

@@ -53,7 +53,7 @@ import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.common.registry.ItemData;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
-@Mod(modid="Waila", name="Waila", version="1.4.3", dependencies="required-after:NotEnoughItems")
+@Mod(modid="Waila", name="Waila", version="1.4.4", dependencies="required-after:NotEnoughItems")
 @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, 
 			packetHandler = WailaPacketHandler.class, versionBounds="[1.3.0,)")
 

mcp/mobius/waila/overlay/OverlayRenderer.java

@@ -20,8 +20,6 @@ import java.awt.Point;
 import mcp.mobius.waila.Constants;
 import mcp.mobius.waila.mod_Waila;
 import mcp.mobius.waila.addons.ConfigHandler;
-import mcp.mobius.waila.addons.ExternalModulesHandler;
-import mcp.mobius.waila.gui.truetyper.FontHelper;
 import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
@@ -111,7 +109,7 @@ public class OverlayRenderer {
     
     public static void renderOverlay(ItemStack stack, List<String> textData, Point pos)
     {
-    	TrueTypeFont font = (TrueTypeFont)mod_Waila.instance.proxy.getFont();
+    	TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont();
     	
     	GL11.glPushMatrix();