The content

README.md

@@ -0,0 +1,4 @@
+Waila-1.7.10
+============
+
+A port of Prof. Mobius' Minecraft mod, Waila, to Minecraft 1.7.10. Unofficial.

build.gradle

@@ -0,0 +1,135 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+configurations {
+    deployerJars
+}
+
+//add dependency repositories
+repositories {
+	mavenLocal()
+    mavenCentral()
+    maven {
+        name = "chickenbones"
+        url = "http://chickenbones.net/maven/"
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'forge'
+apply plugin: 'maven'
+
+version = "1.5.2a"
+group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "Waila"
+
+// Define properties file
+ext.configFile = file "build.properties"
+
+configFile.withReader {
+    // Load config. It shall from now be referenced as simply config or project.config
+    def prop = new Properties()
+    prop.load(it)
+    project.ext.config = new ConfigSlurper().parse prop
+}
+
+dependencies {
+    compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev"
+    compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev"
+    compile "codechicken:NotEnoughItems:${config.mc_version}-${config.nei_version}:dev"
+    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
+}
+
+minecraft {
+    version = "1.7.10-10.13.0.1160"
+    assetDir = "eclipse/assets"
+}
+
+def root = project.projectDir.parentFile
+sourceSets {
+    main {
+        java {
+            srcDir new File(root, "src")
+        }
+        resources {
+            srcDir new File(root, "resources")
+        }
+    }
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+jar { 
+exclude "**/client/gui/inventory/GuiContainer.class" 
+exclude "**/client/gui/inventory/GuiContainer.java" 
+}
+
+task sourceJar(type: Jar) {
+    from sourceSets.main.java
+    from new File(root, "dev")
+    classifier = 'sources'
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+artifacts {
+    archives sourceJar, devJar
+}
+
+uploadArchives {
+	dependsOn 'reobf'
+    repositories.mavenDeployer {
+        configuration = configurations.deployerJars
+        repository(url: "scp://mobiusstrip.eu/home/mobius/web/maven"){
+            authentication(userName: "mobius")
+        }
+
+        pom {
+            groupId = project.group
+            version = project.version
+            artifactId = project.archivesBaseName
+            project {
+                name project.archivesBaseName
+                packaging 'jar'
+                description 'Waila '
+                url 'http://mobiusstrip.eu'        
+            }
+        }
+    }
+
+}

build.properties

@@ -0,0 +1,7 @@
+mc_version=1.7.10
+forge_version=10.13.0.1160
+ccl_version=1.1.1.93
+ccc_version=1.0.1.8
+nei_version=1.0.2.15
+mod_version=1.0
+waila_version=1.5.2a

gource.sh

@@ -1,3 +0,0 @@
-#gource --file-idle-time 0 --camera-mode overview --title "Minecraft Coder Pack" -s 2 --hide-filenames --stop-at-end --disable-progress  --output-ppm-stream  - | ffmpeg -y -r 60 -b 6000K -f image2pipe -vcodec ppm -i - -vcodec libtheora  out.ogg
-gource --file-idle-time 0 --camera-mode overview --title "Waila" -s 2 --hide-filenames --stop-at-end --disable-progress  --output-ppm-stream  - | ffmpeg -y -f image2pipe -vcodec ppm -i - -vpre libx264-medium -vcodec libx264 out_small.mkv
-

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue May 06 21:57:37 CEST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip

gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

mcp/mobius/waila/addons/projectred/HUDHandlerRsGateLogic.java

@@ -1,105 +0,0 @@
-package mcp.mobius.waila.addons.projectred;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDHandlerRsGateLogic implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("pr.showdata")) return currenttip;
-		
-		int orient = 0;
-		int subID  = 0;
-		int shape  = 0;
-		int pmax   = 0;
-		int val    = 0;
-		int max    = 0;
-		int dec    = 0;
-		int inc    = 0;
-		
-		boolean found = false;
-		
-		if (!accessor.getNBTData().hasKey("parts")) return currenttip;
-		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
-		for (int i = 0; i < parts.tagCount(); i++){
-			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
-			String id = subtag.getString("id");
-			
-			if (id.equals("pr_sgate") || id.equals("pr_igate") || 
-				id.equals("pr_tgate") || id.equals("pr_bgate") || 
-				id.equals("pr_agate") || id.equals("pr_rgate")){
-				orient = accessor.getNBTInteger(subtag, "orient");
-				subID  = accessor.getNBTInteger(subtag, "subID");
-				shape  = accessor.getNBTInteger(subtag, "shape");
-				
-				if (subID == 17)
-					pmax =  accessor.getNBTInteger(subtag, "pmax");
-				
-				if (subID == 19){
-					val = accessor.getNBTInteger(subtag, "val");
-					max = accessor.getNBTInteger(subtag, "max");
-					dec = accessor.getNBTInteger(subtag, "dec");
-					inc = accessor.getNBTInteger(subtag, "inc");
-				}
-					
-					
-				found  = true;
-			}
-		}		
-		
-		if (!found) return currenttip;		
-		
-		switch(subID){
-		case 10:		
-			currenttip.add(String.format("Delay : \u00a7f%d ticks", (int)Math.pow(2, shape)));
-			break;	
-			
-		case 15:
-			if (shape == 0)
-				currenttip.add("Shape : \u00a7fOpen");
-			if (shape == 1)
-				currenttip.add("Shape : \u00a7fHalf closed");			
-			if (shape == 2)
-				currenttip.add("Shape : \u00a7fclosed");			
-			break;
-			
-		case 17:
-			currenttip.add(String.format("Timer : \u00a7f%d \u00a7rms", (pmax + 2) * 50));
-			break;
-		
-		case 19:
-		
-			
-			currenttip.add(String.format("Value : \u00a7f%d \u00a7r/ \u00a7f%d", val, max));
-			currenttip.add(String.format("Step  : \u00a7f-%d \u00a7r/ \u00a7f+%d", dec, inc));
-			
-		default:
-			break;
-		}
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}

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

@@ -1,51 +0,0 @@
-package mcp.mobius.waila.addons.projectred;
-
-import java.io.File;
-import java.util.logging.Level;
-
-import net.minecraft.block.Block;
-import net.minecraftforge.common.Configuration;
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class ProjectRedModule {
-
-
-	public static Class BlockMultipart = null;
-	
-	public static void register(){	
-		try{
-			Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration");
-			mod_Waila.log.log(Level.INFO, "ProjectRed|Integration mod found.");
-		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found.");
-			return;
-		}
-		
-		try{
-			
-			//InstancedRsGateLogic = Class.forName("mrtjp.projectred.integration.InstancedRsGateLogic");
-			BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart");
-			
-		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
-			return;
-//		} catch (NoSuchMethodException e){
-//			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
-//			return;			
-//		} catch (NoSuchFieldException e){
-//			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
-//			return;			
-		} catch (Exception e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio");	
-		ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata");	
-		
-		ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart);
-	}	
-	
-}

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

@@ -1,57 +0,0 @@
-package mcp.mobius.waila.addons.thaumcraft;
-
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class ThaumcraftModule {
-
-	public static Class BlockMagicalLeaves = null;
-	public static Class BlockCustomPlant = null;
-	
-	public static Class TileCrystalCapacitor = null;
-	public static Field TileCrystalCapacitor_StoredVis = null;
-	public static Field TileCrystalCapacitor_MaxVis = null;		
-	
-	public static void register(){
-
-		try{
-			Class ModThaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
-			mod_Waila.log.log(Level.INFO, "Thaumcraft mod found.");
-		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
-			return;
-		}
-		
-		try{
-			BlockMagicalLeaves = Class.forName("thaumcraft.common.world.BlockMagicalLeaves");
-			BlockCustomPlant = Class.forName("thaumcraft.common.world.BlockCustomPlant");	
-			
-			TileCrystalCapacitor = Class.forName("thaumcraft.common.tiles.TileCrystalCapacitor");
-			TileCrystalCapacitor_StoredVis = TileCrystalCapacitor.getField("storedVis");
-			TileCrystalCapacitor_MaxVis    = TileCrystalCapacitor.getField("maxVis");			
-			
-			
-		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Class not found. " + e);
-			return;
-//		} catch (NoSuchMethodException e){
-//			mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Method not found." + e);
-//			return;			
-		} catch (NoSuchFieldException e){
-			mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Field not found." + e);
-			return;			
-//		} catch (Exception e){
-//			mod_Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e);
-//			return;			
-		}		
-		ModuleRegistrar.instance().addConfig("Thaumcraft", "thaumcraft.storedvis");		
-		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerLeaves(), BlockMagicalLeaves);
-		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerPlants(), BlockCustomPlant);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCrystalCapacitor);		
-		
-	}
-
-}

mcp/mobius/waila/api/IWailaDataProvider.java

@@ -1,4 +0,0 @@
-package mcp.mobius.waila.api;
-
-public interface IWailaDataProvider extends IWailaBlock{
-}

mcp/mobius/waila/api/IWailaRegistrar.java

@@ -1,44 +0,0 @@
-package mcp.mobius.waila.api;
-
-public interface IWailaRegistrar {
-	/* Add a config option in the section modname with displayed text configtext and access key keyname */
-	public void addConfig(String modname, String keyname, String configtext);
-	public void addConfigRemote(String modname, String keyname, String configtext);	
-	public void addConfig(String modname, String keyname);
-	public void addConfigRemote(String modname, String keyname);	
-	
-	/* Register a IWailaDataProvider for the given blockID, either for the Head section or the Body section */
-	@Deprecated
-	public void registerHeadProvider (IWailaDataProvider dataProvider, int blockID);
-	@Deprecated
-	public void registerBodyProvider (IWailaDataProvider dataProvider, int blockID);
-	@Deprecated
-	public void registerTailProvider (IWailaDataProvider dataProvider, int blockID);	
-	
-	/* Register a stack overrider for the given blockID */
-	@Deprecated
-	public void registerStackProvider(IWailaDataProvider dataProvider, int blockID);
-	public void registerStackProvider(IWailaDataProvider dataProvider, Class block);	
-	
-	/* Same thing, but works on a class hierarchy instead */
-	public void registerHeadProvider (IWailaDataProvider dataProvider, Class block);
-	public void registerBodyProvider (IWailaDataProvider dataProvider, Class block);
-	public void registerTailProvider (IWailaDataProvider dataProvider, Class block);	
-
-	/* Entity text registration methods */
-	public void registerHeadProvider (IWailaEntityProvider dataProvider, Class block);
-	public void registerBodyProvider (IWailaEntityProvider dataProvider, Class block);
-	public void registerTailProvider (IWailaEntityProvider dataProvider, Class block);	
-	
-	/* The block decorators */
-	@Deprecated
-	public void registerBlockDecorator (IWailaBlockDecorator decorator, int blockID);
-	public void registerBlockDecorator (IWailaBlockDecorator decorator, Class block);
-	
-	public void registerDocTextFile  (String filename);
-	
-	public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item);
-	
-	
-	/* Entity registration methods */
-}

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

@@ -1,103 +0,0 @@
-package mcp.mobius.waila.api.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Set;
-
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.Property;
-
-public class ConfigHandler implements IWailaConfigHandler {
-
-	private static ConfigHandler instance = null;
-	private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
-	private ArrayList<String> serverconfigs = new ArrayList<String>();
-	
-	private ConfigHandler() {
-		instance = this;
-	}
-
-	public static ConfigHandler instance(){
-		if (ConfigHandler.instance == null)
-			ConfigHandler.instance = new ConfigHandler();
-		return ConfigHandler.instance;
-	}
-	
-	public void addModule(String modName, HashMap<String, String> options){
-		this.addModule(modName, new ConfigModule(modName, options));
-	}
-
-	public void addModule(String modName, ConfigModule options){
-		this.modules.put(modName, options);
-	}	
-	
-	@Override
-	public Set<String> getModuleNames(){
-		return this.modules.keySet();
-	}
-	
-	@Override
-	public HashMap<String, String> getConfigKeys(String modName){
-		if (this.modules.containsKey(modName))
-			return this.modules.get(modName).options;
-		else
-			return null;
-	}
-	
-	public void addConfig(String modName, String key, String name){
-		if (!this.modules.containsKey(modName))
-			this.modules.put(modName, new ConfigModule(modName));
-		
-		this.modules.get(modName).addOption(key, name);
-	}
-
-	public void addConfigServer(String modName, String key, String name){
-		if (!this.modules.containsKey(modName))
-			this.modules.put(modName, new ConfigModule(modName));
-		
-		this.modules.get(modName).addOption(key, name);
-		this.serverconfigs.add(key);
-	}	
-	
-	@Override
-	public boolean getConfig(String key, boolean defvalue){
-		mod_Waila.instance.config.load();
-		
-		if (this.serverconfigs.contains(key) && !mod_Waila.instance.serverPresent)
-			return false;
-		
-		Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, defvalue);
-		return prop.getBoolean(defvalue);		
-	}
-	
-	public boolean isServerRequired(String key){
-		return this.serverconfigs.contains(key);
-	}
-	
-	@Override
-	public boolean getConfig(String key){
-		return this.getConfig(key, true);
-	}
-	
-	public int getConfigInt(String key){
-		mod_Waila.instance.config.load();
-		Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0);
-		return prop.getInt();			
-	}
-	
-	@Override
-	public void setConfig(String key, boolean value){
-		mod_Waila.instance.config.load();
-		mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, true).set(value);;
-		mod_Waila.instance.config.save();
-	}
-	
-	public void setConfigInt(String key, int value){
-		mod_Waila.instance.config.load();
-		mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, 0).set(value);;
-		mod_Waila.instance.config.save();		
-	}
-}

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

@@ -1,139 +0,0 @@
-package mcp.mobius.waila.api.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import mcp.mobius.waila.WailaExceptionHandler;
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.api.IWailaBlock;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.network.Packet0x01TERequest;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import codechicken.nei.api.ItemInfo.Layout;
-import cpw.mods.fml.common.network.PacketDispatcher;
-
-public class MetaDataProvider{
-	
-	private ArrayList<IWailaDataProvider>   headProviders = new ArrayList<IWailaDataProvider>();
-	private ArrayList<IWailaDataProvider>   bodyProviders = new ArrayList<IWailaDataProvider>();
-	private ArrayList<IWailaDataProvider>   tailProviders = new ArrayList<IWailaDataProvider>();
-	private Class prevBlock = null;
-	private Class prevTile  = null;
-	
-	public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor) {
-		Block block   = accessor.getBlock();
-		int   blockID = accessor.getBlockID();
-		
-		if (IWailaBlock.class.isInstance(block)){
-			try{
-				return ((IWailaBlock)block).getWailaStack(accessor, ConfigHandler.instance());
-			}catch (Throwable e){
-				WailaExceptionHandler.handleErr(e, block.getClass().toString(), null);
-			}
-		}
-
-		if(ModuleRegistrar.instance().hasStackProviders(block)){
-			for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(block)){
-				try{
-					ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance());
-					if (retval != null)
-						return retval;					
-				}catch (Throwable e){
-					WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null);					
-				}				
-			}
-		}
-		return null;
-	}
-
-	public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessor accessor, List<String> currenttip, Layout layout) {
-		Block block   = accessor.getBlock();
-		int   blockID = accessor.getBlockID();
-		
-		if (accessor.getTileEntity() != null && mod_Waila.instance.serverPresent && 
-				((System.currentTimeMillis() - accessor.timeLastUpdate >= 250))){
-			accessor.timeLastUpdate = System.currentTimeMillis();
-			PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop));
-		}
-
-		/* Interface IWailaBlock */
-		if (IWailaBlock.class.isInstance(block)){
-			TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
-			if (layout == Layout.HEADER)
-				try{				
-					return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip);
-				}					
-			else if (layout == Layout.BODY)
-				try{					
-					return ((IWailaBlock)block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip);
-				}
-			else if (layout == Layout.FOOTER)
-				try{					
-					return ((IWailaBlock)block).getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip);
-				}				
-		}		
-
-		headProviders.clear();
-		bodyProviders.clear();
-		tailProviders.clear();
-		
-		/* Lookup by class (for blocks)*/		
-		if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
-			headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block));
-
-		else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
-			bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block));
-
-		else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
-			tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(block));
-
-		
-		/* Lookup by class (for tileentities)*/		
-		if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
-			headProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
-
-		else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
-			bodyProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
-	
-		else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
-			tailProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
-	
-		/* Apply all collected providers */
-		if (layout == Layout.HEADER)
-			for (IWailaDataProvider dataProvider : headProviders)
-				try{				
-					currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-				}
-
-		if (layout == Layout.BODY)		
-			for (IWailaDataProvider dataProvider : bodyProviders)
-				try{				
-					currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-				}
-		
-		if (layout == Layout.FOOTER)	
-			for (IWailaDataProvider dataProvider : tailProviders)
-				try{				
-					currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
-				} catch (Throwable e){
-					currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-				}		
-		
-		return currenttip;
-	}
-}

mcp/mobius/waila/client/ConfigKeyHandler.java

