update + sa + fix

# Conflicts:
#	dependencies.gradle

dependencies.gradle

@@ -1,9 +1,23 @@
 // Add your dependencies here
 
 dependencies {
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.20-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.37-GTNH:dev')
 
     shadowImplementation('au.com.bytecode:opencsv:2.4')
 
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.69:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.111:dev") { transitive = false }
+
+    runtimeOnly("com.github.GTNewHorizons:WAILAPlugins:0.7.0:dev") {
+        exclude group: 'com.github.GTNewHorizons', module: 'waila'
+    }
+    runtimeOnly("com.github.GTNewHorizons:EnderCore:0.5.0:dev")
+    runtimeOnly("com.github.GTNewHorizons:BuildCraft:7.1.45:dev")
+    runtimeOnly("curse.maven:cofh-lib-220333:2388748")
+    runtimeOnly("curse.maven:extrautils-225561:2264383")
+    runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.12.3-GTNH:dev")
+    runtimeOnly("com.github.GTNewHorizons:Railcraft:9.17.6:dev")
+    runtimeOnly('curse.maven:thermal-foundation-222880:2388753')
+    runtimeOnly('curse.maven:thermal-expansion-69163:2388759')
+    runtimeOnly('curse.maven:thermal-dynamics-227443:2388756')
+    implementation('curse.maven:cofh-core-69162:2388751')
 }

gradle.properties

@@ -174,6 +174,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.46'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
 }
 
 

src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java

@@ -8,6 +8,7 @@ import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class BCModule {
 
@@ -15,21 +16,26 @@ public class BCModule {
     public static Method TileTank_getTankInfo = null;
 
     public static void register() {
+        if (LoadedMods.WAILA_PLUGINS) {
+            return;
+        }
+
         try {
             TileTank = Class.forName("buildcraft.factory.TileTank");
             TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class);
 
-            ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount");
-            ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
-            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);
-            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
-
+            Waila.log.log(Level.INFO, "Buildcraft mod found.");
         } catch (ClassNotFoundException | NoSuchMethodException e) {
             Waila.log.log(Level.INFO, "[BC] Buildcraft mod not found.");
             return;
         }
-        Waila.log.log(Level.INFO, "Buildcraft mod found.");
 
+        ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
+        ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount");
+
+        TankFluidHandler tankFluidHandler = new TankFluidHandler();
+        ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTank);
+        ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTank);
     }
 
 }

src/main/java/mcp/mobius/waila/addons/buildcraft/TankFluidHandler.java

@@ -19,8 +19,9 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NumberFormatter;
 
-public class HUDHandlerBCTanks implements IWailaDataProvider {
+public class TankFluidHandler implements IWailaDataProvider {
 
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
@@ -30,27 +31,41 @@ public class HUDHandlerBCTanks implements IWailaDataProvider {
     @Override
     public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
+
+        if (!ConfigHandler.instance().getConfig("bc.tanktype")) {
+            return currenttip;
+        }
+
         FluidTankInfo tank = this.getTank(accessor);
         FluidStack stack = tank != null ? tank.fluid : null;
-
         String name = currenttip.get(0);
-        if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype"))
-            name = name + " (" + stack.getFluid().getName() + ")";
-        else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype"))
-            name = name + " " + LangUtil.translateG("hud.msg.empty");
-        currenttip.set(0, name);
+        String fluidName = stack == null ? LangUtil.translateG("hud.msg.empty")
+                : stack.getFluid().getLocalizedName(stack);
+
+        currenttip.set(0, name + " < " + fluidName + " >");
+
         return currenttip;
     }
 
     @Override
     public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
+
+        if (!ConfigHandler.instance().getConfig("bc.tankamount")) {
+            return currenttip;
+        }
+
         FluidTankInfo tank = this.getTank(accessor);
         FluidStack stack = tank != null ? tank.fluid : null;
         int liquidAmount = stack != null ? stack.amount : 0;
         int capacity = tank != null ? tank.capacity : 0;
 
-        if (ConfigHandler.instance().getConfig("bc.tankamount")) currenttip.add(liquidAmount + "/" + capacity + " mB");
+        currenttip.add(
+                String.format(
+                        "%s / %s %s",
+                        NumberFormatter.format(liquidAmount),
+                        NumberFormatter.format(capacity),
+                        ConfigHandler.instance().fluidUnit));
 
         return currenttip;
     }

src/main/java/mcp/mobius/waila/addons/exu/DrumFluidHandler.java

@@ -14,8 +14,10 @@ import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.utils.NumberFormatter;
 
-public class HUDHandlerDrum implements IWailaDataProvider {
+public class DrumFluidHandler implements IWailaDataProvider {
 
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
@@ -34,18 +36,19 @@ public class HUDHandlerDrum implements IWailaDataProvider {
 
         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));
+        int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount;
+        currenttip.add(
+                String.format(
+                        "%s / %s %s",
+                        NumberFormatter.format(amount),
+                        NumberFormatter.format(tanks[0].capacity),
+                        ConfigHandler.instance().fluidUnit));
 
         return currenttip;
     }
@@ -59,7 +62,6 @@ public class HUDHandlerDrum implements IWailaDataProvider {
     @Override
     public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
             int y, int z) {
-        if (te != null) te.writeToNBT(tag);
         return tag;
     }
 

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

@@ -4,30 +4,26 @@ import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class ExtraUtilitiesModule {
 
     public static Class<?> TileEntityDrum = null;
 
     public static void register() {
+        if (LoadedMods.WAILA_PLUGINS) {
+            return;
+        }
 
         try {
-            Class.forName("com.rwtema.extrautils.ExtraUtils");
+            TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
             Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
         } catch (ClassNotFoundException e) {
             Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
             return;
         }
 
-        try {
-            TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
-        } catch (ClassNotFoundException e) {
-            Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e);
-            return;
-        }
-
         ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");
-        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum);
-        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDrum(), TileEntityDrum);
+        ModuleRegistrar.instance().registerBodyProvider(new DrumFluidHandler(), TileEntityDrum);
     }
 }

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

@@ -4,30 +4,29 @@ import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class OpenBlocksModule {
 
     public static Class<?> TileEntityTank = null;
 
     public static void register() {
+        if (LoadedMods.WAILA_PLUGINS) {
+            return;
+        }
+
         try {
-            Class.forName("openblocks.OpenBlocks");
+            TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
             Waila.log.log(Level.INFO, "OpenBlocks mod found.");
         } catch (ClassNotFoundException e) {
             Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
             return;
         }
 
-        try {
-            TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
-        } catch (ClassNotFoundException e) {
-            Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e);
-            return;
-        }
-
         ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");
-        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank);
-        ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank);
-        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileEntityTank);
+
+        TankFluidHandler tankFluidHandler = new TankFluidHandler();
+        ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileEntityTank);
+        ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileEntityTank);
     }
 }

