update bs+deps

* update gradle+deps

* remove bak file
clean wci

* add back

* sa

.gitignore

@@ -26,3 +26,4 @@ whitelist.json
 *.ipr
 *.iws
 src/main/resources/mixins.*.json
+*.bat

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.28-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev')
 
     shadowImplementation('au.com.bytecode:opencsv:2.4')
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle

@@ -4,10 +4,9 @@ pluginManagement {
         maven {
             // RetroFuturaGradle
             name "GTNH Maven"
-            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-            allowInsecureProtocol = true
+            url "https://nexus.gtnewhorizons.com/repository/public/"
             mavenContent {
-                includeGroup("com.gtnewhorizons.retrofuturagradle")
+                includeGroupByRegex("com\\.gtnewhorizons\\..+")
             }
         }
         gradlePluginPortal()
@@ -17,8 +16,8 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.diffplug.blowdryerSetup' version '1.6.0'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+    id 'com.diffplug.blowdryerSetup' version '1.7.1'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains
 }
 
 blowdryerSetup {

src/main/java/mcp/mobius/waila/Waila.java

@@ -2,18 +2,6 @@ package mcp.mobius.waila;
 
 import java.lang.reflect.Field;
 
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.client.KeyEvent;
-import mcp.mobius.waila.commands.CommandDumpHandlers;
-import mcp.mobius.waila.network.NetworkHandler;
-import mcp.mobius.waila.network.WailaPacketHandler;
-import mcp.mobius.waila.overlay.DecoratorRenderer;
-import mcp.mobius.waila.overlay.OverlayConfig;
-import mcp.mobius.waila.overlay.WailaTickHandler;
-import mcp.mobius.waila.server.ProxyServer;
-import mcp.mobius.waila.utils.ModIdentification;
-
 import net.minecraftforge.common.MinecraftForge;
 
 import org.apache.logging.log4j.LogManager;
@@ -36,6 +24,17 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.client.KeyEvent;
+import mcp.mobius.waila.commands.CommandDumpHandlers;
+import mcp.mobius.waila.network.NetworkHandler;
+import mcp.mobius.waila.network.WailaPacketHandler;
+import mcp.mobius.waila.overlay.DecoratorRenderer;
+import mcp.mobius.waila.overlay.OverlayConfig;
+import mcp.mobius.waila.overlay.WailaTickHandler;
+import mcp.mobius.waila.server.ProxyServer;
+import mcp.mobius.waila.utils.ModIdentification;
 
 @Mod(
         modid = "Waila",

src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.agriculture;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class AgricultureModule {
 
     public static Class BlockCrop = null;

src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java

@@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.agriculture;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerCrop implements IWailaDataProvider {
 
     @Override

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

@@ -2,13 +2,13 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.lang.reflect.Method;
 
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 import org.apache.logging.log4j.Level;
 
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
 public class BCModule {
 
     public static Class TileTank = null;

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

@@ -2,13 +2,6 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.Waila;
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -20,6 +13,13 @@ import net.minecraftforge.fluids.FluidTankInfo;
 
 import org.apache.logging.log4j.Level;
 
+import mcp.mobius.waila.Waila;
+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;
+
 public class HUDHandlerBCTanks implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java

@@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.carpenters;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java

@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.enderio;
 
 import java.lang.reflect.Method;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class EnderIOModule {
 
     public static Class TileCapacitorBank = null;

src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java

@@ -1,21 +1,24 @@
 package mcp.mobius.waila.addons.enderio;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.RESET;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
-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;
-
 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 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 HUDHandlerCapacitor implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java

@@ -1,20 +1,22 @@
 package mcp.mobius.waila.addons.enderio;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.RESET;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerTesseract implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java

@@ -3,11 +3,11 @@ package mcp.mobius.waila.addons.enderstorage;
 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 org.apache.logging.log4j.Level;
-
 public class EnderStorageModule {
 
     public static Class TileFrequencyOwner = null;

src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java

@@ -2,18 +2,18 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.util.List;
 
-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;
-
 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 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 HUDHandlerStorage implements IWailaDataProvider {
 
     private static String[] colors = { LangUtil.translateG("hud.msg.white"), LangUtil.translateG("hud.msg.orange"),

src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java

@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.etb;
 
 import java.lang.reflect.Field;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class ETBModule {
 
     public static Class TileSocket = null;

src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java

@@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.etb;
 
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -15,6 +10,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
 public class HUDHandlerSocket implements IWailaDataProvider {
 
     @Override

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

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.exu;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class ExtraUtilitiesModule {
 
     public static Class ModExtraUtilities = null;

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

@@ -2,10 +2,6 @@ package mcp.mobius.waila.addons.exu;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -15,6 +11,10 @@ import net.minecraftforge.common.util.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

src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.gravestone;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class GravestoneModule {
 
     public static Class BlockGraveStone = null;

src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java

@@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.gravestone;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDHandlerGravestone implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java

@@ -2,18 +2,18 @@ package mcp.mobius.waila.addons.harvestcraft;
 
 import java.util.List;
 
-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.NBTUtil;
-
 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 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.NBTUtil;
+
 public class HUDHandlerPamCrop implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.harvestcraft;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class HarvestcraftModule {
 
     public static Class TileEntityPamCrop = null;

src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java.bak

@@ -1,87 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-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.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTEBaseGenerator 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) {
-		
-		try{
-			int    storage = -1;
-			int production = -1;
-			
-			if (IC2Module.TileEntityBaseGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TEBG_MaxStorage.getShort(accessor.getTileEntity());
-				production = IC2Module.TEBG_Production.getInt(accessor.getTileEntity());
-			}
-			else if (IC2Module.TileEntityGeoGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TEGG_MaxStorage.getShort(accessor.getTileEntity());
-				production = IC2Module.TEGG_Production.getInt(accessor.getTileEntity());
-			}
-			else if (IC2Module.TileEntitySemifluidGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TESG_MaxStorage.getShort(accessor.getTileEntity());
-				production = (int)IC2Module.TESG_Production.getDouble(accessor.getTileEntity());
-			}
-		
-			String storedStr  = LangUtil.translateG("hud.msg.stored");
-			String outputStr  = LangUtil.translateG("hud.msg.output");			
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				double stored  = IC2Module.getStoredEnergy(accessor); 
-			
-				if ( stored >= 0.0 && storage > 0)
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
-				
-				//else if (stored >= 0.0)
-				//	currenttip.add(String.format("Stored : %d EU", stored));				
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
-					if ( production > 0)
-						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
-			}
-			
-		} 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(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/ic2/HUDHandlerTEElectricBlock.java.bak

@@ -1,72 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-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.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,
-			IWailaConfigHandler config) {
-		// TODO Auto-generated method stub
-		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) {
-		
-		try{
-			String storedStr  = LangUtil.translateG("hud.msg.stored");
-			String outputStr  = LangUtil.translateG("hud.msg.output");				
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				double stored  = IC2Module.getStoredEnergy(accessor); 
-				int    storage = IC2Module.TEEB_MaxStorage.getInt(accessor.getTileEntity());
-				
-				if ( stored >= 0.0 )
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
-				int production = IC2Module.TEEB_Output.getInt(accessor.getTileEntity());
-					if ( production > 0)
-						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
-			}			
-			
-		} 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(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/ic2/HUDHandlerTEGenerator.java

@@ -1,16 +1,10 @@
 package mcp.mobius.waila.addons.ic2;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
 
 import java.util.List;
 
-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.WailaExceptionHandler;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -18,6 +12,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+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.WailaExceptionHandler;
+
 public class HUDHandlerTEGenerator implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java.bak

@@ -1,92 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-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.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,
-			IWailaConfigHandler config) {
-		// TODO Auto-generated method stub
-		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) {
-		
-		try{
-			
-			IC2Upgrades upgrades = IC2Module.getUpgrades(accessor);			
-			int    baseConsumption = IC2Module.TESM_DefaultEnergyConsume.getInt(accessor.getTileEntity());
-			int    baseOpTime      = IC2Module.TESM_DefaultOperationLength.getInt(accessor.getTileEntity());
-			int    baseStorage     = IC2Module.TESM_DefaultEnergyStorage.getInt(accessor.getTileEntity());
-			
-			long  consumption      = Math.round(Math.min(baseConsumption * Math.pow(1.6D, upgrades.overclocker), 2147483647));
-			
-		    double stackOpLen = baseOpTime * 64.0D * Math.pow(0.7D, upgrades.overclocker);
-		    int     opPerTick = ((int)Math.min(Math.ceil(64.0D / stackOpLen), 2147483647.0D));
-		    int        opTime = ((int)Math.round(stackOpLen * opPerTick / 64.0D));
-
-		    int    storage    = Math.round(Math.min(baseStorage + 10000 * upgrades.storage + opTime * consumption, 2147483647));;
-		    
-			
-			int       maxinput   = (Integer)IC2Module.IES_GetMaxSafeInput.invoke(accessor.getTileEntity()) * (int)Math.pow(4.0D, Math.min(4, upgrades.transform));
-			double stored        = IC2Module.getStoredEnergy(accessor); 
-
-			String storedStr   = LangUtil.translateG("hud.msg.stored");
-			String powerStr    = LangUtil.translateG("hud.msg.power");			
-			String maxPowerStr = LangUtil.translateG("hud.msg.maxpower");	
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				if ( stored >= 0.0 )
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
-			}
-		
-			if (ConfigHandler.instance().getConfig("ic2.consump")){
-				if ( consumption > 0)
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", powerStr, TAB + ALIGNRIGHT, consumption ));
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.inputeu")){
-				if ( maxinput > 0)
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", maxPowerStr, TAB + ALIGNRIGHT, maxinput ));
-			}
-			
-		} 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(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/ic2/HUDHandlerTETradeOMat.java.bak

@@ -1,68 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-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 static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTETradeOMat 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 (!ConfigHandler.instance().getConfig("ic2.tradeomat")) return currenttip;
-		
-		NBTTagCompound slots = accessor.getNBTData().getCompoundTag("InvSlots");
-		NBTTagList     offer = slots.getCompoundTag("offer").getTagList("Contents");
-		NBTTagList    demand = slots.getCompoundTag("demand").getTagList("Contents");		
-		String offersStr  = LangUtil.translateG("hud.msg.offers");
-		String demandsStr = LangUtil.translateG("hud.msg.demands");
-		
-		
-		if (offer.tagCount() == 1){
-			NBTTagCompound subtag = (NBTTagCompound)offer.tagAt(0);
-			ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage"));
-			currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", offersStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
-		}
-
-		if (demand.tagCount() == 1){
-			NBTTagCompound subtag = (NBTTagCompound)demand.tagAt(0);
-			ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage"));
-			currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
-		}		
-		*/
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public NBTTagCompound getNBTData(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/ic2/IC2Module.java

@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.lang.reflect.Field;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class IC2Module {
 
     public static Class TileBaseGenerator = null;

src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java.bak

@@ -1,186 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.logging.Level;
-
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.utils.AccessHelper;
-
-public class IC2Module {
-
-	public static Class TileEntityStandardMachine = null;
-	public static Field TESM_DefaultEnergyStorage = null;	
-	public static Field TESM_DefaultEnergyConsume = null;
-	public static Field TESM_DefaultOperationLength = null;	
-	public static Field TESM_MaxEnergy            = null;	
-	
-	public static Class TileEntityBaseGenerator   = null;
-	public static Field TEBG_MaxStorage           = null;
-	public static Field TEBG_Production           = null;	
-	
-	public static Class TileEntitySemifluidGenerator = null;
-	public static Field TESG_MaxStorage              = null;
-	public static Field TESG_Production              = null;
-	
-	public static Class TileEntityGeoGenerator      = null;	
-	public static Field TEGG_MaxStorage              = null;
-	public static Field TEGG_Production              = null;
-	
-	public static Class TileEntityElectricBlock   = null;
-	public static Field TEEB_MaxStorage           = null;	
-	public static Field TEEB_Output               = null;	
-	
-	public static Class  IEnergySink         = null;
-	public static Method IES_GetMaxSafeInput = null;
-	
-	public static Class  TileEntityTradeOMat = null;
-	
-	/* Some required items */
-	public static Class     IC2Items           = null;
-	public static Field     TransformerUpgrade = null;
-	public static ItemStack TransformerUpgradeStack   = null;
-	public static Field     EnergyStorageUpgrade      = null;
-	public static ItemStack EnergyStorageUpgradeStack = null;		
-	public static Field     OverclockerUpgrade        = null;
-	public static ItemStack OverclockerUpgradeStack   = null;
-	
-	public static void register(){
-	/*
-		
-		try{
-			TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine");
-			TESM_DefaultEnergyStorage = TileEntityStandardMachine.getField("defaultEnergyStorage");
-			TESM_DefaultEnergyConsume = TileEntityStandardMachine.getField("defaultEnergyConsume");
-			TESM_DefaultOperationLength = TileEntityStandardMachine.getField("defaultOperationLength");
-			TESM_MaxEnergy            = TileEntityStandardMachine.getField("maxEnergy");			
-			
-			TileEntityBaseGenerator   = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator");
-			TEBG_MaxStorage           = TileEntityBaseGenerator.getField("maxStorage");
-			TEBG_Production           = TileEntityBaseGenerator.getField("production");			
-
-			TileEntitySemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator");
-			TESG_MaxStorage           = TileEntitySemifluidGenerator.getDeclaredField("maxStorage");
-			TESG_Production           = TileEntitySemifluidGenerator.getDeclaredField("production");
-			TESG_MaxStorage.setAccessible(true);
-			TESG_Production.setAccessible(true);
-			
-			TileEntityGeoGenerator    = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator");
-			TEGG_MaxStorage           = TileEntityGeoGenerator.getField("maxStorage");
-			TEGG_Production           = TileEntityGeoGenerator.getField("production");				
-			
-			TileEntityElectricBlock   = Class.forName("ic2.core.block.wiring.TileEntityElectricBlock");
-			TEEB_MaxStorage           = TileEntityElectricBlock.getField("maxStorage");	
-			TEEB_Output               = TileEntityElectricBlock.getField("output");
-			
-			IEnergySink               = Class.forName("ic2.api.energy.tile.IEnergySink");			
-			IES_GetMaxSafeInput       = IEnergySink.getMethod("getMaxSafeInput");
-			
-			IC2Items                  = Class.forName("ic2.core.Ic2Items");
-			TransformerUpgrade        = IC2Items.getField("transformerUpgrade"); 
-			EnergyStorageUpgrade      = IC2Items.getField("energyStorageUpgrade");
-			OverclockerUpgrade        = IC2Items.getField("overclockerUpgrade");
-			
-			TransformerUpgradeStack   = (ItemStack)TransformerUpgrade.get(null);
-			EnergyStorageUpgradeStack = (ItemStack)EnergyStorageUpgrade.get(null);			
-			OverclockerUpgradeStack   = (ItemStack)OverclockerUpgrade.get(null);
-			
-			TileEntityTradeOMat       = Class.forName("ic2.core.block.personal.TileEntityTradeOMat");
-			
-		} catch (ClassNotFoundException e){
-			//e.printStackTrace();
-			Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			//e.printStackTrace();			
-			Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
-			return;			
-		} catch (NoSuchFieldException e){
-			//e.printStackTrace();			
-			Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
-			return;			
-		} catch (Exception e){
-			//e.printStackTrace();			
-			Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
-			return;			
-		}	
-		
-		
-		ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage");
-		ModuleRegistrar.instance().addConfig("IndustrialCraft2", "ic2.outputeu");
-		ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.inputeu");		
-		ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.consump");
-		ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.tradeomat");
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEStandardMachine(), TileEntityStandardMachine);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(),   TileEntityBaseGenerator);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(),   TileEntitySemifluidGenerator);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(),   TileEntityGeoGenerator);		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEElectricBlock(),   TileEntityElectricBlock);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(),       TileEntityTradeOMat);	
-		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStandardMachine);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityBaseGenerator);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntitySemifluidGenerator);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat);
-		*/
-	}
-
-	/* Retuns the current stored energy if available in the nbt and config is true */
-	public static double getStoredEnergy(IWailaDataAccessor accessor){
-		/*
-		if (ConfigHandler.instance().getConfig("ic2.storage")){
-			if (accessor.getNBTData().hasKey("energy"))
-				return accessor.getNBTData().getDouble("energy");
-			else if (accessor.getNBTData().hasKey("storage"))
-				return accessor.getNBTData().getDouble("storage");
-		}
-		*/
-		return -1.0;
-	}
-	
-	public static IC2Upgrades getUpgrades(IWailaDataAccessor accessor){
-		
-		NBTTagCompound nbt   = accessor.getNBTData();
-		IC2Upgrades upgrades = new IC2Upgrades();
-
-		/*
-		if (!nbt.hasKey("InvSlots")) return null;
-		
-		NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
-		if (!inventory.hasKey("upgrade")) return null;
-		
-		NBTTagList nbtupgrades = inventory.getCompoundTag("upgrade").getTagList("Contents");
-		
-		//List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades);
-		List tagList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtupgrades, "field_74747_a");
-		
-		for (Object subobj : tagList){
-			NBTTagCompound subtag = (NBTTagCompound)subobj;
-			int id    = subtag.getShort("id");
-			int meta  = subtag.getShort("Damage");
-			int count = subtag.getByte("Count");
-			
-			//ItemStack is = new ItemStack(id, 1, count);
-			if (TransformerUpgradeStack.getItemDamage()   == meta && TransformerUpgradeStack.itemID == id)
-				upgrades.transform += count;
-			if (EnergyStorageUpgradeStack.getItemDamage() == meta && EnergyStorageUpgradeStack.itemID == id)
-				upgrades.storage += count;
-			if (OverclockerUpgradeStack.getItemDamage()   == meta && OverclockerUpgradeStack.itemID == id)
-				upgrades.overclocker += count;			
-		}
-		*/
-		return upgrades;
-	}
-	
-}

src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java.bak

@@ -1,7 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-public class IC2Upgrades {
-	public int transform   = 0;
-	public int storage     = 0;
-	public int overclocker = 0;
-}

src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java

@@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.magicalcrops;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerMagicalCrops implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.magicalcrops;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class MagicalCropsModule {
 
     public static Class BlockMagicalCrops = null;

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

@@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.openblocks;
 
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -17,6 +12,11 @@ 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.cbcore.LangUtil;
+
 public class HUDHandlerTank implements IWailaDataProvider {
 
     @Override

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

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.openblocks;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class OpenBlocksModule {
 
     public static Class ModOpenBlocks = null;

src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java

@@ -1,14 +1,14 @@
 package mcp.mobius.waila.addons.projectred;
 
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaFMPAccessor;
 import mcp.mobius.waila.api.IWailaFMPDecorator;
 import mcp.mobius.waila.gui.helpers.UIHelper;
 import mcp.mobius.waila.utils.NBTUtil;
 
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
 public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator {
 
     static byte[][] IOARRAY = { { 1, 1, 2, 1 } /* OR */, { 1, 1, 2, 1 } /* NOR */, { 1, 2, 2, 2 } /* NOT */,

src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java

@@ -1,16 +1,19 @@
 package mcp.mobius.waila.addons.projectred;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
+import net.minecraft.item.ItemStack;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaFMPAccessor;
 import mcp.mobius.waila.api.IWailaFMPProvider;
 import mcp.mobius.waila.utils.NBTUtil;
 
-import net.minecraft.item.ItemStack;
-
 public class HUDFMPGateLogic implements IWailaFMPProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.projectred;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class ProjectRedModule {
 
     public static void register() {

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

@@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.railcraft;
 
 import java.util.List;
 
-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;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,6 +10,12 @@ 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

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

@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.railcraft;
 
 import java.lang.reflect.Method;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class RailcraftModule {
 
     public static Class TileTankBase = null;

src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java

@@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.secretrooms;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDTileEntityCamo implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java

@@ -1,20 +1,22 @@
 package mcp.mobius.waila.addons.statues;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.BLUE;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
 public class HUDHandlerStatues implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java

@@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.statues;
 
 import java.lang.reflect.Field;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class StatuesModule {
 
     public static Class TileEntityStatue = null;

src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java

@@ -1,21 +1,25 @@
 package mcp.mobius.waila.addons.stevescarts;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.ArrayList;
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
 public class HUDCargoManager implements IWailaDataProvider {
 
     private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." };

src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java

@@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.stevescarts;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDCartAssembler implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java

@@ -1,19 +1,23 @@
 package mcp.mobius.waila.addons.stevescarts;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDLiquidManager implements IWailaDataProvider {
 
     private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." };

src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java

@@ -1,14 +1,13 @@
 package mcp.mobius.waila.addons.stevescarts;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaEntityAccessor;
-import mcp.mobius.waila.api.IWailaEntityProvider;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
@@ -16,6 +15,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaEntityAccessor;
+import mcp.mobius.waila.api.IWailaEntityProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
 public class HUDMinecartModular implements IWailaEntityProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java

@@ -1,16 +1,14 @@
 package mcp.mobius.waila.addons.thaumcraft;
 
-import static mcp.mobius.waila.api.SpecialChars.*;
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -18,6 +16,10 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java

@@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thaumcraft;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
 import net.minecraft.nbt.NBTTagCompound;
 
 import org.apache.logging.log4j.Level;
 
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
 public class ThaumcraftModule {
 
     public static Class<?> Thaumcraft = null;

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

@@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.thermaldynamics;
 
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -14,6 +9,11 @@ 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;
+
 /**
  * Created by Lordmau5 on 28.02.2015.
  */

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

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.thermaldynamics;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class ThermalDynamicsModule {
 
     public static Class TileFluidDuct = null;

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

@@ -3,12 +3,6 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -17,6 +11,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameData;
+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;
 
 public class HUDHandlerCache implements IWailaDataProvider {
 

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

@@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerEnergyCell implements IWailaDataProvider {
 
     @Override

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

@@ -3,10 +3,6 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.util.ArrayList;
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -15,6 +11,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class HUDHandlerIBlockInfo implements IWailaDataProvider {
 
     @Override

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

@@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -15,6 +9,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+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;
+
 public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
 
     @Override

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

@@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerISecureTile implements IWailaDataProvider {
 
     @Override

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

@@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-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;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -15,6 +9,12 @@ 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

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

@@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-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 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 mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerTesseract implements IWailaDataProvider {
 
     @Override

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

@@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
 import net.minecraftforge.common.util.ForgeDirection;
 
 import org.apache.logging.log4j.Level;
 
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
 public class ThermalExpansionModule {
 
     public static Class IEnergyProvider = null;

src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java

@@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.twilightforest;
 
 import java.util.List;
 
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
 public class TwilightForestGenericOverride implements IWailaDataProvider {
 
     @Override

src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.addons.twilightforest;
 
+import org.apache.logging.log4j.Level;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import org.apache.logging.log4j.Level;
-
 public class TwilightForestModule {
 
     public static Class BlockTFRoots = null;

src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java

@@ -1,13 +1,13 @@
 package mcp.mobius.waila.addons.vanillamc;
 
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.ItemStack;
+
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.gui.helpers.UIHelper;
 
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.item.ItemStack;
-
 public class HUDDecoratorVanilla implements IWailaBlockDecorator {
 
     @Override

src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java

@@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import java.util.List;
 
-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 net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -15,6 +10,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameData;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.SpecialChars;
 
 public class HUDHandlerFurnace implements IWailaDataProvider {
 

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

@@ -2,13 +2,6 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import java.util.List;
 
-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.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.cbcore.LangUtil;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockRedstoneOre;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -20,6 +13,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.world.World;
 
+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.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.cbcore.LangUtil;
+
 public class HUDHandlerVanilla implements IWailaDataProvider {
 
     static Block mobSpawner = Blocks.mob_spawner;

src/main/java/mcp/mobius/waila/api/SpecialChars.java

@@ -1,8 +1,5 @@
 package mcp.mobius.waila.api;
 
-import static mcp.mobius.waila.api.SpecialChars.RENDER;
-import static mcp.mobius.waila.api.SpecialChars.WailaStyle;
-
 import java.util.regex.Pattern;
 
 public class SpecialChars {

src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java

@@ -5,17 +5,16 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
+
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.handlers.HUDHandlerEntities;
 import mcp.mobius.waila.overlay.OverlayConfig;
 import mcp.mobius.waila.utils.Constants;
 
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
-
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
 public class ConfigHandler implements IWailaConfigHandler {
 
     /* SINGLETON */

src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java

@@ -1,10 +1,5 @@
 package mcp.mobius.waila.api.impl;
 
-import mcp.mobius.waila.api.IWailaCommonAccessor;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaEntityAccessor;
-import mcp.mobius.waila.utils.NBTUtil;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -19,6 +14,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameData;
+import mcp.mobius.waila.api.IWailaCommonAccessor;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaEntityAccessor;
+import mcp.mobius.waila.utils.NBTUtil;
 
 public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor {
 
@@ -213,5 +212,4 @@ public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAcces
     public String getBlockQualifiedName() {
         return this.blockResource;
     }
-
 }

src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java

@@ -1,8 +1,5 @@
 package mcp.mobius.waila.api.impl;
 
-import mcp.mobius.waila.api.IWailaFMPAccessor;
-import mcp.mobius.waila.utils.NBTUtil;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -10,6 +7,9 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import mcp.mobius.waila.api.IWailaFMPAccessor;
+import mcp.mobius.waila.utils.NBTUtil;
+
 public class DataAccessorFMP implements IWailaFMPAccessor {
 
     String id;

src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java

@@ -5,6 +5,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaBlock;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -15,15 +24,6 @@ import mcp.mobius.waila.network.Message0x03EntRequest;
 import mcp.mobius.waila.network.WailaPacketHandler;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
 public class MetaDataProvider {
 
     private Map<Integer, List<IWailaDataProvider>> headBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();

src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java

@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
+import au.com.bytecode.opencsv.CSVReader;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -23,7 +24,6 @@ import mcp.mobius.waila.api.IWailaSummaryProvider;
 import mcp.mobius.waila.api.IWailaTooltipRenderer;
 import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.Constants;
-import au.com.bytecode.opencsv.CSVReader;
 
 public class ModuleRegistrar implements IWailaRegistrar {
 

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

@@ -1,9 +1,5 @@
 package mcp.mobius.waila.client;
 
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.gui.screens.config.ScreenConfig;
-import mcp.mobius.waila.utils.Constants;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.common.config.Configuration;
@@ -14,6 +10,9 @@ 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 mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.gui.screens.config.ScreenConfig;
+import mcp.mobius.waila.utils.Constants;
 
 public class KeyEvent {
 

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

@@ -1,6 +1,15 @@
 package mcp.mobius.waila.client;
 
+import net.minecraft.block.Block;
+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.Waila;
+import mcp.mobius.waila.api.impl.DataAccessorCommon;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.gui.truetyper.FontLoader;
@@ -13,13 +22,6 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack;
 import mcp.mobius.waila.server.ProxyServer;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.MinecraftForge;
-
-import cpw.mods.fml.common.Loader;
-
 public class ProxyClient extends ProxyServer {
 
     TrueTypeFont minecraftiaFont;
@@ -33,8 +35,6 @@ public class ProxyClient extends ProxyServer {
 
         LangUtil.loadLangDir("waila");
 
-        minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true);
-
         // TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT);
 
         if (Loader.isModLoaded("NotEnoughItems")) {
@@ -64,11 +64,22 @@ public class ProxyClient extends ProxyServer {
         ModuleRegistrar.instance().registerTooltipRenderer("waila.health", new TTRenderHealth());
         ModuleRegistrar.instance().registerTooltipRenderer("waila.stack", new TTRenderStack());
         ModuleRegistrar.instance().registerTooltipRenderer("waila.progress", new TTRenderProgressBar());
+
+        MinecraftForge.EVENT_BUS.register(new WorldUnloadEventHandler());
     }
 
     @Override
     public Object getFont() {
+        if (minecraftiaFont == null)
+            minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true);
         return this.minecraftiaFont;
     }
 
+    public static class WorldUnloadEventHandler {
+
+        @SubscribeEvent
+        public void onWorldUnload(WorldEvent.Unload event) {
+            DataAccessorCommon.instance = new DataAccessorCommon();
+        }
+    }
 }

src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java

@@ -1,12 +1,12 @@
 package mcp.mobius.waila.commands;
 
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaEntityProvider;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-
 public class CommandDumpHandlers extends CommandBase {
 
     @Override

src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java

@@ -1,11 +1,11 @@
 package mcp.mobius.waila.gui.events;
 
-import mcp.mobius.waila.gui.interfaces.IWidget;
-
 import net.minecraft.client.Minecraft;
 
 import org.lwjgl.input.Mouse;
 
+import mcp.mobius.waila.gui.interfaces.IWidget;
+
 public class MouseEvent {
 
     public enum EventType {

src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.gui.interfaces;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.events.MouseEvent;
 import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 
-import org.lwjgl.util.Point;
-
 public interface IWidget {
     // Should all the coordinates, sizes, etc be % or absolute values ?
     // Should we allow 2 methods for an absolute referencing (screen pos) and relative one (parent pos) ?

src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java

@@ -2,14 +2,14 @@ package mcp.mobius.waila.gui.screens;
 
 import java.util.HashMap;
 
-import mcp.mobius.waila.gui.interfaces.IWidget;
-import mcp.mobius.waila.gui.widgets.LayoutCanvas;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
 import org.lwjgl.input.Mouse;
 
+import mcp.mobius.waila.gui.interfaces.IWidget;
+import mcp.mobius.waila.gui.widgets.LayoutCanvas;
+
 public abstract class ScreenBase extends GuiScreen {
 
     protected GuiScreen parent; // Return screen if available.

src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java

@@ -1,5 +1,7 @@
 package mcp.mobius.waila.gui.screens.config;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 import mcp.mobius.waila.gui.screens.ScreenBase;
@@ -8,8 +10,6 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
 
-import net.minecraft.client.gui.GuiScreen;
-
 public class ScreenConfig extends ScreenBase {
 
     public ScreenConfig(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java

@@ -1,5 +1,8 @@
 package mcp.mobius.waila.gui.screens.config;
 
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.common.config.Configuration;
+
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.gui.events.MouseEvent;
 import mcp.mobius.waila.gui.interfaces.CType;
@@ -18,9 +21,6 @@ import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC;
 import mcp.mobius.waila.overlay.OverlayConfig;
 import mcp.mobius.waila.utils.Constants;
 
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraftforge.common.config.Configuration;
-
 public class ScreenHUDConfig extends ScreenBase {
 
     private class EventCanvas extends LayoutBase {

src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java

@@ -1,5 +1,7 @@
 package mcp.mobius.waila.gui.screens.config;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
@@ -9,8 +11,6 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
 
-import net.minecraft.client.gui.GuiScreen;
-
 public class ScreenModuleChoice extends ScreenBase {
 
     public ScreenModuleChoice(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java

@@ -1,5 +1,7 @@
 package mcp.mobius.waila.gui.screens.config;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
@@ -12,8 +14,6 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
 import mcp.mobius.waila.utils.Constants;
 
-import net.minecraft.client.gui.GuiScreen;
-
 public class ScreenModuleConfig extends ScreenBase {
 
     private String modName;

src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java

@@ -1,5 +1,8 @@
 package mcp.mobius.waila.gui.screens.config;
 
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.common.config.Configuration;
+
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 import mcp.mobius.waila.gui.screens.ScreenBase;
@@ -10,9 +13,6 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange;
 import mcp.mobius.waila.utils.Constants;
 
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraftforge.common.config.Configuration;
-
 public class ScreenWailaConfig extends ScreenBase {
 
     public ScreenWailaConfig(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java

@@ -1,5 +1,8 @@
 package mcp.mobius.waila.gui.screens.info;
 
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.item.ItemStack;
+
 import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
@@ -10,9 +13,6 @@ import mcp.mobius.waila.gui.widgets.LayoutBase;
 import mcp.mobius.waila.gui.widgets.ViewTable;
 import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.item.ItemStack;
-
 public class ScreenEnchants extends ScreenBase {
 
     public ScreenEnchants(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java

@@ -1,13 +1,13 @@
 package mcp.mobius.waila.gui.testing;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 import mcp.mobius.waila.gui.screens.ScreenBase;
 import mcp.mobius.waila.gui.widgets.ViewTable;
 import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 
-import net.minecraft.client.gui.GuiScreen;
-
 public class ScreenTest extends ScreenBase {
 
     public ScreenTest(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java

@@ -1,5 +1,7 @@
 package mcp.mobius.waila.gui.testing;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 import mcp.mobius.waila.gui.screens.ScreenBase;
@@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.widgets.LabelFixedFont;
 import mcp.mobius.waila.gui.widgets.WidgetGeometry;
 import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel;
 
-import net.minecraft.client.gui.GuiScreen;
-
 public class ScreenTest2 extends ScreenBase {
 
     public ScreenTest2(GuiScreen parent) {

src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java

@@ -1,14 +1,14 @@
 package mcp.mobius.waila.gui.widgets;
 
-import mcp.mobius.waila.gui.interfaces.IWidget;
-import mcp.mobius.waila.overlay.DisplayUtil;
-
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.interfaces.IWidget;
+import mcp.mobius.waila.overlay.DisplayUtil;
+
 public class ItemStackDisplay extends WidgetBase {
 
     ItemStack stack = null;

src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java

@@ -1,11 +1,11 @@
 package mcp.mobius.waila.gui.widgets;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.IWidget;
 
-import org.lwjgl.util.Point;
-
 public class LabelFixedFont extends WidgetBase {
 
     protected String text = "";

src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java

@@ -1,10 +1,10 @@
 package mcp.mobius.waila.gui.widgets;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.helpers.UIHelper;
 import mcp.mobius.waila.gui.interfaces.IWidget;
 
-import org.lwjgl.util.Point;
-
 public class LayoutBase extends WidgetBase {
 
     protected int bgcolor1 = 0x00000000;

src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java

@@ -1,16 +1,16 @@
 package mcp.mobius.waila.gui.widgets;
 
+import net.minecraft.client.gui.ScaledResolution;
+
+import org.lwjgl.input.Mouse;
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.events.MouseEvent;
 import mcp.mobius.waila.gui.events.MouseEvent.EventType;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.IWidget;
 import mcp.mobius.waila.gui.interfaces.Signal;
 
-import net.minecraft.client.gui.ScaledResolution;
-
-import org.lwjgl.input.Mouse;
-import org.lwjgl.util.Point;
-
 public class LayoutCanvas extends LayoutBase {
 
     private MouseEvent lastMouseEvent;

src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java

@@ -1,12 +1,12 @@
 package mcp.mobius.waila.gui.widgets;
 
-import mcp.mobius.waila.gui.interfaces.IWidget;
-
 import net.minecraft.client.gui.ScaledResolution;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.interfaces.IWidget;
+
 public class LayoutCropping extends LayoutBase {
 
     int xOffset = 0;

src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java

@@ -1,11 +1,11 @@
 package mcp.mobius.waila.gui.widgets;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.IWidget;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 
-import org.lwjgl.util.Point;
-
 public class LayoutMargin extends LayoutBase {
 
     int left = 0;

src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java

@@ -1,13 +1,13 @@
 package mcp.mobius.waila.gui.widgets;
 
-import mcp.mobius.waila.gui.helpers.UIHelper;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.helpers.UIHelper;
+import mcp.mobius.waila.gui.interfaces.IWidget;
+
 public class PictureDisplay extends WidgetBase {
 
     protected ResourceLocation texture;

src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java

@@ -1,14 +1,14 @@
 package mcp.mobius.waila.gui.widgets;
 
-import mcp.mobius.waila.gui.events.MouseEvent;
-import mcp.mobius.waila.gui.helpers.UIHelper;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.events.MouseEvent;
+import mcp.mobius.waila.gui.helpers.UIHelper;
+import mcp.mobius.waila.gui.interfaces.IWidget;
+
 public class PictureSwitch extends WidgetBase {
 
     private ResourceLocation texture1;

src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java

@@ -1,12 +1,12 @@
 package mcp.mobius.waila.gui.widgets;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.helpers.UIException;
 import mcp.mobius.waila.gui.interfaces.CType;
 import mcp.mobius.waila.gui.interfaces.IWidget;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 
-import org.lwjgl.util.Point;
-
 public class ViewTable extends WidgetBase {
 
     public class Cell extends WidgetBase {

src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java

@@ -1,5 +1,7 @@
 package mcp.mobius.waila.gui.widgets;
 
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.events.MouseEvent;
 import mcp.mobius.waila.gui.helpers.UIHelper;
 import mcp.mobius.waila.gui.interfaces.CType;
@@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.interfaces.IWidget;
 import mcp.mobius.waila.gui.interfaces.Signal;
 import mcp.mobius.waila.gui.interfaces.WAlign;
 
-import org.lwjgl.util.Point;
-
 public class ViewportScrollable extends WidgetBase {
 
     public class Escalator extends WidgetBase {

src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java

@@ -2,13 +2,6 @@ package mcp.mobius.waila.gui.widgets;
 
 import java.util.LinkedHashMap;
 
-import mcp.mobius.waila.gui.events.MouseEvent;
-import mcp.mobius.waila.gui.helpers.ReverseIterator;
-import mcp.mobius.waila.gui.interfaces.CType;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-import mcp.mobius.waila.gui.interfaces.RenderPriority;
-import mcp.mobius.waila.gui.interfaces.Signal;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -16,6 +9,13 @@ import net.minecraft.client.renderer.texture.TextureManager;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.events.MouseEvent;
+import mcp.mobius.waila.gui.helpers.ReverseIterator;
+import mcp.mobius.waila.gui.interfaces.CType;
+import mcp.mobius.waila.gui.interfaces.IWidget;
+import mcp.mobius.waila.gui.interfaces.RenderPriority;
+import mcp.mobius.waila.gui.interfaces.Signal;
+
 public abstract class WidgetBase implements IWidget {
 
     protected IWidget parent;

src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java

@@ -1,13 +1,13 @@
 package mcp.mobius.waila.gui.widgets;
 
-import mcp.mobius.waila.gui.interfaces.CType;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-import mcp.mobius.waila.gui.interfaces.WAlign;
-
 import net.minecraft.util.MathHelper;
 
 import org.lwjgl.util.Point;
 
+import mcp.mobius.waila.gui.interfaces.CType;
+import mcp.mobius.waila.gui.interfaces.IWidget;
+import mcp.mobius.waila.gui.interfaces.WAlign;
+
 // public class WidgetGeometry implements Cloneable{
 public class WidgetGeometry {
 

src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java

@@ -1,5 +1,11 @@
 package mcp.mobius.waila.gui.widgets.buttons;
 
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.Point;
+
 import mcp.mobius.waila.gui.events.MouseEvent;
 import mcp.mobius.waila.gui.helpers.UIHelper;
 import mcp.mobius.waila.gui.interfaces.IWidget;
@@ -7,12 +13,6 @@ import mcp.mobius.waila.gui.interfaces.Signal;
 import mcp.mobius.waila.gui.widgets.LabelFixedFont;
 import mcp.mobius.waila.gui.widgets.WidgetBase;
 
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.util.Point;
-
 public abstract class ButtonBase extends WidgetBase {
 
     protected boolean mouseOver = false;