@@ -1,166 +0,0 @@
-package mcp.mobius.waila.client;
-
-import java.util.EnumSet;
-import java.util.List;
-
-import mcp.mobius.waila.Constants;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.gui.screens.config.ScreenConfig;
-import mcp.mobius.waila.gui.screens.info.ScreenEnchants;
-import mcp.mobius.waila.handlers.nei.HandlerEnchants;
-import mcp.mobius.waila.overlay.RayTracing;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiInventory;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumMovingObjectType;
-
-import org.lwjgl.input.Keyboard;
-
-import codechicken.lib.lang.LangUtil;
-import codechicken.nei.api.API;
-import codechicken.nei.forge.GuiContainerManager;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-
-public class ConfigKeyHandler extends KeyHandler {
-
-	static boolean firstInventory = true;
-	
-    public ConfigKeyHandler()
-    {
-        super(new KeyBinding[]{
-                new KeyBinding(Constants.BIND_WAILA_CFG,     Keyboard.KEY_NUMPAD0),
-                new KeyBinding(Constants.BIND_WAILA_SHOW,    Keyboard.KEY_NUMPAD1),
-                new KeyBinding(Constants.BIND_WAILA_LIQUID,  Keyboard.KEY_NUMPAD2),
-                new KeyBinding(Constants.BIND_WAILA_RECIPE,  Keyboard.KEY_NUMPAD3),
-                new KeyBinding(Constants.BIND_WAILA_USAGE,   Keyboard.KEY_NUMPAD4),
-                //new KeyBinding(Constants.BIND_WAILA_TESTING, Keyboard.KEY_NUMPAD9),
-            }, new boolean[]{
-                false,
-                false,
-                false,
-                false,
-                false,
-                //false
-            });
-        
-        /*
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_CFG,     LangUtil.translateG("keybind.configscreen"));
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_SHOW,    LangUtil.translateG("keybind.showhide"));
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_LIQUID,  LangUtil.translateG("keybind.showliquid"));
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_RECIPE,  LangUtil.translateG("keybind.showrecipe"));
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_USAGE,   LangUtil.translateG("keybind.showusage"));
-        LanguageRegistry.instance().addStringLocalization(Constants.BIND_WAILA_TESTING, LangUtil.translateG("keybind.testing"));
-        */
-        //LanguageRegistry.instance().addStringLocalization(Constants.BIND_SCREEN_ENCH,   "[Waila] Show enchant screen");
-        //LanguageRegistry.instance().addStringLocalization("key.wailatedump", "[Waila] Dump server TE");      
-        
-		GuiContainerManager.addInputHandler(new HandlerEnchants());
-		API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I);        
-    }
-
-	@Override
-	public void keyDown(EnumSet<TickType> types, KeyBinding kb,	boolean tickEnd, boolean isRepeat) {
-		if (!tickEnd) return;
-		Minecraft mc = Minecraft.getMinecraft();
-		if (kb.keyDescription == Constants.BIND_WAILA_CFG){
-			if(mc.currentScreen == null)
-				mc.displayGuiScreen(new ScreenConfig(mc.currentScreen));
-		}
-
-		if (kb.keyDescription == Constants.BIND_WAILA_TESTING){
-			if(mc.currentScreen == null)
-				mc.displayGuiScreen(new ScreenEnchants(mc.currentScreen));
-		}		
-		
-		if (mc.currentScreen != null)
-			return;
-		
-		if (kb.keyDescription == Constants.BIND_WAILA_SHOW && ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
-			boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_SHOW);
-			ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, !status);
-		}
-		
-		else if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
-			ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, true);			
-		}
-		
-		else if (kb.keyDescription == Constants.BIND_WAILA_LIQUID){
-			boolean status = ConfigHandler.instance().getConfig(Constants.CFG_WAILA_LIQUID);
-			ConfigHandler.instance().setConfig(Constants.CFG_WAILA_LIQUID, !status);
-		}		
-
-		else if (kb.keyDescription == Constants.BIND_WAILA_RECIPE){
-			this.openRecipeGUI(true);
-		}			
-
-		else if (kb.keyDescription == Constants.BIND_WAILA_USAGE){ 
-			this.openRecipeGUI(false);
-		}
-			
-		
-	}
-
-	public void openRecipeGUI(boolean recipe){
-		Minecraft mc = Minecraft.getMinecraft();
-		boolean   uiResult;
-		String    msg;
-		
-		if ((RayTracing.instance().getTarget() != null) && (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.TILE)){
-			List<ItemStack> stacks = RayTracing.instance().getIdentifierItems();
-			if (stacks.size() > 0){
-				mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
-				if (firstInventory){
-					try {Thread.sleep(1000);} catch (Exception e){};
-					firstInventory = false;
-				}					
-		
-				if(recipe)
-					if(!GuiCraftingRecipe.openRecipeGui("item", stacks.get(0).copy())){
-						ItemStack target = stacks.get(0).copy();
-						target.setItemDamage(0);
-						if(!GuiCraftingRecipe.openRecipeGui("item", target)){
-							mc.thePlayer.addChatMessage("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.norecipe"));
-							mc.displayGuiScreen((GuiScreen)null);
-							mc.setIngameFocus();
-						}
-					}				
-				
-				if(!recipe)
-					if(!GuiUsageRecipe.openRecipeGui("item", stacks.get(0).copy())){
-						ItemStack target = stacks.get(0).copy();
-						target.setItemDamage(0);						
-						if(!GuiUsageRecipe.openRecipeGui("item", target)){
-							mc.thePlayer.addChatMessage("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.nousage"));
-							mc.displayGuiScreen((GuiScreen)null);
-							mc.setIngameFocus();
-						}
-					}
-			}
-		}
-	}
-	
-	@Override
-	public void keyUp(EnumSet<TickType> types, KeyBinding kb, boolean tickEnd) {
-		if (!tickEnd) return;
-		if (kb.keyDescription == Constants.BIND_WAILA_SHOW && !ConfigHandler.instance().getConfig(Constants.CFG_WAILA_MODE)){
-			ConfigHandler.instance().setConfig(Constants.CFG_WAILA_SHOW, false);
-		}		
-	}
-
-	@Override
-	public EnumSet<TickType> ticks() {
-        return EnumSet.of(TickType.CLIENT);
-	}
-
-	@Override
-	public String getLabel() {
-		return "Waila Config Screen Keybind";
-	}	
-	
-}

mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java

@@ -1,46 +0,0 @@
-package mcp.mobius.waila.gui.widgets.buttons;
-
-import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.Property;
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.gui.events.MouseEvent;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-
-public class ButtonBooleanConfig extends ButtonBoolean {
-	
-	private String configKey;
-	private boolean instant;
-
-	public ButtonBooleanConfig(IWidget parent, String configKey, String textFalse, String textTrue){
-		this(parent, configKey, true, true, textFalse, textTrue);
-	}
-	
-	public ButtonBooleanConfig(IWidget parent, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){
-		super(parent, textFalse, textTrue);
-		this.configKey = configKey;
-		this.instant   = instant;
-		
-		mod_Waila.instance.config.load();
-		Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
-		this.state = prop.getBoolean(state_);	
-		
-		if (this.state){
-			this.getWidget("LabelTrue").show();
-			this.getWidget("LabelFalse").hide();
-		} else {
-			this.getWidget("LabelTrue").hide();
-			this.getWidget("LabelFalse").show();			
-		}		
-	}
-	
-	@Override
-	public void onMouseClick(MouseEvent event){
-		super.onMouseClick(event);
-		
-		if (this.instant){
-			mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.BOOLEAN));
-			mod_Waila.instance.config.save();
-		}
-	}
-	
-}

mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java

@@ -1,47 +0,0 @@
-package mcp.mobius.waila.gui.widgets.buttons;
-
-import net.minecraftforge.common.Configuration;
-import net.minecraftforge.common.Property;
-
-import org.lwjgl.util.Point;
-
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.gui.events.MouseEvent;
-import mcp.mobius.waila.gui.interfaces.IWidget;
-import mcp.mobius.waila.gui.widgets.WidgetBase;
-
-public class ButtonIntegerConfig extends ButtonInteger {
-
-	private String configKey;
-	private boolean instant;
-
-	public ButtonIntegerConfig(IWidget parent, String configKey, String... texts){
-		this(parent, configKey, true, 0, texts);
-	}
-	
-	public ButtonIntegerConfig(IWidget parent, String configKey, boolean instant, int state_, String... texts){
-		super(parent, texts);
-		this.configKey = configKey;
-		this.instant   = instant;
-		
-		mod_Waila.instance.config.load();
-		Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, this.configKey, state_);
-		this.state = prop.getInt();	
-		
-		for (int i = 0; i < this.nStates; i++)
-			this.getWidget(String.format("Label_%d", i)).hide();
-		
-		this.getWidget(String.format("Label_%d", state)).show();			
-	}
-	
-	@Override
-	public void onMouseClick(MouseEvent event){
-		super.onMouseClick(event);
-		
-		if (this.instant){
-			mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(this.configKey, new Property(this.configKey,String.valueOf(this.state),Property.Type.INTEGER));
-			mod_Waila.instance.config.save();
-		}
-	}
-
-}

mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java

@@ -1,25 +0,0 @@
-package mcp.mobius.waila.handlers.nei;
-
-import java.util.List;
-
-import mcp.mobius.waila.tools.ModIdentification;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-import codechicken.nei.forge.IContainerTooltipHandler;
-
-public class TooltipHandlerWaila implements IContainerTooltipHandler {
-
-	@Override
-	public List<String> handleTooltipFirst(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, List<String> currenttip) {
-		String canonicalName = ModIdentification.nameFromStack(itemstack);
-		if (canonicalName != null && !canonicalName.equals(""))
-			currenttip.add("\u00a79\u00a7o" + canonicalName);
-		return currenttip;
-	}
-
-}

mcp/mobius/waila/network/Packet0x02TENBTData.java

@@ -1,77 +0,0 @@
-package mcp.mobius.waila.network;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.packet.Packet250CustomPayload;
-
-public class Packet0x02TENBTData {
-	public byte header;
-	public NBTTagCompound tag;
-
-	public Packet0x02TENBTData(Packet250CustomPayload packet){
-		DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
-		try{
-			this.header  = inputStream.readByte();
-			this.tag     = Packet0x02TENBTData.readNBTTagCompound(inputStream);
-		} catch (IOException e){}		
-	}	
-	
-	public static Packet250CustomPayload create(NBTTagCompound tag){
-		Packet250CustomPayload packet = new Packet250CustomPayload();
-		ByteArrayOutputStream bos     = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
-		DataOutputStream outputStream = new DataOutputStream(bos);
-		
-		try{
-			outputStream.writeByte(0x02);
-			Packet0x02TENBTData.writeNBTTagCompound(tag, outputStream);
-		}catch(IOException e){}
-		
-		packet.channel = "Waila";
-		packet.data    = bos.toByteArray();
-		packet.length  = bos.size();
-		
-		return packet;
-	}	
-
-    public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) throws IOException
-    {
-        if (par0NBTTagCompound == null)
-        {
-            par1DataOutputStream.writeShort(-1);
-        }
-        else
-        {
-            byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound);
-            
-            if (abyte.length > 32000)
-            	par1DataOutputStream.writeShort(-1);
-            else{
-            	par1DataOutputStream.writeShort((short)abyte.length);
-            	par1DataOutputStream.write(abyte);
-            }
-        }
-    }	
-
-    public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException
-    {
-        short short1 = par0DataInputStream.readShort();
-
-        if (short1 < 0)
-        {
-            return null;
-        }
-        else
-        {
-            byte[] abyte = new byte[short1];
-            par0DataInputStream.readFully(abyte);
-            return CompressedStreamTools.decompress(abyte);
-        }
-    }    
-    
-}

mcp/mobius/waila/overlay/OverlayRenderer.java

@@ -1,202 +0,0 @@
-package mcp.mobius.waila.overlay;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import codechicken.nei.forge.GuiContainerManager;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-
-import java.awt.Dimension;
-import java.awt.Point;
-
-import mcp.mobius.waila.Constants;
-import mcp.mobius.waila.mod_Waila;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.gui.truetyper.TrueTypeFont;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumMovingObjectType;
-import static codechicken.core.gui.GuiDraw.*;
-
-public class OverlayRenderer {
-
-	protected static boolean hasBlending;
-	protected static boolean hasLight;
-	protected static int     boundTexIndex;   	
-	
-    public static void renderOverlay()
-    {
-        Minecraft mc = Minecraft.getMinecraft();
-        if(!(mc.currentScreen == null &&
-             mc.theWorld != null &&
-             mc.isGuiEnabled() &&
-             !mc.gameSettings.keyBindPlayerList.pressed &&
-             ConfigHandler.instance().getConfig(Constants.CFG_WAILA_SHOW, true) &&
-             RayTracing.instance().getTarget()      != null))
-        	return;
-    
-        if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.TILE && RayTracing.instance().getTargetStack() != null)
-        {
-            renderOverlay(RayTracing.instance().getTargetStack(), WailaTickHandler.instance().currenttip, getPositioning());
-        }
-        
-        if (RayTracing.instance().getTarget().typeOfHit == EnumMovingObjectType.ENTITY)
-        {
-        	Entity ent = RayTracing.instance().getTarget().entityHit;
-        	String modName = getEntityMod(ent);
-        	
-        	List<String> textData = new ArrayList<String>();
-        	try{
-        		textData.add("\u00a7f" + ent.getEntityName());
-        	} catch (Exception e){
-        		textData.add("\u00a7f" + "Unknown");
-        	}
-        	textData.add("\u00a79\u00a7o" + modName);
-        	
-        	renderOverlay(ent, textData, getPositioning());
-        }
-    }		
-	
-    private static String getEntityMod(Entity entity){
-    	String modName = "";
-    	try{
-    		EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true);
-    		ModContainer modC = er.getContainer();
-    		modName = modC.getName();
-    	} catch (NullPointerException e){
-    		modName = "Minecraft";	
-    	}
-    	return modName;
-    }
-	
-    private static Point getPositioning()
-    {
-        return new Point(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSX), ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_POSY));
-    }    
-    
-    /*
-    public static int getColor(String key){
-    	int alpha = (int)(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA) / 100.0f * 256) << 24;
-    	return alpha + ConfigHandler.instance().getConfigInt(key);
-    }
-    */
-    
-    public static void renderOverlay(ItemStack stack, List<String> textData, Point pos)
-    {
-    	//TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont();
-    	
-    	GL11.glPushMatrix();
-    	
-    	GL11.glScalef(mod_Waila.scale, mod_Waila.scale, 1.0f);
-    	
-        int w = 0;
-        for (String s : textData)
-            w = Math.max(w, getStringWidth(s)+29);
-        int h = Math.max(24, 10 + 10*textData.size());
-
-        Dimension size = displaySize();
-        int x = ((int)(size.width / mod_Waila.scale)-w-1)*pos.x/10000;
-        int y = ((int)(size.height / mod_Waila.scale)-h-1)*pos.y/10000;
-        
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-        RenderHelper.disableStandardItemLighting();
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_DEPTH_TEST);
-        
-        drawTooltipBox(x, y, w, h, mod_Waila.bgcolor, mod_Waila.gradient1, mod_Waila.gradient2);
-
-        int ty = (h-10*textData.size())/2;
-        
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA);     
-        for (int i = 0; i < textData.size(); i++)
-        	//FontHelper.drawString(textData.get(i), x + 24, y + ty + 10*i, font, 1.0f, 1.0f, new float[] {1.0f, 1.0f, 1.0f});
-            drawString(textData.get(i), x + 24, y + ty + 10*i, mod_Waila.fontcolor, true);
-        GL11.glDisable(GL11.GL_BLEND);
-        
-
-        RenderHelper.enableGUIStandardItemLighting();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        
-        if (stack.getItem() != null)
-            GuiContainerManager.drawItem(x+5, y+h/2-8, stack);
-        
-    	GL11.glPopMatrix();        
-    }    
-    
-    public static void renderOverlay(Entity entity, List<String> textData, Point pos)
-    {
-    	GL11.glPushMatrix();    	
-    	
-    	GL11.glScalef(mod_Waila.scale, mod_Waila.scale, 1.0f);    	
-    	
-        int w = 0;
-        for (String s : textData)
-            w = Math.max(w, getStringWidth(s)+10);
-        int h = Math.max(24, 10 + 10*textData.size());
-
-        Dimension size = displaySize();
-        int x = ((int)(size.width / mod_Waila.scale)-w-1)*pos.x/10000;
-        int y = ((int)(size.height / mod_Waila.scale)-h-1)*pos.y/10000;
-        
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-        RenderHelper.disableStandardItemLighting();
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_DEPTH_TEST);
-        
-        drawTooltipBox(x, y, w, h, mod_Waila.bgcolor, mod_Waila.gradient1, mod_Waila.gradient2);
-
-        int ty = (h-10*textData.size())/2;
-
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA);         
-        for (int i = 0; i < textData.size(); i++)
-            drawString(textData.get(i), x + 6, y + ty + 10*i, mod_Waila.fontcolor, true);
-        GL11.glDisable(GL11.GL_BLEND);
-        
-        //RenderHelper.enableGUIStandardItemLighting();
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        
-    	GL11.glPopMatrix();         
-    }     
-
-    public static void saveGLState(){
-		hasBlending   = GL11.glGetBoolean(GL11.GL_BLEND);
-		hasLight      = GL11.glGetBoolean(GL11.GL_LIGHTING);
-    	boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);  
-    	GL11.glPushAttrib(GL11.GL_CURRENT_BIT);
-    }
-    
-    public static void loadGLState(){
-    	if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND);
-    	if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else	GL11.glDisable(GL11.GL_LIGHTING);
-    	GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex);
-    	GL11.glPopAttrib();
-    	//GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-    }    
-    
-    public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2)
-    {
-        //int bg = 0xf0100010;
-        drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
-        drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
-        drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center
-        drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
-        drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
-        //int grad1 = 0x505000ff;
-        //int grad2 = 0x5028007F;
-        drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
-        drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
-        
-        drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
-        drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
-    }    
-    
-}