src/main/java/mcp/mobius/waila/addons/openblocks/TankFluidHandler.java

@@ -15,9 +15,11 @@ import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NumberFormatter;
 
-public class HUDHandlerTank implements IWailaDataProvider {
+public class TankFluidHandler implements IWailaDataProvider {
 
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
@@ -37,14 +39,10 @@ public class HUDHandlerTank implements IWailaDataProvider {
 
         FluidStack fluid = tanks[0].fluid;
         String name = currenttip.get(0);
+        String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty")
+                : fluid.getFluid().getLocalizedName(fluid);
 
-        try {
-            name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-        } catch (NullPointerException f) {
-            name += " " + LangUtil.translateG("hud.msg.empty");
-        }
-
-        currenttip.set(0, name);
+        currenttip.set(0, name + " < " + fluidName + " >");
 
         return currenttip;
     }
@@ -60,9 +58,13 @@ public class HUDHandlerTank implements IWailaDataProvider {
         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));
+        int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount;
+        currenttip.add(
+                String.format(
+                        "%s / %s %s",
+                        NumberFormatter.format(amount),
+                        NumberFormatter.format(tanks[0].capacity),
+                        ConfigHandler.instance().fluidUnit));
 
         return currenttip;
     }
@@ -76,7 +78,6 @@ public class HUDHandlerTank implements IWailaDataProvider {
     @Override
     public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
             int y, int z) {
-        if (te != null) te.writeToNBT(tag);
         return tag;
     }
 

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

@@ -1,88 +0,0 @@
-package mcp.mobius.waila.addons.railcraft;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidTank;
-
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
-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(fluid));
-            } 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;
-    }
-
-    @Override
-    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
-            int y, int z) {
-        if (te != null) te.writeToNBT(tag);
-        return tag;
-    }
-
-}

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

@@ -1,43 +1,59 @@
 package mcp.mobius.waila.addons.railcraft;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class RailcraftModule {
 
     public static Class<?> TileTankBase = null;
-    public static Class<?> ITankTile = null;
-    public static Method ITankTile_getTank = null;
+    public static Method TileTankBase_getTank = null;
+
+    public static Class<?> StandardTank = null;
+    public static Field StandardTank_capacity = null;
+    public static Field StandardTank_renderData = null;
+
+    public static Field StandardTank_renderDataFluid = null;
+    public static Field StandardTank_renderDataAmount = null;
 
     public static void register() {
-        try {
-            Class.forName("mods.railcraft.common.core.Railcraft");
-            Waila.log.log(Level.INFO, "Railcraft mod found.");
-        } catch (ClassNotFoundException e) {
-            Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
+        if (LoadedMods.WAILA_PLUGINS) {
             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");
+            TileTankBase_getTank = TileTankBase.getMethod("getTank");
 
+            StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
+            StandardTank_capacity = StandardTank.getSuperclass().getDeclaredField("capacity");
+            StandardTank_capacity.setAccessible(true);
+            StandardTank_renderData = StandardTank.getField("renderData");
+
+            StandardTank_renderDataFluid = StandardTank_renderData.getType().getField("fluid");
+            StandardTank_renderDataAmount = StandardTank_renderData.getType().getField("amount");
+
+            Waila.log.log(Level.INFO, "Railcraft mod found.");
         } catch (ClassNotFoundException e) {
             Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e);
             return;
         } catch (NoSuchMethodException e) {
             Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e);
             return;
+        } catch (NoSuchFieldException e) {
+            Waila.log.log(Level.WARN, "[Railcraft] Field not found." + e);
+            return;
         }
 
         ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");
-        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase);
-        ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase);
-        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTankBase);
+
+        TankFluidHandler tankFluidHandler = new TankFluidHandler();
+        ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTankBase);
+        ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTankBase);
     }
 }

src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java

@@ -0,0 +1,102 @@
+package mcp.mobius.waila.addons.railcraft;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.IFluidTank;
+
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NumberFormatter;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
+public class TankFluidHandler 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;
+
+        IFluidTank tank = this.getTank(accessor.getTileEntity());
+        if (tank == null) return currenttip;
+
+        FluidStack fluid = tank.getFluid();
+        String name = currenttip.get(0);
+        String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty")
+                : fluid.getFluid().getLocalizedName(fluid);
+
+        currenttip.set(0, name + " < " + fluidName + " >");
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("railcraft.fluidamount")) return currenttip;
+
+        IFluidTank tank = this.getTank(accessor.getTileEntity());
+        if (tank == null) return currenttip;
+
+        FluidStack fluid = tank.getFluid();
+        int amount = fluid == null ? 0 : fluid.amount;
+
+        currenttip.add(
+                String.format(
+                        "%s / %s %s",
+                        NumberFormatter.format(amount),
+                        NumberFormatter.format(tank.getCapacity()),
+                        ConfigHandler.instance().fluidUnit));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        return tag;
+    }
+
+    private FluidTank getTank(TileEntity tileEntity) {
+        if (tileEntity == null) {
+            return null;
+        }
+
+        try {
+            Object tank = RailcraftModule.TileTankBase_getTank.invoke(tileEntity);
+
+            int capacity = RailcraftModule.StandardTank_capacity.getInt(tank);
+            Object renderData = RailcraftModule.StandardTank_renderData.get(tank);
+
+            Fluid fluid = (Fluid) RailcraftModule.StandardTank_renderDataFluid.get(renderData);
+            int amount = RailcraftModule.StandardTank_renderDataAmount.getInt(renderData);
+
+            return new FluidTank(fluid, amount, capacity);
+        } catch (Exception e) {
+            WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), null);
+            return null;
+        }
+    }
+
+}

src/main/java/mcp/mobius/waila/addons/thermaldynamics/FluiductFluidHandler.java