mcp/mobius/waila/overlay/WailaTickHandler.java

@@ -1,88 +0,0 @@
-package mcp.mobius.waila.overlay;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-import mcp.mobius.waila.api.impl.DataAccessor;
-import mcp.mobius.waila.api.impl.MetaDataProvider;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemBlockWithMetadata;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumMovingObjectType;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import codechicken.nei.api.ItemInfo.Layout;
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.TickType;
-
-public class WailaTickHandler implements ITickHandler {
-
-    //public static LangUtil lang = LangUtil.loadLangDir("waila");
-	
-	private int ticks = 0;
-	public ItemStack identifiedHighlight = new ItemStack(Block.dirt);
-	public List<String> currenttip       = new ArrayList<String>(); 	
-	public MetaDataProvider handler    = new MetaDataProvider();
-	private Minecraft mc = Minecraft.getMinecraft();
-	
-	private static WailaTickHandler _instance;
-	private WailaTickHandler(){}
-	
-	public static WailaTickHandler instance(){
-		if(_instance == null)
-			_instance = new WailaTickHandler();
-		return _instance;
-	}
-	
-	@Override
-	public void tickStart(EnumSet<TickType> type, Object... tickData) {
-	}
-
-	@Override
-	public void tickEnd(EnumSet<TickType> type, Object... tickData) {
-		if(type.contains(TickType.RENDER)){
-			OverlayRenderer.renderOverlay(); 
-		}
-		
-		if(type.contains(TickType.CLIENT)){
-			World world                 = mc.theWorld;
-			EntityPlayer player         = mc.thePlayer;			
-			if (world != null && player != null){
-				RayTracing.instance().fire();
-				MovingObjectPosition target = RayTracing.instance().getTarget();
-				
-				if (target != null && target.typeOfHit == EnumMovingObjectType.TILE){
-					DataAccessor accessor = DataAccessor.instance;
-					accessor.set(world, player, target);
-					ItemStack targetStack = RayTracing.instance().getTargetStack();
-					
-					if (targetStack != null){
-						this.currenttip.clear();
-						
-						//this.identifiedHighlight = handler.identifyHighlight(world, player, target);
-						this.currenttip      = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.HEADER);
-						this.currenttip      = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.BODY);
-						this.currenttip      = handler.handleTextData(targetStack, world, player, target, accessor, currenttip, Layout.FOOTER);
-					}
-				}
-			}
-		}		
-	}
-
-    @Override
-    public EnumSet<TickType> ticks() 
-    {
-        return EnumSet.of(TickType.RENDER, TickType.CLIENT);
-    }
-
-    @Override
-    public String getLabel() 
-    {
-        return "Waila Tick Handler";
-    }
-
-}

mcp/mobius/waila/tools/Reflect.java

@@ -1,22 +0,0 @@
-package mcp.mobius.waila.tools;
-
-import java.lang.reflect.Field;
-
-public class Reflect {
-
-	public static Object getFieldValue(String className, String fieldname, Object obj){
-		try {
-			
-			Class class_ = Class.forName(className);
-			Field field_ = class_.getField(fieldname);
-			field_.setAccessible(true);
-			Object object_ = field_.get(obj);
-			return object_;
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-}

src/main/java/au/com/bytecode/opencsv/CSVParser.java

@@ -1,323 +1,323 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV parser released under a commercial-friendly license.
- * This just implements splitting a single line into fields.
- *
- * @author Glen Smith
- * @author Rainer Pruy
- */
-public class CSVParser {
-
-    private final char separator;
-
-    private final char quotechar;
-
-    private final char escape;
-
-    private final boolean strictQuotes;
-
-    private String pending;
-    private boolean inField = false;
-
-    private final boolean ignoreLeadingWhiteSpace;
-
-    /**
-     * The default separator to use if none is supplied to the constructor.
-     */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    public static final int INITIAL_READ_SIZE = 128;
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-
-
-    /**
-     * The default escape character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
-
-    /**
-     * The default strict quote behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_STRICT_QUOTES = false;
-
-    /**
-     * The default leading whitespace behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
-
-    /**
-     * This is the "null" character - if a value is set to this then it is ignored.
-     * I.E. if the quote character is set to null then there is no quote character.
-     */
-    public static final char NULL_CHARACTER = '\0';
-
-    /**
-     * Constructs CSVParser using a comma for the separator.
-     */
-    public CSVParser() {
-        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVParser with supplied separator.
-     *
-     * @param separator the delimiter to use for separating entries.
-     */
-    public CSVParser(char separator) {
-        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-
-    /**
-     * Constructs CSVParser with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     */
-    public CSVParser(char separator, char quotechar) {
-        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     * @param escape    the character to use for escaping a separator or quote
-     */
-    public CSVParser(char separator, char quotechar, char escape) {
-        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" flag
-     *
-     * @param separator    the delimiter to use for separating entries
-     * @param quotechar    the character to use for quoted elements
-     * @param escape       the character to use for escaping a separator or quote
-     * @param strictQuotes if true, characters outside the quotes are ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
-        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
-     *
-     * @param separator               the delimiter to use for separating entries
-     * @param quotechar               the character to use for quoted elements
-     * @param escape                  the character to use for escaping a separator or quote
-     * @param strictQuotes            if true, characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace if true, white space in front of a quote in a field is ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        if (anyCharactersAreTheSame(separator, quotechar, escape)) {
-            throw new UnsupportedOperationException("The separator, quote, and escape characters must be different!");
-        }
-        if (separator == NULL_CHARACTER) {
-            throw new UnsupportedOperationException("The separator character must be defined!");
-        }
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escape = escape;
-        this.strictQuotes = strictQuotes;
-        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
-    }
-
-    private boolean anyCharactersAreTheSame(char separator, char quotechar, char escape) {
-        return isSameCharacter(separator, quotechar) || isSameCharacter(separator, escape) || isSameCharacter(quotechar, escape);
-    }
-
-    private boolean isSameCharacter(char c1, char c2) {
-        return c1 != NULL_CHARACTER && c1 == c2;
-    }
-
-    /**
-     * @return true if something was left over from last call(s)
-     */
-    public boolean isPending() {
-        return pending != null;
-    }
-
-    public String[] parseLineMulti(String nextLine) throws IOException {
-        return parseLine(nextLine, true);
-    }
-
-    public String[] parseLine(String nextLine) throws IOException {
-        return parseLine(nextLine, false);
-    }
-
-    /**
-     * Parses an incoming String and returns an array of elements.
-     *
-     * @param nextLine the string to parse
-     * @param multi
-     * @return the comma-tokenized list of elements, or null if nextLine is null
-     * @throws IOException if bad things happen during the read
-     */
-    private String[] parseLine(String nextLine, boolean multi) throws IOException {
-
-        if (!multi && pending != null) {
-            pending = null;
-        }
-
-        if (nextLine == null) {
-            if (pending != null) {
-                String s = pending;
-                pending = null;
-                return new String[]{s};
-            } else {
-                return null;
-            }
-        }
-
-        List<String> tokensOnThisLine = new ArrayList<String>();
-        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
-        boolean inQuotes = false;
-        if (pending != null) {
-            sb.append(pending);
-            pending = null;
-            inQuotes = true;
-        }
-        for (int i = 0; i < nextLine.length(); i++) {
-
-            char c = nextLine.charAt(i);
-            if (c == this.escape) {
-                if (isNextCharacterEscapable(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                }
-            } else if (c == quotechar) {
-                if (isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                } else {
-                    //inQuotes = !inQuotes;
-
-                    // the tricky case of an embedded quote in the middle: a,bc"d"ef,g
-                    if (!strictQuotes) {
-                        if (i > 2 //not on the beginning of the line
-                                && nextLine.charAt(i - 1) != this.separator //not at the beginning of an escape sequence
-                                && nextLine.length() > (i + 1) &&
-                                nextLine.charAt(i + 1) != this.separator //not at the	end of an escape sequence
-                                ) {
-
-                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
-                                sb.setLength(0);  //discard white space leading up to quote
-                            } else {
-                                sb.append(c);
-                                //continue;
-                            }
-
-                        }
-                    }
-
-                    inQuotes = !inQuotes;
-                }
-                inField = !inField;
-            } else if (c == separator && !inQuotes) {
-                tokensOnThisLine.add(sb.toString());
-                sb.setLength(0); // start work on next token
-                inField = false;
-            } else {
-                if (!strictQuotes || inQuotes) {
-                    sb.append(c);
-                    inField = true;
-                }
-            }
-        }
-        // line is done - check status
-        if (inQuotes) {
-            if (multi) {
-                // continuing a quoted section, re-append newline
-                sb.append("\n");
-                pending = sb.toString();
-                sb = null; // this partial content is not to be added to field list yet
-            } else {
-                throw new IOException("Un-terminated quoted field at end of CSV line");
-            }
-        }
-        if (sb != null) {
-            tokensOnThisLine.add(sb.toString());
-        }
-        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
-
-    }
-
-    /**
-     * precondition: the current character is a quote or an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && nextLine.charAt(i + 1) == quotechar;
-    }
-
-    /**
-     * precondition: the current character is an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && (nextLine.charAt(i + 1) == quotechar || nextLine.charAt(i + 1) == this.escape);
-    }
-
-    /**
-     * precondition: sb.length() > 0
-     *
-     * @param sb A sequence of characters to examine
-     * @return true if every character in the sequence is whitespace
-     */
-    protected boolean isAllWhiteSpace(CharSequence sb) {
-        boolean result = true;
-        for (int i = 0; i < sb.length(); i++) {
-            char c = sb.charAt(i);
-
-            if (!Character.isWhitespace(c)) {
-                return false;
-            }
-        }
-        return result;
-    }
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV parser released under a commercial-friendly license.
+ * This just implements splitting a single line into fields.
+ *
+ * @author Glen Smith
+ * @author Rainer Pruy
+ */
+public class CSVParser {
+
+    private final char separator;
+
+    private final char quotechar;
+
+    private final char escape;
+
+    private final boolean strictQuotes;
+
+    private String pending;
+    private boolean inField = false;
+
+    private final boolean ignoreLeadingWhiteSpace;
+
+    /**
+     * The default separator to use if none is supplied to the constructor.
+     */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    public static final int INITIAL_READ_SIZE = 128;
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+
+
+    /**
+     * The default escape character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
+
+    /**
+     * The default strict quote behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_STRICT_QUOTES = false;
+
+    /**
+     * The default leading whitespace behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
+
+    /**
+     * This is the "null" character - if a value is set to this then it is ignored.
+     * I.E. if the quote character is set to null then there is no quote character.
+     */
+    public static final char NULL_CHARACTER = '\0';
+
+    /**
+     * Constructs CSVParser using a comma for the separator.
+     */
+    public CSVParser() {
+        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVParser with supplied separator.
+     *
+     * @param separator the delimiter to use for separating entries.
+     */
+    public CSVParser(char separator) {
+        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+
+    /**
+     * Constructs CSVParser with supplied separator and quote char.
+     *
+     * @param separator the delimiter to use for separating entries
+     * @param quotechar the character to use for quoted elements
+     */
+    public CSVParser(char separator, char quotechar) {
+        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param separator the delimiter to use for separating entries
+     * @param quotechar the character to use for quoted elements
+     * @param escape    the character to use for escaping a separator or quote
+     */
+    public CSVParser(char separator, char quotechar, char escape) {
+        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" flag
+     *
+     * @param separator    the delimiter to use for separating entries
+     * @param quotechar    the character to use for quoted elements
+     * @param escape       the character to use for escaping a separator or quote
+     * @param strictQuotes if true, characters outside the quotes are ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
+        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
+     *
+     * @param separator               the delimiter to use for separating entries
+     * @param quotechar               the character to use for quoted elements
+     * @param escape                  the character to use for escaping a separator or quote
+     * @param strictQuotes            if true, characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace if true, white space in front of a quote in a field is ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        if (anyCharactersAreTheSame(separator, quotechar, escape)) {
+            throw new UnsupportedOperationException("The separator, quote, and escape characters must be different!");
+        }
+        if (separator == NULL_CHARACTER) {
+            throw new UnsupportedOperationException("The separator character must be defined!");
+        }
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escape = escape;
+        this.strictQuotes = strictQuotes;
+        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
+    }
+
+    private boolean anyCharactersAreTheSame(char separator, char quotechar, char escape) {
+        return isSameCharacter(separator, quotechar) || isSameCharacter(separator, escape) || isSameCharacter(quotechar, escape);
+    }
+
+    private boolean isSameCharacter(char c1, char c2) {
+        return c1 != NULL_CHARACTER && c1 == c2;
+    }
+
+    /**
+     * @return true if something was left over from last call(s)
+     */
+    public boolean isPending() {
+        return pending != null;
+    }
+
+    public String[] parseLineMulti(String nextLine) throws IOException {
+        return parseLine(nextLine, true);
+    }
+
+    public String[] parseLine(String nextLine) throws IOException {
+        return parseLine(nextLine, false);
+    }
+
+    /**
+     * Parses an incoming String and returns an array of elements.
+     *
+     * @param nextLine the string to parse
+     * @param multi
+     * @return the comma-tokenized list of elements, or null if nextLine is null
+     * @throws IOException if bad things happen during the read
+     */
+    private String[] parseLine(String nextLine, boolean multi) throws IOException {
+
+        if (!multi && pending != null) {
+            pending = null;
+        }
+
+        if (nextLine == null) {
+            if (pending != null) {
+                String s = pending;
+                pending = null;
+                return new String[]{s};
+            } else {
+                return null;
+            }
+        }
+
+        List<String> tokensOnThisLine = new ArrayList<String>();
+        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
+        boolean inQuotes = false;
+        if (pending != null) {
+            sb.append(pending);
+            pending = null;
+            inQuotes = true;
+        }
+        for (int i = 0; i < nextLine.length(); i++) {
+
+            char c = nextLine.charAt(i);
+            if (c == this.escape) {
+                if (isNextCharacterEscapable(nextLine, inQuotes || inField, i)) {
+                    sb.append(nextLine.charAt(i + 1));
+                    i++;
+                }
+            } else if (c == quotechar) {
+                if (isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i)) {
+                    sb.append(nextLine.charAt(i + 1));
+                    i++;
+                } else {
+                    //inQuotes = !inQuotes;
+
+                    // the tricky case of an embedded quote in the middle: a,bc"d"ef,g
+                    if (!strictQuotes) {
+                        if (i > 2 //not on the beginning of the line
+                                && nextLine.charAt(i - 1) != this.separator //not at the beginning of an escape sequence
+                                && nextLine.length() > (i + 1) &&
+                                nextLine.charAt(i + 1) != this.separator //not at the	end of an escape sequence
+                                ) {
+
+                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
+                                sb.setLength(0);  //discard white space leading up to quote
+                            } else {
+                                sb.append(c);
+                                //continue;
+                            }
+
+                        }
+                    }
+
+                    inQuotes = !inQuotes;
+                }
+                inField = !inField;
+            } else if (c == separator && !inQuotes) {
+                tokensOnThisLine.add(sb.toString());
+                sb.setLength(0); // start work on next token
+                inField = false;
+            } else {
+                if (!strictQuotes || inQuotes) {
+                    sb.append(c);
+                    inField = true;
+                }
+            }
+        }
+        // line is done - check status
+        if (inQuotes) {
+            if (multi) {
+                // continuing a quoted section, re-append newline
+                sb.append("\n");
+                pending = sb.toString();
+                sb = null; // this partial content is not to be added to field list yet
+            } else {
+                throw new IOException("Un-terminated quoted field at end of CSV line");
+            }
+        }
+        if (sb != null) {
+            tokensOnThisLine.add(sb.toString());
+        }
+        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+
+    }
+
+    /**
+     * precondition: the current character is a quote or an escape
+     *
+     * @param nextLine the current line
+     * @param inQuotes true if the current context is quoted
+     * @param i        current index in line
+     * @return true if the following character is a quote
+     */
+    private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
+        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+                && nextLine.length() > (i + 1)  // there is indeed another character to check.
+                && nextLine.charAt(i + 1) == quotechar;
+    }
+
+    /**
+     * precondition: the current character is an escape
+     *
+     * @param nextLine the current line
+     * @param inQuotes true if the current context is quoted
+     * @param i        current index in line
+     * @return true if the following character is a quote
+     */
+    protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
+        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+                && nextLine.length() > (i + 1)  // there is indeed another character to check.
+                && (nextLine.charAt(i + 1) == quotechar || nextLine.charAt(i + 1) == this.escape);
+    }
+
+    /**
+     * precondition: sb.length() > 0
+     *
+     * @param sb A sequence of characters to examine
+     * @return true if every character in the sequence is whitespace
+     */
+    protected boolean isAllWhiteSpace(CharSequence sb) {
+        boolean result = true;
+        for (int i = 0; i < sb.length(); i++) {
+            char c = sb.charAt(i);
+
+            if (!Character.isWhitespace(c)) {
+                return false;
+            }
+        }
+        return result;
+    }
+}

src/main/java/au/com/bytecode/opencsv/CSVReader.java

@@ -1,282 +1,282 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV reader released under a commercial-friendly license.
- * 
- * @author Glen Smith
- * 
- */
-public class CSVReader implements Closeable {
-
-    private BufferedReader br;
-
-    private boolean hasNext = true;
-
-    private CSVParser parser;
-    
-    private int skipLines;
-
-    private boolean linesSkiped;
-
-    /**
-     * The default line to start reading.
-     */
-    public static final int DEFAULT_SKIP_LINES = 0;
-
-    /**
-     * Constructs CSVReader using a comma for the separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     */
-    public CSVReader(Reader reader) {
-        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVReader(Reader reader, char separator) {
-        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVReader(Reader reader, char separator, char quotechar) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator, quote char and quote handling
-     * behavior.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
-    }
-
-   /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     */
-
-    public CSVReader(Reader reader, char separator,
-			char quotechar, char escape) {
-        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-	}
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param line
-     *            the line number to skip for start reading 
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, int line) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
-        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
-        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace
-     *            it true, parser should ignore white space before a quote in a field
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        this.br = new BufferedReader(reader);
-        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
-        this.skipLines = line;
-    }
-
-   /**
-     * Reads the entire file into a List with each element being a String[] of
-     * tokens.
-     * 
-     * @return a List of String[], with each String[] representing a line of the
-     *         file.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public List<String[]> readAll() throws IOException {
-
-        List<String[]> allElements = new ArrayList<String[]>();
-        while (hasNext) {
-            String[] nextLineAsTokens = readNext();
-            if (nextLineAsTokens != null)
-                allElements.add(nextLineAsTokens);
-        }
-        return allElements;
-
-    }
-
-    /**
-     * Reads the next line from the buffer and converts to a string array.
-     * 
-     * @return a string array with each comma-separated element as a separate
-     *         entry.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public String[] readNext() throws IOException {
-    	
-    	String[] result = null;
-    	do {
-    		String nextLine = getNextLine();
-    		if (!hasNext) {
-    			return result; // should throw if still pending?
-    		}
-    		String[] r = parser.parseLineMulti(nextLine);
-    		if (r.length > 0) {
-    			if (result == null) {
-    				result = r;
-    			} else {
-    				String[] t = new String[result.length+r.length];
-    				System.arraycopy(result, 0, t, 0, result.length);
-    				System.arraycopy(r, 0, t, result.length, r.length);
-    				result = t;
-    			}
-    		}
-    	} while (parser.isPending());
-    	return result;
-    }
-
-    /**
-     * Reads the next line from the file.
-     * 
-     * @return the next line from the file without trailing newline
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    private String getNextLine() throws IOException {
-    	if (!this.linesSkiped) {
-            for (int i = 0; i < skipLines; i++) {
-                br.readLine();
-            }
-            this.linesSkiped = true;
-        }
-        String nextLine = br.readLine();
-        if (nextLine == null) {
-            hasNext = false;
-        }
-        return hasNext ? nextLine : null;
-    }
-
-    /**
-     * Closes the underlying reader.
-     * 
-     * @throws IOException if the close fails
-     */
-    public void close() throws IOException{
-    	br.close();
-    }
-    
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV reader released under a commercial-friendly license.
+ * 
+ * @author Glen Smith
+ * 
+ */
+public class CSVReader implements Closeable {
+
+    private BufferedReader br;
+
+    private boolean hasNext = true;
+
+    private CSVParser parser;
+    
+    private int skipLines;
+
+    private boolean linesSkiped;
+
+    /**
+     * The default line to start reading.
+     */
+    public static final int DEFAULT_SKIP_LINES = 0;
+
+    /**
+     * Constructs CSVReader using a comma for the separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     */
+    public CSVReader(Reader reader) {
+        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVReader(Reader reader, char separator) {
+        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVReader(Reader reader, char separator, char quotechar) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator, quote char and quote handling
+     * behavior.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
+    }
+
+   /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+
+    public CSVReader(Reader reader, char separator,
+			char quotechar, char escape) {
+        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+	}
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param line
+     *            the line number to skip for start reading 
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, int line) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
+        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
+        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            it true, parser should ignore white space before a quote in a field
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.br = new BufferedReader(reader);
+        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
+        this.skipLines = line;
+    }
+
+   /**
+     * Reads the entire file into a List with each element being a String[] of
+     * tokens.
+     * 
+     * @return a List of String[], with each String[] representing a line of the
+     *         file.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public List<String[]> readAll() throws IOException {
+
+        List<String[]> allElements = new ArrayList<String[]>();
+        while (hasNext) {
+            String[] nextLineAsTokens = readNext();
+            if (nextLineAsTokens != null)
+                allElements.add(nextLineAsTokens);
+        }
+        return allElements;
+
+    }
+
+    /**
+     * Reads the next line from the buffer and converts to a string array.
+     * 
+     * @return a string array with each comma-separated element as a separate
+     *         entry.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public String[] readNext() throws IOException {
+    	
+    	String[] result = null;
+    	do {
+    		String nextLine = getNextLine();
+    		if (!hasNext) {
+    			return result; // should throw if still pending?
+    		}
+    		String[] r = parser.parseLineMulti(nextLine);
+    		if (r.length > 0) {
+    			if (result == null) {
+    				result = r;
+    			} else {
+    				String[] t = new String[result.length+r.length];
+    				System.arraycopy(result, 0, t, 0, result.length);
+    				System.arraycopy(r, 0, t, result.length, r.length);
+    				result = t;
+    			}
+    		}
+    	} while (parser.isPending());
+    	return result;
+    }
+
+    /**
+     * Reads the next line from the file.
+     * 
+     * @return the next line from the file without trailing newline
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    private String getNextLine() throws IOException {
+    	if (!this.linesSkiped) {
+            for (int i = 0; i < skipLines; i++) {
+                br.readLine();
+            }
+            this.linesSkiped = true;
+        }
+        String nextLine = br.readLine();
+        if (nextLine == null) {
+            hasNext = false;
+        }
+        return hasNext ? nextLine : null;
+    }
+
+    /**
+     * Closes the underlying reader.
+     * 
+     * @throws IOException if the close fails
+     */
+    public void close() throws IOException{
+    	br.close();
+    }
+    
+}

src/main/java/au/com/bytecode/opencsv/CSVWriter.java

@@ -1,302 +1,302 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * A very simple CSV writer released under a commercial-friendly license.
- *
- * @author Glen Smith
- *
- */
-public class CSVWriter implements Closeable {
-    
-    public static final int INITIAL_STRING_SIZE = 128;
-
-	private Writer rawWriter;
-
-    private PrintWriter pw;
-
-    private char separator;
-
-    private char quotechar;
-    
-    private char escapechar;
-    
-    private String lineEnd;
-
-    /** The character used for escaping quotes. */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
-
-    /** The default separator to use if none is supplied to the constructor. */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-    
-    /** The quote constant to use when you wish to suppress all quoting. */
-    public static final char NO_QUOTE_CHARACTER = '\u0000';
-    
-    /** The escape constant to use when you wish to suppress all escaping. */
-    public static final char NO_ESCAPE_CHARACTER = '\u0000';
-    
-    /** Default line terminator uses platform encoding. */
-    public static final String DEFAULT_LINE_END = "\n";
-
-    private ResultSetHelper resultService = new ResultSetHelperService();
-    
-    /**
-     * Constructs CSVWriter using a comma for the separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     */
-    public CSVWriter(Writer writer) {
-        this(writer, DEFAULT_SEPARATOR);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVWriter(Writer writer, char separator) {
-        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar) {
-    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
-        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
-    }
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
-        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
-    }   
-    
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
-        this.rawWriter = writer;
-        this.pw = new PrintWriter(writer);
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escapechar = escapechar;
-        this.lineEnd = lineEnd;
-    }
-    
-    /**
-     * Writes the entire list to a CSV file. The list is assumed to be a
-     * String[]
-     *
-     * @param allLines
-     *            a List of String[], with each String[] representing a line of
-     *            the file.
-     */
-    public void writeAll(List<String[]> allLines)  {
-    	for (String[] line : allLines) {
-			writeNext(line);
-		}
-    }
-
-    protected void writeColumnNames(ResultSet rs)
-    	throws SQLException {
-
-    	writeNext(resultService.getColumnNames(rs));
-    }
-    
-    /**
-     * Writes the entire ResultSet to a CSV file.
-     *
-     * The caller is responsible for closing the ResultSet.
-     *
-     * @param rs the recordset to write
-     * @param includeColumnNames true if you want column names in the output, false otherwise
-     *
-     * @throws java.io.IOException thrown by getColumnValue
-     * @throws java.sql.SQLException thrown by getColumnValue
-     */
-    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
-    	
-    	
-    	if (includeColumnNames) {
-			writeColumnNames(rs);
-		}
-    	
-    	while (rs.next())
-    	{
-    		writeNext(resultService.getColumnValues(rs));
-    	}
-    }
-
-    
-    /**
-     * Writes the next line to the file.
-     *
-     * @param nextLine
-     *            a string array with each comma-separated element as a separate
-     *            entry.
-     */
-    public void writeNext(String[] nextLine) {
-    	
-    	if (nextLine == null)
-    		return;
-    	
-        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-        for (int i = 0; i < nextLine.length; i++) {
-
-            if (i != 0) {
-                sb.append(separator);
-            }
-
-            String nextElement = nextLine[i];
-            if (nextElement == null)
-                continue;
-            if (quotechar !=  NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-            
-            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
-
-            if (quotechar != NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-        }
-        
-        sb.append(lineEnd);
-        pw.write(sb.toString());
-
-    }
-
-	private boolean stringContainsSpecialCharacters(String line) {
-	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
-    }
-
-	protected StringBuilder processLine(String nextElement)
-    {
-		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-	    for (int j = 0; j < nextElement.length(); j++) {
-	        char nextChar = nextElement.charAt(j);
-	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else {
-	            sb.append(nextChar);
-	        }
-	    }
-	    
-	    return sb;
-    }
-
-    /**
-     * Flush underlying stream to writer.
-     * 
-     * @throws IOException if bad things happen
-     */
-    public void flush() throws IOException {
-
-        pw.flush();
-
-    } 
-
-    /**
-     * Close the underlying stream writer flushing any buffered content.
-     *
-     * @throws IOException if bad things happen
-     *
-     */
-    public void close() throws IOException {
-        flush();
-        pw.close();
-        rawWriter.close();
-    }
-
-    /**
-     *  Checks to see if the there has been an error in the printstream. 
-     */
-    public boolean checkError() {
-        return pw.checkError();
-    }
-
-    public void setResultService(ResultSetHelper resultService) {
-        this.resultService = resultService;
-    }
-
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * A very simple CSV writer released under a commercial-friendly license.
+ *
+ * @author Glen Smith
+ *
+ */
+public class CSVWriter implements Closeable {
+    
+    public static final int INITIAL_STRING_SIZE = 128;
+
+	private Writer rawWriter;
+
+    private PrintWriter pw;
+
+    private char separator;
+
+    private char quotechar;
+    
+    private char escapechar;
+    
+    private String lineEnd;
+
+    /** The character used for escaping quotes. */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
+
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+    /** The quote constant to use when you wish to suppress all quoting. */
+    public static final char NO_QUOTE_CHARACTER = '\u0000';
+    
+    /** The escape constant to use when you wish to suppress all escaping. */
+    public static final char NO_ESCAPE_CHARACTER = '\u0000';
+    
+    /** Default line terminator uses platform encoding. */
+    public static final String DEFAULT_LINE_END = "\n";
+
+    private ResultSetHelper resultService = new ResultSetHelperService();
+    
+    /**
+     * Constructs CSVWriter using a comma for the separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     */
+    public CSVWriter(Writer writer) {
+        this(writer, DEFAULT_SEPARATOR);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVWriter(Writer writer, char separator) {
+        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar) {
+    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
+        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
+    }
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
+        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
+    }   
+    
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
+        this.rawWriter = writer;
+        this.pw = new PrintWriter(writer);
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escapechar = escapechar;
+        this.lineEnd = lineEnd;
+    }
+    
+    /**
+     * Writes the entire list to a CSV file. The list is assumed to be a
+     * String[]
+     *
+     * @param allLines
+     *            a List of String[], with each String[] representing a line of
+     *            the file.
+     */
+    public void writeAll(List<String[]> allLines)  {
+    	for (String[] line : allLines) {
+			writeNext(line);
+		}
+    }
+
+    protected void writeColumnNames(ResultSet rs)
+    	throws SQLException {
+
+    	writeNext(resultService.getColumnNames(rs));
+    }
+    
+    /**
+     * Writes the entire ResultSet to a CSV file.
+     *
+     * The caller is responsible for closing the ResultSet.
+     *
+     * @param rs the recordset to write
+     * @param includeColumnNames true if you want column names in the output, false otherwise
+     *
+     * @throws java.io.IOException thrown by getColumnValue
+     * @throws java.sql.SQLException thrown by getColumnValue
+     */
+    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
+    	
+    	
+    	if (includeColumnNames) {
+			writeColumnNames(rs);
+		}
+    	
+    	while (rs.next())
+    	{
+    		writeNext(resultService.getColumnValues(rs));
+    	}
+    }
+
+    
+    /**
+     * Writes the next line to the file.
+     *
+     * @param nextLine
+     *            a string array with each comma-separated element as a separate
+     *            entry.
+     */
+    public void writeNext(String[] nextLine) {
+    	
+    	if (nextLine == null)
+    		return;
+    	
+        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+        for (int i = 0; i < nextLine.length; i++) {
+
+            if (i != 0) {
+                sb.append(separator);
+            }
+
+            String nextElement = nextLine[i];
+            if (nextElement == null)
+                continue;
+            if (quotechar !=  NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+            
+            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
+
+            if (quotechar != NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+        }
+        
+        sb.append(lineEnd);
+        pw.write(sb.toString());
+
+    }
+
+	private boolean stringContainsSpecialCharacters(String line) {
+	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
+    }
+
+	protected StringBuilder processLine(String nextElement)
+    {
+		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+	    for (int j = 0; j < nextElement.length(); j++) {
+	        char nextChar = nextElement.charAt(j);
+	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else {
+	            sb.append(nextChar);
+	        }
+	    }
+	    
+	    return sb;
+    }
+
+    /**
+     * Flush underlying stream to writer.
+     * 
+     * @throws IOException if bad things happen
+     */
+    public void flush() throws IOException {
+
+        pw.flush();
+
+    } 
+
+    /**
+     * Close the underlying stream writer flushing any buffered content.
+     *
+     * @throws IOException if bad things happen
+     *
+     */
+    public void close() throws IOException {
+        flush();
+        pw.close();
+        rawWriter.close();
+    }
+
+    /**
+     *  Checks to see if the there has been an error in the printstream. 
+     */
+    public boolean checkError() {
+        return pw.checkError();
+    }
+
+    public void setResultService(ResultSetHelper resultService) {
+        this.resultService = resultService;
+    }
+
+}

src/main/java/au/com/bytecode/opencsv/bean/package.html

@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A simple bean binding interface for use with opencsv.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+<p>
+A simple bean binding interface for use with opencsv.
+</p>
+<br>
+<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
+</body>
+</html>

src/main/java/au/com/bytecode/opencsv/package.html

@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A very simple CSV parser for Java released under a commercial-friendly license.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+<p>
+A very simple CSV parser for Java released under a commercial-friendly license.
+</p>
+<br>
+<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
+</body>
+</html>

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

@@ -2,9 +2,6 @@ package mcp.mobius.waila;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.google.common.eventbus.EventBus;
@@ -12,37 +9,25 @@ import com.google.common.eventbus.Subscribe;
 
 import mcp.mobius.waila.api.IWailaRegistrar;
 import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.api.impl.MetaDataProvider;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.client.WailaClientEventHandler;
-import mcp.mobius.waila.network.WailaConnectionHandler;
+import mcp.mobius.waila.network.NetworkHandler;
 import mcp.mobius.waila.network.WailaPacketHandler;
+import mcp.mobius.waila.overlay.OverlayConfig;
+import mcp.mobius.waila.overlay.DecoratorRenderer;
+import mcp.mobius.waila.overlay.WailaTickHandler;
 import mcp.mobius.waila.server.ProxyServer;
-import mcp.mobius.waila.tools.ModIdentification;
-import mcp.mobius.waila.tools.Reflect;
+import mcp.mobius.waila.utils.Constants;
+import mcp.mobius.waila.utils.ModIdentification;
 import net.minecraft.client.resources.I18n;
-import net.minecraft.enchantment.Enchantment;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.common.Configuration;
+import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
-import codechicken.core.CommonUtils;
-import codechicken.lib.lang.LangUtil;
-import cpw.mods.fml.client.registry.KeyBindingRegistry;
-import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLModContainer;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.IMCCallback;
-import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -50,64 +35,34 @@ import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.ItemData;
 import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.Side;
+import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.client.KeyEvent;
 
-@Mod(modid="Waila", name="Waila", version="1.4.5a", dependencies="required-after:NotEnoughItems")
+@Mod(modid="Waila", name="Waila", version="1.5.2_1.7.2", dependencies="required-after:NotEnoughItems")
+/*
 @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, 
-			packetHandler = WailaPacketHandler.class, versionBounds="[1.3.0,)")
+			packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)")
+			//packetHandler = WailaPacketHandler.class)
+*/
 
-public class mod_Waila {
+public class Waila {
     // The instance of your mod that Forge uses.
 	@Instance("Waila")
-	public static mod_Waila instance;
+	public static Waila instance;
 
 	@SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer")
 	public static ProxyServer proxy;	
-	
 	public static Logger log = Logger.getLogger("Waila");
-	public  Configuration config = null;	
 	public boolean serverPresent = false;
 	
-	public static int posX;
-	public static int posY;
-	public static int alpha;
-	public static int bgcolor;
-	public static int gradient1;
-	public static int gradient2;
-	public static int fontcolor;
-	public static float scale;
-	
     /* INIT SEQUENCE */
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-		config = new Configuration(event.getSuggestedConfigurationFile());
-
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW,     true);
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE,     true);
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID,   false);
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, false);
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND,  true);
-		
-		
-
-		posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,     5000).getInt();
-		posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,     100).getInt();
-
-		alpha =     config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,     80).getInt();
-		bgcolor =   config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR,   0x100010).getInt();
-		gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff).getInt();
-		gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f).getInt();
-		fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0).getInt();
-		scale     = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,     100).getInt() / 100.0f;
-		
-		config.save();
-		
-		updateColors();
-		
-		MinecraftForge.EVENT_BUS.register(new WailaClientEventHandler());		
+    	ConfigHandler.instance().loadDefaultConfig(event);
+		OverlayConfig.updateColors();
+		MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());		
 	}	
 	
     @EventHandler