@@ -0,0 +1,112 @@
+package mcp.mobius.waila.addons.thermaldynamics;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.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;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NumberFormatter;
+
+/**
+ * Created by Lordmau5 on 28.02.2015.
+ */
+public class FluiductFluidHandler 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("thermaldynamics.fluiductsFluid")) {
+            return currenttip;
+        }
+
+        NBTTagCompound tag = accessor.getNBTData();
+        FluidStack fluid = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("fluid"));
+        int capacity = tag.getInteger("capacity");
+
+        if (capacity == 0) {
+            return currenttip;
+        }
+
+        String name = currenttip.get(0);
+        String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty")
+                : fluid.getFluid().getLocalizedName(fluid);
+
+        currenttip.set(0, name + " < " + fluidName + " >");
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+
+        if (!config.getConfig("thermaldynamics.fluiductsAmount")) {
+            return currenttip;
+        }
+
+        NBTTagCompound tag = accessor.getNBTData();
+        FluidStack fluid = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("fluid"));
+        int amount = fluid == null ? 0 : fluid.amount;
+        int capacity = tag.getInteger("capacity");
+
+        if (capacity == 0) {
+            return currenttip;
+        }
+
+        currenttip.add(
+                String.format(
+                        "%s / %s %s",
+                        NumberFormatter.format(amount),
+                        NumberFormatter.format(capacity),
+                        ConfigHandler.instance().fluidUnit));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te instanceof IFluidHandler fluidHandler) {
+            FluidTankInfo[] infos = fluidHandler.getTankInfo(ForgeDirection.UNKNOWN);
+            if (infos.length != 1) {
+                return tag;
+            }
+
+            FluidTankInfo info = infos[0];
+
+            if (info.fluid != null) {
+                NBTTagCompound fluidNBT = info.fluid.writeToNBT(new NBTTagCompound());
+                tag.setTag("fluid", fluidNBT);
+            }
+
+            tag.setInteger("capacity", info.capacity);
+        }
+
+        return tag;
+    }
+
+}

src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java

@@ -4,31 +4,35 @@ import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class ThermalDynamicsModule {
 
     public static Class<?> TileFluidDuct = null;
 
     public static void register() {
-        // XXX : We register the Fluiduct
-        try {
-            TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct");
-
-            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid");
-            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount");
-            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct);
-            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct);
-            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDuct(), TileFluidDuct);
-
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException) {
-                Waila.log.log(Level.INFO, "[Thermal Dynamics] Thermal Dynamics mod not found.");
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks. {}", e);
-            }
+        if (LoadedMods.WAILA_PLUGINS) {
             return;
         }
-        Waila.log.log(Level.INFO, "Thermal Dynamics mod found.");
+
+        try {
+            TileFluidDuct = Class.forName("cofh.thermaldynamics.duct.fluid.TileFluidDuct");
+            Waila.log.log(Level.INFO, "Thermal Dynamics mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[Thermal Dynamics] Thermal Dynamics mod not found.");
+            return;
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks. {}", e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid");
+        ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount");
+
+        FluiductFluidHandler fluiductFluidHandler = new FluiductFluidHandler();
+        ModuleRegistrar.instance().registerHeadProvider(fluiductFluidHandler, TileFluidDuct);
+        ModuleRegistrar.instance().registerBodyProvider(fluiductFluidHandler, TileFluidDuct);
+        ModuleRegistrar.instance().registerNBTProvider(fluiductFluidHandler, TileFluidDuct);
     }
 
 }

src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java

@@ -40,14 +40,17 @@ public class HUDHandlerCache implements IWailaDataProvider {
             if (storedItem != null) {
                 String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem());
                 name += String.format(
-                        " < " + SpecialChars.getRenderString(
+                        " < %s %s >",
+                        SpecialChars.getRenderString(
                                 "waila.stack",
                                 "1",
                                 namex,
                                 "0",
-                                String.valueOf(storedItem.getItemDamage())) + color + " %s >",
+                                String.valueOf(storedItem.getItemDamage())) + color,
                         storedItem.getDisplayName());
-            } else name += " " + LangUtil.translateG("hud.msg.empty");
+            } else {
+                name += " < " + LangUtil.translateG("hud.msg.empty") + " >";
+            }
 
             currenttip.set(0, name);
         } catch (Exception e) {

src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java

@@ -1,5 +1,6 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
+import java.text.NumberFormat;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -13,7 +14,7 @@ import mcp.mobius.waila.api.ITaggedList;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
+import mcp.mobius.waila.api.SpecialChars;
 
 public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
 
@@ -34,15 +35,27 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
 
         if (!config.getConfig("thermalexpansion.energyhandler")) return currenttip;
         if (!accessor.getNBTData().hasKey("Energy")) return currenttip;
+        if (!accessor.getNBTData().hasKey("MaxStorage")) return currenttip;
 
-        int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
-        int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
-        try {
-            if ((maxEnergy != 0) && (((ITaggedList) currenttip).getEntries("RFEnergyStorage").size() == 0)) {
-                ((ITaggedList) currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage");
+        if (currenttip instanceof ITaggedList taggedTips) {
+            int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
+            int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
+
+            if (maxEnergy > 0 && taggedTips.getEntries("RFEnergyStorage").isEmpty()) {
+                if (config.getConfig("thermalexpansion.rfenergybar")) {
+                    taggedTips.add(
+                            SpecialChars.getRenderString("waila.rfenergy", energy + "", maxEnergy + ""),
+                            "RFEnergyStorage");
+                } else {
+                    taggedTips.add(
+                            // TODO: Use NumberFormatter from #54
+                            String.format(
+                                    "%s / %s RF",
+                                    NumberFormat.getInstance().format(energy),
+                                    NumberFormat.getInstance().format(maxEnergy)),
+                            "RFEnergyStorage");
+                }
             }
-        } catch (Exception e) {
-            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
         }
 
         return currenttip;

src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java

@@ -1,104 +0,0 @@
-package mcp.mobius.waila.addons.thermalexpansion;
-
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
-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("thermalexpansion.fluidtype")) return currenttip;
-
-        try {
-            FluidStack fluid = (FluidStack) ThermalExpansionModule.TileTank_getTankFluid
-                    .invoke(accessor.getTileEntity());
-            String name = currenttip.get(0);
-
-            try {
-                name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-            } 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) {
-        try {
-            if (config.getConfig("thermalexpansion.fluidamount")) {
-                int amount = 0;
-                if (accessor.getNBTData().hasKey("Amount"))
-                    amount = accessor.getNBTInteger(accessor.getNBTData(), "Amount");
-
-                Integer capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity
-                        .invoke(accessor.getTileEntity());
-
-                currenttip.add(String.format("%d / %d mB", amount, capacity));
-            }
-
-            if (config.getConfig("thermalexpansion.tankmode")) {
-                Byte mode = (Byte) ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity());
-                if (mode == 0) currenttip.add(
-                        String.format(
-                                "%s : \u00a7a%s",
-                                LangUtil.translateG("hud.msg.mode"),
-                                LangUtil.translateG("hud.msg.input")));
-                else if (mode == 1) currenttip.add(
-                        String.format(
-                                "%s : \u00a7c%s",
-                                LangUtil.translateG("hud.msg.mode"),
-                                LangUtil.translateG("hud.msg.output")));
-                else currenttip.add(String.format("Mode : Unknown (%d)", mode));
-            }
-
-        } 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;
-    }
-
-    @Override
-    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
-            int y, int z) {
-        try {
-            int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te);
-            tag.setInteger("Amount", amount);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return tag;
-    }
-
-}