@@ -118,6 +73,13 @@ public class mod_Waila {
             EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this));
             FMLbus.register(this);
         } catch (Throwable t) {}
+        
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
+        	MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
+    		FMLCommonHandler.instance().bus().register(new KeyEvent());
+    		FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());        	
+        }
+		FMLCommonHandler.instance().bus().register(new NetworkHandler());        
 	}
 
     @EventHandler
@@ -125,7 +87,8 @@ public class mod_Waila {
 		proxy.registerHandlers();
     	ModIdentification.init();
         
-        if (ConfigHandler.instance().getConfig(Constants.CFG_WAILA_KEYBIND)){
+    	/*
+        if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
         
 	        for (String key: ModIdentification.keyhandlerStrings.keySet()){
 	        	String orig  = I18n.getString(key);
@@ -157,6 +120,7 @@ public class mod_Waila {
 	        	LanguageRegistry.instance().addStringLocalization(key, modif);
 	        }
         }
+        */
         
 	}
 
@@ -180,15 +144,15 @@ public class mod_Waila {
 			if (imcMessage.key.equalsIgnoreCase("addconfig")){
 				String[] params = imcMessage.getStringValue().split("\\$\\$");
 				if (params.length != 3){
-					mod_Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));					
+					Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));					
 					continue;
 				}
-				mod_Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));				
+				Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));				
 				ConfigHandler.instance().addConfig(params[0], params[1], params[2]);
 			}
 			
 			if (imcMessage.key.equalsIgnoreCase("register")){
-				mod_Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
+				Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
 				this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender());
 			}
 		}
@@ -199,31 +163,22 @@ public class mod_Waila {
 		String methodName = splitName[splitName.length-1];
 		String className  = method.substring(0, method.length()-methodName.length()-1);
 		
-		mod_Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
+		Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
 		
 		try{
 			Class  reflectClass  = Class.forName(className);
 			Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class);
 			reflectMethod.invoke(null, (IWailaRegistrar)ModuleRegistrar.instance());
 			
-			mod_Waila.log.info(String.format("Success in registering %s", modname));
+			Waila.log.info(String.format("Success in registering %s", modname));
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.warning(String.format("Could not find class %s", className));
+			Waila.log.warning(String.format("Could not find class %s", className));
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.warning(String.format("Could not find method %s", methodName));
+			Waila.log.warning(String.format("Could not find method %s", methodName));
 		} catch (Exception e){
-			mod_Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
+			Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
 		}
 		
 	}
-	
-	public static void updateColors(){
-    	alpha     = (int)(ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_ALPHA) / 100.0f * 256) << 24;
-    	bgcolor   = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_BGCOLOR);
-    	gradient1 = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_GRADIENT1);
-    	gradient2 = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_GRADIENT2);
-    	fontcolor = alpha + ConfigHandler.instance().getConfigInt(Constants.CFG_WAILA_FONTCOLOR);
-	}
-	
 }

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

@@ -0,0 +1,30 @@
+package mcp.mobius.waila.addons.agriculture;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class AgricultureModule {
+	public static Class BlockCrop  = null;
+
+	
+	public static void register(){
+		try{
+			Class Agriculture = Class.forName("com.teammetallurgy.agriculture.Agriculture");
+			Waila.log.log(Level.INFO, "Agriculture mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[Agriculture] Agriculture mod not found.");
+			return;
+		}			
+		
+		try{
+			BlockCrop = Class.forName("com.teammetallurgy.agriculture.crops.BlockCrop");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[Agriculture] Class not found. " + e);
+			return;
+		}
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(),  BlockCrop);
+	}
+}

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

@@ -1,30 +1,42 @@
-package mcp.mobius.waila.addons.thaumcraft;
+package mcp.mobius.waila.addons.agriculture;
 
 import java.util.List;
 
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
-public class HUDHandlerPlants implements IWailaDataProvider {
+public class HUDHandlerCrop implements IWailaDataProvider {
+
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
+		return null;
 	}
 
 	@Override
 	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
+		return currenttip;		
 	}
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("general.showcrop")) return currenttip;
+		
+		int growthStage = accessor.getMetadata();
+
+		float growthValue = (growthStage / 6.0F) * 100.0F;
+		if (growthValue < 100.0)
+			currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
+		else
+			currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
 		return currenttip;
 	}
 
 	@Override
 	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 		return currenttip;
-	}	
+	}
+
 }

src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java

@@ -4,9 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import codechicken.lib.lang.LangUtil;
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class AppEngModule {
@@ -26,18 +24,19 @@ public class AppEngModule {
 			IAEItemStack_getItemStack  = IAEItemStack.getMethod("getItemStack");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e);
 			return;
 		} catch (SecurityException e) {
-			mod_Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e);
+			Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e);
 			return;
 		} catch (NoSuchMethodException e) {
-			mod_Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e);
+			Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e);
 			return;
 		}
 		
-		mod_Waila.log.log(Level.INFO, "AppEng mod found.");
+		Waila.log.log(Level.INFO, "AppEng mod found.");
 		ModuleRegistrar.instance().addConfig("Applied Energetic", "appeng.monitorcontent");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileStorageMonitor);
 	}
 }

src/main/java/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java

@@ -3,12 +3,12 @@ package mcp.mobius.waila.addons.appeng;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 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 HUDAppEngMonitor implements IWailaDataProvider {
 

src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java

@@ -4,9 +4,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import codechicken.lib.lang.LangUtil;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemInfo;
 
@@ -24,15 +23,15 @@ public class BetterBarrelsModule {
 			IBarrelStorage_getItem   = IBarrelStorage.getMethod("getItem");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
+			Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
 		} catch (NoSuchFieldException e){
-			mod_Waila.log.log(Level.WARNING, "[BB] Storage field not found.");			
+			Waila.log.log(Level.WARNING, "[BB] Storage field not found.");			
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
+			Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
 		}
 		
 		if (IBarrelStorage_getItem != null){
-			mod_Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
+			Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
 			ModuleRegistrar.instance().addConfig("BetterBarrels", "bb.content");			
 			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBBContent(), TileEntityBarrel);			
 		}

src/main/java/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java

@@ -5,7 +5,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.api.ItemInfo.Layout;
@@ -43,7 +43,7 @@ public class HUDHandlerBBContent implements IWailaDataProvider {
 			try {
 			 stack = (ItemStack) BetterBarrelsModule.IBarrelStorage_getItem.invoke(BetterBarrelsModule.TileEntityBarrel_Storage.get(entity));
 			} catch (Exception e){
-				mod_Waila.log.log(Level.SEVERE, "[BB] Unhandled exception trying to access a barrel storage for display !.\n" + String.valueOf(e));
+				Waila.log.log(Level.SEVERE, "[BB] Unhandled exception trying to access a barrel storage for display !.\n" + String.valueOf(e));
 				currenttip.add("<ERROR!>");
 				return currenttip;
 			}

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

@@ -3,9 +3,9 @@ package mcp.mobius.waila.addons.buildcraft;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import net.minecraftforge.common.util.ForgeDirection;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import net.minecraftforge.common.ForgeDirection;
 
 public class BCModule {
 
@@ -20,9 +20,9 @@ public class BCModule {
 	public static void register(){
 		try {
 			Class ModBuildcraftFactory = Class.forName("buildcraft.BuildCraftFactory");
-			mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
+			Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");	
+			Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");	
 			return;
 		}		
 		
@@ -31,10 +31,10 @@ public class BCModule {
 			TileTank_getTankInfo      = TileTank.getMethod("getTankInfo", ForgeDirection.class);
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[BC] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[BC] Method not found." + e);
 			return;	
 		}
 		
@@ -42,6 +42,7 @@ public class BCModule {
 		ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
 		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);			
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
 	}
 	
 }

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

@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.mod_Waila;
+import net.minecraftforge.common.util.ForgeDirection;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class BCPowerAPIModule {
@@ -30,9 +30,9 @@ public class BCPowerAPIModule {
 	public static void register(){	
 		try{
 			Class ModClass = Class.forName("buildcraft.api.power.IPowerReceptor");
-			mod_Waila.log.log(Level.INFO, "Buildcraft Power API found.");
+			Waila.log.log(Level.INFO, "Buildcraft Power API found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found.");
+			Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found.");
 			return;
 		}
 		
@@ -56,23 +56,24 @@ public class BCPowerAPIModule {
 			
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
 			return;			
 //		} catch (NoSuchFieldException e){
 //			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
 //			return;			
 		} catch (Exception e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
 			return;			
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("BuildcraftAPI", "bcapi.storage");
 		ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.consump");
 		ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.trigger");
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor);		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", IPowerReceptor);
 
 	}	
 	

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

@@ -5,25 +5,17 @@ import java.util.logging.Level;
 
 //import buildcraft.factory.TileTank;
 
-
-
-
-
-
-
-import codechicken.lib.lang.LangUtil;
-import mcp.mobius.waila.mod_Waila;
+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 net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import net.minecraftforge.liquids.ILiquidTank;
-import net.minecraftforge.liquids.LiquidStack;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerBCTanks implements IWailaDataProvider {
 
@@ -70,7 +62,7 @@ public class HUDHandlerBCTanks implements IWailaDataProvider {
 		try{
 			tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
 		} catch (Exception e){
-			mod_Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
+			Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
 			return null;
 		}
 		return tank;

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

@@ -2,13 +2,13 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.WailaExceptionHandler;
+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.cbcore.LangUtil;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerIPowerReceptor implements IWailaDataProvider {
 

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

@@ -0,0 +1,45 @@
+package mcp.mobius.waila.addons.carpenters;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class CarpentersModule {
+
+	public static Class TEBase = null;
+	public static Class BlockCarpentersDoor = null;
+	public static Class BlockCarpentersHatch = null;
+	
+	public static void register(){
+		/*
+		try{
+			Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks");
+			Waila.log.log(Level.INFO, "CarpentersBlocks mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[CarpentersBlocks] CarpentersBlocks mod not found.");
+			return;
+		}			
+		
+		try{
+			TEBase    = Class.forName("carpentersblocks.tileentity.TEBase");
+			BlockCarpentersDoor  = Class.forName("carpentersblocks.block.BlockCarpentersDoor");
+			BlockCarpentersHatch = Class.forName("carpentersblocks.block.BlockCarpentersHatch");
+			
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[CarpentersBlocks] Class not found. " + e);
+			return;
+		} catch (Exception e) {
+			Waila.log.log(Level.WARNING, "[CarpentersBlocks] Error while loading module. " + e);
+			return;
+		}			
+
+		ModuleRegistrar.instance().addConfig("Carpenter's Blocks", "carpenters.hide");
+		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersDoor);
+		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch);
+		ModuleRegistrar.instance().registerSyncedNBTKey("data",    TEBase);
+		ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase);
+		*/
+	}	
+	
+}

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

@@ -0,0 +1,56 @@
+package mcp.mobius.waila.addons.carpenters;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDCarpentersBlocksTE implements IWailaDataProvider {
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		/*
+		if (!config.getConfig("carpenters.hide")) return null;
+
+		NBTTagCompound tag  = accessor.getNBTData();
+		short         data  = tag.getShort("data");
+		short         cover = tag.getShort("cover_6");        
+		
+		if(CarpentersModule.BlockCarpentersDoor.isInstance(accessor.getBlock())){
+			int type   = data & 0x7;
+			if (type != 5)  return null;
+			if (cover == 0) return null;
+			
+			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);
+		}
+		
+		else if (CarpentersModule.BlockCarpentersHatch.isInstance(accessor.getBlock())){
+			int type = data & 0x7;
+			if (type  != 0) return null;
+			if (cover == 0) return null;
+			
+			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);			
+		}
+		*/
+		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) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

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

@@ -4,8 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class EnderIOModule {
@@ -22,9 +21,9 @@ public class EnderIOModule {
 	public static void register(){	
 		try{
 			Class ModClass = Class.forName("crazypants.enderio.EnderIO");
-			mod_Waila.log.log(Level.INFO, "EnderIO mod found.");
+			Waila.log.log(Level.INFO, "EnderIO mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
+			Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
 			return;
 		}
 		
@@ -40,16 +39,16 @@ public class EnderIOModule {
 			TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
 			return;			
 //		} catch (NoSuchFieldException e){
 //			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
 //			return;			
 		} catch (Exception e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
 			return;			
 		}
 		
@@ -59,6 +58,8 @@ public class EnderIOModule {
 		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileCapacitorBank);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);		
 	}	
 	
 }

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

@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.enderio;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 HUDHandlerCapacitor implements IWailaDataProvider{
 

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.enderio;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

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

@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class EnderStorageModule {
@@ -20,9 +20,9 @@ public class EnderStorageModule {
 	public static void register(){	
 		try{
 			Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage");
-			mod_Waila.log.log(Level.INFO, "EnderStorage mod found.");
+			Waila.log.log(Level.INFO, "EnderStorage mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
+			Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
 			return;
 		}
 		
@@ -37,20 +37,21 @@ public class EnderStorageModule {
 			TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
 			return;			
 		} catch (NoSuchFieldException e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
 			return;			
 		} catch (Exception e){
-			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
 			return;			
 		}
 		
 		ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(),    TileFrequencyOwner);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileFrequencyOwner);
 	}
 }

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

@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 HUDHandlerStorage implements IWailaDataProvider {
 	

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

@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.util.logging.Level;
 
 import net.minecraft.item.Item;
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ETBModule {
@@ -29,9 +29,9 @@ public class ETBModule {
 	public static void register(){	
 		try{
 			Class ModClass = Class.forName("emasher.sockets.TileSocket");
-			mod_Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
+			Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
+			Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
 			return;
 		}	
 		
@@ -63,21 +63,21 @@ public class ETBModule {
 			
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e);
 			return;
 //		} catch (NoSuchMethodException e){
 //			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Method not found." + e);
 //			return;			
 		} catch (NoSuchFieldException e){
-			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
 			return;			
 		} catch (Exception e){
-			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
 			return;			
 		}		
 		
 		ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
-		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileSocket);
 	}
 }

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

@@ -5,11 +5,11 @@ import java.util.List;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.WailaExceptionHandler;
+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 {
 

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.exu;
 
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ExtraUtilitiesModule {
@@ -15,20 +15,21 @@ public class ExtraUtilitiesModule {
 
 		try{
 			Class ModExtraUtilities = Class.forName("extrautils.ExtraUtils");
-			mod_Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
+			Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
+			Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
 			return;
 		}			
 		
 		try{
 			TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
 			return;
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);			
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityDrum);
 	}
 }

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

@@ -4,7 +4,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.gravestone;
 
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class GravestoneModule {
@@ -13,20 +13,21 @@ public class GravestoneModule {
 
 		try{
 			Class ModGravestone = Class.forName("GraveStone.ModGraveStone");
-			mod_Waila.log.log(Level.INFO, "GraveStone mod found.");
+			Waila.log.log(Level.INFO, "GraveStone mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
+			Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
 			return;
 		}		
 
 		try {
 			BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
 		} catch (ClassNotFoundException e) {
-			mod_Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
 		}
 
 		
-		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);		
+		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);	
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockGraveStone);
 	}
 
 }

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

@@ -1,14 +1,15 @@
-package mcp.mobius.waila.addons.thaumcraft;
+package mcp.mobius.waila.addons.harvestcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.WailaExceptionHandler;
+import mcp.mobius.waila.cbcore.LangUtil;
+import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import net.minecraft.item.ItemStack;
+import mcp.mobius.waila.utils.NBTUtil;
 
-public class HUDHandlerCapacitor implements IWailaDataProvider {
+public class HUDHandlerPamCrop implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
@@ -22,22 +23,22 @@ public class HUDHandlerCapacitor implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (config.getConfig("thaumcraft.storedvis")){
-			try{
-				short storedVis = ThaumcraftModule.TileCrystalCapacitor_StoredVis.getShort(accessor.getTileEntity());
-				short maxVis    = ThaumcraftModule.TileCrystalCapacitor_MaxVis.getShort(accessor.getTileEntity());
+		if (!config.getConfig("general.showcrop")) return currenttip;
 		
-				currenttip.add(String.format("%s/%s vis", storedVis, maxVis));
-			}catch (Exception e){
-				currenttip = WailaExceptionHandler.handleErr(e, accessor.getClass().getName(), currenttip);
-			}
-		}
+		int growthStage = NBTUtil.getNBTInteger(accessor.getNBTData(), "growthStage");
+
+		float growthValue = (growthStage / 2.0F) * 100.0F;
+		if (growthValue < 100.0)
+			currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
+		else
+			currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
 		return currenttip;
+
 	}
 
 	@Override
 	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 		return currenttip;
-	}	
-	
+	}
+
 }

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

@@ -0,0 +1,30 @@
+package mcp.mobius.waila.addons.harvestcraft;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class HarvestcraftModule {
+	public static Class TileEntityPamCrop  = null;
+
+	
+	public static void register(){
+		try{
+			Class PamHarvestCraft = Class.forName("assets.pamharvestcraft.PamHarvestCraft");
+			Waila.log.log(Level.INFO, "PamHarvestCraft mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[PamHarvestCraft] PamHarvestCraft mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityPamCrop = Class.forName("assets.pamharvestcraft.TileEntityPamCrop");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[PamHarvestCraft] Class not found. " + e);
+			return;
+		}
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(),  TileEntityPamCrop);
+	}
+}

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

@@ -2,13 +2,14 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 {
 
@@ -50,7 +51,7 @@ public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
 				double stored  = IC2Module.getStoredEnergy(accessor); 
 			
 				if ( stored >= 0.0 && storage > 0)
-					currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
+					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));				
@@ -58,7 +59,7 @@ public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
 			
 			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
 					if ( production > 0)
-						currenttip.add(String.format("%s : \u00a7f%d\u00a7r EU/t", outputStr, production));
+						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
 			}
 			
 		} catch (Exception e){    

src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java

@@ -2,13 +2,14 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 {
 
@@ -37,13 +38,13 @@ public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
 				int    storage = IC2Module.TEEB_MaxStorage.getInt(accessor.getTileEntity());
 				
 				if ( stored >= 0.0 )
-					currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
+					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 : \u00a7f%d\u00a7r EU/t", outputStr, production));
+						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
 			}			
 			
 		} catch (Exception e){    

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

@@ -2,13 +2,14 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 {
 
@@ -53,17 +54,17 @@ public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
 			/* EU Storage */
 			if (ConfigHandler.instance().getConfig("ic2.storage")){
 				if ( stored >= 0.0 )
-					currenttip.add(String.format("%s : \u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, Math.round(Math.min(stored,storage)), storage));
+					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 : \u00a7f%d\u00a7r EU/t", powerStr, consumption ));
+					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 : \u00a7f%d\u00a7r EU/t", maxPowerStr, maxinput ));
+					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", maxPowerStr, TAB + ALIGNRIGHT, maxinput ));
 			}
 			
 		} catch (Exception e){    

src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -10,6 +10,7 @@ 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 {
 
@@ -25,7 +26,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 
 	@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");
@@ -38,15 +39,15 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 		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 : \u00a7f%d\u00a7r x \u00a7f%s\u00a7r", offersStr, is.stackSize, is.getDisplayName()));
+			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 : \u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, is.stackSize, is.getDisplayName()));
+			currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
 		}		
-		
+		*/
 		return currenttip;
 	}
 

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

@@ -9,11 +9,11 @@ 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.mod_Waila;
+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.tools.AccessHelper;
+import mcp.mobius.waila.utils.AccessHelper;
 
 public class IC2Module {
 
@@ -54,7 +54,7 @@ public class IC2Module {
 	public static ItemStack OverclockerUpgradeStack   = null;
 	
 	public static void register(){
-
+	/*
 		
 		try{
 			TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine");
@@ -97,19 +97,19 @@ public class IC2Module {
 			
 		} catch (ClassNotFoundException e){
 			//e.printStackTrace();
-			mod_Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
 			//e.printStackTrace();			
-			mod_Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
 			return;			
 		} catch (NoSuchFieldException e){
 			//e.printStackTrace();			
-			mod_Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
 			return;			
 		} catch (Exception e){
 			//e.printStackTrace();			
-			mod_Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
 			return;			
 		}	
 		
@@ -125,17 +125,27 @@ public class IC2Module {
 		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().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;
 	}
 	
@@ -143,7 +153,8 @@ public class IC2Module {
 		
 		NBTTagCompound nbt   = accessor.getNBTData();
 		IC2Upgrades upgrades = new IC2Upgrades();
-		
+
+		/*
 		if (!nbt.hasKey("InvSlots")) return null;
 		
 		NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
@@ -168,7 +179,7 @@ public class IC2Module {
 			if (OverclockerUpgradeStack.getItemDamage()   == meta && OverclockerUpgradeStack.itemID == id)
 				upgrades.overclocker += count;			
 		}
-		
+		*/
 		return upgrades;
 	}
 	

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

@@ -1,17 +1,18 @@
-package mcp.mobius.waila.addons.thaumcraft;
+package mcp.mobius.waila.addons.magicalcrops;
 
 import java.util.List;
 
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
-public class HUDHandlerLeaves implements IWailaDataProvider {
+public class HUDHandlerMagicalCrops implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
+		return null;
 	}
 
 	@Override
@@ -21,11 +22,21 @@ public class HUDHandlerLeaves implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("general.showcrop")) return currenttip;
+		
+		int growthStage = accessor.getMetadata();
+
+		float growthValue = (growthStage / 7.0F) * 100.0F;
+		if (growthValue < 100.0)
+			currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
+		else
+			currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
 		return currenttip;
 	}
 
 	@Override
 	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 		return currenttip;
-	}	
+	}
+
 }

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

@@ -0,0 +1,30 @@
+package mcp.mobius.waila.addons.magicalcrops;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class MagicalCropsModule {
+	public static Class BlockMagicalCrops  = null;
+
+	
+	public static void register(){
+		try{
+			Class MagicalCrops = Class.forName("magicalcrops.mod_sCrops");
+			Waila.log.log(Level.INFO, "MagicalCrops mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[MagicalCrops] MagicalCrops mod not found.");
+			return;
+		}			
+		
+		try{
+			BlockMagicalCrops = Class.forName("magicalcrops.BlockMagicalCrops");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[MagicalCrops] Class not found. " + e);
+			return;
+		}
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(),  BlockMagicalCrops);
+	}
+}

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

@@ -2,15 +2,15 @@ package mcp.mobius.waila.addons.openblocks;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.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.cbcore.LangUtil;
 
 public class HUDHandlerTank implements IWailaDataProvider {
 

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.openblocks;
 
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class OpenBlocksModule {
@@ -13,21 +13,22 @@ public class OpenBlocksModule {
 	public static void register(){
 		try{
 			Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks");
-			mod_Waila.log.log(Level.INFO, "OpenBlocks mod found.");
+			Waila.log.log(Level.INFO, "OpenBlocks mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
+			Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
 			return;
 		}			
 		
 		try{
 			TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[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().registerSyncedNBTKey("*", TileEntityTank);
 	}
 }

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

@@ -4,13 +4,16 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
+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;
 
-public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
+public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator {
 
 	static byte[][] IOARRAY={
 		{1,1,2,1} /* OR    */, {1,1,2,1} /* NOR   */, {1,2,2,2} /* NOT    */, {1,1,2,1} /* AND   */,
@@ -22,36 +25,28 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
 		{11,12,11,12} /* Inver */, {11,12,11,12} /* Buff  */, {1,9,2,8} /* Cmp    */, {1,12,2,12} /* And   */,
 		};		
 	
+	
+	static byte[][] IOARRAYALTER={
+			{1,8,2,9} /* Cmp 1*/, {1,6,2,2} /* State 1*/, {2,8,2,9} /* Count 1*/, {6,2,2,1} /* Transp 1*/,
+			{2,1,2,1} /* Latch 1*/, {2,1,2,1} /* Latch 2*/, {2,1,2,1} /* Latch 3*/
+		};		
+	
 	static String[] IONAMES={ "", "IN", "OUT", "SWAP", "IN_A", "IN_B", "LOCK", "IO", "POS", "NEG", "BUS", "A", "B"};
 	
 	@Override
-	public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+	public void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
+
 		if (!config.getConfig("pr.showio")) return;
 	
 		
 		int orient = 0;
 		int subID  = 0;
 		int shape  = 0;
-		boolean found = false;
 		
-		if (!accessor.getNBTData().hasKey("parts")) return;
-		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
-		for (int i = 0; i < parts.tagCount(); i++){
-			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
-			String id = subtag.getString("id");
-			
-			if (id.equals("pr_sgate") || id.equals("pr_igate") || 
-			    id.equals("pr_tgate") || id.equals("pr_bgate") || 
-			    id.equals("pr_agate") || id.equals("pr_rgate")){
-				orient = accessor.getNBTInteger(subtag, "orient");
-				subID  = accessor.getNBTInteger(subtag, "subID");
-				shape  = accessor.getNBTInteger(subtag, "shape");
-				found  = true;
-			}
-		}
+		orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
+		subID  = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
+		shape  = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");		
 		
-		if (!found) return;
-
 		//orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4));
 		int hOrient = orient & 0x3;
 		ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2);
@@ -68,8 +63,27 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
 			hOrient = 3;
 		
 		String[] IOStr    = new String[4];
-		for (int i = 0; i < 4; i++)
-			IOStr[i] = IONAMES[IOARRAY[subID][i]];
+		if (shape != 0){
+			int altIndex = -1;
+			if (subID == 26 && shape == 1) altIndex = 0;
+			if (subID == 20 && shape == 1) altIndex = 1;
+			if (subID == 19 && shape == 1) altIndex = 2;
+			if (subID == 14 && shape == 1) altIndex = 3;
+			if (subID == 12 && shape == 1) altIndex = 4;
+			if (subID == 12 && shape == 2) altIndex = 5;
+			if (subID == 12 && shape == 3) altIndex = 6;			
+			
+			if (altIndex == -1)
+				for (int i = 0; i < 4; i++)
+					IOStr[i] = IONAMES[IOARRAY[subID][i]];
+			else
+				for (int i = 0; i < 4; i++)
+					IOStr[i] = IONAMES[IOARRAYALTER[altIndex][i]];				
+		} else {
+			for (int i = 0; i < 4; i++)
+				IOStr[i] = IONAMES[IOARRAY[subID][i]];
+			
+		}
 		
 		String[] IOStrRot = new String[4];
 		
@@ -118,7 +132,6 @@ public class HUDDecoratorRsGateLogic implements IWailaBlockDecorator {
 			break;
 		default:
 			break;
-		
 		}
 		
         double x = accessor.getRenderingPosition().xCoord;

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

@@ -0,0 +1,82 @@
+package mcp.mobius.waila.addons.projectred;
+
+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 static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDFMPGateLogic implements IWailaFMPProvider {
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("pr.showdata")) return currenttip;
+		
+		int orient = 0;
+		int subID  = 0;
+		int shape  = 0;
+		int pmax   = 0;
+		int val    = 0;
+		int max    = 0;
+		int dec    = 0;
+		int inc    = 0;		
+		
+		orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
+		subID  = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
+		shape  = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");
+		
+		if (subID == 17)
+			pmax =  NBTUtil.getNBTInteger(accessor.getNBTData(), "pmax");
+		
+		if (subID == 19){
+			val = NBTUtil.getNBTInteger(accessor.getNBTData(), "val");
+			max = NBTUtil.getNBTInteger(accessor.getNBTData(), "max");
+			dec = NBTUtil.getNBTInteger(accessor.getNBTData(), "dec");
+			inc = NBTUtil.getNBTInteger(accessor.getNBTData(), "inc");
+		}
+		
+		switch(subID){
+		case 10:		
+			currenttip.add(String.format("[Repeater]" + TAB + ALIGNRIGHT + WHITE + "%d" + GRAY + " ticks", (int)Math.pow(2, shape)));
+			break;	
+			
+		case 15:
+			if (shape == 0)
+				currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Open");
+			if (shape == 1)
+				currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Half closed");			
+			if (shape == 2)
+				currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Closed");			
+			break;
+			
+		case 17:
+			currenttip.add(String.format("[Timer delay]" + TAB + ALIGNRIGHT + WHITE + "%d " + GRAY + "ms", (pmax + 2) * 50));
+			break;
+		
+		case 19:
+		
+			
+			currenttip.add(String.format("[Counter value]"+ TAB + ALIGNRIGHT + WHITE + "%d "  + GRAY + "/ " + WHITE + "%d", val, max));
+			currenttip.add(String.format("[Counter step]" + TAB + ALIGNRIGHT + WHITE + "-%d " + GRAY + "/ " + WHITE + "+%d", dec, inc));
+			
+		default:
+			break;
+		}
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

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

@@ -0,0 +1,44 @@
+package mcp.mobius.waila.addons.projectred;
+
+import java.io.File;
+import java.util.logging.Level;
+
+import net.minecraft.block.Block;
+import net.minecraftforge.common.config.Configuration;
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class ProjectRedModule {
+
+	public static void register(){	
+		try{
+			Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration");
+			Waila.log.log(Level.INFO, "ProjectRed|Integration mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found.");
+			return;
+		}
+		
+		ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio");	
+		ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata");	
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_sgate");
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_igate");
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_tgate");
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_bgate");
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_agate");
+		ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_rgate");
+		
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_sgate");
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_igate");
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_tgate");
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_bgate");
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_agate");
+		ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_rgate");		
+		
+		//ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart);
+		//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart);
+		//ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
+	}	
+	
+}

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

@@ -3,14 +3,14 @@ package mcp.mobius.waila.addons.railcraft;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;
-import mcp.mobius.waila.WailaExceptionHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerTank implements IWailaDataProvider {
 

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

@@ -3,7 +3,7 @@ package mcp.mobius.waila.addons.railcraft;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class RailcraftModule {
@@ -15,9 +15,9 @@ public class RailcraftModule {
 	public static void register(){
 		try{
 			Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft");
-			mod_Waila.log.log(Level.INFO, "Railcraft mod found.");
+			Waila.log.log(Level.INFO, "Railcraft mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
+			Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
 			return;
 		}			
 		
@@ -28,15 +28,16 @@ public class RailcraftModule {
 			//StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
 			return;			
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(),  TileTankBase);
 		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(),  TileTankBase);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTankBase);
 	}
 }

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

@@ -0,0 +1,92 @@
+package mcp.mobius.waila.addons.secretrooms;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDTileEntityCamo implements IWailaDataProvider {
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		/*
+		if (!config.getConfig("secretrooms.hide")) return null;
+		
+		if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){
+			return this.getTrapDoorBlock(accessor);
+
+		}
+
+		else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){
+			return new ItemStack(Blocks.torch);
+		}		
+		
+		else if (accessor.getNBTData() != null){
+			NBTTagCompound tag = accessor.getNBTData();
+			
+			if (tag.hasKey("copyID") && tag.hasKey("copyMeta")){
+				int copyID   = accessor.getNBTInteger(tag, "copyID");
+				int copyMeta = accessor.getNBTInteger(tag, "copyMeta");			
+				return new ItemStack(copyID, 1, copyMeta);
+			}
+		}
+		*/
+		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) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor){
+		// modify coordinates to get hinge Block.
+		/*
+		int i = accessor.getMetadata();
+		int j = accessor.getPosition().blockX;
+		int k = accessor.getPosition().blockZ;
+
+		if ((i & 3) == 0)
+		{
+			k++;
+		}
+
+		if ((i & 3) == 1)
+		{
+			k--;
+		}
+
+		if ((i & 3) == 2)
+		{
+			j++;
+		}
+
+		if ((i & 3) == 3)
+		{
+			j--;
+		}
+
+		int blockID   = accessor.getWorld().getBlockId(j, accessor.getPosition().blockY, k);
+		int blockMeta = accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k);
+		
+		return new ItemStack(blockID, 1, blockMeta);
+		*/
+		return null;
+	}
+	
+}

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

@@ -0,0 +1,46 @@
+package mcp.mobius.waila.addons.secretrooms;
+
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class SecretRoomsModule {
+
+	public static Class  TileEntityCamo = null;
+	public static Class  BlockTorchLever = null;
+	public static Class  BlockCamoTrapDoor = null;
+	
+	public static void register(){
+		/*
+		try{
+			Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms");
+			Waila.log.log(Level.INFO, "SecretRooms mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[SecretRooms] SecretRooms mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityCamo    = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.TileEntityCamo");
+			BlockTorchLever   = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockTorchLever");
+			BlockCamoTrapDoor = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockCamoTrapDoor");
+			
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[SecretRooms] Class not found. " + e);
+			return;
+		} catch (Exception e) {
+			Waila.log.log(Level.WARNING, "[SecretRooms] Error while loading module. " + e);
+			return;
+		}			
+
+		ModuleRegistrar.instance().addConfig("SecretRooms", "secretrooms.hide");
+		ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), TileEntityCamo);
+		ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockTorchLever);
+		ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor);
+		ModuleRegistrar.instance().registerSyncedNBTKey("copyID",   TileEntityCamo);
+		ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo);
+		*/
+	}		
+	
+}

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

@@ -0,0 +1,68 @@
+package mcp.mobius.waila.addons.statues;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+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 static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDHandlerStatues 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) {
+		try {
+			String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity());
+			if (skinName.equals("")){
+				TileEntity belowEnt = accessor.getWorld().getTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
+				if (StatuesModule.TileEntityStatue.isInstance(belowEnt))
+					skinName = (String)StatuesModule.skinName.get(belowEnt);
+			}
+			
+			
+			
+			if (skinName.equals("")){
+				currenttip.clear();
+				currenttip.add(WHITE + "Statue : Unknown");
+			} else {
+				currenttip.clear();
+				currenttip.add(WHITE + "Statue : " + skinName);				
+			}
+			
+			
+		} catch (Exception e) {
+			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+		}
+		
+		/*
+		String skinName = accessor.getNBTData().getString("skin");
+		if (skinName.equals("")){
+			if (accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ) !=  null){
+				
+			}
+		}
+		*/
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		currenttip.add(BLUE + ITALIC + "Statues" );
+		return currenttip;
+	}
+
+}

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

@@ -0,0 +1,39 @@
+package mcp.mobius.waila.addons.statues;
+
+import java.lang.reflect.Field;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class StatuesModule {
+
+	public static Class TileEntityStatue  = null;
+	public static Field skinName = null;
+	
+	public static void register(){
+		try{
+			Class Statues = Class.forName("info.jbcs.minecraft.statues.Statues");
+			Waila.log.log(Level.INFO, "Statues mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[Statues] Statues mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityStatue = Class.forName("info.jbcs.minecraft.statues.TileEntityStatue");
+			skinName = TileEntityStatue.getDeclaredField("skinName");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
+			return;
+		} catch (NoSuchFieldException e){
+			Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
+			return;
+		}
+		
+		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(),  TileEntityStatue);
+		ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(),  TileEntityStatue);		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStatue);
+	}	
+	
+}

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