src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java

@@ -0,0 +1,94 @@
+package mcp.mobius.waila.addons.thermalexpansion;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NumberFormatter;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
+public class TankFluidHandler 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("thermalexpansion.fluidtype")) {
+            return currenttip;
+        }
+
+        TileEntity tileEntity = accessor.getTileEntity();
+        if (tileEntity == null) return currenttip;
+
+        try {
+            FluidStack fluid = (FluidStack) ThermalExpansionModule.TileTank_getTankFluid.invoke(tileEntity);
+            String name = currenttip.get(0);
+            String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty")
+                    : fluid.getFluid().getLocalizedName(fluid);
+
+            currenttip.set(0, name + " < " + fluidName + " >");
+
+        } catch (Exception e) {
+            WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+
+        if (!config.getConfig("thermalexpansion.fluidamount")) {
+            return currenttip;
+        }
+
+        TileEntity tileEntity = accessor.getTileEntity();
+        if (tileEntity == null) return currenttip;
+
+        try {
+            int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(tileEntity);
+            int capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity.invoke(tileEntity);
+
+            currenttip.add(
+                    String.format(
+                            "%s / %s %s",
+                            NumberFormatter.format(amount),
+                            NumberFormatter.format(capacity),
+                            ConfigHandler.instance().fluidUnit));
+
+        } catch (Exception e) {
+            WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        return tag;
+    }
+
+}

src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankModeHandler.java

@@ -1,4 +1,4 @@
-package mcp.mobius.waila.addons.thermaldynamics;
+package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
@@ -7,17 +7,15 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
 
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.SpecialChars;
 import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
 
-/**
- * Created by Lordmau5 on 28.02.2015.
- */
-public class HUDHandlerDuct implements IWailaDataProvider {
+public class TankModeHandler implements IWailaDataProvider {
 
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
@@ -27,33 +25,33 @@ public class HUDHandlerDuct implements IWailaDataProvider {
     @Override
     public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
-        if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip;
-
-        FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData());
-
-        String name = "";
-
-        try {
-            name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-        } catch (NullPointerException f) {
-            name += " " + LangUtil.translateG("hud.msg.empty");
-        }
-
-        currenttip.add(name);
         return currenttip;
     }
 
     @Override
     public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
             IWailaConfigHandler config) {
-        if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip;
+        try {
+            if (config.getConfig("thermalexpansion.tankmode")) {
+                Byte mode = (Byte) ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity());
+                if (mode == 0) {
+                    currenttip.add(
+                            String.format(
+                                    "%s : %s",
+                                    LangUtil.translateG("hud.msg.mode"),
+                                    SpecialChars.GREEN + LangUtil.translateG("hud.msg.input")));
+                } else if (mode == 1) {
+                    currenttip.add(
+                            String.format(
+                                    "%s : %s",
+                                    LangUtil.translateG("hud.msg.mode"),
+                                    SpecialChars.RED + LangUtil.translateG("hud.msg.output")));
+                }
+            }
 
-        int amount = 0;
-
-        NBTTagCompound tag = accessor.getNBTData();
-        if (tag.hasKey("Amount")) amount = accessor.getNBTInteger(tag, "Amount");
-
-        currenttip.add(String.format(" %d / 1000 mB", amount));
+        } catch (Exception e) {
+            WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
 
         return currenttip;
     }
@@ -67,7 +65,6 @@ public class HUDHandlerDuct implements IWailaDataProvider {
     @Override
     public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
             int y, int z) {
-        if (te != null) te.writeToNBT(tag);
         return tag;
     }
 

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

@@ -9,6 +9,7 @@ import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class ThermalExpansionModule {
 
@@ -67,6 +68,7 @@ public class ThermalExpansionModule {
             IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored");
 
             ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.rfenergybar");
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);
@@ -74,13 +76,11 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
 
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+            printedThermalExpansionNotFound = true;
         } catch (Exception e) {
-            if (e instanceof ClassNotFoundException) {
-                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                printedThermalExpansionNotFound = true;
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks. {}", e);
-            }
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks. {}", e);
         }
 
         // XXX : We register the energy cell
@@ -93,41 +93,43 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
 
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
-                if (!printedThermalExpansionNotFound) {
-                    printedThermalExpansionNotFound = true;
-                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                }
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks. {}", e);
+        } catch (ClassNotFoundException e) {
+            if (!printedThermalExpansionNotFound) {
+                printedThermalExpansionNotFound = true;
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
             }
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks. {}", e);
         }
 
         // XXX : We register the Tank interface
         try {
             TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank");
-            TileTank_getTankFluid = TileTank.getMethod("getTankFluid");
-            TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
-            TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount");
             TileTank_mode = TileTank.getField("mode");
 
-            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
-            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
-            ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
-            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
-            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);
-            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTank);
+            if (!LoadedMods.WAILA_PLUGINS) {
+                TileTank_getTankFluid = TileTank.getMethod("getTankFluid");
+                TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
+                TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount");
 
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
-                if (!printedThermalExpansionNotFound) {
-                    printedThermalExpansionNotFound = true;
-                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                }
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks. {}", e);
+                ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
+                ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
+
+                TankFluidHandler tankFluidHandler = new TankFluidHandler();
+                ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTank);
+                ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTank);
             }
+
+            ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
+            ModuleRegistrar.instance().registerBodyProvider(new TankModeHandler(), TileTank);
+
+        } catch (ClassNotFoundException e) {
+            if (!printedThermalExpansionNotFound) {
+                printedThermalExpansionNotFound = true;
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+            }
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks. {}", e);
         }
 
         // XXX : We register the Tesseract interface
@@ -142,15 +144,13 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract);
 
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
-                if (!printedThermalExpansionNotFound) {
-                    printedThermalExpansionNotFound = true;
-                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                }
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
+        } catch (ClassNotFoundException e) {
+            if (!printedThermalExpansionNotFound) {
+                printedThermalExpansionNotFound = true;
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
             }
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
         }
 
         // XXX : We register the ISecureTile interface