@@ -0,0 +1,150 @@
+package mcp.mobius.waila.addons.stevescarts;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import codechicken.lib.math.MathHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+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 static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDCargoManager implements IWailaDataProvider {
+
+	private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."};
+	private static String sides[]  = {"Yellow", "Blue", "Green", "Red"};
+	
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("stevescarts.showall")) return currenttip;
+		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
+			currenttip.add(ITALIC + "Press shift for more data");
+			return currenttip;			
+		}
+		
+		NBTTagCompound tag = accessor.getNBTData();
+
+		if (config.getConfig("stevescarts.colorblind")){
+			int side = accessor.getSide().ordinal() - 2;
+			if (side >= 0)
+				currenttip.add("Looking at side " + WHITE + sides[side]);		
+		}
+		
+		int layout = accessor.getNBTInteger(tag, "layout");
+		switch(layout){
+		case 0:
+			currenttip.add("Slots : "+ WHITE + "Shared");
+			break;
+		case 1:
+			currenttip.add("Slots : "+ WHITE + "By side");
+			break;
+		case 2:
+			currenttip.add("Slots : "+ WHITE + "By color");
+			break;						
+		}
+		
+		try{
+			ArrayList<Object> itemSelection = (ArrayList<Object>) StevesCartsModule.ItemSelections.get(accessor.getTileEntity());
+
+			int toCart   = accessor.getNBTInteger(tag, "tocart");
+			int doReturn = accessor.getNBTInteger(tag, "doReturn");
+			
+			for (int i = 0; i < 4; i++){
+				int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i));
+				int color  = accessor.getNBTInteger(tag, "color"  + String.valueOf(i));
+				int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i));
+				if (color == 5) continue;
+				
+				
+				String direction    = (toCart   & (1 << i)) != 0 ? "Load" : "Unload";
+				String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
+				String sAmount      = amount == 0 ? "All" : String.valueOf(this.getAmount(amount) + " " + this.getAmountType(amount));
+				
+				String selection =  (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target)));
+				currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY, 
+																					 TAB + ALIGNRIGHT,  WHITE + selection + GRAY, 
+						                                                             TAB + ALIGNRIGHT,  WHITE + direction + GRAY, 
+						                                                             TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY,
+						                                                             TAB + ALIGNRIGHT,  WHITE + sAmount + GRAY));
+			}
+			
+		} 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;
+	}
+
+    public int getAmount(int id)
+    {
+        switch (id)
+        {
+            case 1:
+                return 1;
+
+            case 2:
+                return 3;
+
+            case 3:
+                return 8;
+
+            case 4:
+                return 16;
+
+            case 5:
+                return 32;
+
+            case 6:
+                return 64;
+
+            case 7:
+                return 1;
+
+            case 8:
+                return 2;
+
+            case 9:
+                return 3;
+
+            case 10:
+                return 5;
+
+            default:
+                return 0;
+        }
+    }
+
+    //0 - MAX
+    //1 - Items
+    //2 - Stacks
+    public String getAmountType(int id)
+    {
+    	if (id <= 6)
+        {
+            return "I";
+        }
+        else
+        {
+            return "S";
+        }
+    }	
+	
+}

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

@@ -0,0 +1,88 @@
+package mcp.mobius.waila.addons.stevescarts;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+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;
+import static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDCartAssembler implements IWailaDataProvider {
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		/*
+		if (!config.getConfig("stevescarts.showall")) return currenttip;
+		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
+			currenttip.add(ITALIC + "Press shift for more data");
+			return currenttip;			
+		}
+		
+		int currTime      = accessor.getNBTInteger(accessor.getNBTData(), "currentTime");
+		int maxTime       = accessor.getNBTInteger(accessor.getNBTData(), "maxTime");
+		int isAssembling  = accessor.getNBTInteger(accessor.getNBTData(), "isAssembling");
+		NBTTagList slots  = accessor.getNBTData().getTagList("Items");
+		boolean hasOutput = false;
+		Item ItemCartModule = null;
+		try {
+			ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null);
+		} catch (Exception e) {
+			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+			return currenttip;
+		}
+		
+		for (int i = 0; i < slots.tagCount(); i++){
+			NBTTagCompound subtag = (NBTTagCompound)(slots.tagAt(i));
+			byte slot = subtag.getByte("Slot");
+			if (slot == 30)
+				hasOutput = true;
+		}
+		
+		if (isAssembling == 1){
+			currenttip.add(String.format("Time remaining : %.1f sec", (maxTime - currTime) / 20.0f));
+			
+			NBTTagCompound output = accessor.getNBTData().getCompoundTag("Output");
+			short outID = output.getShort("id");
+			byte[] metas = output.getCompoundTag("tag").getByteArray("Modules"); 
+			
+			for (byte b : metas){
+				currenttip.add(new ItemStack(ItemCartModule, 1, b).getDisplayName());
+			}
+		}
+		else
+			if (hasOutput)
+				currenttip.add(String.format("Time remaining : <Done>"));
+			else
+				currenttip.add(String.format("Time remaining : <Idle>"));
+		*/
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+
+}

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

@@ -0,0 +1,126 @@
+package mcp.mobius.waila.addons.stevescarts;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import static mcp.mobius.waila.api.SpecialChars.*;
+
+
+public class HUDLiquidManager implements IWailaDataProvider {
+
+	private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."};
+	private static String sides[]  = {"Yellow", "Blue", "Green", "Red"};	
+	
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("stevescarts.showall")) return currenttip;
+		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
+			currenttip.add(ITALIC + "Press shift for more data");
+			return currenttip;			
+		}
+		
+		NBTTagCompound tag = accessor.getNBTData();
+
+		if (config.getConfig("stevescarts.colorblind")){
+			int side = accessor.getSide().ordinal() - 2;
+			if (side >= 0)
+				currenttip.add("Looking at side " + WHITE + sides[side]);		
+		}		
+		
+		int layout = accessor.getNBTInteger(tag, "layout");
+		switch(layout){
+		case 0:
+			currenttip.add("Tanks : "+ WHITE + "Shared");
+			break;
+		case 1:
+			currenttip.add("Tanks : "+ WHITE + "By side");
+			break;
+		case 2:
+			currenttip.add("Tanks : "+ WHITE + "By color");
+			break;
+		}
+		
+		int toCart   = accessor.getNBTInteger(tag, "tocart");
+		int doReturn = accessor.getNBTInteger(tag, "doReturn");
+		
+		for (int i = 0; i < 4; i++){
+			int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i));
+			int color  = accessor.getNBTInteger(tag, "color"  + String.valueOf(i));
+			int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i));
+			
+			String fluidName   = "<Empty>";
+			int    fluidAmount = 0;
+			if (tag.hasKey("Fluid" + i)){
+				fluidName   = tag.getCompoundTag("Fluid" + i).getString("FluidName");
+				fluidAmount = tag.getCompoundTag("Fluid" + i).getInteger("Amount");
+			}
+			
+			String fluidString = fluidAmount == 0 ? "<Empty>" : String.format("%s mB of %s", fluidAmount, fluidName); 
+			
+			if (color == 5) continue;
+			
+			
+			String direction    = (toCart   & (1 << i)) != 0 ? "Load" : "Unload";
+			String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
+			String sAmount      = amount == 0 ? "All" : String.valueOf(this.getMaxAmountBuckets(amount)) + " mB";
+			
+			//String selection =  (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target)));
+			currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY,
+																		 TAB + ALIGNRIGHT,  WHITE + fluidString + GRAY,
+			                                                             TAB + ALIGNRIGHT,  WHITE + direction + GRAY, 
+			                                                             TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY,
+					                                                     TAB + ALIGNRIGHT,  WHITE + sAmount + GRAY));			
+			
+			
+		}		
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	public int getMaxAmountBuckets(int id) {
+		switch(id) {
+			case 1:
+				return 250;
+			case 2:
+				return 500;
+			case 3:
+				return 750;
+			case 4:
+				return 1000;
+			case 5:
+				return 2000;
+			case 6:
+				return 3000;
+			case 7:
+				return 5000;
+			case 8:
+				return 7500;
+			case 9:
+				return 10000;
+			case 10:
+				return 15000;
+			default:
+				return 0;
+		}
+	}	
+	
+}

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

@@ -0,0 +1,85 @@
+package mcp.mobius.waila.addons.stevescarts;
+
+import java.util.List;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+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 static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDMinecartModular implements IWailaEntityProvider {
+
+	@Override
+	public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
+		if (currenttip.get(0).contains("entity.StevesCarts.Minecart")){
+			currenttip.remove(0);
+			currenttip.add(WHITE + "Modular Minecart");
+		}
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
+		if (!config.getConfig("stevescarts.showall")) return currenttip;
+		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
+			currenttip.add(ITALIC + "Press shift for more data");
+			return currenttip;			
+		}
+		
+		Item ItemCartModule = null;
+		try {
+			ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null);
+		} catch (Exception e) {
+			currenttip = WailaExceptionHandler.handleErr(e, accessor.getEntity().getClass().getName(), currenttip);
+			return currenttip;
+		}		
+		
+		NBTTagCompound tag = accessor.getNBTData();
+		if (tag.hasKey("Modules")){
+			byte[] metas = tag.getByteArray("Modules"); 
+			
+			for (int i = 0; i < metas.length; i++){
+				if (tag.hasKey("module" + String.valueOf(i) + "Fuel")){
+					
+					int fuel = accessor.getNBTInteger(tag, "module" + String.valueOf(i) + "Fuel");
+					currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + fuel + GRAY + " POW ]");
+					
+				} else if (tag.hasKey("module" + String.valueOf(i) + "Fluid")){
+					
+					NBTTagCompound subtag = tag.getCompoundTag("module" + String.valueOf(i) + "Fluid");
+					if (subtag.hasKey("Amount")){
+						int amount = accessor.getNBTInteger(subtag, "Amount");
+						String fluid = subtag.getString("FluidName"); 
+						currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + String.valueOf(amount) + GRAY + " mB of " + WHITE + fluid + GRAY + " ]");
+					} else {
+						currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " < " + WHITE + "Empty" + GRAY + " > ");
+					}
+				
+				}else{
+					
+					currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName());
+					
+				}
+			}			
+		}
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+}

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

@@ -0,0 +1,80 @@
+package mcp.mobius.waila.addons.stevescarts;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class StevesCartsModule {
+
+	public static Class  TileEntityCartAssembler = null;
+	public static Class  TileEntityCargo  = null;
+	public static Class  TileEntityLiquid = null;
+	public static Class  MinecartModular = null;
+	public static Class  StevesItems = null;
+	public static Class  CargoItemSelection = null;
+
+	public static Field  ItemCartComponent = null; //Items.component
+	public static Field  ItemCartModule = null;    //Items.modules
+	public static Field  ItemSelections = null;    //TileEntityCargo.itemSelections
+	
+	public static Method GetSelectionName = null;  // CargoItemSelection.getName
+	
+	public static void register(){
+		/*
+		try{
+			Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts");
+			Waila.log.log(Level.INFO, "StevesCarts mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[StevesCarts] StevesCarts mod not found.");
+			return;
+		}			
+		
+		try{
+			TileEntityCartAssembler = Class.forName("vswe.stevescarts.TileEntities.TileEntityCartAssembler");
+			TileEntityCargo         = Class.forName("vswe.stevescarts.TileEntities.TileEntityCargo");
+			TileEntityLiquid        = Class.forName("vswe.stevescarts.TileEntities.TileEntityLiquid");
+			MinecartModular         = Class.forName("vswe.stevescarts.Carts.MinecartModular");
+			StevesItems             = Class.forName("vswe.stevescarts.Items.Items");
+			CargoItemSelection      = Class.forName("vswe.stevescarts.Helpers.CargoItemSelection");
+			
+			ItemCartComponent = StevesItems.getDeclaredField("component");
+			ItemCartModule    = StevesItems.getDeclaredField("modules");
+			ItemSelections    = TileEntityCargo.getDeclaredField("itemSelections");
+			
+			GetSelectionName  = CargoItemSelection.getDeclaredMethod("getName");
+			
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[StevesCarts] Class not found. " + e);
+			return;
+		} catch (NoSuchFieldException e) {
+			Waila.log.log(Level.WARNING, "[StevesCarts] Field not found. " + e);
+			return;
+		} catch (NoSuchMethodException e) {
+			Waila.log.log(Level.WARNING, "[StevesCarts] Method not found. " + e);
+			return;
+		} catch (Exception e) {
+			Waila.log.log(Level.WARNING, "[StevesCarts] Error while loading module. " + e);
+			return;
+		}			
+			
+		ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.showall");
+		ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.colorblind");
+		ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.shifttoggle");
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDCartAssembler(),    TileEntityCartAssembler);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDCargoManager(),     TileEntityCargo);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDLiquidManager(),    TileEntityLiquid);		
+		ModuleRegistrar.instance().registerHeadProvider(new HUDMinecartModular(),  MinecartModular);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDMinecartModular(),  MinecartModular);
+		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);	
+		*/		
+	}	
+	
+}

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

@@ -0,0 +1,112 @@
+package mcp.mobius.waila.addons.thaumcraft;
+
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.StringUtils;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.NBTUtil;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+import static mcp.mobius.waila.api.SpecialChars.*;
+
+public class HUDHandlerIAspectContainer implements IWailaDataProvider {
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		/*
+		if (!config.getConfig("thaumcraft.aspects")) return currenttip;
+		
+		ItemStack headSlot = accessor.getPlayer().inventory.armorInventory[3];
+		if (headSlot == null) return currenttip;
+		
+		boolean hasReveal =  ThaumcraftModule.ItemGoggles.isInstance(headSlot.getItem()) ||
+							(ThaumcraftModule.ItemRevealingHelm != null && ThaumcraftModule.ItemRevealingHelm.isInstance(headSlot.getItem())) ||
+							(ThaumcraftModule.ItemGemHelm != null && ThaumcraftModule.ItemGemHelm.isInstance(headSlot.getItem()));
+		
+		if (!hasReveal) return currenttip;
+		
+		NBTTagCompound tag = accessor.getNBTData();
+		
+		if (tag.hasKey("Aspect") && tag.hasKey("Amount") && !tag.getString("Aspect").equals("")){
+			String aspect = Character.toUpperCase(tag.getString("Aspect").charAt(0)) + tag.getString("Aspect").substring(1);
+			currenttip.add(this.getAspectString(tag, "Aspect", "Amount", accessor));
+		}
+
+		if (tag.hasKey("aspect") && tag.hasKey("amount") && !tag.getString("aspect").equals("")){
+			String aspect = Character.toUpperCase(tag.getString("aspect").charAt(0)) + tag.getString("aspect").substring(1);
+			currenttip.add(this.getAspectString(tag, "aspect", "amount", accessor));
+		}		
+		
+		if (tag.hasKey("Aspects")){
+			NBTTagList taglist = tag.getTagList("Aspects");
+			for (int i = 0; i < taglist.tagCount(); i++){
+				NBTTagCompound subtag = (NBTTagCompound)taglist.tagAt(i);
+				if (subtag.hasKey("amount") && subtag.hasKey("key") && !subtag.getString("key").equals("")){
+					currenttip.add(this.getAspectString(subtag, "key", "amount", accessor));
+				}
+			}
+		}
+		*/
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}	
+	
+	private String getAspectString(NBTTagCompound tag, String keyAspect, String keyAmount, IWailaDataAccessor accessor){
+		String aspect = tag.getString(keyAspect);
+		aspect = knowAspect(aspect, accessor) ? aspect : "????";
+		aspect = Character.toUpperCase(aspect.charAt(0)) + aspect.substring(1); 
+		
+		String amount = String.valueOf(NBTUtil.getNBTInteger(tag, keyAmount));
+		
+		
+		
+		return String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s",  aspect, amount);
+	}
+	
+	private boolean knowAspect(String name, IWailaDataAccessor accessor){
+		/*
+		try{
+			Object proxy    = ThaumcraftModule.TC_proxy.get(null);
+			Object known    = ThaumcraftModule.getKnownAspects.invoke(proxy, (Object[])null);
+			Object listAspc = ((Map<String, Object>)known).get(accessor.getPlayer().username);
+			//Object research = ThaumcraftModule.playerResearch.get(proxy); 
+			//Object aspect       = ThaumcraftModule.getAspect.invoke(null, name);
+			//Object knownaspects = ThaumcraftModule.aspectsDiscovered.get(research);
+			//Boolean known   = (Boolean)ThaumcraftModule.hasDiscoveredAspect.invoke(research, accessor.getPlayer().username, aspect);
+			
+			Object[] aspects = (Object[])ThaumcraftModule.list_getAspects.invoke(listAspc);
+			for (Object o : aspects){
+				if (ThaumcraftModule.aspect_tag.get(o).equals(name)){
+					return true;
+				}
+			}
+
+			return false;
+			
+		} catch (Exception e){
+			WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
+			return false;
+		}
+		*/
+		return false;
+	}
+	
+}

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

@@ -0,0 +1,92 @@
+package mcp.mobius.waila.addons.thaumcraft;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
+public class ThaumcraftModule {
+
+	public static Class IAspectContainer = null;
+	public static Class TileAlchemyFurnace = null;
+	public static Class ItemGoggles = null;
+	public static Class ItemRevealingHelm = null;
+	public static Class ItemGemHelm = null;
+	
+	public static Class Thaumcraft = null;
+	public static Class TCClientProxy = null;
+	public static Class TCCommonProxy = null;
+	//public static Class PlayerKnowledge = null;
+	public static Class Aspect = null;
+	public static Class AspectList = null;
+	
+	public static Field TC_proxy       = null; //Thaumcraft.proxy
+	//public static Field playerResearch = null; //ClientProxy.playerResearch
+	//public static Field aspectsDiscovered = null; //PlayerKnowledge.aspectsDiscovered 
+	public static Field aspect_tag        = null; //Aspect.tag
+	
+	//public static Method hasDiscoveredAspect = null; //PlayerKnowledge.hasDiscoveredAspect
+	//public static Method getAspect = null; //Aspect.getAspect
+	public static Method getKnownAspects = null; //CommonProxy.getKnownAspects
+	public static Method list_getAspects = null; //AspectList.getAspects
+	
+	public static void register(){
+		/*
+		try{
+			Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
+			Waila.log.log(Level.INFO, "Thaumcraft mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
+			return;
+		}
+
+		try{
+			ItemRevealingHelm = Class.forName("vazkii.tinkerer.common.item.ItemRevealingHelm");
+		} catch (ClassNotFoundException e){	}		
+		
+		try{
+			ItemGemHelm = Class.forName("vazkii.tinkerer.common.item.kami.armor.ItemGemHelm");
+		} catch (ClassNotFoundException e){	}		
+		
+		try{
+			IAspectContainer   = Class.forName("thaumcraft.api.aspects.IAspectContainer");
+			TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
+			ItemGoggles        = Class.forName("thaumcraft.common.items.armor.ItemGoggles");
+			TCClientProxy      = Class.forName("thaumcraft.client.ClientProxy");
+			TCCommonProxy      = Class.forName("thaumcraft.common.CommonProxy");
+			//PlayerKnowledge    = Class.forName("thaumcraft.common.lib.research.PlayerKnowledge");
+			Aspect             = Class.forName("thaumcraft.api.aspects.Aspect");
+			AspectList         = Class.forName("thaumcraft.api.aspects.AspectList");
+			
+			TC_proxy           = Thaumcraft.getDeclaredField("proxy");
+			//playerResearch     = TCClientProxy.getDeclaredField("playerResearch");
+			//aspectsDiscovered  = PlayerKnowledge.getDeclaredField("aspectsDiscovered");
+			//playerResearch.setAccessible(true);
+			aspect_tag         = Aspect.getDeclaredField("tag");
+			aspect_tag.setAccessible(true);
+			
+			//hasDiscoveredAspect = PlayerKnowledge.getDeclaredMethod("hasDiscoveredAspect", String.class, Aspect);
+			//getAspect           = Aspect.getDeclaredMethod("getAspect", String.class);
+			getKnownAspects     = TCCommonProxy.getDeclaredMethod("getKnownAspects");
+			list_getAspects     = AspectList.getDeclaredMethod("getAspects");
+			
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[Thaumcraft] Class not found. " + e);
+			return;
+		} catch (Exception e){
+			Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e);
+			//WailaExceptionHandler.handleErr(e, null, null);
+			return;			
+		}
+		
+		ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", IAspectContainer);
+		*/
+	}
+
+}

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

@@ -2,15 +2,15 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.fluids.FluidStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerConduitFluid implements IWailaDataProvider {
 
@@ -26,7 +26,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-
+		/*
 		if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip;
 		
 		boolean found   = false;
@@ -51,7 +51,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
 			currenttip.add(fluid.getFluid().getLocalizedName());			
 		else
 			currenttip.add(LangUtil.translateG("hud.msg.empty"));
-		
+		*/
 		return currenttip;
 	}
 

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

@@ -23,7 +23,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		
+		/*
 		if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip;
 		
 		boolean found = false;
@@ -52,7 +52,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
 			currenttip.add("Mode : \u00a7fRound-Robin");			
 		else
 			currenttip.add("Mode : <UNKNOWN>");
-
+		 */
 		return currenttip;
 	}
 

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

@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 HUDHandlerEnergyCell implements IWailaDataProvider {
 

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

@@ -4,11 +4,11 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.WailaExceptionHandler;
+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 HUDHandlerIEnergyHandler implements IWailaDataProvider {
 

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

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

@@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
-import mcp.mobius.waila.WailaExceptionHandler;
 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 HUDHandlerTank implements IWailaDataProvider {
 

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
+import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

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

@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.ForgeDirection;
-import mcp.mobius.waila.mod_Waila;
+import net.minecraftforge.common.util.ForgeDirection;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ThermalExpansionModule {
@@ -42,12 +42,12 @@ public class ThermalExpansionModule {
 	//public static Field  TileConduitBase_isOutput = null;	
 	
 	public static void register(){
-
+		/*
 		try{
 			Class ModThermalExpansion = Class.forName("thermalexpansion.ThermalExpansion");
-			mod_Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
+			Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[Thermal Expansion] ThermalExpansion mod not found.");
+			Waila.log.log(Level.INFO, "[Thermal Expansion] ThermalExpansion mod not found.");
 			return;
 		}		
 		
@@ -84,13 +84,13 @@ public class ThermalExpansionModule {
 			//TileEnergyCell_energySend = TileEnergyCell.getField("energySend");
 			
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Method not found." + e);
 			return;			
 		} catch (NoSuchFieldException e){
-			mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Field not found." + e);
 			return;			
 //		} catch (Exception e){
 //			mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Unhandled exception." + e);
@@ -119,7 +119,13 @@ public class ThermalExpansionModule {
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitFluid(), BlockMultipart);		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitItem(),  BlockMultipart);		
 			
-		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", IEnergyHandler);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEnergyCell);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", ISecureTile);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
+		*/
 	}
 	
 	

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

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.twilightforest;
 
 import java.util.logging.Level;
 
-import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class TwilightForestModule {
@@ -15,9 +15,9 @@ public class TwilightForestModule {
 
 		try{
 			Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod");
-			mod_Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
+			Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
 		} catch (ClassNotFoundException e){
-			mod_Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
+			Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
 			return;
 		}		
 
@@ -26,13 +26,16 @@ public class TwilightForestModule {
 			BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant");
 			BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling");				
 		} catch (ClassNotFoundException e) {
-			mod_Waila.log.log(Level.WARNING, "[TwilightForestMod] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[TwilightForestMod] Class not found. " + e);
 		}
 
 		
 		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots);
 		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant);		
-		//ExternalModulesHandler.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFSapling);				
+		//ExternalModulesHandler.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFSapling);	
+		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFRoots);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFPlant);		
 	}
 
 }

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

@@ -2,9 +2,10 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import java.util.List;
 
-import codechicken.lib.lang.LangUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSilverfish;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
@@ -14,46 +15,47 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerVanilla implements IWailaDataProvider {
 
-	static int mobSpawnerID  = Block.mobSpawner.blockID;
-	static int cropsID       = Block.crops.blockID;
-	static int melonStemID   = Block.melonStem.blockID;
-	static int pumpkinStemID = Block.pumpkinStem.blockID;
-	static int carrotID      = Block.carrot.blockID;
-	static int potatoID      = Block.potato.blockID;
-	static int leverID       = Block.lever.blockID;
-	static int repeaterIdle  = Block.redstoneRepeaterIdle.blockID;
-	static int repeaterActv  = Block.redstoneRepeaterActive.blockID;
-	static int comparatorIdl = Block.redstoneComparatorIdle.blockID;
-	static int comparatorAct = Block.redstoneComparatorActive.blockID;
-	static int redstone      = Block.redstoneWire.blockID;
-	static int jukebox       = Block.jukebox.blockID;
-	static int cocoa		 = Block.cocoaPlant.blockID;
-	static int netherwart    = Block.netherStalk.blockID;
-	static int silverfish    = Block.silverfish.blockID;
+	static Block mobSpawner    = Blocks.mob_spawner;
+	static Block crops         = Blocks.wheat;
+	static Block melonStem     = Blocks.melon_stem;
+	static Block pumpkinStem   = Blocks.pumpkin_stem;
+	static Block carrot        = Blocks.carrots;
+	static Block potato        = Blocks.potatoes;
+	static Block lever         = Blocks.lever;
+	static Block repeaterIdle  = Blocks.unpowered_repeater;
+	static Block repeaterActv  = Blocks.powered_repeater;
+	static Block comparatorIdl = Blocks.unpowered_comparator;
+	static Block comparatorAct = Blocks.powered_comparator;
+	static Block redstone      = Blocks.redstone_wire;
+	static Block jukebox       = Blocks.jukebox;
+	static Block cocoa		   = Blocks.cocoa;
+	static Block netherwart    = Blocks.nether_wart;
+	static Block silverfish    = Blocks.monster_egg;
 	
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		int blockID       = accessor.getBlockID();
+		Block block       = accessor.getBlock();
 		
-		if (blockID == silverfish){
+		if (block == silverfish && config.getConfig("vanilla.silverfish")){
 			int metadata = accessor.getMetadata();
 			switch(metadata){
 			case 0:
-				return new ItemStack(Block.stone);
+				return new ItemStack(Blocks.stone);
 			case 1:
-				return new ItemStack(Block.cobblestone);
+				return new ItemStack(Blocks.cobblestone);
 			case 2:
-				return new ItemStack(Block.stoneBrick);
+				return new ItemStack(Blocks.brick_block);
 			default:
 				return null;
 			}
 		}
 
-		if (blockID == redstone){
-			return new ItemStack(Item.redstone);
+		if (block == redstone){
+			return new ItemStack(Items.redstone);
 		}
 		
 		return null;
@@ -62,16 +64,16 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		int blockID       = accessor.getBlockID();
+		Block block       = accessor.getBlock();
 		
 		/* Mob spawner handler */
-		if (blockID == mobSpawnerID && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
+		if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
 			String name = currenttip.get(0);
-			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).getSpawnerLogic().getEntityNameToSpawn();
+			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
 			currenttip.set(0, String.format("%s (%s)", name, mobname));
 		}
 
-		if (blockID == redstone){
+		if (block == redstone){
 			String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), "");
 			currenttip.set(0, name);
 		}		
@@ -81,10 +83,11 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		int blockID       = accessor.getBlockID();
+		Block block       = accessor.getBlock();
 		/* Crops */
-		if (config.getConfig("vanilla.growthvalue"))
-			if (blockID == cropsID || blockID == melonStemID || blockID == pumpkinStemID || blockID == carrotID || blockID == potatoID){
+		boolean iscrop = crops.getClass().isInstance(block);	//Done to cover all inheriting mods
+		if (config.getConfig("general.showcrop"))
+			if (iscrop || block == melonStem || block == pumpkinStem || block == carrot || block == potato){
 				float growthValue = (accessor.getMetadata() / 7.0F) * 100.0F;
 				if (growthValue < 100.0)
 					currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
@@ -93,7 +96,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 				return currenttip;
 			}		
 
-		if (blockID == cocoa){
+		if (block == cocoa && config.getConfig("general.showcrop")){
 		
 			float growthValue = ((accessor.getMetadata() >> 2) / 2.0F) * 100.0F;
 			if (growthValue < 100.0)
@@ -103,7 +106,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 			return currenttip;
 		}		
 		
-		if (blockID == netherwart){
+		if (block == netherwart && config.getConfig("general.showcrop")){
 			float growthValue = (accessor.getMetadata() / 3.0F) * 100.0F;
 			if (growthValue < 100.0)
 				currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
@@ -113,14 +116,14 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 		}		
 		
 		if (config.getConfig("vanilla.leverstate"))
-			if (blockID == leverID){
+			if (block == lever){
 				String redstoneOn = (accessor.getMetadata() & 8) == 0 ? LangUtil.translateG("hud.msg.off") : LangUtil.translateG("hud.msg.on");
 				currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.state"), redstoneOn));
 				return currenttip;				
 			}				
 
 		if (config.getConfig("vanilla.repeater"))
-			if ((blockID == repeaterIdle) ||(blockID == repeaterActv)){
+			if ((block == repeaterIdle) ||(block == repeaterActv)){
 				int tick = (accessor.getMetadata() >> 2) + 1 ;
 				if (tick == 1)
 					currenttip.add(String.format("%s : %s tick", LangUtil.translateG("hud.msg.delay"), tick));
@@ -130,7 +133,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 			}		
 
 		if (config.getConfig("vanilla.comparator"))
-			if ((blockID == comparatorIdl) ||(blockID == comparatorAct)){
+			if ((block == comparatorIdl) ||(block == comparatorAct)){
 				String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") : LangUtil.translateG("hud.msg.substractor");
 				//int outputSignal = ((TileEntityComparator)entity).func_96100_a();
 				currenttip.add("Mode : " + mode);
@@ -139,13 +142,14 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 			}		
 
 		if (config.getConfig("vanilla.redstone"))
-			if (blockID == redstone){
+			if (block == redstone){
 				currenttip.add(String.format("%s : %s" , LangUtil.translateG("hud.msg.power"), accessor.getMetadata()));
 				return currenttip;				
 			}	
 		
+		/*
 		if (config.getConfig("vanilla.jukebox"))
-			if (blockID == jukebox){
+			if (block == jukebox){
 				NBTTagCompound tag = accessor.getNBTData();
 				Item record = null;
 				if (tag.hasKey("Record")){
@@ -155,6 +159,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 					currenttip.add(LangUtil.translateG("hud.msg.empty"));
 				}
 			}
+		*/
 		
 		return currenttip;
 	}	
@@ -166,35 +171,52 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 	
 	public static void register(){
 		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype");
-		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.growthvalue");
 		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.leverstate");
 		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.repeater");
 		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.comparator");
 		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.redstone");
+		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.silverfish");
 		ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.jukebox");
 		
 		IWailaDataProvider provider = new HUDHandlerVanilla();
 		
-		ModuleRegistrar.instance().registerStackProvider(provider, silverfish);
-		ModuleRegistrar.instance().registerStackProvider(provider, redstone);
-		ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawnerID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, cropsID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, melonStemID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStemID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, carrotID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, potatoID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, leverID);
-		ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle);
-		ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv);
-		ModuleRegistrar.instance().registerBodyProvider(provider, comparatorIdl);
-		ModuleRegistrar.instance().registerBodyProvider(provider, comparatorAct);
-		ModuleRegistrar.instance().registerHeadProvider(provider, redstone);
-		ModuleRegistrar.instance().registerBodyProvider(provider, redstone);
-		ModuleRegistrar.instance().registerBodyProvider(provider, jukebox);
-		ModuleRegistrar.instance().registerBodyProvider(provider, cocoa);
-		ModuleRegistrar.instance().registerBodyProvider(provider, netherwart);			
+		ModuleRegistrar.instance().registerStackProvider(provider, silverfish.getClass());
+		ModuleRegistrar.instance().registerStackProvider(provider, redstone.getClass());
+		ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, crops.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, melonStem.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStem.getClass());
+		//ModuleRegistrar.instance().registerBodyProvider(provider, carrot.getClass());
+		//ModuleRegistrar.instance().registerBodyProvider(provider, potato.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, lever.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, comparatorIdl.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, comparatorAct.getClass());
+		ModuleRegistrar.instance().registerHeadProvider(provider, redstone.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, redstone.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, jukebox.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, cocoa.getClass());
+		ModuleRegistrar.instance().registerBodyProvider(provider, netherwart.getClass());			
 		
-		ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", mobSpawner.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", crops.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", melonStem.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", pumpkinStem.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", carrot.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", potato.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", lever.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterIdle.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterActv.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorIdl.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorAct.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", redstone.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", jukebox.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", cocoa.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", netherwart.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", silverfish.getClass());	
+		
+		//ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
 		
 		//ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
 	}