@@ -163,15 +163,13 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile);
 
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException) {
-                if (!printedThermalExpansionNotFound) {
-                    printedThermalExpansionNotFound = true;
-                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                }
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks. {}", e);
+        } catch (ClassNotFoundException e) {
+            if (!printedThermalExpansionNotFound) {
+                printedThermalExpansionNotFound = true;
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
             }
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks. {}", e);
         }
 
         // XXX : We register the Cache interface
@@ -186,16 +184,15 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCache(), TileCache);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCache(), TileCache);
 
-        } catch (Exception e) {
-            if (e instanceof ClassNotFoundException) {
-                if (!printedThermalExpansionNotFound) {
-                    printedThermalExpansionNotFound = true;
-                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
-                }
-            } else {
-                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
+        } catch (ClassNotFoundException e) {
+            if (!printedThermalExpansionNotFound) {
+                printedThermalExpansionNotFound = true;
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
             }
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
         }
+
         if (!printedThermalExpansionNotFound) {
             Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
         }

src/main/java/mcp/mobius/waila/client/KeyEvent.java

@@ -7,7 +7,6 @@ import net.minecraftforge.common.config.Configuration;
 import org.lwjgl.input.Keyboard;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
@@ -15,6 +14,7 @@ import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.gui.screens.config.ScreenConfig;
 import mcp.mobius.waila.handlers.nei.NEIHandler;
 import mcp.mobius.waila.utils.Constants;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class KeyEvent {
 
@@ -63,14 +63,10 @@ public class KeyEvent {
                 boolean status = ConfigHandler.instance()
                         .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true);
                 ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status);
-            } else if (key_recipe.isPressed()) {
-                if (Loader.isModLoaded("NotEnoughItems")) {
-                    NEIHandler.openRecipeGUI(true);
-                }
-            } else if (key_usage.isPressed()) {
-                if (Loader.isModLoaded("NotEnoughItems")) {
-                    NEIHandler.openRecipeGUI(false);
-                }
+            } else if (LoadedMods.NEI && key_recipe.isPressed()) {
+                NEIHandler.openRecipeGUI(true);
+            } else if (LoadedMods.NEI && key_usage.isPressed()) {
+                NEIHandler.openRecipeGUI(false);
             }
     }
 

src/main/java/mcp/mobius/waila/client/ProxyClient.java

@@ -1,12 +1,15 @@
 package mcp.mobius.waila.client;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
 
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import mcp.mobius.waila.api.impl.DataAccessorCommon;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -21,8 +24,11 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderAspectString;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderFluidBar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderHealth;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar;
+import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderRFBar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack;
 import mcp.mobius.waila.server.ProxyServer;
+import mcp.mobius.waila.utils.LoadedMods;
+import mcp.mobius.waila.utils.NumberFormatter;
 
 public class ProxyClient extends ProxyServer {
 
@@ -35,7 +41,7 @@ public class ProxyClient extends ProxyServer {
 
         LangUtil.loadLangDir("waila");
 
-        if (Loader.isModLoaded("NotEnoughItems")) {
+        if (LoadedMods.NEI) {
             NEIHandler.register();
         } else {
             MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler());
@@ -56,10 +62,14 @@ public class ProxyClient extends ProxyServer {
         ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack());
         ModuleRegistrar.instance().registerTooltipRenderer("waila.progress", new TTRenderProgressBar());
         ModuleRegistrar.instance().registerTooltipRenderer("waila.fluid", new TTRenderFluidBar());
+        ModuleRegistrar.instance().registerTooltipRenderer("waila.rfenergy", new TTRenderRFBar());
 
         ModuleRegistrar.instance().registerTooltipRenderer("waila.tcaspect", new TTRenderAspectString());
 
         MinecraftForge.EVENT_BUS.register(new WorldUnloadEventHandler());
+
+        ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager())
+                .registerReloadListener(new NumberFormatterReloadListener());
     }
 
     @Override
@@ -78,4 +88,12 @@ public class ProxyClient extends ProxyServer {
             }
         }
     }
+
+    private static class NumberFormatterReloadListener implements IResourceManagerReloadListener {
+
+        @Override
+        public void onResourceManagerReload(IResourceManager resourceManager) {
+            NumberFormatter.onResourcesReload();
+        }
+    }
 }

src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java

@@ -2,7 +2,6 @@ package mcp.mobius.waila.overlay.tooltiprenderers;
 
 import java.awt.Dimension;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -15,27 +14,27 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.common.Loader;
 import gregtech.api.util.GTUtil;
-import gregtech.api.util.GTUtility;
 import gregtech.common.fluid.GTFluid;
 import gtPlusPlus.api.objects.minecraft.FluidGT6;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import mcp.mobius.waila.api.IWailaCommonAccessor;
 import mcp.mobius.waila.api.IWailaVariableWidthTooltipRenderer;
 import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.overlay.DisplayUtil;
+import mcp.mobius.waila.utils.LoadedMods;
+import mcp.mobius.waila.utils.NumberFormatter;
 
 public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
 
     int maxStringW;
 
     private final Consumer<String> bindColor;
-    private final Function<Integer, String> formatNumber;
     private static final int height = 12;
 
     public TTRenderFluidBar() {
-        if (Loader.isModLoaded("gregtech_nh")) {
+        if (LoadedMods.GT5U) {
             bindColor = (fluidName) -> {
                 FluidStack aCheck = FluidUtils.getWildcardFluidStack(fluidName, 1000);
                 if (aCheck != null && (aCheck.getFluid() instanceof FluidGT6 || aCheck.getFluid() instanceof GTFluid)) {
@@ -45,26 +44,40 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
                     GL11.glColor4f(1F, 1F, 1F, 1F);
                 }
             };
-
-            formatNumber = GTUtility::formatNumbers;
         } else {
             bindColor = (fluidName) -> GL11.glColor4f(1F, 1F, 1F, 1F);
-            formatNumber = (number) -> String.format("%,d", number);
         }
     }
 
     @Override
     public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
-        int commaCount = (int) (Math.floor((params[2].length() - 1) / 3D) + Math.floor((params[3].length() - 1) / 3D));
-        // ",".repeat(commaCount) doesn't exist in java 8 so do this instead.
-        StringBuilder sb = new StringBuilder(commaCount);
-        for (int i = 0; i < commaCount; i++) {
-            sb.append(",");
+        String barText;
+        if (!(params[0].equals("EMPTYFLUID") && params[1].equals("EMPTYFLUID"))) {
+            int commaCount = (int) (Math.floor((params[2].length() - 1) / 3D)
+                    + Math.floor((params[3].length() - 1) / 3D));
+            // ",".repeat(commaCount) doesn't exist in java 8 so do this instead.
+            StringBuilder sb = new StringBuilder(commaCount);
+            for (int i = 0; i < commaCount; i++) {
+                sb.append(",");
+            }
+            barText = String
+                    .format("%s / %s %s %s%s", params[2], params[3], ConfigHandler.instance().fluidUnit, params[1], sb);
+        } else {
+            int commaCount = (int) (Math.floor((params[3].length() - 1) / 3D));
+            // ",".repeat(commaCount) doesn't exist in java 8 so do this instead.
+            StringBuilder sb = new StringBuilder(commaCount);
+            for (int i = 0; i < commaCount; i++) {
+                sb.append(",");
+            }
+            barText = String.format(
+                    "%s / %s %s%s",
+                    LangUtil.translateG("hud.msg.empty"),
+                    params[3],
+                    ConfigHandler.instance().fluidUnit,
+                    sb);
         }
-        return new Dimension(
-                DisplayUtil.getDisplayWidth(
-                        params[2] + " /   " + params[3] + ConfigHandler.instance().fluidUnit + params[1] + sb) + 4,
-                height);
+
+        return new Dimension(DisplayUtil.getDisplayWidth(barText) + 4, height);
     }
 
     public static final ResourceLocation gradient = new ResourceLocation("waila", "textures/gradient.png");
@@ -76,56 +89,74 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
         double amount = Double.parseDouble(params[2]);
         double capacity = Double.parseDouble(params[3]);
         Tessellator tessellator = Tessellator.instance;
-
-        IIcon icon = FluidRegistry.getFluid(fluidName).getIcon();
+        boolean isEmpty = fluidName.equals("EMPTYFLUID") && localizedName.equals("EMPTYFLUID");
 
         Minecraft mc = Minecraft.getMinecraft();
-        mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+        if (!isEmpty) {
+            IIcon icon = FluidRegistry.getFluid(fluidName).getIcon();
+            mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
+            bindColor.accept(fluidName);
 
-        bindColor.accept(fluidName);
-
-        tessellator.startDrawingQuads();
-        // Intentionally draw 2 pixels taller than needed than cover with the border to make the texture more visible
-        int i = (int) ((double) (maxStringW - 2) * amount / capacity);
-        int j = 0;
-        for (; i > height; i = i - height) {
-            drawRectFromIcon(tessellator, 1 + (j * height), 0, 0, icon, height, height);
-            j++;
+            tessellator.startDrawingQuads();
+            // Intentionally draw 2 pixels taller than needed than cover with the border to make the texture more
+            // visible
+            int i = (int) ((double) (maxStringW - 2) * amount / capacity);
+            int j = 0;
+            for (; i > height; i = i - height) {
+                drawRectFromIcon(tessellator, 1 + (j * height), 0, 0, icon, height, height);
+                j++;
+            }
+            if (i > 0) drawRect(
+                    tessellator,
+                    1 + (j * height),
+                    0,
+                    0,
+                    i,
+                    height,
+                    icon.getMinU(),
+                    icon.getMinV(),
+                    icon.getMinU() + ((icon.getMaxU() - icon.getMinU()) * ((double) i / height)),
+                    icon.getMaxV());
+            tessellator.draw();
         }
-        if (i > 0) drawRect(
-                tessellator,
-                1 + (j * height),
-                0,
-                0,
-                i,
-                height,
-                icon.getMinU(),
-                icon.getMinV(),
-                icon.getMinU() + ((icon.getMaxU() - icon.getMinU()) * ((double) i / height)),
-                icon.getMaxV());
-        tessellator.draw();
 
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glColor4f(1F, 1F, 1F, 0.70F);
-        mc.getTextureManager().bindTexture(gradient);
-        tessellator.startDrawingQuads();
-        drawRect(tessellator, 1, 0, 0, maxStringW - 2, height - 1, 0, 0, 1, 1);
-        tessellator.draw();
+        if (!isEmpty) {
+            GL11.glEnable(GL11.GL_BLEND);
+            GL11.glColor4f(1F, 1F, 1F, 0.70F);
+            mc.getTextureManager().bindTexture(gradient);
+            tessellator.startDrawingQuads();
+            drawRect(tessellator, 1, 0, 0, maxStringW - 2, height - 1, 0, 0, 1, 1);
+            tessellator.draw();
+        } else {
+            Gui.drawRect(1, 0, maxStringW - 1, height - 1, 0x1A575656);
+        }
 
         drawThickBeveledBox(0, 0, maxStringW, height, 1, 0xFF505050, 0xFF505050, -1);
 
-        DisplayUtil.drawString(
-                formatNumber.apply((int) amount) + " / "
-                        + formatNumber.apply((int) capacity)
-                        + " "
-                        + ConfigHandler.instance().fluidUnit
-                        + " "
-                        + localizedName,
-                2,
-                2,
-                0xFFFFFFFF,
-                true);
-
+        if (!isEmpty) {
+            DisplayUtil.drawString(
+                    String.format(
+                            "%s / %s %s %s",
+                            NumberFormatter.format((int) amount),
+                            NumberFormatter.format((int) capacity),
+                            ConfigHandler.instance().fluidUnit,
+                            localizedName),
+                    2,
+                    2,
+                    0xFFFFFFFF,
+                    true);
+        } else {
+            DisplayUtil.drawString(
+                    String.format(
+                            "%s / %s %s",
+                            LangUtil.translateG("hud.msg.empty"),
+                            NumberFormatter.format((int) capacity),
+                            ConfigHandler.instance().fluidUnit),
+                    2,
+                    2,
+                    0xFFDDDDDD,
+                    true);
+        }
     }
 
     public static void drawRectFromIcon(Tessellator tessellator, int x, int y, double z, IIcon icon, int width,

src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderRFBar.java

@@ -0,0 +1,133 @@
+package mcp.mobius.waila.overlay.tooltiprenderers;
+
+import java.awt.Dimension;
+import java.text.NumberFormat;
+import java.util.function.Function;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+
+import mcp.mobius.waila.api.IWailaCommonAccessor;
+import mcp.mobius.waila.api.IWailaVariableWidthTooltipRenderer;
+import mcp.mobius.waila.overlay.DisplayUtil;
+
+public class TTRenderRFBar implements IWailaVariableWidthTooltipRenderer {
+
+    int maxStringW;
+
+    private final Function<Integer, String> formatNumber;
+    private static final NumberFormat energyFormat = NumberFormat.getInstance();
+    private static final int height = 12;
+    private static final int width = 2;
+
+    static {
+        energyFormat.setGroupingUsed(true);
+    }
+
+    public TTRenderRFBar() {
+        formatNumber = energyFormat::format;
+    }
+
+    @Override
+    public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
+        int commaCount = (int) (Math.floor((params[0].length() - 1) / 3D) + Math.floor((params[1].length() - 1) / 3D));
+        StringBuilder sb = new StringBuilder(commaCount);
+        for (int i = 0; i < commaCount; i++) {
+            sb.append(",");
+        }
+        return new Dimension(
+                DisplayUtil.getDisplayWidth(String.format("%s / %s RF%s", params[0], params[1], sb)) + 4,
+                height);
+    }
+
+    public static final ResourceLocation barTexture = new ResourceLocation("waila", "textures/rf_energy_bar.png");
+    public static final ResourceLocation gradientTexture = new ResourceLocation("waila", "textures/gradient.png");
+
+    @Override
+    public void draw(String[] params, IWailaCommonAccessor accessor) {
+        int amount = Integer.parseInt(params[0]);
+        int capacity = Integer.parseInt(params[1]);
+        Tessellator tessellator = Tessellator.instance;
+
+        Minecraft mc = Minecraft.getMinecraft();
+        mc.getTextureManager().bindTexture(barTexture);
+
+        GL11.glColor4f(1F, 1F, 1F, 1F);
+        tessellator.startDrawingQuads();
+
+        // Draw dark (uncharged) background for whole bar first
+        for (int i = 0; i < (maxStringW - 2); i += width) {
+            drawRect(tessellator, 1 + i, 0, 0, width, height, 0.0, 0.0, 0.5, 1.0);
+        }
+
+        double i = (double) (maxStringW - 2) * amount / capacity;
+        int drawnRects = 0;
+        for (; i > width; i -= width) {
+            drawRect(tessellator, 1 + (drawnRects * width), 0, 0, width, height, 0.5, 0.0, 1.0, 1.0);
+            drawnRects++;
+        }
+        // Do less than full increments just as much as they take up on the scaled texture
+        drawRectD(tessellator, 1 + (drawnRects * width), 0, 0, i, height, 0.5, 0.0, 0.5 + 0.25 * i, 1.0);
+        tessellator.draw();
+
+        // Border
+        drawThickBeveledBox(0, 0, maxStringW, height, 1, 0xFF505050, 0xFF505050, -1);
+
+        // Gradient
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glColor4f(1F, 1F, 1F, 0.5F);
+        mc.getTextureManager().bindTexture(gradientTexture);
+        tessellator.startDrawingQuads();
+        drawRect(tessellator, 1, 1, 0, maxStringW - 2, height - 2, 0, 0, 1, 1);
+        tessellator.draw();
+
+        DisplayUtil.drawString(
+                String.format("%s / %s RF", formatNumber.apply(amount), formatNumber.apply(capacity)),
+                2,
+                2,
+                0xFFFFFFFF,
+                true);
+
+    }
+
+    public static void drawRect(Tessellator tessellator, int x, int y, double z, int width, int height, double minU,
+            double minV, double maxU, double maxV) {
+        tessellator.addVertexWithUV(x, y + height, z, minU, maxV);
+        tessellator.addVertexWithUV(x + width, y + height, z, maxU, maxV);
+        tessellator.addVertexWithUV(x + width, y, z, maxU, minV);
+        tessellator.addVertexWithUV(x, y, z, minU, minV);
+    }
+
+    public static void drawRectD(Tessellator tessellator, double x, double y, double z, double width, double height,
+            double minU, double minV, double maxU, double maxV) {
+        tessellator.addVertexWithUV(x, y + height, z, minU, maxV);
+        tessellator.addVertexWithUV(x + width, y + height, z, maxU, maxV);
+        tessellator.addVertexWithUV(x + width, y, z, maxU, minV);
+        tessellator.addVertexWithUV(x, y, z, minU, minV);
+    }
+
+    public static void drawThickBeveledBox(int x1, int y1, int x2, int y2, int thickness, int topleftcolor,
+            int botrightcolor, int fillcolor) {
+        if (fillcolor != -1) {
+            Gui.drawRect(x1 + 1, y1 + 1, x2 - 1, y2 - 1, fillcolor);
+        }
+        Gui.drawRect(x1, y1, x2 - 1, y1 + thickness, topleftcolor);
+        Gui.drawRect(x1, y1, x1 + thickness, y2 - 1, topleftcolor);
+        Gui.drawRect(x2 - thickness, y1, x2, y2 - 1, botrightcolor);
+        Gui.drawRect(x1, y2 - thickness, x2, y2, botrightcolor);
+    }
+
+    @Override
+    public void setMaxLineWidth(int width) {
+        maxStringW = width + 2;
+    }
+
+    @Override
+    public int getMaxLineWidth() {
+        return maxStringW;
+    }
+}

src/main/java/mcp/mobius/waila/server/ProxyServer.java

@@ -2,7 +2,6 @@ package mcp.mobius.waila.server;
 
 import java.lang.reflect.Method;
 
-import cpw.mods.fml.common.Loader;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.addons.agriculture.AgricultureModule;
 import mcp.mobius.waila.addons.buildcraft.BCModule;
@@ -30,6 +29,7 @@ import mcp.mobius.waila.api.IWailaRegistrar;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 import mcp.mobius.waila.handlers.DecoratorFMP;
 import mcp.mobius.waila.handlers.HUDHandlerFMP;
+import mcp.mobius.waila.utils.LoadedMods;
 
 public class ProxyServer {
 
@@ -102,7 +102,7 @@ public class ProxyServer {
         /* Agriculture */
         AgricultureModule.register();
 
-        if (Loader.isModLoaded("ForgeMultipart")) {
+        if (LoadedMods.FORGE_MULTIPART) {
             HUDHandlerFMP.register();
             DecoratorFMP.register();
         }

src/main/java/mcp/mobius/waila/utils/LoadedMods.java

@@ -0,0 +1,11 @@
+package mcp.mobius.waila.utils;
+
+import cpw.mods.fml.common.Loader;
+
+public class LoadedMods {
+
+    public static boolean FORGE_MULTIPART = Loader.isModLoaded("ForgeMultipart");
+    public static boolean NEI = Loader.isModLoaded("NotEnoughItems");
+    public static boolean GT5U = Loader.isModLoaded("gregtech_nh");
+    public static boolean WAILA_PLUGINS = Loader.isModLoaded("wailaplugins");
+}

src/main/java/mcp/mobius/waila/utils/NumberFormatter.java

@@ -0,0 +1,34 @@
+package mcp.mobius.waila.utils;
+
+import java.text.NumberFormat;
+import java.util.Locale;
+
+import net.minecraft.client.Minecraft;
+
+import gregtech.api.util.GTUtility;
+
+public class NumberFormatter {
+
+    private static NumberFormat numberFormat = NumberFormat.getInstance(getCurrentLocale());
+
+    public static String format(long number) {
+        if (LoadedMods.GT5U) {
+            return GTUtility.formatNumbers(number);
+        }
+
+        return numberFormat.format(number);
+    }
+
+    public static Locale getCurrentLocale() {
+        String langCode = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
+        String[] parts = langCode.split("_", 2);
+        String language = parts[0];
+        String country = parts.length == 1 ? "" : parts[1];
+
+        return new Locale(language, country);
+    }
+
+    public static void onResourcesReload() {
+        numberFormat = NumberFormat.getInstance(getCurrentLocale());
+    }
+}

src/main/resources/assets/waila/lang/cs_CZ.lang

@@ -41,8 +41,7 @@ client.msg.nousage=Nenalezeno žádné využití.
 
 hud.msg.holdkeymoreinfo=Držte %s pro více informací
 
-hud.msg.none=<Nic>
-hud.msg.empty=<Prázdný>
+hud.msg.empty=Prázdný
 hud.msg.output=Výstup
 hud.msg.input=Vstup
 hud.msg.out=Ven

src/main/resources/assets/waila/lang/de_DE.lang

@@ -41,8 +41,7 @@ client.msg.nousage=Keine Nutzung gefunden.
 
 hud.msg.holdkeymoreinfo=Halte %s für mehr Infos
 
-hud.msg.none=<Nichts>
-hud.msg.empty=<Leer>
+hud.msg.empty=Leer
 hud.msg.output=Output
 hud.msg.input=Input
 hud.msg.out=Out

src/main/resources/assets/waila/lang/en_US.lang

@@ -42,8 +42,7 @@ client.msg.nousage=No usage found.
 
 hud.msg.holdkeymoreinfo=Hold %s for more info
 
-hud.msg.none=<None>
-hud.msg.empty=<Empty>
+hud.msg.empty=Empty
 hud.msg.output=Output
 hud.msg.input=Input
 hud.msg.out=Out
@@ -115,6 +114,7 @@ option.ic2.consump=Show consumption
 option.ic2.tradeomat=Show Trade-O-Mat request
 option.thaumcraft.storedvis=Capacitor storage
 option.thermalexpansion.energyhandler=Show RF storage
+option.thermalexpansion.rfenergybar=Use Progress Bar for RF
 option.thermalexpansion.energycell=Show ECell IN/OUT
 option.thermalexpansion.fluidtype=Show fluid type
 option.thermalexpansion.fluidamount=Show fluid amount

src/main/resources/assets/waila/lang/et_EE

@@ -38,8 +38,7 @@ waila.keybind.testing=[Waila] Testimine
 client.msg.norecipe=Ühtegi retsepti ei leitud.
 client.msg.nousage=Ühtegi kasutust ei leitud.
 
-hud.msg.none=<Mitte Ükski>
-hud.msg.empty=<Tühi>
+hud.msg.empty=Tühi
 hud.msg.output=Väljund
 hud.msg.input=Sisend
 hud.msg.out=Välja

src/main/resources/assets/waila/lang/et_EE.lang

@@ -41,8 +41,7 @@ client.msg.nousage=Ühtegi kasutust ei leitud.
 
 hud.msg.holdkeymoreinfo=Hoia %s lisainfo saamiseks
 
-hud.msg.none=<Mitte Ükski>
-hud.msg.empty=<Tühi>
+hud.msg.empty=Tühi
 hud.msg.output=Väljund
 hud.msg.input=Sisend
 hud.msg.out=Välja

src/main/resources/assets/waila/lang/fr_FR.lang

@@ -39,8 +39,7 @@ client.msg.nousage=Pas d'utilisation trouvée.
 
 hud.msg.holdkeymoreinfo=Maintenez %s pour plus d'infos
 
-hud.msg.none=<Aucun>
-hud.msg.empty=<Vide>
+hud.msg.empty=Vide
 hud.msg.output=Sortie
 hud.msg.input=Entrée
 hud.msg.out=Sortie

src/main/resources/assets/waila/lang/it_IT.lang

@@ -41,8 +41,7 @@ client.msg.nousage=Nessun uso trovato.
 
 hud.msg.holdkeymoreinfo=Tieni premuto %s per più info
 
-hud.msg.none=<Niente>
-hud.msg.empty=<Vuoto>
+hud.msg.empty=Vuoto
 hud.msg.output=Uscita
 hud.msg.input=Entrata
 hud.msg.out=Fuori

src/main/resources/assets/waila/lang/nl_NL.lang

@@ -39,8 +39,7 @@ client.msg.nousage=Geen gebruik gevonden.
 
 hud.msg.holdkeymoreinfo=Houd %s ingedrukt voor meer info
 
-hud.msg.none=<Geen>
-hud.msg.empty=<Leeg>
+hud.msg.empty=Leeg
 hud.msg.output=Uitvoer
 hud.msg.input=Invoer
 hud.msg.out=Uit

src/main/resources/assets/waila/lang/ru_RU.lang

@@ -41,8 +41,7 @@ client.msg.nousage=Применений не найдено.
 
 hud.msg.holdkeymoreinfo=Удерживайте %s для подробностей
 
-hud.msg.none=<Ничего>
-hud.msg.empty=<Пусто>
+hud.msg.empty=Пусто
 hud.msg.output=Вывод
 hud.msg.input=Ввод
 hud.msg.out=Из

src/main/resources/assets/waila/lang/zh_CN.lang

@@ -41,8 +41,7 @@ client.msg.nousage=未发现可参与合成.
 
 hud.msg.holdkeymoreinfo=按住 %s 查看更多信息
 
-hud.msg.none=<无>
-hud.msg.empty=<空>
+hud.msg.empty=空
 hud.msg.output=输出
 hud.msg.input=输入
 hud.msg.out=输出