Convert world unload event handler to public inner class (#17)

* update gradle+deps

* remove bak file
clean wci

* add back

* sa

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Ignore spotlessApply reformat
+4ee7d7396c8a27b994d49169140edbf9adfdc2dc

.gitattributes

@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

.github/scripts/test-no-crash-reports.sh

@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
-  echo "Crash reports detected:"
-  cat $directory/*
-  exit 1
-else
-  echo "No crash reports detected"
-  exit 0
-fi

.github/workflows/build-and-test.yml

@@ -1,5 +1,3 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Build and test
 
@@ -11,35 +9,5 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with: 
-        fetch-depth: 0
-    
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-    
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1 minute
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 10 ./gradlew runServer || true
-
-    - name: Test no crashes happend
-      run: |
-        chmod +x .github/scripts/test-no-crash-reports.sh
-        .github/scripts/test-no-crash-reports.sh
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -1,51 +1,14 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Release tagged build
 
 on:
   push:
-    tags:
-      - '*'
+    tags: [ '*' ]
+
+permissions:
+  contents: write
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
-
-      - name: Publish to Maven
-        run: ./gradlew publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

.gitignore

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

dependencies.gradle

@@ -1,8 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev')
 
     shadowImplementation('au.com.bytecode:opencsv:2.4')
 }

gradle.properties

@@ -58,3 +58,6 @@ containsMixinsAndOrCoreModOnly = false
 # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.
 usesShadowedDependencies = true
+
+# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories
+includeWellKnownRepositories = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # 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\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 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"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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
@@ -105,84 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "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 or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # 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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,10 +25,14 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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="-Xmx64m" "-Xms64m"
 
@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
 :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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

repositories.gradle

@@ -1,11 +1,4 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-    }
-    maven {
-        url = "https://jitpack.io"
-    }
 }

settings.gradle

@@ -0,0 +1,28 @@
+
+pluginManagement {
+    repositories {
+        maven {
+            // RetroFuturaGradle
+            name "GTNH Maven"
+            url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+            allowInsecureProtocol = true
+            mavenContent {
+                includeGroup("com.gtnewhorizons.retrofuturagradle")
+            }
+        }
+        gradlePluginPortal()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains
+}
+
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
+}

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

@@ -1,7 +1,8 @@
 package mcp.mobius.waila;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+
+import net.minecraftforge.common.MinecraftForge;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -9,22 +10,6 @@ import org.apache.logging.log4j.Logger;
 import com.google.common.eventbus.EventBus;
 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.ModuleRegistrar;
-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.utils.Constants;
-import mcp.mobius.waila.utils.ModIdentification;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLModContainer;
 import cpw.mods.fml.common.Mod;
@@ -38,38 +23,51 @@ 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.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
-import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.api.impl.ConfigHandler;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
 import mcp.mobius.waila.client.KeyEvent;
 import mcp.mobius.waila.commands.CommandDumpHandlers;
+import mcp.mobius.waila.network.NetworkHandler;
+import mcp.mobius.waila.network.WailaPacketHandler;
+import mcp.mobius.waila.overlay.DecoratorRenderer;
+import mcp.mobius.waila.overlay.OverlayConfig;
+import mcp.mobius.waila.overlay.WailaTickHandler;
+import mcp.mobius.waila.server.ProxyServer;
+import mcp.mobius.waila.utils.ModIdentification;
 
-@Mod(modid="Waila", name="Waila", version="GRADLETOKEN_VERSION", dependencies="after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions="*")
+@Mod(
+        modid = "Waila",
+        name = "Waila",
+        version = "GRADLETOKEN_VERSION",
+        dependencies = "after:NotEnoughItems@[1.0.4.0,)",
+        acceptableRemoteVersions = "*")
 /*
-@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, 
-			packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)")
-			//packetHandler = WailaPacketHandler.class)
-*/
+ * @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler =
+ * WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") //packetHandler =
+ * WailaPacketHandler.class)
+ */
 
 public class Waila {
-    // The instance of your mod that Forge uses.
-	@Instance("Waila")
-	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 = LogManager.getLogger("Waila");
-	public boolean serverPresent = false;
-	
+    // The instance of your mod that Forge uses.
+    @Instance("Waila")
+    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 = LogManager.getLogger("Waila");
+    public boolean serverPresent = false;
+
     /* INIT SEQUENCE */
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-    	ConfigHandler.instance().loadDefaultConfig(event);
-		OverlayConfig.updateColors();
-		MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());	
-		WailaPacketHandler.INSTANCE.ordinal();
-	}	
-	
+        ConfigHandler.instance().loadDefaultConfig(event);
+        OverlayConfig.updateColors();
+        MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
+        WailaPacketHandler.INSTANCE.ordinal();
+    }
+
     @EventHandler
     public void initialize(FMLInitializationEvent event) {
         try {
@@ -78,98 +76,81 @@ public class 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());    
-    		
+
+        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());        
-	}
+        FMLCommonHandler.instance().bus().register(new NetworkHandler());
+    }
 
     @EventHandler
     public void postInit(FMLPostInitializationEvent event) {
-		proxy.registerHandlers();
-    	ModIdentification.init();
-        
-    	/*
-        if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
-        
-	        for (String key: ModIdentification.keyhandlerStrings.keySet()){
-	        	String orig  = I18n.getString(key);
-	        	if (orig.equals(key))
-	        		orig = LanguageRegistry.instance().getStringLocalization(key);
-	        	if (orig.equals(key))
-	        		orig = LangUtil.translateG(key);	        	
-	        	if (orig.isEmpty())
-	        		orig = key;
-	        	
-	        	String modif;
-	        	if (orig.startsWith("[") || orig.contains(":"))
-	        		modif = orig;
-	        	else{
-	        		String id = ModIdentification.keyhandlerStrings.get(key);
-	        		
-	        		if (id.contains("."))
-	        			id = id.split("\\.")[0];
-	        		
-	        		if (id.length() > 10)
-	        			id = id.substring(0, 11);
-	        		
-	        		if (id.isEmpty())
-	        			id = "????";
-	        		
-	        		modif = String.format("[%s] %s", id, orig);
-	        	}
-	
-	        	LanguageRegistry.instance().addStringLocalization(key, modif);
-	        }
-        }
-        */
-        
-	}
+        proxy.registerHandlers();
+        ModIdentification.init();
+
+        /*
+         * if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
+         * for (String key: ModIdentification.keyhandlerStrings.keySet()){ String orig = I18n.getString(key); if
+         * (orig.equals(key)) orig = LanguageRegistry.instance().getStringLocalization(key); if (orig.equals(key)) orig
+         * = LangUtil.translateG(key); if (orig.isEmpty()) orig = key; String modif; if (orig.startsWith("[") ||
+         * orig.contains(":")) modif = orig; else{ String id = ModIdentification.keyhandlerStrings.get(key); if
+         * (id.contains(".")) id = id.split("\\.")[0]; if (id.length() > 10) id = id.substring(0, 11); if (id.isEmpty())
+         * id = "????"; modif = String.format("[%s] %s", id, orig); }
+         * LanguageRegistry.instance().addStringLocalization(key, modif); } }
+         */
+
+    }
 
     @Subscribe
-    public void loadComplete(FMLLoadCompleteEvent event) {    
-    	proxy.registerMods();
-    	proxy.registerIMCs();
-    	
-    	/*
-    	String[] ores = OreDictionary.getOreNames();
-    	for (String s : ores)
-    		for (ItemStack stack : OreDictionary.getOres(s))
-    			System.out.printf("%s : %s\n", s, stack);
-    	*/
-    }    
-    	
-    @EventHandler
-	public void processIMC(FMLInterModComms.IMCEvent event)
-	{
-		for (IMCMessage imcMessage : event.getMessages()){
-			if (!imcMessage.isStringMessage()) continue;
-			
-			if (imcMessage.key.equalsIgnoreCase("addconfig")){
-				String[] params = imcMessage.getStringValue().split("\\$\\$");
-				if (params.length != 3){
-					Waila.log.warn(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
-					continue;
-				}
-				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")){
-				Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
-				ModuleRegistrar.instance().addIMCRequest(imcMessage.getStringValue(), imcMessage.getSender());
-			}
-		}
-	}		
-	
+    public void loadComplete(FMLLoadCompleteEvent event) {
+        proxy.registerMods();
+        proxy.registerIMCs();
 
-	
-	@EventHandler
-	public void serverStarting(FMLServerStartingEvent event){
-		event.registerServerCommand(new CommandDumpHandlers());
-	}	
-}
+        /*
+         * String[] ores = OreDictionary.getOreNames(); for (String s : ores) for (ItemStack stack :
+         * OreDictionary.getOres(s)) System.out.printf("%s : %s\n", s, stack);
+         */
+    }
+
+    @EventHandler
+    public void processIMC(FMLInterModComms.IMCEvent event) {
+        for (IMCMessage imcMessage : event.getMessages()) {
+            if (!imcMessage.isStringMessage()) continue;
+
+            if (imcMessage.key.equalsIgnoreCase("addconfig")) {
+                String[] params = imcMessage.getStringValue().split("\\$\\$");
+                if (params.length != 3) {
+                    Waila.log.warn(
+                            String.format(
+                                    "Error while parsing config option from [ %s ] for %s",
+                                    imcMessage.getSender(),
+                                    imcMessage.getStringValue()));
+                    continue;
+                }
+                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")) {
+                Waila.log.info(
+                        String.format(
+                                "Receiving registration request from [ %s ] for method %s",
+                                imcMessage.getSender(),
+                                imcMessage.getStringValue()));
+                ModuleRegistrar.instance().addIMCRequest(imcMessage.getStringValue(), imcMessage.getSender());
+            }
+        }
+    }
+
+    @EventHandler
+    public void serverStarting(FMLServerStartingEvent event) {
+        event.registerServerCommand(new CommandDumpHandlers());
+    }
+}

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

@@ -6,25 +6,25 @@ 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.WARN, "[Agriculture] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(),  BlockCrop);
-	}
+    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.WARN, "[Agriculture] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(), BlockCrop);
+    }
 }

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

@@ -2,50 +2,55 @@ package mcp.mobius.waila.addons.agriculture;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerCrop implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("general.showcrop")) return currenttip;
-		
-		int growthStage = accessor.getMetadata();
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("general.showcrop")) return currenttip;
 
-		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;
-	}
+        int growthStage = accessor.getMetadata();
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
-	
 }

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

@@ -2,43 +2,41 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.lang.reflect.Method;
 
+import net.minecraftforge.common.util.ForgeDirection;
+
 import org.apache.logging.log4j.Level;
 
-import net.minecraftforge.common.util.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class BCModule {
 
-	public static Class  TileTank       = null;
-	public static Method TileTank_getTankInfo      = null;
-	
-	//public static Class  IPowerReceptor = null;
-	//public static Class  PipeTransportPower = null;
-	//public static Class  TileGenericPipe    = null;
-	//public static Class  TileEngine         = null;
-	
+    public static Class TileTank = null;
+    public static Method TileTank_getTankInfo = null;
 
+    // public static Class IPowerReceptor = null;
+    // public static Class PipeTransportPower = null;
+    // public static Class TileGenericPipe = null;
+    // public static Class TileEngine = null;
 
-	public static void register(){
-		try{
-			TileTank            = Class.forName("buildcraft.factory.TileTank");
-			TileTank_getTankInfo      = TileTank.getMethod("getTankInfo", ForgeDirection.class);
+    public static void register() {
+        try {
+            TileTank = Class.forName("buildcraft.factory.TileTank");
+            TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class);
 
-			ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount");
-			ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
-			ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[BC] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[BC] Method not found." + e);
-			return;	
-		}
-		
+            ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount");
+            ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype");
+            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[BC] Class not found. " + e);
+            return;
+        } catch (NoSuchMethodException e) {
+            Waila.log.log(Level.WARN, "[BC] Method not found." + e);
+            return;
+        }
+
+    }
 
-	}
-	
 }

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

@@ -2,18 +2,6 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.util.List;
 
-//import buildcraft.factory.TileTank;
-
-
-
-
-import org.apache.logging.log4j.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.impl.ConfigHandler;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,62 +10,76 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
+
+import org.apache.logging.log4j.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerBCTanks implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		FluidTankInfo tank  = this.getTank(accessor);
-		FluidStack stack = tank != null ? tank.fluid : null; 
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        FluidTankInfo tank = this.getTank(accessor);
+        FluidStack stack = tank != null ? tank.fluid : null;
 
+        String name = currenttip.get(0);
+        if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype"))
+            name = name + " (" + stack.getFluid().getName() + ")";
+        else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype"))
+            name = name + " " + LangUtil.translateG("hud.msg.empty");
+        currenttip.set(0, name);
+        return currenttip;
+    }
 
-		String name = currenttip.get(0); 
-		if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype"))
-			name = name + " (" + stack.getFluid().getName() + ")";
-		else if (stack == null &&  ConfigHandler.instance().getConfig("bc.tanktype"))
-			name = name + " " + LangUtil.translateG("hud.msg.empty");
-		currenttip.set(0, name);		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        FluidTankInfo tank = this.getTank(accessor);
+        FluidStack stack = tank != null ? tank.fluid : null;
+        int liquidAmount = stack != null ? stack.amount : 0;
+        int capacity = tank != null ? tank.capacity : 0;
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		FluidTankInfo tank  = this.getTank(accessor);
-		FluidStack    stack = tank  != null ? tank.fluid : null;
-		int liquidAmount    = stack != null ? stack.amount:0;
-		int capacity        = tank  != null ? tank.capacity : 0;		
-		
-		if (ConfigHandler.instance().getConfig("bc.tankamount"))
-			currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity)  + " mB");
-		
-		return currenttip;
-	}		
+        if (ConfigHandler.instance().getConfig("bc.tankamount"))
+            currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity) + " mB");
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    public FluidTankInfo getTank(IWailaDataAccessor accessor) {
+        FluidTankInfo tank = null;
+        try {
+            tank = ((FluidTankInfo[]) BCModule.TileTank_getTankInfo
+                    .invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
+        } catch (Exception e) {
+            Waila.log.log(
+                    Level.ERROR,
+                    "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
+            return null;
+        }
+        return tank;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        return tag;
+    }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}	
-	
-	public FluidTankInfo getTank(IWailaDataAccessor accessor){
-		FluidTankInfo tank = null;
-		try{
-			tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
-		} catch (Exception e){
-			Waila.log.log(Level.ERROR, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
-			return null;
-		}
-		return tank;
-	}
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
-	
 }

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

@@ -2,39 +2,26 @@ package mcp.mobius.waila.addons.carpenters;
 
 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;
-		}			
+    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);
+         */
+    }
 
-		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

@@ -7,60 +7,50 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
-		if (!config.getConfig("carpenters.hide")) return null;
+    @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;
+    }
 
-		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> 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> 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;
+    }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -9,57 +9,57 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class EnderIOModule {
 
-	public static Class TileCapacitorBank = null;
-	public static Method TCB_getMaxInput     = null;
-	public static Method TCB_getMaxOutput    = null;
-	public static Method TCB_getEnergyStored = null;
-	public static Method TCB_getMaxEnergyStored = null;
-	public static Method TCB_getMaxIO = null;
+    public static Class TileCapacitorBank = null;
+    public static Method TCB_getMaxInput = null;
+    public static Method TCB_getMaxOutput = null;
+    public static Method TCB_getEnergyStored = null;
+    public static Method TCB_getMaxEnergyStored = null;
+    public static Method TCB_getMaxIO = null;
+
+    public static Class TileTesseract = null;
+
+    public static void register() {
+        try {
+            Class ModClass = Class.forName("crazypants.enderio.EnderIO");
+            Waila.log.log(Level.INFO, "EnderIO mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
+            return;
+        }
+
+        try {
+
+            TileCapacitorBank = Class.forName("crazypants.enderio.machine.power.TileCapacitorBank");
+            TCB_getEnergyStored = TileCapacitorBank.getMethod("getEnergyStored");
+            TCB_getMaxInput = TileCapacitorBank.getMethod("getMaxInput");
+            TCB_getMaxOutput = TileCapacitorBank.getMethod("getMaxOutput");
+            TCB_getMaxEnergyStored = TileCapacitorBank.getMethod("getMaxEnergyStored");
+            TCB_getMaxIO = TileCapacitorBank.getMethod("getMaxIO");
+
+            TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube");
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
+            return;
+        } catch (NoSuchMethodException e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
+            return;
+            // } catch (NoSuchFieldException e){
+            // mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
+            // return;
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfig("EnderIO", "enderio.inout");
+        ModuleRegistrar.instance().addConfig("EnderIO", "enderio.storage");
+        ModuleRegistrar.instance().addConfig("EnderIO", "enderio.owner");
+        ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract);
+    }
 
-	public static Class TileTesseract = null;	
-	
-	public static void register(){	
-		try{
-			Class ModClass = Class.forName("crazypants.enderio.EnderIO");
-			Waila.log.log(Level.INFO, "EnderIO mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found.");
-			return;
-		}
-		
-		try{
-			
-			TileCapacitorBank = Class.forName("crazypants.enderio.machine.power.TileCapacitorBank");
-			TCB_getEnergyStored    = TileCapacitorBank.getMethod("getEnergyStored");
-			TCB_getMaxInput        = TileCapacitorBank.getMethod("getMaxInput");
-			TCB_getMaxOutput       = TileCapacitorBank.getMethod("getMaxOutput");
-			TCB_getMaxEnergyStored = TileCapacitorBank.getMethod("getMaxEnergyStored");
-			TCB_getMaxIO           = TileCapacitorBank.getMethod("getMaxIO");
-			
-			TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
-			return;			
-//		} catch (NoSuchFieldException e){
-//			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
-//			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.inout");
-		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.storage");
-		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.owner");
-		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCapacitor(), TileCapacitorBank);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract);		
-	}	
-	
 }

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

@@ -1,75 +1,110 @@
 package mcp.mobius.waila.addons.enderio;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.RESET;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
 
-public class HUDHandlerCapacitor implements IWailaDataProvider{
+public class HUDHandlerCapacitor implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		
-		if (accessor.getPlayer().isSneaking()){
-			try{
-				
-				String maxIOStr  = LangUtil.translateG("hud.msg.maxio");
-				String inputStr  = LangUtil.translateG("hud.msg.input");
-				String outputStr = LangUtil.translateG("hud.msg.output");
-				
-				if (config.getConfig("enderio.storage")){
-					Integer maxEnergyStored = (Integer)EnderIOModule.TCB_getMaxEnergyStored.invoke(accessor.getTileEntity());
-					Double  energyStored    = (Double)EnderIOModule.TCB_getEnergyStored.invoke(accessor.getTileEntity());					
-					currenttip.add(String.format("%s%.1f%s / %s%d%s RF", WHITE, energyStored * 10, RESET, WHITE, maxEnergyStored * 10, RESET));
-				}
-				
-				if (config.getConfig("enderio.inout")){
-					Integer maxIO           = (Integer)EnderIOModule.TCB_getMaxIO.invoke(accessor.getTileEntity());
-					Integer maxInput        = (Integer)EnderIOModule.TCB_getMaxInput.invoke(accessor.getTileEntity());
-					Integer maxOutput       = (Integer)EnderIOModule.TCB_getMaxOutput.invoke(accessor.getTileEntity());					
-					currenttip.add(String.format("%s : %s%d%sRF/t ", maxIOStr, TAB + ALIGNRIGHT + WHITE, maxIO     * 10, TAB + ALIGNRIGHT));
-					currenttip.add(String.format("%s : %s%d%sRF/t ", inputStr, TAB + ALIGNRIGHT + WHITE, maxInput  * 10, TAB + ALIGNRIGHT));
-					currenttip.add(String.format("%s : %s%d%sRF/t ", outputStr,TAB + ALIGNRIGHT + WHITE, maxOutput * 10, TAB + ALIGNRIGHT));
-				}
-				
-				
-			} catch (Exception e) {
-				currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);			
-			}
-		}
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (accessor.getPlayer().isSneaking()) {
+            try {
+
+                String maxIOStr = LangUtil.translateG("hud.msg.maxio");
+                String inputStr = LangUtil.translateG("hud.msg.input");
+                String outputStr = LangUtil.translateG("hud.msg.output");
+
+                if (config.getConfig("enderio.storage")) {
+                    Integer maxEnergyStored = (Integer) EnderIOModule.TCB_getMaxEnergyStored
+                            .invoke(accessor.getTileEntity());
+                    Double energyStored = (Double) EnderIOModule.TCB_getEnergyStored.invoke(accessor.getTileEntity());
+                    currenttip.add(
+                            String.format(
+                                    "%s%.1f%s / %s%d%s RF",
+                                    WHITE,
+                                    energyStored * 10,
+                                    RESET,
+                                    WHITE,
+                                    maxEnergyStored * 10,
+                                    RESET));
+                }
+
+                if (config.getConfig("enderio.inout")) {
+                    Integer maxIO = (Integer) EnderIOModule.TCB_getMaxIO.invoke(accessor.getTileEntity());
+                    Integer maxInput = (Integer) EnderIOModule.TCB_getMaxInput.invoke(accessor.getTileEntity());
+                    Integer maxOutput = (Integer) EnderIOModule.TCB_getMaxOutput.invoke(accessor.getTileEntity());
+                    currenttip.add(
+                            String.format(
+                                    "%s : %s%d%sRF/t ",
+                                    maxIOStr,
+                                    TAB + ALIGNRIGHT + WHITE,
+                                    maxIO * 10,
+                                    TAB + ALIGNRIGHT));
+                    currenttip.add(
+                            String.format(
+                                    "%s : %s%d%sRF/t ",
+                                    inputStr,
+                                    TAB + ALIGNRIGHT + WHITE,
+                                    maxInput * 10,
+                                    TAB + ALIGNRIGHT));
+                    currenttip.add(
+                            String.format(
+                                    "%s : %s%d%sRF/t ",
+                                    outputStr,
+                                    TAB + ALIGNRIGHT + WHITE,
+                                    maxOutput * 10,
+                                    TAB + ALIGNRIGHT));
+                }
+
+            } catch (Exception e) {
+                currenttip = WailaExceptionHandler
+                        .handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+            }
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,79 +1,95 @@
 package mcp.mobius.waila.addons.enderio;
 
+import static mcp.mobius.waila.api.SpecialChars.RESET;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import static mcp.mobius.waila.api.SpecialChars.*;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerTesseract implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		
-		if (accessor.getPlayer().isSneaking()){
-		
-			String channel = "%s : %s%s%s %s";
-			String freq;
-			String frequser;
-			String owner;
-			
-			if (config.getConfig("enderio.channel")){
-			
-				if (accessor.getNBTData().hasKey("channelName")){
-					freq = accessor.getNBTData().getString("channelName");
-					
-					if (accessor.getNBTData().hasKey("channelUser"))
-						frequser = "[ " + WHITE + accessor.getNBTData().getString("channelUser") + RESET + " ]";
-					else
-						frequser = "[ " + WHITE + LangUtil.translateG("hud.msg.public") + RESET +" ]";
-						
-				}
-				else{
-					freq     = LangUtil.translateG("hud.msg.none");
-					frequser = "";
-				}
-				
-				currenttip.add(String.format(channel, LangUtil.translateG("hud.msg.frequency"), TAB + WHITE, freq, RESET, frequser));
-			}
-	
-			if (config.getConfig("enderio.owner")){
-				if (accessor.getNBTData().hasKey("owner"))
-					currenttip.add(String.format("%s : %s%s", LangUtil.translateG("hud.msg.owner"), TAB + WHITE, accessor.getNBTData().getString("owner")));
-			}
-		
-		}
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (accessor.getPlayer().isSneaking()) {
+
+            String channel = "%s : %s%s%s %s";
+            String freq;
+            String frequser;
+            String owner;
+
+            if (config.getConfig("enderio.channel")) {
+
+                if (accessor.getNBTData().hasKey("channelName")) {
+                    freq = accessor.getNBTData().getString("channelName");
+
+                    if (accessor.getNBTData().hasKey("channelUser"))
+                        frequser = "[ " + WHITE + accessor.getNBTData().getString("channelUser") + RESET + " ]";
+                    else frequser = "[ " + WHITE + LangUtil.translateG("hud.msg.public") + RESET + " ]";
+
+                } else {
+                    freq = LangUtil.translateG("hud.msg.none");
+                    frequser = "";
+                }
+
+                currenttip.add(
+                        String.format(
+                                channel,
+                                LangUtil.translateG("hud.msg.frequency"),
+                                TAB + WHITE,
+                                freq,
+                                RESET,
+                                frequser));
+            }
+
+            if (config.getConfig("enderio.owner")) {
+                if (accessor.getNBTData().hasKey("owner")) currenttip.add(
+                        String.format(
+                                "%s : %s%s",
+                                LangUtil.translateG("hud.msg.owner"),
+                                TAB + WHITE,
+                                accessor.getNBTData().getString("owner")));
+            }
+
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -10,49 +10,49 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class EnderStorageModule {
 
-	public static Class TileFrequencyOwner = null;
-	public static Field TileFrequencyOwner_Freq = null;
-	
-	public static Class EnderStorageManager = null;	
-	public static Method GetColourFromFreq = null;
-	
-	public static Class TileEnderTank = null;
-	
-	public static void register(){	
-		try{
-			Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage");
-			Waila.log.log(Level.INFO, "EnderStorage mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
-			return;
-		}
-		
-		try{
-			
-			TileFrequencyOwner  = Class.forName("codechicken.enderstorage.common.TileFrequencyOwner");		
-			TileFrequencyOwner_Freq = TileFrequencyOwner.getField("freq");
-			
-			EnderStorageManager = Class.forName("codechicken.enderstorage.api.EnderStorageManager");
-			GetColourFromFreq   = EnderStorageManager.getDeclaredMethod("getColourFromFreq", Integer.TYPE, Integer.TYPE);
-			
-			TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
-			return;			
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Field not found." + e);
-			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStorage(), TileFrequencyOwner);
-	}
+    public static Class TileFrequencyOwner = null;
+    public static Field TileFrequencyOwner_Freq = null;
+
+    public static Class EnderStorageManager = null;
+    public static Method GetColourFromFreq = null;
+
+    public static Class TileEnderTank = null;
+
+    public static void register() {
+        try {
+            Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage");
+            Waila.log.log(Level.INFO, "EnderStorage mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found.");
+            return;
+        }
+
+        try {
+
+            TileFrequencyOwner = Class.forName("codechicken.enderstorage.common.TileFrequencyOwner");
+            TileFrequencyOwner_Freq = TileFrequencyOwner.getField("freq");
+
+            EnderStorageManager = Class.forName("codechicken.enderstorage.api.EnderStorageManager");
+            GetColourFromFreq = EnderStorageManager.getDeclaredMethod("getColourFromFreq", Integer.TYPE, Integer.TYPE);
+
+            TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank");
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
+            return;
+        } catch (NoSuchMethodException e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
+            return;
+        } catch (NoSuchFieldException e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Field not found." + e);
+            return;
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerStorage(), TileFrequencyOwner);
+    }
 }

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

@@ -2,83 +2,75 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerStorage implements IWailaDataProvider {
-	
-	private static String[] colors = {
-		LangUtil.translateG("hud.msg.white"),
-		LangUtil.translateG("hud.msg.orange"),
-		LangUtil.translateG("hud.msg.magenta"),
-		LangUtil.translateG("hud.msg.lblue"),
-		LangUtil.translateG("hud.msg.yellow"),
-		LangUtil.translateG("hud.msg.lime"),
-		LangUtil.translateG("hud.msg.pink"),
-		LangUtil.translateG("hud.msg.gray"),
-		LangUtil.translateG("hud.msg.lgray"),
-		LangUtil.translateG("hud.msg.cyan"),
-		LangUtil.translateG("hud.msg.purple"),
-		LangUtil.translateG("hud.msg.blue"),
-		LangUtil.translateG("hud.msg.brown"),
-		LangUtil.translateG("hud.msg.green"),
-		LangUtil.translateG("hud.msg.red"),
-		LangUtil.translateG("hud.msg.black")		
-	};
-	
-	@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;
-	}
+    private static String[] colors = { LangUtil.translateG("hud.msg.white"), LangUtil.translateG("hud.msg.orange"),
+            LangUtil.translateG("hud.msg.magenta"), LangUtil.translateG("hud.msg.lblue"),
+            LangUtil.translateG("hud.msg.yellow"), LangUtil.translateG("hud.msg.lime"),
+            LangUtil.translateG("hud.msg.pink"), LangUtil.translateG("hud.msg.gray"),
+            LangUtil.translateG("hud.msg.lgray"), LangUtil.translateG("hud.msg.cyan"),
+            LangUtil.translateG("hud.msg.purple"), LangUtil.translateG("hud.msg.blue"),
+            LangUtil.translateG("hud.msg.brown"), LangUtil.translateG("hud.msg.green"),
+            LangUtil.translateG("hud.msg.red"), LangUtil.translateG("hud.msg.black") };
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		if(config.getConfig("enderstorage.colors")){
-			try{
-				
-				int freq = EnderStorageModule.TileFrequencyOwner_Freq.getInt(accessor.getTileEntity());
-				int freqLeft   = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 0); 
-				int freqCenter = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 1);
-				int freqRight  = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 2);
-				
-				if (!EnderStorageModule.TileEnderTank.isInstance(accessor.getTileEntity()))
-					currenttip.add(String.format("%s/%s/%s", colors[freqLeft], colors[freqCenter], colors[freqRight]));
-				else
-					currenttip.add(String.format("%s/%s/%s", colors[freqRight], colors[freqCenter], colors[freqLeft]));
-				
-				
-			} catch (Exception e){
-				currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-			}
-		}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-		
-		return currenttip;
-	}
+    @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("enderstorage.colors")) {
+            try {
+
+                int freq = EnderStorageModule.TileFrequencyOwner_Freq.getInt(accessor.getTileEntity());
+                int freqLeft = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 0);
+                int freqCenter = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 1);
+                int freqRight = (Integer) EnderStorageModule.GetColourFromFreq.invoke(null, freq, 2);
+
+                if (!EnderStorageModule.TileEnderTank.isInstance(accessor.getTileEntity()))
+                    currenttip.add(String.format("%s/%s/%s", colors[freqLeft], colors[freqCenter], colors[freqRight]));
+                else currenttip.add(String.format("%s/%s/%s", colors[freqRight], colors[freqCenter], colors[freqLeft]));
+
+            } catch (Exception e) {
+                currenttip = WailaExceptionHandler
+                        .handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+            }
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}	
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -9,75 +9,72 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ETBModule {
 
-	public static Class TileSocket      = null;
-	public static Field Socket_sides    = null;
-	public static Field Socket_configs  = null;
-	//public static Field Socket_sideID   = null;
-	//public static Field Socket_sideMeta = null;
-	//public static Field Socket_facID    = null;
-	//public static Field Socket_facMeta  = null;	
-	
-	public static Class SocketsMod = null;
-	public static Field module     = null;
-	
-	public static Class SideConfig   = null;
-	public static Field SC_tank      = null;
-	public static Field SC_inventory = null;
-	public static Field SC_rsControl = null;	
-	public static Field SC_rsLatch   = null;		
-	
-	public static void register(){	
-		try{
-			Class ModClass = Class.forName("emasher.sockets.TileSocket");
-			Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
-			return;
-		}	
-		
-		try{
-			
-			TileSocket     = Class.forName("emasher.sockets.TileSocket");		
-			Socket_sides   = TileSocket.getField("sides");
-			Socket_configs = TileSocket.getField("configs");
-			//Socket_sideID = TileSocket.getField("sideID");
-			//Socket_sideMeta = TileSocket.getField("sideMeta");
-			//Socket_facID = TileSocket.getField("facID");
-			//Socket_facMeta = TileSocket.getField("facMeta");
-		
-			SocketsMod = Class.forName("emasher.sockets.SocketsMod");
-			module     = SocketsMod.getField("module");
-			//module     = (Item)SocketsMod.getField("module").get(null);
-			/*
-			if (module == null){
-				mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !");
-				return;					
-			}
-			*/
-			
-			SideConfig   = Class.forName("emasher.api.SideConfig");
-			SC_tank      = SideConfig.getField("tank");
-			SC_inventory = SideConfig.getField("inventory");
-			SC_rsControl = SideConfig.getField("rsControl");
-			SC_rsLatch   = SideConfig.getField("rsLatch");			
-			
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e);
-			return;
-//		} catch (NoSuchMethodException e){
-//			Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e);
-//			return;			
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e);
-			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Unhandled exception." + e);
-			return;			
-		}		
-		
-		ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerSocket(), TileSocket);
-	}
+    public static Class TileSocket = null;
+    public static Field Socket_sides = null;
+    public static Field Socket_configs = null;
+    // public static Field Socket_sideID = null;
+    // public static Field Socket_sideMeta = null;
+    // public static Field Socket_facID = null;
+    // public static Field Socket_facMeta = null;
+
+    public static Class SocketsMod = null;
+    public static Field module = null;
+
+    public static Class SideConfig = null;
+    public static Field SC_tank = null;
+    public static Field SC_inventory = null;
+    public static Field SC_rsControl = null;
+    public static Field SC_rsLatch = null;
+
+    public static void register() {
+        try {
+            Class ModClass = Class.forName("emasher.sockets.TileSocket");
+            Waila.log.log(Level.INFO, "Engineer Toolbox mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found.");
+            return;
+        }
+
+        try {
+
+            TileSocket = Class.forName("emasher.sockets.TileSocket");
+            Socket_sides = TileSocket.getField("sides");
+            Socket_configs = TileSocket.getField("configs");
+            // Socket_sideID = TileSocket.getField("sideID");
+            // Socket_sideMeta = TileSocket.getField("sideMeta");
+            // Socket_facID = TileSocket.getField("facID");
+            // Socket_facMeta = TileSocket.getField("facMeta");
+
+            SocketsMod = Class.forName("emasher.sockets.SocketsMod");
+            module = SocketsMod.getField("module");
+            // module = (Item)SocketsMod.getField("module").get(null);
+            /*
+             * if (module == null){ mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !");
+             * return; }
+             */
+
+            SideConfig = Class.forName("emasher.api.SideConfig");
+            SC_tank = SideConfig.getField("tank");
+            SC_inventory = SideConfig.getField("inventory");
+            SC_rsControl = SideConfig.getField("rsControl");
+            SC_rsLatch = SideConfig.getField("rsLatch");
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e);
+            return;
+            // } catch (NoSuchMethodException e){
+            // Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e);
+            // return;
+        } catch (NoSuchFieldException e) {
+            Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e);
+            return;
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Engineer Toolbox] Unhandled exception." + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerSocket(), TileSocket);
+    }
 }

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

@@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -16,99 +17,93 @@ import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerSocket implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("etb.displaydata")) return currenttip;
-		
-			try {
-				int[]      sides = (int[])ETBModule.Socket_sides.get(accessor.getTileEntity());
-				Object[] configs = (Object[])ETBModule.Socket_configs.get(accessor.getTileEntity());
-				Item     module  = (Item)ETBModule.module.get(null);
-				
-				
-				for( int s = 0; s < 6; s++){
-						if (sides[s] != 0){
-							
-							int tank            = (Integer)ETBModule.SC_tank.get(configs[s]);
-							int inventory       = (Integer)ETBModule.SC_inventory.get(configs[s]);
-							boolean[] rsControl = (boolean[])ETBModule.SC_rsControl.get(configs[s]);
-							boolean[] rsLatch   = (boolean[])ETBModule.SC_rsLatch.get(configs[s]);
-							
-							
-							ItemStack stack = new ItemStack(module, 1, sides[s]);
-							String tipstr = String.format("%-5s : %s ", ForgeDirection.getOrientation(s), stack.getDisplayName());
-							
-							String configstr = "[ ";
-							
-							if (tank != -1)
-								configstr += "\u00a79" + String.valueOf(tank) + " ";
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("etb.displaydata")) return currenttip;
 
-							if (inventory != -1)
-								configstr += "\u00a7a" + String.valueOf(inventory) + " ";
-							
-							if (rsControl[0] || rsControl[1] || rsControl[2]){
-								configstr += "\u00a7c";
-								configstr += rsControl[0] ? "1" : "0";
-								configstr += rsControl[1] ? "1" : "0";
-								configstr += rsControl[2] ? "1" : "0";
-								configstr += " ";
-							}
+        try {
+            int[] sides = (int[]) ETBModule.Socket_sides.get(accessor.getTileEntity());
+            Object[] configs = (Object[]) ETBModule.Socket_configs.get(accessor.getTileEntity());
+            Item module = (Item) ETBModule.module.get(null);
 
-							if (rsLatch[0] || rsLatch[1] || rsLatch[2]){
-								configstr += "\u00a75";
-								configstr += rsLatch[0] ? "1" : "0";
-								configstr += rsLatch[1] ? "1" : "0";
-								configstr += rsLatch[2] ? "1" : "0";
-								configstr += " ";
-							}							
-							
-							configstr += "\u00a7r]";
-							
-							if (!configstr.equals("[ \u00a7r]"))
-								tipstr += " " + configstr;
-							
-							/*
-							if ((tank != -1) && (inventory != -1))
-								tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]", tank, inventory);
-							else if (tank != -1)
-								tipstr += String.format("[ \u00a79%d \u00a7r]", tank);
-							else if (inventory != -1)
-								tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory);
-							*/
-							
-							currenttip.add(tipstr);
-						}
-				}
-			
-				
-			
-		} catch (Exception e) {
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);			
-		}
-		
-		return currenttip;
-	}
+            for (int s = 0; s < 6; s++) {
+                if (sides[s] != 0) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+                    int tank = (Integer) ETBModule.SC_tank.get(configs[s]);
+                    int inventory = (Integer) ETBModule.SC_inventory.get(configs[s]);
+                    boolean[] rsControl = (boolean[]) ETBModule.SC_rsControl.get(configs[s]);
+                    boolean[] rsLatch = (boolean[]) ETBModule.SC_rsLatch.get(configs[s]);
+
+                    ItemStack stack = new ItemStack(module, 1, sides[s]);
+                    String tipstr = String
+                            .format("%-5s : %s ", ForgeDirection.getOrientation(s), stack.getDisplayName());
+
+                    String configstr = "[ ";
+
+                    if (tank != -1) configstr += "\u00a79" + String.valueOf(tank) + " ";
+
+                    if (inventory != -1) configstr += "\u00a7a" + String.valueOf(inventory) + " ";
+
+                    if (rsControl[0] || rsControl[1] || rsControl[2]) {
+                        configstr += "\u00a7c";
+                        configstr += rsControl[0] ? "1" : "0";
+                        configstr += rsControl[1] ? "1" : "0";
+                        configstr += rsControl[2] ? "1" : "0";
+                        configstr += " ";
+                    }
+
+                    if (rsLatch[0] || rsLatch[1] || rsLatch[2]) {
+                        configstr += "\u00a75";
+                        configstr += rsLatch[0] ? "1" : "0";
+                        configstr += rsLatch[1] ? "1" : "0";
+                        configstr += rsLatch[2] ? "1" : "0";
+                        configstr += " ";
+                    }
+
+                    configstr += "\u00a7r]";
+
+                    if (!configstr.equals("[ \u00a7r]")) tipstr += " " + configstr;
+
+                    /*
+                     * if ((tank != -1) && (inventory != -1)) tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]",
+                     * tank, inventory); else if (tank != -1) tipstr += String.format("[ \u00a79%d \u00a7r]", tank);
+                     * else if (inventory != -1) tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory);
+                     */
+
+                    currenttip.add(tipstr);
+                }
+            }
+
+        } catch (Exception e) {
+            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -7,29 +7,28 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ExtraUtilitiesModule {
 
-	public static Class ModExtraUtilities = null;
-	public static Class TileEntityDrum    = null;	
-	
-	public static void register(){
-		
+    public static Class ModExtraUtilities = null;
+    public static Class TileEntityDrum = null;
 
-		try{
-			Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils");
-			Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
-			return;
-		}			
-		
-		try{
-			TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDrum(), TileEntityDrum);
-	}
+    public static void register() {
+
+        try {
+            Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils");
+            Waila.log.log(Level.INFO, "ExtraUtilities mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found.");
+            return;
+        }
+
+        try {
+            TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDrum(), TileEntityDrum);
+    }
 }

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

@@ -10,54 +10,57 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDHandlerDrum implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		
-		if (!config.getConfig("extrautilities.fluidamount")) return currenttip;
-		
-		int amount = 0;
-		
-		NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank");
-		if (subtag.hasKey("Amount"))
-			amount = accessor.getNBTInteger(subtag, "Amount");
-		
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity));
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (!config.getConfig("extrautilities.fluidamount")) return currenttip;
+
+        int amount = 0;
+
+        NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank");
+        if (subtag.hasKey("Amount")) amount = accessor.getNBTInteger(subtag, "Amount");
+
+        IFluidHandler handler = (IFluidHandler) accessor.getTileEntity();
+        if (handler == null) return currenttip;
+
+        FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+        if (tanks.length != 1) return currenttip;
+
+        currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -7,27 +7,26 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class GravestoneModule {
 
-	public static Class BlockGraveStone = null;	
-	
-	public static void register(){
+    public static Class BlockGraveStone = null;
 
-		try{
-			Class ModGravestone = Class.forName("GraveStone.ModGraveStone");
-			Waila.log.log(Level.INFO, "GraveStone mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
-			return;
-		}		
+    public static void register() {
 
-		try {
-			BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
-		} catch (ClassNotFoundException e) {
-			Waila.log.log(Level.WARN, "[GraveStone] Class not found. " + e);
-		}
+        try {
+            Class ModGravestone = Class.forName("GraveStone.ModGraveStone");
+            Waila.log.log(Level.INFO, "GraveStone mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found.");
+            return;
+        }
 
-		
-		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);	
-		ModuleRegistrar.instance().registerNBTProvider  (new HUDHandlerGravestone(), BlockGraveStone);
-	}
+        try {
+            BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[GraveStone] Class not found. " + e);
+        }
+
+        ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerGravestone(), BlockGraveStone);
+    }
 
 }

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

@@ -7,37 +7,41 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDHandlerGravestone implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @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> 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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}	
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,54 +2,58 @@ package mcp.mobius.waila.addons.harvestcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.NBTUtil;
 
 public class HUDHandlerPamCrop implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("general.showcrop")) return currenttip;
-		
-		int growthStage = NBTUtil.getNBTInteger(accessor.getNBTData(), "growthStage");
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("general.showcrop")) return currenttip;
 
-		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;
+        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;
-	}
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -6,25 +6,25 @@ 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.WARN, "[PamHarvestCraft] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(),  TileEntityPamCrop);
-	}
+    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.WARN, "[PamHarvestCraft] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(), TileEntityPamCrop);
+    }
 }

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

@@ -1,87 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		
-		try{
-			int    storage = -1;
-			int production = -1;
-			
-			if (IC2Module.TileEntityBaseGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TEBG_MaxStorage.getShort(accessor.getTileEntity());
-				production = IC2Module.TEBG_Production.getInt(accessor.getTileEntity());
-			}
-			else if (IC2Module.TileEntityGeoGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TEGG_MaxStorage.getShort(accessor.getTileEntity());
-				production = IC2Module.TEGG_Production.getInt(accessor.getTileEntity());
-			}
-			else if (IC2Module.TileEntitySemifluidGenerator.isInstance(accessor.getTileEntity())){
-				storage    = IC2Module.TESG_MaxStorage.getShort(accessor.getTileEntity());
-				production = (int)IC2Module.TESG_Production.getDouble(accessor.getTileEntity());
-			}
-		
-			String storedStr  = LangUtil.translateG("hud.msg.stored");
-			String outputStr  = LangUtil.translateG("hud.msg.output");			
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				double stored  = IC2Module.getStoredEnergy(accessor); 
-			
-				if ( stored >= 0.0 && storage > 0)
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
-				
-				//else if (stored >= 0.0)
-				//	currenttip.add(String.format("Stored : %d EU", stored));				
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
-					if ( production > 0)
-						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
-			}
-			
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 		
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
-}

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

@@ -1,72 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
-
-public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,
-			IWailaConfigHandler config) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		
-		try{
-			String storedStr  = LangUtil.translateG("hud.msg.stored");
-			String outputStr  = LangUtil.translateG("hud.msg.output");				
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				double stored  = IC2Module.getStoredEnergy(accessor); 
-				int    storage = IC2Module.TEEB_MaxStorage.getInt(accessor.getTileEntity());
-				
-				if ( stored >= 0.0 )
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage));
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
-				int production = IC2Module.TEEB_Output.getInt(accessor.getTileEntity());
-					if ( production > 0)
-						currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
-			}			
-			
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 		
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
-}

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

@@ -1,5 +1,8 @@
 package mcp.mobius.waila.addons.ic2;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -8,104 +11,113 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
 
 public class HUDHandlerTEGenerator implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		return null;
-	}
+    @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> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		try{
-			double storage    = accessor.getNBTData().getDouble("storage");
-			int    production = accessor.getNBTData().getInteger("production");
-			long   maxStorage = accessor.getNBTData().getLong("maxStorage");
-			
-			String storedStr  = LangUtil.translateG("hud.msg.stored");
-			String outputStr  = LangUtil.translateG("hud.msg.output");			
-			
-			/* EU Storage */
-			if (ConfigHandler.instance().getConfig("ic2.storage")){
-				if (maxStorage > 0)
-					currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(storage,maxStorage)), maxStorage));
-			}
-			
-			if (ConfigHandler.instance().getConfig("ic2.outputeu")){
-				currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
-			}
-			
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 		
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        try {
+            double storage = accessor.getNBTData().getDouble("storage");
+            int production = accessor.getNBTData().getInteger("production");
+            long maxStorage = accessor.getNBTData().getLong("maxStorage");
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+            String storedStr = LangUtil.translateG("hud.msg.stored");
+            String outputStr = LangUtil.translateG("hud.msg.output");
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag,	World world, int x, int y, int z) {
-		
-		try{
-			double storage    = -1;
-			long   production = -1;
-			long   maxStorage = -1;
-			
-			if (IC2Module.TileBaseGenerator.isInstance(te)){
-				storage    = IC2Module.TileBaseGenerator_storage.getDouble(te);
-				production = (long)IC2Module.TileBaseGenerator_production.getInt(te);
-				maxStorage = (long)IC2Module.TileBaseGenerator_maxStorage.getShort(te);
-			}
+            /* EU Storage */
+            if (ConfigHandler.instance().getConfig("ic2.storage")) {
+                if (maxStorage > 0) currenttip.add(
+                        String.format(
+                                "%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU",
+                                storedStr,
+                                TAB + ALIGNRIGHT,
+                                Math.round(Math.min(storage, maxStorage)),
+                                maxStorage));
+            }
 
-			else if (IC2Module.TileGeoGenerator.isInstance(te)){
-				storage    = IC2Module.TileGeoGenerator_storage.getDouble(te);
-				production = (long)IC2Module.TileGeoGenerator_production.getInt(te);
-				maxStorage = (long)IC2Module.TileGeoGenerator_maxStorage.getShort(te);				
-			}
-			
-			else if (IC2Module.TileKineticGenerator.isInstance(te)){
-				storage    = IC2Module.TileKineticGenerator_storage.getDouble(te);
-				production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te));
-				maxStorage = (long)IC2Module.TileKineticGenerator_maxStorage.getInt(te);				
-			}			
-			
-			else if (IC2Module.TileSemifluidGenerator.isInstance(te)){
-				storage    = IC2Module.TileSemifluidGenerator_storage.getDouble(te);
-				production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te));
-				maxStorage = (long)IC2Module.TileSemifluidGenerator_maxStorage.getShort(te);				
-			}			
-			
-			else if (IC2Module.TileStirlingGenerator.isInstance(te)){
-				storage    = IC2Module.TileStirlingGenerator_storage.getDouble(te);
-				production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te));
-				maxStorage = (long)IC2Module.TileStirlingGenerator_maxStorage.getShort(te);				
-			}			
-			
-			tag.setDouble ("storage",    storage);
-			tag.setLong   ("production", production);
-			tag.setLong   ("maxStorage", maxStorage);
-			
-		} catch (Exception e){
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}
+            if (ConfigHandler.instance().getConfig("ic2.outputeu")) {
+                currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production));
+            }
+
+        } catch (Exception e) {
+            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+
+        try {
+            double storage = -1;
+            long production = -1;
+            long maxStorage = -1;
+
+            if (IC2Module.TileBaseGenerator.isInstance(te)) {
+                storage = IC2Module.TileBaseGenerator_storage.getDouble(te);
+                production = (long) IC2Module.TileBaseGenerator_production.getInt(te);
+                maxStorage = (long) IC2Module.TileBaseGenerator_maxStorage.getShort(te);
+            }
+
+            else if (IC2Module.TileGeoGenerator.isInstance(te)) {
+                storage = IC2Module.TileGeoGenerator_storage.getDouble(te);
+                production = (long) IC2Module.TileGeoGenerator_production.getInt(te);
+                maxStorage = (long) IC2Module.TileGeoGenerator_maxStorage.getShort(te);
+            }
+
+            else if (IC2Module.TileKineticGenerator.isInstance(te)) {
+                storage = IC2Module.TileKineticGenerator_storage.getDouble(te);
+                production = MathHelper.floor_double_long(IC2Module.TileKineticGenerator_production.getDouble(te));
+                maxStorage = (long) IC2Module.TileKineticGenerator_maxStorage.getInt(te);
+            }
+
+            else if (IC2Module.TileSemifluidGenerator.isInstance(te)) {
+                storage = IC2Module.TileSemifluidGenerator_storage.getDouble(te);
+                production = MathHelper.floor_double_long(IC2Module.TileSemifluidGenerator_production.getDouble(te));
+                maxStorage = (long) IC2Module.TileSemifluidGenerator_maxStorage.getShort(te);
+            }
+
+            else if (IC2Module.TileStirlingGenerator.isInstance(te)) {
+                storage = IC2Module.TileStirlingGenerator_storage.getDouble(te);
+                production = MathHelper.floor_double_long(IC2Module.TileStirlingGenerator_production.getDouble(te));
+                maxStorage = (long) IC2Module.TileStirlingGenerator_maxStorage.getShort(te);
+            }
+
+            tag.setDouble("storage", storage);
+            tag.setLong("production", production);
+            tag.setLong("maxStorage", maxStorage);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return tag;
+    }
 
 }

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

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

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

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

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

@@ -1,6 +1,7 @@
 package mcp.mobius.waila.addons.ic2;
 
 import java.lang.reflect.Field;
+
 import org.apache.logging.log4j.Level;
 
 import mcp.mobius.waila.Waila;
@@ -8,84 +9,84 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class IC2Module {
 
-	public static Class TileBaseGenerator = null;
-	public static Field TileBaseGenerator_storage    = null;
-	public static Field TileBaseGenerator_maxStorage = null;
-	public static Field TileBaseGenerator_production = null;
-	
-	public static Class TileGeoGenerator = null;
-	public static Field TileGeoGenerator_storage    = null;
-	public static Field TileGeoGenerator_maxStorage = null;
-	public static Field TileGeoGenerator_production = null;
+    public static Class TileBaseGenerator = null;
+    public static Field TileBaseGenerator_storage = null;
+    public static Field TileBaseGenerator_maxStorage = null;
+    public static Field TileBaseGenerator_production = null;
 
-	public static Class TileKineticGenerator = null;
-	public static Field TileKineticGenerator_storage    = null;
-	public static Field TileKineticGenerator_maxStorage = null;
-	public static Field TileKineticGenerator_production = null;	
-	
-	public static Class TileSemifluidGenerator = null;
-	public static Field TileSemifluidGenerator_storage    = null;
-	public static Field TileSemifluidGenerator_maxStorage = null;
-	public static Field TileSemifluidGenerator_production = null;	
-	
-	public static Class TileStirlingGenerator = null;
-	public static Field TileStirlingGenerator_storage    = null;
-	public static Field TileStirlingGenerator_maxStorage = null;
-	public static Field TileStirlingGenerator_production = null;	
-	
-	public static void register(){
-		// XXX : We register the Energy interface first
-		try{
-			TileBaseGenerator            = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator");
-			TileBaseGenerator_storage    = TileBaseGenerator.getDeclaredField("storage");
-			TileBaseGenerator_maxStorage = TileBaseGenerator.getDeclaredField("maxStorage");
-			TileBaseGenerator_production = TileBaseGenerator.getDeclaredField("production");
+    public static Class TileGeoGenerator = null;
+    public static Field TileGeoGenerator_storage = null;
+    public static Field TileGeoGenerator_maxStorage = null;
+    public static Field TileGeoGenerator_production = null;
+
+    public static Class TileKineticGenerator = null;
+    public static Field TileKineticGenerator_storage = null;
+    public static Field TileKineticGenerator_maxStorage = null;
+    public static Field TileKineticGenerator_production = null;
+
+    public static Class TileSemifluidGenerator = null;
+    public static Field TileSemifluidGenerator_storage = null;
+    public static Field TileSemifluidGenerator_maxStorage = null;
+    public static Field TileSemifluidGenerator_production = null;
+
+    public static Class TileStirlingGenerator = null;
+    public static Field TileStirlingGenerator_storage = null;
+    public static Field TileStirlingGenerator_maxStorage = null;
+    public static Field TileStirlingGenerator_production = null;
+
+    public static void register() {
+        // XXX : We register the Energy interface first
+        try {
+            TileBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator");
+            TileBaseGenerator_storage = TileBaseGenerator.getDeclaredField("storage");
+            TileBaseGenerator_maxStorage = TileBaseGenerator.getDeclaredField("maxStorage");
+            TileBaseGenerator_production = TileBaseGenerator.getDeclaredField("production");
+
+            TileGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator");
+            TileGeoGenerator_storage = TileGeoGenerator.getDeclaredField("storage");
+            TileGeoGenerator_maxStorage = TileGeoGenerator.getDeclaredField("maxStorage");
+            TileGeoGenerator_production = TileGeoGenerator.getDeclaredField("production");
+
+            TileKineticGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityKineticGenerator");
+            TileKineticGenerator_storage = TileKineticGenerator.getDeclaredField("EUstorage");
+            TileKineticGenerator_maxStorage = TileKineticGenerator.getDeclaredField("maxEUStorage");
+            TileKineticGenerator_production = TileKineticGenerator.getDeclaredField("production");
+            TileKineticGenerator_storage.setAccessible(true);
+            TileKineticGenerator_maxStorage.setAccessible(true);
+            TileKineticGenerator_production.setAccessible(true);
+
+            TileSemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator");
+            TileSemifluidGenerator_storage = TileSemifluidGenerator.getDeclaredField("storage");
+            TileSemifluidGenerator_maxStorage = TileSemifluidGenerator.getDeclaredField("maxStorage");
+            TileSemifluidGenerator_production = TileSemifluidGenerator.getDeclaredField("production");
+            TileSemifluidGenerator_storage.setAccessible(true);
+            TileSemifluidGenerator_maxStorage.setAccessible(true);
+            TileSemifluidGenerator_production.setAccessible(true);
+
+            TileStirlingGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityStirlingGenerator");
+            TileStirlingGenerator_storage = TileStirlingGenerator.getDeclaredField("EUstorage");
+            TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage");
+            TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production");
+
+            // ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator);
+
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileBaseGenerator);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileGeoGenerator);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileKineticGenerator);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator);
+
+            ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage");
+            ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu");
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e);
+        }
+    }
 
-			TileGeoGenerator            = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator");
-			TileGeoGenerator_storage    = TileGeoGenerator.getDeclaredField("storage");
-			TileGeoGenerator_maxStorage = TileGeoGenerator.getDeclaredField("maxStorage");
-			TileGeoGenerator_production = TileGeoGenerator.getDeclaredField("production");			
-			
-			TileKineticGenerator            = Class.forName("ic2.core.block.generator.tileentity.TileEntityKineticGenerator");
-			TileKineticGenerator_storage    = TileKineticGenerator.getDeclaredField("EUstorage");
-			TileKineticGenerator_maxStorage = TileKineticGenerator.getDeclaredField("maxEUStorage");
-			TileKineticGenerator_production = TileKineticGenerator.getDeclaredField("production");		
-			TileKineticGenerator_storage.setAccessible(true);
-			TileKineticGenerator_maxStorage.setAccessible(true);
-			TileKineticGenerator_production.setAccessible(true);
-			
-			TileSemifluidGenerator            = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator");
-			TileSemifluidGenerator_storage    = TileSemifluidGenerator.getDeclaredField("storage");
-			TileSemifluidGenerator_maxStorage = TileSemifluidGenerator.getDeclaredField("maxStorage");
-			TileSemifluidGenerator_production = TileSemifluidGenerator.getDeclaredField("production");
-			TileSemifluidGenerator_storage.setAccessible(true);
-			TileSemifluidGenerator_maxStorage.setAccessible(true);
-			TileSemifluidGenerator_production.setAccessible(true);
-			
-			TileStirlingGenerator            = Class.forName("ic2.core.block.generator.tileentity.TileEntityStirlingGenerator");
-			TileStirlingGenerator_storage    = TileStirlingGenerator.getDeclaredField("EUstorage");
-			TileStirlingGenerator_maxStorage = TileStirlingGenerator.getDeclaredField("maxEUStorage");
-			TileStirlingGenerator_production = TileStirlingGenerator.getDeclaredField("production");			
-			
-			//ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileBaseGenerator);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileGeoGenerator);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileKineticGenerator);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileSemifluidGenerator);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEGenerator(), TileStirlingGenerator);
-			
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileBaseGenerator);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileGeoGenerator);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileKineticGenerator);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileSemifluidGenerator);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTEGenerator(), TileStirlingGenerator);
-			
-			ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage");
-			ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu");			
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e);
-		}		
-	}
-	
 }

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

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

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

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

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

@@ -2,52 +2,56 @@ package mcp.mobius.waila.addons.magicalcrops;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerMagicalCrops implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("general.showcrop")) return currenttip;
-		
-		int growthStage = accessor.getMetadata();
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("general.showcrop")) return currenttip;
 
-		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;
-	}
+        int growthStage = accessor.getMetadata();
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -6,25 +6,25 @@ 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.WARN, "[MagicalCrops] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(),  BlockMagicalCrops);
-	}
+    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.WARN, "[MagicalCrops] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(), BlockMagicalCrops);
+    }
 }

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

@@ -11,6 +11,7 @@ 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;
@@ -18,63 +19,65 @@ import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerTank implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		if (!config.getConfig("openblocks.fluidamount")) return currenttip;		
-	
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		FluidStack  fluid = tanks[0].fluid; 
-		String name       = currenttip.get(0);
-		
-		try{
-			name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-		} catch (NullPointerException f){
-			name += " " + LangUtil.translateG("hud.msg.empty");
-		}			
-		
-		currenttip.set(0, name);		
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("openblocks.fluidamount")) return currenttip;
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("openblocks.fluidamount")) return currenttip;
-		
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		if(tanks[0].fluid != null)
-			currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity));
-		else
-			currenttip.add(String.format("0 / %d mB", tanks[0].capacity));
-		
-		return currenttip;
-	}
+        IFluidHandler handler = (IFluidHandler) accessor.getTileEntity();
+        if (handler == null) return currenttip;
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+        if (tanks.length != 1) return currenttip;
+
+        FluidStack fluid = tanks[0].fluid;
+        String name = currenttip.get(0);
+
+        try {
+            name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+        } catch (NullPointerException f) {
+            name += " " + LangUtil.translateG("hud.msg.empty");
+        }
+
+        currenttip.set(0, name);
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("openblocks.fluidamount")) return currenttip;
+
+        IFluidHandler handler = (IFluidHandler) accessor.getTileEntity();
+        if (handler == null) return currenttip;
+
+        FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
+        if (tanks.length != 1) return currenttip;
+
+        if (tanks[0].fluid != null)
+            currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity));
+        else currenttip.add(String.format("0 / %d mB", tanks[0].capacity));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -6,29 +6,29 @@ import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class OpenBlocksModule {
-	
-	public static Class ModOpenBlocks  = null;
-	public static Class TileEntityTank = null;	
-	
-	public static void register(){
-		try{
-			Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks");
-			Waila.log.log(Level.INFO, "OpenBlocks mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
-			return;
-		}			
-		
-		try{
-			TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank);
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank);		
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileEntityTank);
-	}
+
+    public static Class ModOpenBlocks = null;
+    public static Class TileEntityTank = null;
+
+    public static void register() {
+        try {
+            Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks");
+            Waila.log.log(Level.INFO, "OpenBlocks mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found.");
+            return;
+        }
+
+        try {
+            TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank);
+        ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileEntityTank);
+    }
 }

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

@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.projectred;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaFMPAccessor;
 import mcp.mobius.waila.api.IWailaFMPDecorator;
@@ -10,201 +11,321 @@ import mcp.mobius.waila.utils.NBTUtil;
 
 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   */,
-		{1,1,2,1} /* NAND  */, {0,1,2,1} /* XOR   */, {0,1,2,1} /* XNOR   */, {1,2,2,2} /* Buf   */,
-		{3,4,2,5} /* Multi */, {1,0,2,0} /* Pulse */, {1,0,2,0} /* Repeat */, {1,2,2,2} /* Rand  */,
-		{2,1,2,1} /* Latch */, {2,1,2,1} /* Toggle*/, {6,1,2,2} /* Transp */, {2,0,0,0} /* Light */,
-		{2,0,0,0} /* Rain  */, {1,7,2,7} /* Timer */, {2,2,2,2} /* Sequen */, {2,9,2,8} /* Count */,
-		{1,2,2,6} /* State */, {6,1,2,1} /* Sync  */, {10,1,10,1} /* Bus    */, {11,12,11,12} /* Null  */,
-		{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, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
+    static byte[][] IOARRAY = { { 1, 1, 2, 1 } /* OR */, { 1, 1, 2, 1 } /* NOR */, { 1, 2, 2, 2 } /* NOT */,
+            { 1, 1, 2, 1 } /* AND */, { 1, 1, 2, 1 } /* NAND */, { 0, 1, 2, 1 } /* XOR */, { 0, 1, 2, 1 } /* XNOR */,
+            { 1, 2, 2, 2 } /* Buf */, { 3, 4, 2, 5 } /* Multi */, { 1, 0, 2, 0 } /* Pulse */,
+            { 1, 0, 2, 0 } /* Repeat */, { 1, 2, 2, 2 } /* Rand */, { 2, 1, 2, 1 } /* Latch */,
+            { 2, 1, 2, 1 } /* Toggle */, { 6, 1, 2, 2 } /* Transp */, { 2, 0, 0, 0 } /* Light */,
+            { 2, 0, 0, 0 } /* Rain */, { 1, 7, 2, 7 } /* Timer */, { 2, 2, 2, 2 } /* Sequen */,
+            { 2, 9, 2, 8 } /* Count */, { 1, 2, 2, 6 } /* State */, { 6, 1, 2, 1 } /* Sync */,
+            { 10, 1, 10, 1 } /* Bus */, { 11, 12, 11, 12 } /* Null */, { 11, 12, 11, 12 } /* Inver */,
+            { 11, 12, 11, 12 } /* Buff */, { 1, 9, 2, 8 } /* Cmp */, { 1, 12, 2, 12 } /* And */, };
 
-		if (!config.getConfig("pr.showio")) return;
-	
-		
-		int orient = 0;
-		int subID  = 0;
-		int shape  = 0;
-		
-		orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
-		subID  = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
-		shape  = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");		
-		
-		//orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4));
-		int hOrient = orient & 0x3;
-		ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2);
-		
-		//System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient));
-		
-		if (vOrient == ForgeDirection.EAST)
-			hOrient -= 1;
+    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, IWailaFMPAccessor accessor, IWailaConfigHandler config) {
+
+        if (!config.getConfig("pr.showio")) return;
+
+        int orient = 0;
+        int subID = 0;
+        int shape = 0;
+
+        orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient");
+        subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID");
+        shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape");
+
+        // orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4));
+        int hOrient = orient & 0x3;
+        ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2);
+
+        // System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient));
+
+        if (vOrient == ForgeDirection.EAST) hOrient -= 1;
+
+        if (vOrient == ForgeDirection.WEST) hOrient += 1;
+
+        if (hOrient == -1) hOrient = 3;
+
+        String[] IOStr = new String[4];
+        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];
+
+        for (int i = 0; i < 4; i++) {
+            int j = i + hOrient;
+            if (j >= 4) j -= 4;
+            IOStrRot[j] = IOStr[i];
+        }
+
+        switch (vOrient) {
+            case DOWN:
+                UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.2F, 1.4F, 90F, 0F, 0F); // Orient
+                                                                                                                        // 0
+                UIHelper.drawFloatingText(
+                        IOStrRot[1],
+                        accessor.getRenderingPosition(),
+                        -0.4F,
+                        0.2F,
+                        0.5F,
+                        90F,
+                        270F,
+                        0F); // Orient 1
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.5F,
+                        0.2F,
+                        -0.4F,
+                        90F,
+                        180F,
+                        0F); // Orient 2
+                UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.2F, 0.5F, 90F, 90F, 0F); // Orient
+                                                                                                                         // 3
+                break;
+            case EAST:
+                UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.8F, 0.5F, 1.4F, 0F, 90F, 90F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[1],
+                        accessor.getRenderingPosition(),
+                        0.8F,
+                        -0.4F,
+                        0.5F,
+                        0F,
+                        90F,
+                        180F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.8F,
+                        0.5F,
+                        -0.4F,
+                        0F,
+                        90F,
+                        270F);
+                UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.8F, 1.4F, 0.5F, 0F, 90F, 0F);
+                break;
+            case NORTH:
+                UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.2F, 0F, 180F, 0F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[1],
+                        accessor.getRenderingPosition(),
+                        1.4F,
+                        0.5F,
+                        0.2F,
+                        0F,
+                        180F,
+                        90F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.5F,
+                        -0.4F,
+                        0.2F,
+                        0F,
+                        180F,
+                        180F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[3],
+                        accessor.getRenderingPosition(),
+                        -0.4F,
+                        0.5F,
+                        0.2F,
+                        0F,
+                        180F,
+                        270F);
+                break;
+            case SOUTH:
+                UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.8F, 0F, 0F, 0F);
+                UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.8F, 0F, 0F, 90F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.5F,
+                        -0.4F,
+                        0.8F,
+                        0F,
+                        0F,
+                        180F);
+                UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.8F, 0F, 0F, 270F);
+                break;
+            case UP:
+                UIHelper.drawFloatingText(
+                        IOStrRot[0],
+                        accessor.getRenderingPosition(),
+                        0.5F,
+                        0.8F,
+                        1.4F,
+                        270F,
+                        180F,
+                        0F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[1],
+                        accessor.getRenderingPosition(),
+                        1.4F,
+                        0.8F,
+                        0.5F,
+                        270F,
+                        270F,
+                        0F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.5F,
+                        0.8F,
+                        -0.4F,
+                        270F,
+                        0F,
+                        0F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[3],
+                        accessor.getRenderingPosition(),
+                        -0.4F,
+                        0.8F,
+                        0.5F,
+                        270F,
+                        90F,
+                        0F);
+                break;
+            case WEST:
+                UIHelper.drawFloatingText(
+                        IOStrRot[0],
+                        accessor.getRenderingPosition(),
+                        0.2F,
+                        0.5F,
+                        1.4F,
+                        180F,
+                        90F,
+                        90F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[1],
+                        accessor.getRenderingPosition(),
+                        0.2F,
+                        1.4F,
+                        0.5F,
+                        180F,
+                        90F,
+                        180F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[2],
+                        accessor.getRenderingPosition(),
+                        0.2F,
+                        0.5F,
+                        -0.4F,
+                        180F,
+                        90F,
+                        270F);
+                UIHelper.drawFloatingText(
+                        IOStrRot[3],
+                        accessor.getRenderingPosition(),
+                        0.2F,
+                        -0.4F,
+                        0.5F,
+                        180F,
+                        90F,
+                        0F);
+                break;
+            default:
+                break;
+        }
 
-		if (vOrient == ForgeDirection.WEST)
-			hOrient += 1;		
-		
-		if (hOrient == -1)
-			hOrient = 3;
-		
-		String[] IOStr    = new String[4];
-		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];
-		
-		for (int i = 0; i < 4 ; i++){
-			int j = i + hOrient;
-			if (j >= 4) j -= 4;
-			IOStrRot[j] = IOStr[i];
-		}
-		
-		switch(vOrient){
-		case DOWN:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(),  0.5F, 0.2F,  1.4F,   90F,    0F, 0F);  // Orient 0
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(), -0.4F, 0.2F,  0.5F,   90F,  270F, 0F);  // Orient 1
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(),  0.5F, 0.2F, -0.4F,   90F,  180F, 0F);  // Orient 2
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(),  1.4F, 0.2F,  0.5F,   90F,   90F, 0F);  // Orient 3				
-			break;
-		case EAST:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(),  0.8F,   0.5F,  1.4F, 0F, 90F,   90F);
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(),  0.8F,  -0.4F,  0.5F, 0F, 90F,  180F);
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(),  0.8F,   0.5F, -0.4F, 0F, 90F,  270F);
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(),  0.8F,   1.4F,  0.5F, 0F, 90F,    0F);			
-			break;
-		case NORTH:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(),  0.5F,  1.4F, 0.2F, 0F, 180F,   0F);
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(),  1.4F,  0.5F, 0.2F, 0F, 180F,  90F);
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(),  0.5F, -0.4F, 0.2F, 0F, 180F, 180F);
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(), -0.4F,  0.5F, 0.2F, 0F, 180F, 270F);			
-			break;
-		case SOUTH:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(),  0.5F,  1.4F, 0.8F, 0F, 0F,   0F);
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(), -0.4F,  0.5F, 0.8F, 0F, 0F,  90F);
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(),  0.5F, -0.4F, 0.8F, 0F, 0F, 180F);
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(),  1.4F,  0.5F, 0.8F, 0F, 0F, 270F);			
-			break;
-		case UP:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(),  0.5F, 0.8F,  1.4F, 270F,  180F, 0F);
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(),  1.4F, 0.8F,  0.5F, 270F,  270F, 0F);
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(),  0.5F, 0.8F, -0.4F, 270F,  0F,   0F);
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(), -0.4F, 0.8F,  0.5F, 270F,  90F,  0F);			
-			break;
-		case WEST:
-			UIHelper.drawFloatingText(IOStrRot[0],  accessor.getRenderingPosition(), 0.2F,  0.5F,  1.4F, 180F, 90F,  90F);
-			UIHelper.drawFloatingText(IOStrRot[1],  accessor.getRenderingPosition(), 0.2F,  1.4F,  0.5F, 180F, 90F, 180F);
-			UIHelper.drawFloatingText(IOStrRot[2],  accessor.getRenderingPosition(), 0.2F,  0.5F, -0.4F, 180F, 90F, 270F);
-			UIHelper.drawFloatingText(IOStrRot[3],  accessor.getRenderingPosition(), 0.2F, -0.4F,  0.5F, 180F, 90F,   0F);			
-			break;
-		default:
-			break;
-		}
-		
         double x = accessor.getRenderingPosition().xCoord;
         double y = accessor.getRenderingPosition().yCoord;
         double z = accessor.getRenderingPosition().zCoord;
-		
-		switch(vOrient){
-		case DOWN:
-	        UIHelper.drawRectangle(x - 0.1, y + 0.1, z,        x,       y + 0.1, z + 0.35, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 0.65, x,       y + 0.1, z + 1.0,  255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.0, y + 0.1, z,        x + 1.1, y + 0.1, z + 0.35, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.0, y + 0.1, z + 0.65, x + 1.1, y + 0.1, z + 1.0,  255, 255, 255, 150 );	        
 
-	        UIHelper.drawRectangle(x - 0.1,  y + 0.1, z - 0.1, x + 0.35,  y + 0.1, z + 0.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 0.65, y + 0.1, z - 0.1, x + 1.1,   y + 0.1, z + 0.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x - 0.1,  y + 0.1, z + 1.0, x + 0.35,  y + 0.1, z + 1.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 0.65, y + 0.1, z + 1.0, x + 1.1,   y + 0.1, z + 1.1, 255, 255, 255, 150 );	        
-			break;
-		case EAST:
-			UIHelper.drawRectangleEW(x + 0.9, y,        z - 0.1, x + 0.9, y + 0.35, z, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z - 0.1, x + 0.9, y + 1.0,  z, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.9, y,        z + 1.0, x + 0.9, y + 0.35, z + 1.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z + 1.0, x + 0.9, y + 1.0,  z + 1.1, 255, 255, 255, 150 );			
+        switch (vOrient) {
+            case DOWN:
+                UIHelper.drawRectangle(x - 0.1, y + 0.1, z, x, y + 0.1, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 0.65, x, y + 0.1, z + 1.0, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.0, y + 0.1, z, x + 1.1, y + 0.1, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.0, y + 0.1, z + 0.65, x + 1.1, y + 0.1, z + 1.0, 255, 255, 255, 150);
 
-			UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z - 0.1,  x + 0.9, y, z + 0.35, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z + 0.65, x + 0.9, y, z + 1.1, 255, 255, 255, 150 );			
-			UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z - 0.1,  x + 0.9, y + 1.1, z + 0.35, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z + 0.65, x + 0.9, y + 1.1, z + 1.1, 255, 255, 255, 150 );			
-			break;
-		case NORTH:
-			UIHelper.drawRectangle(x - 0.1, y,        z + 0.1, x,       y + 0.35, z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x - 0.1, y + 0.65, z + 0.1, x,       y + 1.0,  z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.0, y,        z + 0.1, x + 1.1, y + 0.35, z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.0, y + 0.65, z + 0.1, x + 1.1, y + 1.0,  z + 0.1, 255, 255, 255, 150 );			
+                UIHelper.drawRectangle(x - 0.1, y + 0.1, z - 0.1, x + 0.35, y + 0.1, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.65, y + 0.1, z - 0.1, x + 1.1, y + 0.1, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 1.0, x + 0.35, y + 0.1, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.65, y + 0.1, z + 1.0, x + 1.1, y + 0.1, z + 1.1, 255, 255, 255, 150);
+                break;
+            case EAST:
+                UIHelper.drawRectangleEW(x + 0.9, y, z - 0.1, x + 0.9, y + 0.35, z, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z - 0.1, x + 0.9, y + 1.0, z, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y, z + 1.0, x + 0.9, y + 0.35, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z + 1.0, x + 0.9, y + 1.0, z + 1.1, 255, 255, 255, 150);
 
-			UIHelper.drawRectangle(x - 0.1,  y - 0.1, z + 0.1, x + 0.35, y,       z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 0.65, y - 0.1, z + 0.1, x + 1.1,  y,       z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x - 0.1,  y + 1.0, z + 0.1, x + 0.35, y + 1.1, z + 0.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 0.65, y + 1.0, z + 0.1, x + 1.1,  y + 1.1, z + 0.1, 255, 255, 255, 150 );
-			break;
-		case SOUTH:
-			UIHelper.drawRectangle(x, y,              z + 0.9, x - 0.1, y + 0.35, z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x, y + 0.65,       z + 0.9, x - 0.1, y + 1.0,  z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.1, y,        z + 0.9, x + 1.0, y + 0.35, z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.1, y + 0.65, z + 0.9, x + 1.0, y + 1.0,  z + 0.9, 255, 255, 255, 150 );			
+                UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z - 0.1, x + 0.9, y, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z + 0.65, x + 0.9, y, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z - 0.1, x + 0.9, y + 1.1, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z + 0.65, x + 0.9, y + 1.1, z + 1.1, 255, 255, 255, 150);
+                break;
+            case NORTH:
+                UIHelper.drawRectangle(x - 0.1, y, z + 0.1, x, y + 0.35, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x - 0.1, y + 0.65, z + 0.1, x, y + 1.0, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.0, y, z + 0.1, x + 1.1, y + 0.35, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.0, y + 0.65, z + 0.1, x + 1.1, y + 1.0, z + 0.1, 255, 255, 255, 150);
 
-			UIHelper.drawRectangle(x + 0.35,  y - 0.1, z + 0.9, x - 0.1,   y,       z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.10,  y - 0.1, z + 0.9, x + 0.65,  y,       z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 0.35,  y + 1.0, z + 0.9, x - 0.1,   y + 1.1, z + 0.9, 255, 255, 255, 150 );
-			UIHelper.drawRectangle(x + 1.1,   y + 1.0, z + 0.9, x + 0.65,  y + 1.1, z + 0.9, 255, 255, 255, 150 );			
-			break;
-		case UP:
-	        UIHelper.drawRectangle(x, y + 0.9, z,        x - 0.1,       y + 0.9, z + 0.35, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x, y + 0.9, z + 0.65, x - 0.1,       y + 0.9, z + 1.0,  255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.1, y + 0.9, z,        x + 1.0, y + 0.9, z + 0.35, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 0.65, x + 1.0, y + 0.9, z + 1.0,  255, 255, 255, 150 );	        
+                UIHelper.drawRectangle(x - 0.1, y - 0.1, z + 0.1, x + 0.35, y, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.65, y - 0.1, z + 0.1, x + 1.1, y, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x - 0.1, y + 1.0, z + 0.1, x + 0.35, y + 1.1, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.65, y + 1.0, z + 0.1, x + 1.1, y + 1.1, z + 0.1, 255, 255, 255, 150);
+                break;
+            case SOUTH:
+                UIHelper.drawRectangle(x, y, z + 0.9, x - 0.1, y + 0.35, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x, y + 0.65, z + 0.9, x - 0.1, y + 1.0, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y, z + 0.9, x + 1.0, y + 0.35, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 0.65, z + 0.9, x + 1.0, y + 1.0, z + 0.9, 255, 255, 255, 150);
 
-	        UIHelper.drawRectangle(x + 0.35,  y + 0.9, z - 0.1, x - 0.1,  y + 0.9, z + 0.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.1,   y + 0.9, z - 0.1, x + 0.65, y + 0.9, z + 0.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x +0.35,   y + 0.9, z + 1.0, x - 0.1,  y + 0.9, z + 1.1, 255, 255, 255, 150 );
-	        UIHelper.drawRectangle(x + 1.1,   y + 0.9, z + 1.0, x + 0.65, y + 0.9, z + 1.1, 255, 255, 255, 150 );				
-			
-			break;
-		case WEST:
-			UIHelper.drawRectangleEW(x + 0.1, y+ 0.35,  z - 0.1, x + 0.1, y , z, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.1, y + 1.0,  z - 0.1, x + 0.1, y + 0.65,  z, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z + 1.0, x + 0.1, y, z + 1.1, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.1, y + 1.0,  z + 1.0, x + 0.1, y + 0.65,  z + 1.1, 255, 255, 255, 150 );			
+                UIHelper.drawRectangle(x + 0.35, y - 0.1, z + 0.9, x - 0.1, y, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.10, y - 0.1, z + 0.9, x + 0.65, y, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.35, y + 1.0, z + 0.9, x - 0.1, y + 1.1, z + 0.9, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 1.0, z + 0.9, x + 0.65, y + 1.1, z + 0.9, 255, 255, 255, 150);
+                break;
+            case UP:
+                UIHelper.drawRectangle(x, y + 0.9, z, x - 0.1, y + 0.9, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x, y + 0.9, z + 0.65, x - 0.1, y + 0.9, z + 1.0, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 0.9, z, x + 1.0, y + 0.9, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 0.65, x + 1.0, y + 0.9, z + 1.0, 255, 255, 255, 150);
 
-			UIHelper.drawRectangleEW(x + 0.1, y, z - 0.1,  x + 0.1, y - 0.1, z + 0.35, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.1, y, z + 0.65, x + 0.1, y - 0.1, z + 1.1, 255, 255, 255, 150 );			
-			UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z - 0.1,  x + 0.1, y + 1.0, z + 0.35, 255, 255, 255, 150 );
-			UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z + 0.65, x + 0.1, y + 1.0, z + 1.1, 255, 255, 255, 150 );			
-			break;
-		default:
-			break;
-		
-		}
-	}
+                UIHelper.drawRectangle(x + 0.35, y + 0.9, z - 0.1, x - 0.1, y + 0.9, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 0.9, z - 0.1, x + 0.65, y + 0.9, z + 0.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 0.35, y + 0.9, z + 1.0, x - 0.1, y + 0.9, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 1.0, x + 0.65, y + 0.9, z + 1.1, 255, 255, 255, 150);
+
+                break;
+            case WEST:
+                UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z - 0.1, x + 0.1, y, z, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z - 0.1, x + 0.1, y + 0.65, z, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z + 1.0, x + 0.1, y, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z + 1.0, x + 0.1, y + 0.65, z + 1.1, 255, 255, 255, 150);
+
+                UIHelper.drawRectangleEW(x + 0.1, y, z - 0.1, x + 0.1, y - 0.1, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y, z + 0.65, x + 0.1, y - 0.1, z + 1.1, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z - 0.1, x + 0.1, y + 1.0, z + 0.35, 255, 255, 255, 150);
+                UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z + 0.65, x + 0.1, y + 1.0, z + 1.1, 255, 255, 255, 150);
+                break;
+            default:
+                break;
+
+        }
+    }
 
 }

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

@@ -1,82 +1,99 @@
 package mcp.mobius.waila.addons.projectred;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaFMPAccessor;
 import mcp.mobius.waila.api.IWailaFMPProvider;
 import mcp.mobius.waila.utils.NBTUtil;
-import 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> 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> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("pr.showdata")) return currenttip;
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,	IWailaConfigHandler config) {
-		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

@@ -7,35 +7,35 @@ 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);
-	}	
-	
+    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

@@ -2,7 +2,6 @@ package mcp.mobius.waila.addons.railcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,75 +9,80 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerTank implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("railcraft.fluidamount")) return currenttip;	
-		try {
-			IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
-			if (tank == null) return currenttip;
-			
-			FluidStack fluid = tank.getFluid();
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("railcraft.fluidamount")) return currenttip;
+        try {
+            IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank
+                    .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
+            if (tank == null) return currenttip;
 
-			String name = currenttip.get(0);
-			
-			try{
-				name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-			} catch (NullPointerException f){
-				name += " " + LangUtil.translateG("hud.msg.empty");
-			}			
-			
-			currenttip.set(0, name);			
-			
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 		
-		
-		return currenttip;
-	}
+            FluidStack fluid = tank.getFluid();
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("railcraft.fluidamount")) return currenttip;	
-		
-		try {
-			IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
-			if (tank == null) return currenttip;			
-			
-			FluidStack fluid = tank.getFluid();
-			if (fluid != null)
-				currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity));
-			else
-				currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity));
-			
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 		
-		
-		return currenttip;
-	}
+            String name = currenttip.get(0);
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+            try {
+                name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+            } catch (NullPointerException f) {
+                name += " " + LangUtil.translateG("hud.msg.empty");
+            }
+
+            currenttip.set(0, name);
+
+        } catch (Exception e) {
+            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("railcraft.fluidamount")) return currenttip;
+
+        try {
+            IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank
+                    .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity()));
+            if (tank == null) return currenttip;
+
+            FluidStack fluid = tank.getFluid();
+            if (fluid != null) currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity));
+            else currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity));
+
+        } catch (Exception e) {
+            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -8,37 +8,38 @@ import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class RailcraftModule {
-	public static Class  TileTankBase = null;	
-	public static Class  ITankTile = null;
-	public static Method ITankTile_getTank = null;
-	//public static Class  StandardTank = null;	
-	
-	public static void register(){
-		try{
-			Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft");
-			Waila.log.log(Level.INFO, "Railcraft mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
-			return;
-		}			
-		
-		try{
-			TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase");
-			ITankTile    = Class.forName("mods.railcraft.common.blocks.machine.ITankTile");
-			ITankTile_getTank = ITankTile.getMethod("getTank");
-			//StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(),  TileTankBase);
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(),  TileTankBase);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTankBase);
-	}
+
+    public static Class TileTankBase = null;
+    public static Class ITankTile = null;
+    public static Method ITankTile_getTank = null;
+    // public static Class StandardTank = null;
+
+    public static void register() {
+        try {
+            Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft");
+            Waila.log.log(Level.INFO, "Railcraft mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found.");
+            return;
+        }
+
+        try {
+            TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase");
+            ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile");
+            ITankTile_getTank = ITankTile.getMethod("getTank");
+            // StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e);
+            return;
+        } catch (NoSuchMethodException e) {
+            Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase);
+        ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTankBase);
+    }
 }

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

@@ -7,94 +7,62 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDTileEntityCamo implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
-		if (!config.getConfig("secretrooms.hide")) return null;
-		
-		if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){
-			return this.getTrapDoorBlock(accessor);
+    @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;
+    }
 
-		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> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaHead(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;
+    }
 
-	@Override
-	public List<String> getWailaBody(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;
+    }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	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;
-	}
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,40 +2,27 @@ package mcp.mobius.waila.addons.secretrooms;
 
 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;
-		}			
+    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);
+         */
+    }
 
-		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

@@ -1,5 +1,9 @@
 package mcp.mobius.waila.addons.statues;
 
+import static mcp.mobius.waila.api.SpecialChars.BLUE;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -7,72 +11,72 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
 
 public class HUDHandlerStatues implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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);
+            }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+            if (skinName.equals("")) {
+                currenttip.clear();
+                currenttip.add(WHITE + "Statue : Unknown");
+            } else {
+                currenttip.clear();
+                currenttip.add(WHITE + "Statue : " + skinName);
+            }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		currenttip.add(BLUE + ITALIC + "Statues" );
-		return currenttip;
-	}
+        } 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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -9,32 +9,32 @@ 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.WARN, "[Statues] Class not found. " + e);
-			return;
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[Statues] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue);
-		ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue);		
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStatues(), TileEntityStatue);
-	}	
-	
+    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.WARN, "[Statues] Class not found. " + e);
+            return;
+        } catch (NoSuchFieldException e) {
+            Waila.log.log(Level.WARN, "[Statues] Class not found. " + e);
+            return;
+        }
+
+        ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue);
+        ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue);
+        ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerStatues(), TileEntityStatue);
+    }
+
 }

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

@@ -1,5 +1,11 @@
 package mcp.mobius.waila.addons.stevescarts;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,97 +14,105 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-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;
-	}
+    private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." };
+    private static String sides[] = { "Yellow", "Blue", "Green", "Red" };
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@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();
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-		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());
+    @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 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;
-	}
+        NBTTagCompound tag = accessor.getNBTData();
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (config.getConfig("stevescarts.colorblind")) {
+            int side = accessor.getSide().ordinal() - 2;
+            if (side >= 0) currenttip.add("Looking at side " + WHITE + sides[side]);
+        }
 
-    public int getAmount(int id)
-    {
-        switch (id)
-        {
+        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;
 
@@ -134,26 +148,22 @@ public class HUDCargoManager implements IWailaDataProvider {
         }
     }
 
-    //0 - MAX
-    //1 - Items
-    //2 - Stacks
-    public String getAmountType(int id)
-    {
-    	if (id <= 6)
-        {
+    // 0 - MAX
+    // 1 - Items
+    // 2 - Stacks
+    public String getAmountType(int id) {
+        if (id <= 6) {
             return "I";
-        }
-        else
-        {
+        } else {
             return "S";
         }
-    }	
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}    
-    
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
+
 }

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

@@ -7,80 +7,59 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDCartAssembler implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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> 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;
-	}
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 }

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

@@ -1,5 +1,11 @@
 package mcp.mobius.waila.addons.stevescarts;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -7,129 +13,135 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import 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;
-	}
+    private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." };
+    private static String sides[] = { "Yellow", "Blue", "Green", "Red" };
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@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();
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-		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> 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;
+        }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        NBTTagCompound tag = accessor.getNBTData();
 
-	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;
-		}
-	}	
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
+        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;
+        }
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 }

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

@@ -1,5 +1,11 @@
 package mcp.mobius.waila.addons.stevescarts;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.GRAY;
+import static mcp.mobius.waila.api.SpecialChars.ITALIC;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.List;
 
 import net.minecraft.entity.Entity;
@@ -8,86 +14,103 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaEntityAccessor;
 import mcp.mobius.waila.api.IWailaEntityProvider;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import static mcp.mobius.waila.api.SpecialChars.*;
 
 public class HUDMinecartModular implements IWailaEntityProvider {
 
-	@Override
-	public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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");
+        }
 
-	@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;
-	}
+        return currenttip;
+    }
 
-	@Override
-	public List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) {
-		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;
+        }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
+        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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
 }

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

@@ -5,72 +5,50 @@ import java.lang.reflect.Method;
 
 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 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);
+         */
+    }
 
-	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

@@ -1,9 +1,13 @@
 package mcp.mobius.waila.addons.thaumcraft;
 
+import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
+import static mcp.mobius.waila.api.SpecialChars.TAB;
+import static mcp.mobius.waila.api.SpecialChars.WHITE;
+
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -11,106 +15,113 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import static mcp.mobius.waila.api.SpecialChars.*;
 
-public class HUDHandlerIAspectContainer implements IWailaDataProvider{
+public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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;
-		
-		NBTTagCompound tag = accessor.getNBTData();
-		if (tag.hasKey("Aspects")){
-			NBTTagList taglist = tag.getTagList("Aspects", 10);
-			
-			List<String> unknownAspects = new ArrayList<String>();
-			
-			for (int i = 0; i < taglist.tagCount(); i++){
-				NBTTagCompound subtag = taglist.getCompoundTagAt(i);
-				
-				String aspect = Character.toUpperCase(subtag.getString("key").charAt(0)) + subtag.getString("key").substring(1); 
-				String amount = String.valueOf(subtag.getInteger("value"));
-				
-				if (!aspect.equals("???"))
-					currenttip.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s",  aspect, amount));
-				else
-					unknownAspects.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s",  aspect, amount));
-			}
-			
-			currenttip.addAll(unknownAspects);
-		}		
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (!config.getConfig("thaumcraft.aspects")) return currenttip;
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag,	World world, int x, int y, int z) {
-	
-		try{
-			tag.setTag("Aspects", new NBTTagList());
-			NBTTagList aspects = tag.getTagList("Aspects", 10);			
-			
-			ItemStack headSlot = player.inventory.armorInventory[3];
-			if (headSlot == null) return tag;
-			boolean hasReveal =  ThaumcraftModule.IGoggles.isInstance(headSlot.getItem());
-			if (!hasReveal) return tag;
-			
-			HashMap knownAspects        = (HashMap)       ThaumcraftModule.CommonProxy_getKnownAspects.invoke(ThaumcraftModule.Thaumcraft_proxy.get(null));
-			LinkedHashMap playerAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(knownAspects.get(player.getCommandSenderName()));
-			LinkedHashMap tileAspects   = new LinkedHashMap();
-			
-			if (ThaumcraftModule.IAspectContainer.isInstance(te)){
-				tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.IAspectContainer_getAspects.invoke(te));
-			} else if (ThaumcraftModule.TileAlchemyFurnace.isInstance(te)){
-				tileAspects = (LinkedHashMap) ThaumcraftModule.AspectList_aspects.get(ThaumcraftModule.TileAlchemyFurnace_aspects.get(te));
-			}
-			
-			for (Object o : tileAspects.keySet()){
-				if ((Integer) tileAspects.get(o) > 0){
-					if (playerAspects.containsKey(o)){
-						NBTTagCompound cmptag = new NBTTagCompound();
-						cmptag.setString ("key",   (String)ThaumcraftModule.Aspect_tag.get(o));
-						cmptag.setInteger("value", (Integer) tileAspects.get(o));
-						aspects.appendTag(cmptag);
-					} else {
-						NBTTagCompound cmptag = new NBTTagCompound();
-						cmptag.setString ("key",   "???");
-						cmptag.setInteger("value", (Integer) tileAspects.get(o));
-						aspects.appendTag(cmptag);					
-					}
-				}
-			}
-				
-				//for (int i = 0; i < aspects.tagCount(); i++){
-				//	System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"), aspects.getCompoundTagAt(i).getString("value"));
-				//}
-		
-			
-			
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		
-		return tag;
-	}
+        NBTTagCompound tag = accessor.getNBTData();
+        if (tag.hasKey("Aspects")) {
+            NBTTagList taglist = tag.getTagList("Aspects", 10);
+
+            List<String> unknownAspects = new ArrayList<String>();
+
+            for (int i = 0; i < taglist.tagCount(); i++) {
+                NBTTagCompound subtag = taglist.getCompoundTagAt(i);
+
+                String aspect = subtag.getString("key");
+                String amount = String.valueOf(subtag.getInteger("value"));
+
+                if (!aspect.equals("???"))
+                    currenttip.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount));
+                else unknownAspects.add(String.format("%s" + TAB + ALIGNRIGHT + WHITE + "%s", aspect, amount));
+            }
+
+            currenttip.addAll(unknownAspects);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+
+        try {
+            tag.setTag("Aspects", new NBTTagList());
+            NBTTagList aspects = tag.getTagList("Aspects", 10);
+
+            ItemStack headSlot = player.inventory.armorInventory[3];
+            if (headSlot == null) return tag;
+            boolean hasReveal = ThaumcraftModule.IGoggles.isInstance(headSlot.getItem());
+            if (!hasReveal) return tag;
+
+            Map<String, ?> knownAspects = (Map<String, ?>) ThaumcraftModule.CommonProxy_getKnownAspects
+                    .invoke(ThaumcraftModule.Thaumcraft_proxy.get(null));
+            Map<?, Integer> playerAspects = (Map<?, Integer>) ThaumcraftModule.AspectList_aspects
+                    .get(knownAspects.get(player.getCommandSenderName()));
+            Map<?, Integer> tileAspects = new LinkedHashMap<>();
+
+            if (ThaumcraftModule.IAspectContainer.isInstance(te)) {
+                tileAspects = (Map<?, Integer>) ThaumcraftModule.AspectList_aspects
+                        .get(ThaumcraftModule.IAspectContainer_getAspects.invoke(te));
+            } else if (ThaumcraftModule.TileAlchemyFurnace.isInstance(te)) {
+                tileAspects = (Map<?, Integer>) ThaumcraftModule.AspectList_aspects
+                        .get(ThaumcraftModule.TileAlchemyFurnace_aspects.get(te));
+            }
+
+            for (Object o : tileAspects.keySet()) {
+                if ((Integer) tileAspects.get(o) > 0) {
+                    if (playerAspects.containsKey(o)) {
+                        NBTTagCompound cmptag = new NBTTagCompound();
+                        cmptag.setString("key", (String) ThaumcraftModule.Aspect_getName.invoke(o));
+                        cmptag.setInteger("value", (Integer) tileAspects.get(o));
+                        aspects.appendTag(cmptag);
+                    } else {
+                        NBTTagCompound cmptag = new NBTTagCompound();
+                        cmptag.setString("key", "???");
+                        cmptag.setInteger("value", (Integer) tileAspects.get(o));
+                        aspects.appendTag(cmptag);
+                    }
+                }
+            }
+
+            // for (int i = 0; i < aspects.tagCount(); i++){
+            // System.out.printf("%s : %s\n", aspects.getCompoundTagAt(i).getString("key"),
+            // aspects.getCompoundTagAt(i).getString("value"));
+            // }
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return tag;
+    }
 
 }

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

@@ -11,71 +11,70 @@ import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class ThaumcraftModule {
-	
-	public static Class  Thaumcraft = null;
-	public static Field  Thaumcraft_proxy = null;
-	
-	public static Class  IAspectContainer = null;
-	public static Method IAspectContainer_getAspects = null;
-	
-	public static Class  AspectList = null;
-	public static Method AspectList_writeToNBT = null;
-	public static Field  AspectList_aspects = null;
 
-	public static Class TileAlchemyFurnace = null;
-	public static Field TileAlchemyFurnace_aspects = null;	
-	
-	public static Class  Aspect = null;
-	public static Field  Aspect_tag = null;		
-	
-	public static Class  CommonProxy = null;
-	public static Method CommonProxy_getKnownAspects = null;
+    public static Class<?> Thaumcraft = null;
+    public static Field Thaumcraft_proxy = null;
 
-	public static Class IGoggles = null;	
+    public static Class<?> IAspectContainer = null;
+    public static Method IAspectContainer_getAspects = null;
 
-	//public static Class TileAlchemyFurnace = null;
-	
-	
-	public static void register(){
-		try{
-			Thaumcraft                  = Class.forName("thaumcraft.common.Thaumcraft");
-			Thaumcraft_proxy            = Thaumcraft.getDeclaredField("proxy");
-			
-			IAspectContainer            = Class.forName("thaumcraft.api.aspects.IAspectContainer");
-			IAspectContainer_getAspects = IAspectContainer.getDeclaredMethod("getAspects");
-			
-			AspectList                  = Class.forName("thaumcraft.api.aspects.AspectList");
-			AspectList_writeToNBT       = AspectList.getDeclaredMethod("writeToNBT", NBTTagCompound.class);
-			AspectList_aspects          = AspectList.getDeclaredField("aspects");
+    public static Class<?> AspectList = null;
+    public static Method AspectList_writeToNBT = null;
+    public static Field AspectList_aspects = null;
 
-			TileAlchemyFurnace          = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
-			TileAlchemyFurnace_aspects  = TileAlchemyFurnace.getDeclaredField("aspects");
-			
-			Aspect                      = Class.forName("thaumcraft.api.aspects.Aspect");
-			Aspect_tag                  = Aspect.getDeclaredField("tag");
-			Aspect_tag.setAccessible(true);
-			
-			CommonProxy                 = Class.forName("thaumcraft.common.CommonProxy");
-			CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects");
+    public static Class<?> TileAlchemyFurnace = null;
+    public static Field TileAlchemyFurnace_aspects = null;
 
-			IGoggles           			= Class.forName("thaumcraft.api.IGoggles");			
+    public static Class<?> Aspect = null;
+    public static Field Aspect_tag = null;
+    public static Method Aspect_getName = null;
 
-			ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");		
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), IAspectContainer);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e);
-			return;
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e);
-			return;			
-		}		
-		
-		
-		
-	}
+    public static Class<?> CommonProxy = null;
+    public static Method CommonProxy_getKnownAspects = null;
+
+    public static Class<?> IGoggles = null;
+
+    // public static Class<?> TileAlchemyFurnace = null;
+
+    public static void register() {
+        try {
+            Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
+            Thaumcraft_proxy = Thaumcraft.getDeclaredField("proxy");
+
+            IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer");
+            IAspectContainer_getAspects = IAspectContainer.getDeclaredMethod("getAspects");
+
+            AspectList = Class.forName("thaumcraft.api.aspects.AspectList");
+            AspectList_writeToNBT = AspectList.getDeclaredMethod("writeToNBT", NBTTagCompound.class);
+            AspectList_aspects = AspectList.getDeclaredField("aspects");
+
+            TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace");
+            TileAlchemyFurnace_aspects = TileAlchemyFurnace.getDeclaredField("aspects");
+
+            Aspect = Class.forName("thaumcraft.api.aspects.Aspect");
+            Aspect_tag = Aspect.getDeclaredField("tag");
+            Aspect_tag.setAccessible(true);
+            Aspect_getName = Aspect.getDeclaredMethod("getName");
+
+            CommonProxy = Class.forName("thaumcraft.common.CommonProxy");
+            CommonProxy_getKnownAspects = CommonProxy.getDeclaredMethod("getKnownAspects");
+
+            IGoggles = Class.forName("thaumcraft.api.IGoggles");
+
+            ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
+
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e);
+            return;
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e);
+            return;
+        }
+
+    }
 
 }

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

@@ -1,71 +1,74 @@
-package mcp.mobius.waila.addons.thermaldynamics;
-
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.List;
-
-/**
- * Created by Lordmau5 on 28.02.2015.
- */
-public class HUDHandlerDuct implements IWailaDataProvider {
-
-    @Override
-    public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-        return null;
-    }
-
-    @Override
-    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-        if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip;
-
-        FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData());
-
-        String name = "";
-
-        try{
-            name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
-        } catch (NullPointerException f){
-            name += " " + LangUtil.translateG("hud.msg.empty");
-        }
-
-        currenttip.add(name);
-        return currenttip;
-    }
-
-    @Override
-    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-        if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip;
-
-        int amount = 0;
-
-        NBTTagCompound tag = accessor.getNBTData();
-        if (tag.hasKey("Amount"))
-            amount = accessor.getNBTInteger(tag, "Amount");
-
-        currenttip.add(String.format(" %d / 1000 mB", amount));
-
-        return currenttip;
-    }
-
-    @Override
-    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-        return currenttip;
-    }
-
-    @Override
-    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-        if (te != null)
-            te.writeToNBT(tag);
-        return tag;
-    }
-
-}
+package mcp.mobius.waila.addons.thermaldynamics;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidStack;
+
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+
+/**
+ * Created by Lordmau5 on 28.02.2015.
+ */
+public class HUDHandlerDuct implements IWailaDataProvider {
+
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
+
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip;
+
+        FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData());
+
+        String name = "";
+
+        try {
+            name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+        } catch (NullPointerException f) {
+            name += " " + LangUtil.translateG("hud.msg.empty");
+        }
+
+        currenttip.add(name);
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip;
+
+        int amount = 0;
+
+        NBTTagCompound tag = accessor.getNBTData();
+        if (tag.hasKey("Amount")) amount = accessor.getNBTInteger(tag, "Amount");
+
+        currenttip.add(String.format(" %d / 1000 mB", amount));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
+
+}

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

@@ -1,44 +1,39 @@
-package mcp.mobius.waila.addons.thermaldynamics;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import org.apache.logging.log4j.Level;
-
-public class ThermalDynamicsModule {
-
-    public static Class TileFluidDuct = null;
-
-    public static void register(){
-        // XXX : We register the Fluiduct
-        try{
-            TileFluidDuct              = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct");
-
-            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid");
-            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount");
-            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct);
-            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct);
-            ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDuct(), TileFluidDuct);
-
-        } catch (Exception e){
-            Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e);
-        }
-
-        // XXX : We register the IBlockInfo interface
-		/*
-		try{
-			IBlockInfo              = Class.forName("cofh.api.block.IBlockInfo");
-			IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class);
-			
-			
-			//ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e);
-		}			
-		*/
-    }
-
-
-}
+package mcp.mobius.waila.addons.thermaldynamics;
+
+import org.apache.logging.log4j.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class ThermalDynamicsModule {
+
+    public static Class TileFluidDuct = null;
+
+    public static void register() {
+        // XXX : We register the Fluiduct
+        try {
+            TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid");
+            ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount");
+            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDuct(), TileFluidDuct);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e);
+        }
+
+        // XXX : We register the IBlockInfo interface
+        /*
+         * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo =
+         * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class,
+         * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class);
+         * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+         * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo);
+         * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception
+         * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); }
+         */
+    }
+
+}

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

@@ -1,11 +1,8 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
-import cpw.mods.fml.common.registry.GameData;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.SpecialChars;
-import mcp.mobius.waila.cbcore.LangUtil;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -13,34 +10,44 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
+import cpw.mods.fml.common.registry.GameData;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.SpecialChars;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerCache implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) { return null; }
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return null;
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if(!config.getConfig("thermalexpansion.cache"))
-            return currenttip;
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("thermalexpansion.cache")) return currenttip;
         try {
             ItemStack storedItem = null;
-            if(accessor.getNBTData().hasKey("Item"))
+            if (accessor.getNBTData().hasKey("Item"))
                 storedItem = readItemStack(accessor.getNBTData().getCompoundTag("Item"));
 
             String name = currenttip.get(0);
             String color = "";
-            if(name.startsWith("\u00a7"))
-                color = name.substring(0, 2);
+            if (name.startsWith("\u00a7")) color = name.substring(0, 2);
 
-            if(storedItem != null) {
+            if (storedItem != null) {
                 String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem());
-                name += String.format(" < " + SpecialChars.getRenderString("waila.stack", "1", namex, "0", String.valueOf(storedItem.getItemDamage())) + color + " %s >", storedItem.getDisplayName());
-            }
-            else
-                name += " " + LangUtil.translateG("hud.msg.empty");
+                name += String.format(
+                        " < " + SpecialChars.getRenderString(
+                                "waila.stack",
+                                "1",
+                                namex,
+                                "0",
+                                String.valueOf(storedItem.getItemDamage())) + color + " %s >",
+                        storedItem.getDisplayName());
+            } else name += " " + LangUtil.translateG("hud.msg.empty");
 
             currenttip.set(0, name);
         } catch (Exception e) {
@@ -48,44 +55,39 @@ public class HUDHandlerCache implements IWailaDataProvider {
         }
 
         return currenttip;
-	}
+    }
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-        if (!config.getConfig("thermalexpansion.cache"))
-            return currenttip;
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("thermalexpansion.cache")) return currenttip;
 
         NBTTagCompound tag = accessor.getNBTData();
         ItemStack storedItem = null;
-        if(tag.hasKey("Item"))
-            storedItem = readItemStack(tag.getCompoundTag("Item"));
+        if (tag.hasKey("Item")) storedItem = readItemStack(tag.getCompoundTag("Item"));
 
         int stored = 0;
         int maxStored = 0;
-        if(tag.hasKey("Stored"))
-            stored = tag.getInteger("Stored");
-        if(tag.hasKey("MaxStored"))
-            maxStored = tag.getInteger("MaxStored");
+        if (tag.hasKey("Stored")) stored = tag.getInteger("Stored");
+        if (tag.hasKey("MaxStored")) maxStored = tag.getInteger("MaxStored");
 
-        if(storedItem != null) {
+        if (storedItem != null) {
             currenttip.add("Stored: " + stored + "/" + maxStored);
-        }
-        else
-            currenttip.add("Capacity: " + maxStored);
+        } else currenttip.add("Capacity: " + maxStored);
 
+        return currenttip;
+    }
 
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaTail(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;
-	}
-
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if(te != null)
-            te.writeToNBT(tag);
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
         try {
             tag.setInteger("MaxStored", (Integer) ThermalExpansionModule.TileCache_getMaxStored.invoke(te));
             tag.setInteger("Stored", (Integer) ThermalExpansionModule.TileCache_getStored.invoke(te));
@@ -95,7 +97,7 @@ public class HUDHandlerCache implements IWailaDataProvider {
             e.printStackTrace();
         }
         return tag;
-	}
+    }
 
     public ItemStack readItemStack(NBTTagCompound tag) {
         ItemStack is = new ItemStack(Item.getItemById(tag.getShort("id")));
@@ -107,5 +109,5 @@ public class HUDHandlerCache implements IWailaDataProvider {
 
         return is;
     }
-	
+
 }

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

@@ -2,56 +2,67 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerEnergyCell implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("thermalexpansion.energycell")) return currenttip;
-		
-		int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv");
-		int energySend    = accessor.getNBTInteger(accessor.getNBTData(), "Send");
-		
-		currenttip.add(String.format("%s/%s : %d / %d RF/t", LangUtil.translateG("hud.msg.in"), LangUtil.translateG("hud.msg.out"), energyReceive, energySend));
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("thermalexpansion.energycell")) return currenttip;
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv");
+        int energySend = accessor.getNBTInteger(accessor.getNBTData(), "Send");
+
+        currenttip.add(
+                String.format(
+                        "%s/%s : %d / %d RF/t",
+                        LangUtil.translateG("hud.msg.in"),
+                        LangUtil.translateG("hud.msg.out"),
+                        energyReceive,
+                        energySend));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        try {
+            int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te);
+            int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te);
+            tag.setInteger("Recv", recv);
+            tag.setInteger("Send", send);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te);
-			int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te);
-			tag.setInteger("Recv", recv);
-			tag.setInteger("Send", send);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
-	
 }

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

@@ -8,51 +8,56 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class HUDHandlerIBlockInfo implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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> 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;
-	}
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try{
-			List info = new ArrayList();
-			Block block = world.getBlock(x, y, z);
-			ThermalExpansionModule.IBlockInfo_getBlockInfo.invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false);
-			
-			for (Object i : info){
-				System.out.printf("%s\n", i);
-			}
-			
-		} catch (Exception e){
-			throw new RuntimeException(e);
-		}		
-		
-		return tag;
-	}
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        try {
+            List info = new ArrayList();
+            Block block = world.getBlock(x, y, z);
+            ThermalExpansionModule.IBlockInfo_getBlockInfo
+                    .invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false);
+
+            for (Object i : info) {
+                System.out.printf("%s\n", i);
+            }
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return tag;
+    }
 
 }

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

@@ -8,72 +8,81 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import mcp.mobius.waila.api.ITaggedList;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import mcp.mobius.waila.api.ITaggedList;
 
 public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("thermalexpansion.energyhandler")) return currenttip;
-		if (!accessor.getNBTData().hasKey("Energy")) return currenttip;
-		
-		int energy    = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
-		int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
-		try {
-			if ((maxEnergy != 0) && (((ITaggedList)currenttip).getEntries("RFEnergyStorage").size() == 0)){
-				((ITaggedList)currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage");
-			}
-		} catch (Exception e){    
-			currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
-		} 
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (!config.getConfig("thermalexpansion.energyhandler")) return currenttip;
+        if (!accessor.getNBTData().hasKey("Energy")) return currenttip;
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try{
-			Integer energy = -1;
-			Integer maxsto = -1;
-			if (ThermalExpansionModule.IEnergyInfo.isInstance(te)){
-				energy = (Integer) ThermalExpansionModule.IEnergyInfo_getCurStorage.invoke(te);
-				maxsto = (Integer) ThermalExpansionModule.IEnergyInfo_getMaxStorage.invoke(te);
-			} else if (ThermalExpansionModule.IEnergyProvider.isInstance(te)){
-				energy = (Integer) ThermalExpansionModule.IEnergyProvider_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
-				maxsto = (Integer) ThermalExpansionModule.IEnergyProvider_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN);
-			} else if (ThermalExpansionModule.IEnergyReceiver.isInstance(te)){
-				energy = (Integer) ThermalExpansionModule.IEnergyReceiver_getCurStorage.invoke(te, ForgeDirection.UNKNOWN);
-				maxsto = (Integer) ThermalExpansionModule.IEnergyReceiver_getMaxStorage.invoke(te, ForgeDirection.UNKNOWN);
-			}
+        int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
+        int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
+        try {
+            if ((maxEnergy != 0) && (((ITaggedList) currenttip).getEntries("RFEnergyStorage").size() == 0)) {
+                ((ITaggedList) currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage");
+            }
+        } catch (Exception e) {
+            currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        try {
+            Integer energy = -1;
+            Integer maxsto = -1;
+            if (ThermalExpansionModule.IEnergyInfo.isInstance(te)) {
+                energy = (Integer) ThermalExpansionModule.IEnergyInfo_getCurStorage.invoke(te);
+                maxsto = (Integer) ThermalExpansionModule.IEnergyInfo_getMaxStorage.invoke(te);
+            } else if (ThermalExpansionModule.IEnergyProvider.isInstance(te)) {
+                energy = (Integer) ThermalExpansionModule.IEnergyProvider_getCurStorage
+                        .invoke(te, ForgeDirection.UNKNOWN);
+                maxsto = (Integer) ThermalExpansionModule.IEnergyProvider_getMaxStorage
+                        .invoke(te, ForgeDirection.UNKNOWN);
+            } else if (ThermalExpansionModule.IEnergyReceiver.isInstance(te)) {
+                energy = (Integer) ThermalExpansionModule.IEnergyReceiver_getCurStorage
+                        .invoke(te, ForgeDirection.UNKNOWN);
+                maxsto = (Integer) ThermalExpansionModule.IEnergyReceiver_getMaxStorage
+                        .invoke(te, ForgeDirection.UNKNOWN);
+            }
+
+            tag.setInteger("Energy", energy);
+            tag.setInteger("MaxStorage", maxsto);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return tag;
+    }
 
-			tag.setInteger("Energy",     energy);
-			tag.setInteger("MaxStorage", maxsto);
-			
-		} catch (Exception e){
-			throw new RuntimeException(e);
-		}
-		
-		return tag;
-	}	
-	
 }

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

@@ -2,78 +2,82 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerISecureTile implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("thermalexpansion.owner")){
-		
-			String owner  = accessor.getNBTData().getString("Owner");
-			int    iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access");
-			
-			if (owner.equals("[None]"))
-				return currenttip;
-			
-			String access = "INVALID";
-			switch(iaccess){
-			case 0:
-				access = LangUtil.translateG("hud.msg.public");
-				break;
-			case 1:
-				access = LangUtil.translateG("hud.msg.restricted");
-				break;
-			case 2:
-				access = LangUtil.translateG("hud.msg.private");			
-				break;
-			}
-			
-			currenttip.add(String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access));
-		
-		}
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (config.getConfig("thermalexpansion.owner")) {
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te);
-			int    access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal();
-			
-			tag.setString("Owner", owner);
-			tag.setInteger("Access", access);
-			
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
+            String owner = accessor.getNBTData().getString("Owner");
+            int iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access");
+
+            if (owner.equals("[None]")) return currenttip;
+
+            String access = "INVALID";
+            switch (iaccess) {
+                case 0:
+                    access = LangUtil.translateG("hud.msg.public");
+                    break;
+                case 1:
+                    access = LangUtil.translateG("hud.msg.restricted");
+                    break;
+                case 2:
+                    access = LangUtil.translateG("hud.msg.private");
+                    break;
+            }
+
+            currenttip.add(
+                    String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access));
+
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        try {
+            String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te);
+            int access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal();
+
+            tag.setString("Owner", owner);
+            tag.setInteger("Access", access);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return tag;
+    }
 
 }

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

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

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

@@ -2,109 +2,114 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerTesseract implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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("thermalexpansion.tesssendrecv")){
-			String send = String.format("%s : ", LangUtil.translateG("hud.msg.send"));
-			String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv"));
-			String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item"));
-			String fluid= String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid"));
-			String energ= String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ"));
-			
-			
-			switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")){
-			case 0:
-				send += item;
-				break;
-			case 1:
-				recv += item;
-				break;
-			case 2:
-				send += item;
-				recv += item;
-				break;
-			}
-	
-			switch (accessor.getNBTInteger(accessor.getNBTData(), "Fluid.Mode")){
-			case 0:
-				send += fluid;
-				break;
-			case 1:
-				recv += fluid;
-				break;
-			case 2:
-				send += fluid;
-				recv += fluid;
-				break;
-			}
-			
-			switch (accessor.getNBTInteger(accessor.getNBTData(), "Energy.Mode")){
-			case 0:
-				send += energ;
-				break;
-			case 1:
-				recv += energ;
-				break;
-			case 2:
-				send += energ;
-				recv += energ;
-				break;
-			}		
-			
-			if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.send"))))
-				currenttip.add(send);
-			
-			if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.recv"))))		
-				currenttip.add(recv);
-		}
-		
-		if (config.getConfig("thermalexpansion.tessfreq"))
-			currenttip.add(String.format("%s : %d",LangUtil.translateG("hud.msg.frequency"), accessor.getNBTInteger(accessor.getNBTData(), "Frequency")));		
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        if (config.getConfig("thermalexpansion.tesssendrecv")) {
+            String send = String.format("%s : ", LangUtil.translateG("hud.msg.send"));
+            String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv"));
+            String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item"));
+            String fluid = String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid"));
+            String energ = String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ"));
+
+            switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")) {
+                case 0:
+                    send += item;
+                    break;
+                case 1:
+                    recv += item;
+                    break;
+                case 2:
+                    send += item;
+                    recv += item;
+                    break;
+            }
+
+            switch (accessor.getNBTInteger(accessor.getNBTData(), "Fluid.Mode")) {
+                case 0:
+                    send += fluid;
+                    break;
+                case 1:
+                    recv += fluid;
+                    break;
+                case 2:
+                    send += fluid;
+                    recv += fluid;
+                    break;
+            }
+
+            switch (accessor.getNBTInteger(accessor.getNBTData(), "Energy.Mode")) {
+                case 0:
+                    send += energ;
+                    break;
+                case 1:
+                    recv += energ;
+                    break;
+                case 2:
+                    send += energ;
+                    recv += energ;
+                    break;
+            }
+
+            if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.send")))) currenttip.add(send);
+
+            if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.recv")))) currenttip.add(recv);
+        }
+
+        if (config.getConfig("thermalexpansion.tessfreq")) currenttip.add(
+                String.format(
+                        "%s : %d",
+                        LangUtil.translateG("hud.msg.frequency"),
+                        accessor.getNBTInteger(accessor.getNBTData(), "Frequency")));
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        try {
+            byte modeItem = ThermalExpansionModule.TileTesseract_Item.getByte(te);
+            byte modeFluid = ThermalExpansionModule.TileTesseract_Fluid.getByte(te);
+            byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te);
+            tag.setByte("Item.Mode", modeItem);
+            tag.setByte("Fluid.Mode", modeFluid);
+            tag.setByte("Energy.Mode", modeEnergy);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return tag;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			byte modeItem   = ThermalExpansionModule.TileTesseract_Item.getByte(te);
-			byte modeFluid  = ThermalExpansionModule.TileTesseract_Fluid.getByte(te);
-			byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te);
-			tag.setByte("Item.Mode", modeItem);
-			tag.setByte("Fluid.Mode", modeFluid);
-			tag.setByte("Energy.Mode", modeEnergy);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
-	
 }

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

@@ -1,181 +1,176 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import net.minecraftforge.common.util.ForgeDirection;
-import org.apache.logging.log4j.Level;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+import net.minecraftforge.common.util.ForgeDirection;
+
+import org.apache.logging.log4j.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
 public class ThermalExpansionModule {
 
-	public static Class  IEnergyProvider = null;
-	public static Method IEnergyProvider_getMaxStorage = null;
-	public static Method IEnergyProvider_getCurStorage = null;
+    public static Class IEnergyProvider = null;
+    public static Method IEnergyProvider_getMaxStorage = null;
+    public static Method IEnergyProvider_getCurStorage = null;
 
-	public static Class  IEnergyReceiver = null;
-	public static Method IEnergyReceiver_getMaxStorage = null;
-	public static Method IEnergyReceiver_getCurStorage = null;	
+    public static Class IEnergyReceiver = null;
+    public static Method IEnergyReceiver_getMaxStorage = null;
+    public static Method IEnergyReceiver_getCurStorage = null;
 
-	public static Class  IEnergyInfo = null;
-	public static Method IEnergyInfo_getMaxStorage = null;
-	public static Method IEnergyInfo_getCurStorage = null;	
-	
-	public static Class TileEnergyCell = null;
-	public static Field TileEnergyCell_Recv = null;
-	public static Field TileEnergyCell_Send = null;
-	
-	public static Class  TileTank = null;
-	public static Method TileTank_getTankFluid = null;
-	public static Method TileTank_getTankCapacity = null;
-	public static Method TileTank_getTankAmount = null;
-	public static Field  TileTank_mode = null;
-	
-	public static Class TileTesseract = null;
-	public static Field TileTesseract_Item   = null;
-	public static Field TileTesseract_Fluid  = null;
-	public static Field TileTesseract_Energy = null;
-	
-	public static Class  ISecureTile = null;
-	public static Method ISecureTile_getAccess    = null;
-	public static Method ISecureTile_getOwnerName = null;
+    public static Class IEnergyInfo = null;
+    public static Method IEnergyInfo_getMaxStorage = null;
+    public static Method IEnergyInfo_getCurStorage = null;
 
-    public static Class  TileCache = null;
+    public static Class TileEnergyCell = null;
+    public static Field TileEnergyCell_Recv = null;
+    public static Field TileEnergyCell_Send = null;
+
+    public static Class TileTank = null;
+    public static Method TileTank_getTankFluid = null;
+    public static Method TileTank_getTankCapacity = null;
+    public static Method TileTank_getTankAmount = null;
+    public static Field TileTank_mode = null;
+
+    public static Class TileTesseract = null;
+    public static Field TileTesseract_Item = null;
+    public static Field TileTesseract_Fluid = null;
+    public static Field TileTesseract_Energy = null;
+
+    public static Class ISecureTile = null;
+    public static Method ISecureTile_getAccess = null;
+    public static Method ISecureTile_getOwnerName = null;
+
+    public static Class TileCache = null;
     public static Method TileCache_getItemStack = null;
     public static Method TileCache_getMaxStored = null;
     public static Method TileCache_getStored = null;
-	
-	public static Class BlockMultipart = null;
-	
-	public static Class  IBlockInfo = null;
-	public static Method IBlockInfo_getBlockInfo = null;
-	
-	public static void register(){
-		// XXX : We register the Energy interface first
-		try{
-			IEnergyProvider              = Class.forName("cofh.api.energy.IEnergyProvider");
-			IEnergyProvider_getMaxStorage = IEnergyProvider.getMethod("getMaxEnergyStored", ForgeDirection.class);
-			IEnergyProvider_getCurStorage = IEnergyProvider.getMethod("getEnergyStored",    ForgeDirection.class);
-			
-			IEnergyReceiver              = Class.forName("cofh.api.energy.IEnergyReceiver");
-			IEnergyReceiver_getMaxStorage = IEnergyReceiver.getMethod("getMaxEnergyStored", ForgeDirection.class);
-			IEnergyReceiver_getCurStorage = IEnergyReceiver.getMethod("getEnergyStored",    ForgeDirection.class);			
-			
-			IEnergyInfo                  = Class.forName("cofh.api.tileentity.IEnergyInfo");
-			IEnergyInfo_getMaxStorage    = IEnergyInfo.getMethod("getInfoMaxEnergyStored");
-			IEnergyInfo_getCurStorage    = IEnergyInfo.getMethod("getInfoEnergyStored");			
 
-			
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyProvider);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyReceiver);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIEnergyHandler(), IEnergyInfo);			
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
-		}
+    public static Class BlockMultipart = null;
 
-		// XXX : We register the energy cell
-		try{		
-			TileEnergyCell = Class.forName("cofh.thermalexpansion.block.cell.TileCell");
-			TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive");
-			TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend");
-			
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerEnergyCell(), TileEnergyCell);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e);
-		}				
-			
-		// XXX : We register the Tank interface
-		try{
-			TileTank                 = Class.forName("cofh.thermalexpansion.block.tank.TileTank");
-			TileTank_getTankFluid    = TileTank.getMethod("getTankFluid");
-			TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
-			TileTank_getTankAmount   = TileTank.getMethod("getTankFluidAmount");
-			TileTank_mode            = TileTank.getField("mode");
-			
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
-			ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
-			ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);		
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTank);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e);
-		}			
-	
-		// XXX : We register the Tesseract interface
-		try{
-			TileTesseract = Class.forName("cofh.thermalexpansion.block.ender.TileTesseract");
-			TileTesseract_Item   = TileTesseract.getDeclaredField("modeItem");
-			TileTesseract_Fluid  = TileTesseract.getDeclaredField("modeFluid");
-			TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy");			
-			
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv");
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq");
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
-		}		
+    public static Class IBlockInfo = null;
+    public static Method IBlockInfo_getBlockInfo = null;
 
-		// XXX : We register the ISecureTile interface
-		try{
-			ISecureTile   = Class.forName("cofh.api.tileentity.ISecurable");
-			ISecureTile_getAccess    = ISecureTile.getDeclaredMethod("getAccess");
-			ISecureTile_getOwnerName = ISecureTile.getDeclaredMethod("getOwnerName");
-			
-			ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner");		
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerISecureTile(), ISecureTile);
-			//ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile);
-			//ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e);
-		}
+    public static void register() {
+        // XXX : We register the Energy interface first
+        try {
+            IEnergyProvider = Class.forName("cofh.api.energy.IEnergyProvider");
+            IEnergyProvider_getMaxStorage = IEnergyProvider.getMethod("getMaxEnergyStored", ForgeDirection.class);
+            IEnergyProvider_getCurStorage = IEnergyProvider.getMethod("getEnergyStored", ForgeDirection.class);
+
+            IEnergyReceiver = Class.forName("cofh.api.energy.IEnergyReceiver");
+            IEnergyReceiver_getMaxStorage = IEnergyReceiver.getMethod("getMaxEnergyStored", ForgeDirection.class);
+            IEnergyReceiver_getCurStorage = IEnergyReceiver.getMethod("getEnergyStored", ForgeDirection.class);
+
+            IEnergyInfo = Class.forName("cofh.api.tileentity.IEnergyInfo");
+            IEnergyInfo_getMaxStorage = IEnergyInfo.getMethod("getInfoMaxEnergyStored");
+            IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
+        }
+
+        // XXX : We register the energy cell
+        try {
+            TileEnergyCell = Class.forName("cofh.thermalexpansion.block.cell.TileCell");
+            TileEnergyCell_Recv = TileEnergyCell.getDeclaredField("energyReceive");
+            TileEnergyCell_Send = TileEnergyCell.getDeclaredField("energySend");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e);
+        }
+
+        // XXX : We register the Tank interface
+        try {
+            TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank");
+            TileTank_getTankFluid = TileTank.getMethod("getTankFluid");
+            TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
+            TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount");
+            TileTank_mode = TileTank.getField("mode");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
+            ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
+            ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTank);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e);
+        }
+
+        // XXX : We register the Tesseract interface
+        try {
+            TileTesseract = Class.forName("cofh.thermalexpansion.block.ender.TileTesseract");
+            TileTesseract_Item = TileTesseract.getDeclaredField("modeItem");
+            TileTesseract_Fluid = TileTesseract.getDeclaredField("modeFluid");
+            TileTesseract_Energy = TileTesseract.getDeclaredField("modeEnergy");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv");
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
+        }
+
+        // XXX : We register the ISecureTile interface
+        try {
+            ISecureTile = Class.forName("cofh.api.tileentity.ISecurable");
+            ISecureTile_getAccess = ISecureTile.getDeclaredMethod("getAccess");
+            ISecureTile_getOwnerName = ISecureTile.getDeclaredMethod("getOwnerName");
+
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner");
+            ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile);
+            // ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile);
+            // ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile);
+
+        } catch (Exception e) {
+            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e);
+        }
 
         // XXX : We register the Cache interface
-        try{
+        try {
             TileCache = Class.forName("cofh.thermalexpansion.block.cache.TileCache");
-            TileCache_getItemStack   = TileCache.getDeclaredMethod("getStoredItemType");
-            TileCache_getMaxStored  = TileCache.getDeclaredMethod("getMaxStoredCount");
-            TileCache_getStored     = TileCache.getDeclaredMethod("getStoredCount");
+            TileCache_getItemStack = TileCache.getDeclaredMethod("getStoredItemType");
+            TileCache_getMaxStored = TileCache.getDeclaredMethod("getMaxStoredCount");
+            TileCache_getStored = TileCache.getDeclaredMethod("getStoredCount");
 
             ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.cache");
             ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerCache(), TileCache);
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCache(), TileCache);
-            ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCache(), TileCache);
+            ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCache(), TileCache);
 
-        } catch (Exception e){
+        } catch (Exception e) {
             Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
         }
 
         // XXX : We register the IBlockInfo interface
-		/*
-		try{
-			IBlockInfo              = Class.forName("cofh.api.block.IBlockInfo");
-			IBlockInfo_getBlockInfo = IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class, ForgeDirection.class, EntityPlayer.class, List.class, boolean.class);
-			
-			
-			//ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo);
-			ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo);
-			
-		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e);
-		}			
-		*/
-	}
-	
-	
+        /*
+         * try{ IBlockInfo = Class.forName("cofh.api.block.IBlockInfo"); IBlockInfo_getBlockInfo =
+         * IBlockInfo.getMethod("getBlockInfo", IBlockAccess.class, int.class, int.class, int.class,
+         * ForgeDirection.class, EntityPlayer.class, List.class, boolean.class);
+         * //ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+         * ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIBlockInfo(), IBlockInfo);
+         * ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerIBlockInfo(), IBlockInfo); } catch (Exception
+         * e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading IBlockInfo hooks." + e); }
+         */
+    }
+
 }

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

@@ -7,34 +7,39 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
 public class TwilightForestGenericOverride implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
-	}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata());
+    }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+    @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;
-	}
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
+    @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;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        return tag;
+    }
 }

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

@@ -7,31 +7,30 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class TwilightForestModule {
 
-	public static Class BlockTFRoots = null;	
-	public static Class BlockTFPlant = null;
-	public static Class BlockTFSapling = null;
-	
-	public static void register(){
+    public static Class BlockTFRoots = null;
+    public static Class BlockTFPlant = null;
+    public static Class BlockTFSapling = null;
 
-		try{
-			Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod");
-			Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
-			return;
-		}		
+    public static void register() {
 
-		try {
-			BlockTFRoots = Class.forName("twilightforest.block.BlockTFRoots");
-			BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant");
-			BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling");				
-		} catch (ClassNotFoundException e) {
-			Waila.log.log(Level.WARN, "[TwilightForestMod] Class not found. " + e);
-		}
+        try {
+            Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod");
+            Waila.log.log(Level.INFO, "TwilightForestMod mod found.");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found.");
+            return;
+        }
 
-		
-		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots);
-		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant);		
-	}
+        try {
+            BlockTFRoots = Class.forName("twilightforest.block.BlockTFRoots");
+            BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant");
+            BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling");
+        } catch (ClassNotFoundException e) {
+            Waila.log.log(Level.WARN, "[TwilightForestMod] Class not found. " + e);
+        }
+
+        ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots);
+        ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant);
+    }
 
 }

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

@@ -2,6 +2,7 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
+
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -9,71 +10,71 @@ import mcp.mobius.waila.gui.helpers.UIHelper;
 
 public class HUDDecoratorVanilla implements IWailaBlockDecorator {
 
-	@Override
-	public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+    @Override
+    public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+
+        Tessellator tessellator = Tessellator.instance;
+
+        // UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F,
+        // accessor.getPartialFrame());
+        UIHelper.drawFloatingText("IN", accessor.getRenderingPosition(), 0.5F, 0.2F, -0.2F, 90F, 0F, 0F);
+        UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F, 0.5F, 90F, 90F, 0F);
+        UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 1.2F, 0.2F, 0.5F, 90F, -90F, 0F);
+        UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 0.5F, 0.2F, 1.2F, 90F, -180F, 0F);
 
-Tessellator tessellator = Tessellator.instance;
-		
-		//UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F, accessor.getPartialFrame());
-		UIHelper.drawFloatingText("IN",  accessor.getRenderingPosition(),  0.5F, 0.2F, -0.2F, 90F,   0F,  0F);
-		UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F,  0.5F, 90F,  90F,  0F);
-		UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(),  1.2F, 0.2F,  0.5F, 90F, -90F,  0F);
-		UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(),  0.5F, 0.2F,  1.2F, 90F, -180F, 0F);
-      
         double offset = 0.1;
         double delta = 1 + 2 * offset;
-        
+
         double x = accessor.getRenderingPosition().xCoord - offset;
         double y = accessor.getRenderingPosition().yCoord - offset;
         double z = accessor.getRenderingPosition().zCoord - offset;
-		
+
         tessellator.startDrawingQuads();
 
         tessellator.setColorRGBA(255, 255, 255, 150);
 
-        tessellator.addVertex(x,          y + 0.2 , z);
-        tessellator.addVertex(x,          y + 0.2 , z + delta/2 - 0.1);
-        tessellator.addVertex(x + offset, y + 0.2,  z + delta/2 - 0.1);
-        tessellator.addVertex(x + offset, y + 0.2,  z);
+        tessellator.addVertex(x, y + 0.2, z);
+        tessellator.addVertex(x, y + 0.2, z + delta / 2 - 0.1);
+        tessellator.addVertex(x + offset, y + 0.2, z + delta / 2 - 0.1);
+        tessellator.addVertex(x + offset, y + 0.2, z);
 
-        tessellator.addVertex(x,          y + 0.2 , z + delta/2 + 0.1);
-        tessellator.addVertex(x,          y + 0.2 , z + delta);
-        tessellator.addVertex(x + offset, y + 0.2,  z + delta);
-        tessellator.addVertex(x + offset, y + 0.2,  z + delta/2 + 0.1);        
+        tessellator.addVertex(x, y + 0.2, z + delta / 2 + 0.1);
+        tessellator.addVertex(x, y + 0.2, z + delta);
+        tessellator.addVertex(x + offset, y + 0.2, z + delta);
+        tessellator.addVertex(x + offset, y + 0.2, z + delta / 2 + 0.1);
 
-        tessellator.addVertex(x + delta - 0.1,          y + 0.2 , z + 0.1);
-        tessellator.addVertex(x + delta - 0.1,          y + 0.2 , z + delta/2 - 0.1);
-        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2,  z + delta/2 - 0.1);
-        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2,  z + 0.1);
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + 0.1);
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta / 2 - 0.1);
+        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta / 2 - 0.1);
+        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + 0.1);
 
-        tessellator.addVertex(x + delta - 0.1,          y + 0.2 , z + delta/2 + 0.1);
-        tessellator.addVertex(x + delta - 0.1,          y + 0.2 , z + delta);
-        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2,  z + delta);
-        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2,  z + delta/2 + 0.1);        
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta / 2 + 0.1);
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta);
+        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta);
+        tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta / 2 + 0.1);
 
-        
-        tessellator.addVertex(x+ 0.1,           y + 0.2,  z);
-        tessellator.addVertex(x+ 0.1,           y + 0.2,  z+ offset);
-        tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2,  z+ offset);
-        tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2,  z);
+        tessellator.addVertex(x + 0.1, y + 0.2, z);
+        tessellator.addVertex(x + 0.1, y + 0.2, z + offset);
+        tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + offset);
+        tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z);
 
-        tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2,  z);
-        tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2,  z+ offset);
-        tessellator.addVertex(x+ delta,         y + 0.2,  z+ offset);
-        tessellator.addVertex(x+ delta,         y + 0.2,  z);        
+        tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z);
+        tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + offset);
+        tessellator.addVertex(x + delta, y + 0.2, z + offset);
+        tessellator.addVertex(x + delta, y + 0.2, z);
 
-        tessellator.addVertex(x + 0.1,                y + 0.2,  z+ delta - 0.1);
-        tessellator.addVertex(x + 0.1,                y + 0.2,  z+ offset+ delta - 0.1);
-        tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2,  z+ offset+ delta - 0.1);
-        tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2,  z+ delta - 0.1);
+        tessellator.addVertex(x + 0.1, y + 0.2, z + delta - 0.1);
+        tessellator.addVertex(x + 0.1, y + 0.2, z + offset + delta - 0.1);
+        tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + offset + delta - 0.1);
+        tessellator.addVertex(x + delta / 2 - 0.1, y + 0.2, z + delta - 0.1);
 
-        tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2,  z+ delta - 0.1);
-        tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2,  z+ offset+ delta - 0.1);
-        tessellator.addVertex(x+ delta - 0.1,   y + 0.2,  z+ offset+ delta - 0.1);
-        tessellator.addVertex(x+ delta - 0.1,   y + 0.2,  z+ delta - 0.1);        
-        
-        tessellator.draw();			
-		
-	}
+        tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + delta - 0.1);
+        tessellator.addVertex(x + delta / 2 + 0.1, y + 0.2, z + offset + delta - 0.1);
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + offset + delta - 0.1);
+        tessellator.addVertex(x + delta - 0.1, y + 0.2, z + delta - 0.1);
+
+        tessellator.draw();
+
+    }
 
 }

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

@@ -2,77 +2,93 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import java.util.List;
 
-import cpw.mods.fml.common.registry.GameData;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraft.world.World;
+
+import cpw.mods.fml.common.registry.GameData;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.SpecialChars;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class HUDHandlerFurnace implements IWailaDataProvider {
 
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
+    @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> 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) {
-		int cookTime   = accessor.getNBTData().getShort("CookTime");
-		NBTTagList tag = accessor.getNBTData().getTagList("Items", 10);
-		
-		String renderStr = "";
-		{
-			ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0));
-			String name     = GameData.getItemRegistry().getNameForObject(stack.getItem());
-			renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
-		}
-		{
-			ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1));
-			String name     = GameData.getItemRegistry().getNameForObject(stack.getItem());
-			renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
-		}
-		
-		renderStr += SpecialChars.getRenderString("waila.progress", String.valueOf(cookTime), String.valueOf(200));
-		
-		{
-			ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2));
-			String name     = GameData.getItemRegistry().getNameForObject(stack.getItem());
-			renderStr += SpecialChars.getRenderString("waila.stack", "1", name, String.valueOf(stack.stackSize), String.valueOf(stack.getItemDamage()));
-		}		
-		
-		currenttip.add(renderStr);
-		
-		return currenttip;
-	}
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        int cookTime = accessor.getNBTData().getShort("CookTime");
+        NBTTagList tag = accessor.getNBTData().getTagList("Items", 10);
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
+        String renderStr = "";
+        {
+            ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(0));
+            String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
+            renderStr += SpecialChars.getRenderString(
+                    "waila.stack",
+                    "1",
+                    name,
+                    String.valueOf(stack.stackSize),
+                    String.valueOf(stack.getItemDamage()));
+        }
+        {
+            ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(1));
+            String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
+            renderStr += SpecialChars.getRenderString(
+                    "waila.stack",
+                    "1",
+                    name,
+                    String.valueOf(stack.stackSize),
+                    String.valueOf(stack.getItemDamage()));
+        }
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}
-	
-	public static void register(){
-		//ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);
-		//ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);	
-	}
+        renderStr += SpecialChars.getRenderString("waila.progress", String.valueOf(cookTime), String.valueOf(200));
+
+        {
+            ItemStack stack = ItemStack.loadItemStackFromNBT(tag.getCompoundTagAt(2));
+            String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
+            renderStr += SpecialChars.getRenderString(
+                    "waila.stack",
+                    "1",
+                    name,
+                    String.valueOf(stack.stackSize),
+                    String.valueOf(stack.getItemDamage()));
+        }
+
+        currenttip.add(renderStr);
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
+
+    public static void register() {
+        // ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);
+        // ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerFurnace(), TileEntityFurnace.class);
+    }
 }

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

@@ -12,6 +12,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.world.World;
+
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -21,271 +22,271 @@ import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerVanilla implements IWailaDataProvider {
 
-	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;
-	static Block doubleplant   = Blocks.double_plant;
-	static Block leave         = Blocks.leaves;
-	static Block leave2        = Blocks.leaves2;	
-	static Block log           = Blocks.log;
-	static Block log2          = Blocks.log2;
-	static Block quartz        = Blocks.quartz_block;
-	
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		Block block       = accessor.getBlock();
-		
-		if (block == silverfish && config.getConfig("vanilla.silverfish")){
-			int metadata = accessor.getMetadata();
-			switch(metadata){
-			case 0:
-				return new ItemStack(Blocks.stone);
-			case 1:
-				return new ItemStack(Blocks.cobblestone);
-			case 2:
-				return new ItemStack(Blocks.brick_block);
-			default:
-				return null;
-			}
-		}
+    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;
+    static Block doubleplant = Blocks.double_plant;
+    static Block leave = Blocks.leaves;
+    static Block leave2 = Blocks.leaves2;
+    static Block log = Blocks.log;
+    static Block log2 = Blocks.log2;
+    static Block quartz = Blocks.quartz_block;
 
-		if (block == redstone){
-			return new ItemStack(Items.redstone);
-		}
-		
-		if (block == doubleplant && (accessor.getMetadata() & 8) != 0){
-			int x = accessor.getPosition().blockX;
-			int y = accessor.getPosition().blockY - 1;
-			int z = accessor.getPosition().blockZ;
-			int meta = accessor.getWorld().getBlockMetadata(x, y, z);
-			
-			return new ItemStack(doubleplant, 0, meta);
-		}
-		
-		if (block instanceof BlockRedstoneOre){
-			return new ItemStack(Blocks.redstone_ore);
-		}
-		
-		if (block == crops ){
-			return new ItemStack(Items.wheat);
-		}
-		
-		if ((block == leave || block == leave2) && (accessor.getMetadata() > 3)){
-			return new ItemStack(block, 1, accessor.getMetadata() - 4);
-		}
-		
-		if (block == log || block == log2){
-			return new ItemStack(block, 1, accessor.getMetadata()%4);
-		}
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        Block block = accessor.getBlock();
 
-		if ((block == quartz) && (accessor.getMetadata() > 2)){
-			return new ItemStack(block, 1, 2);
-		}		
-		
-		return null;
-		
-	}
+        if (block == silverfish && config.getConfig("vanilla.silverfish")) {
+            int metadata = accessor.getMetadata();
+            switch (metadata) {
+                case 0:
+                    return new ItemStack(Blocks.stone);
+                case 1:
+                    return new ItemStack(Blocks.cobblestone);
+                case 2:
+                    return new ItemStack(Blocks.brick_block);
+                default:
+                    return null;
+            }
+        }
 
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		Block block       = accessor.getBlock();
-		
-		/* Mob spawner handler */
-		if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
-			String name = currenttip.get(0);
-			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
-			currenttip.set(0, String.format("%s (%s)", name, mobname));
-		}
+        if (block == redstone) {
+            return new ItemStack(Items.redstone);
+        }
 
-		if (block == redstone){
-			String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), "");
-			currenttip.set(0, name);
-		}		
-		
-		if (block == melonStem){
-			currenttip.set(0, SpecialChars.WHITE + "Melon stem");
-		}
-	
-		if (block == pumpkinStem){
-			currenttip.set(0, SpecialChars.WHITE + "Pumpkin stem");
-		}		
-		
-		return currenttip;
-	}
+        if (block == doubleplant && (accessor.getMetadata() & 8) != 0) {
+            int x = accessor.getPosition().blockX;
+            int y = accessor.getPosition().blockY - 1;
+            int z = accessor.getPosition().blockZ;
+            int meta = accessor.getWorld().getBlockMetadata(x, y, z);
 
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		Block block       = accessor.getBlock();
-		/* Crops */
-		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));
-				else
-					currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
-				return currenttip;
-			}		
+            return new ItemStack(doubleplant, 0, meta);
+        }
 
-		if (block == cocoa && config.getConfig("general.showcrop")){
-		
-			float growthValue = ((accessor.getMetadata() >> 2) / 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;
-		}		
-		
-		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));
-			else
-				currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
-			return currenttip;
-		}		
-		
-		if (config.getConfig("vanilla.leverstate"))
-			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 (block instanceof BlockRedstoneOre) {
+            return new ItemStack(Blocks.redstone_ore);
+        }
 
-		if (config.getConfig("vanilla.repeater"))
-			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));
-				else
-					currenttip.add(String.format("%s : %s ticks", LangUtil.translateG("hud.msg.delay"), tick));
-				return currenttip;				
-			}		
+        if (block == crops) {
+            return new ItemStack(Items.wheat);
+        }
 
-		if (config.getConfig("vanilla.comparator"))
-			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);
-				//currenttip.add(String.format("Out : %s", outputSignal));
-				return currenttip;				
-			}		
+        if ((block == leave || block == leave2) && (accessor.getMetadata() > 3)) {
+            return new ItemStack(block, 1, accessor.getMetadata() - 4);
+        }
 
-		if (config.getConfig("vanilla.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 (block == jukebox){
-				NBTTagCompound tag = accessor.getNBTData();
-				Item record = null;
-				if (tag.hasKey("Record")){
-					record = Item.itemsList[accessor.getNBTInteger(tag, "Record")];
-					currenttip.add(((ItemRecord)record).getRecordTitle());					
-				} else {
-					currenttip.add(LangUtil.translateG("hud.msg.empty"));
-				}
-			}
-		*/
-		
-		return currenttip;
-	}	
+        if (block == log || block == log2) {
+            return new ItemStack(block, 1, accessor.getMetadata() % 4);
+        }
 
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}	
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
-	public static void register(){
-		ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype");
-		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.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, redstone.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, doubleplant.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, BlockRedstoneOre.class);
-		ModuleRegistrar.instance().registerStackProvider(provider, crops.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, leave.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, leave2.getClass());		
-		ModuleRegistrar.instance().registerStackProvider(provider, log.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, log2.getClass());
-		ModuleRegistrar.instance().registerStackProvider(provider, quartz.getClass());	
-		
-		//ModuleRegistrar.instance().registerStackProvider(provider, Block.class);
-		ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass());
-		ModuleRegistrar.instance().registerHeadProvider(provider, melonStem.getClass());
-		ModuleRegistrar.instance().registerHeadProvider(provider, pumpkinStem.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().registerNBTProvider(provider, mobSpawner.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, crops.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, melonStem.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, pumpkinStem.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, carrot.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, potato.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, lever.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, repeaterIdle.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, repeaterActv.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, comparatorIdl.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, comparatorAct.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, redstone.getClass());		
-		ModuleRegistrar.instance().registerNBTProvider(provider, jukebox.getClass());		
-		ModuleRegistrar.instance().registerNBTProvider(provider, cocoa.getClass());
-		ModuleRegistrar.instance().registerNBTProvider(provider, netherwart.getClass());		
-		ModuleRegistrar.instance().registerNBTProvider(provider, silverfish.getClass());	
-		
-		//ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
-		
-		//ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
-	}
+        if ((block == quartz) && (accessor.getMetadata() > 2)) {
+            return new ItemStack(block, 1, 2);
+        }
 
+        return null;
+
+    }
+
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        Block block = accessor.getBlock();
+
+        /* Mob spawner handler */
+        if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner
+                && config.getConfig("vanilla.spawntype")) {
+            String name = currenttip.get(0);
+            String mobname = ((TileEntityMobSpawner) accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
+            currenttip.set(0, String.format("%s (%s)", name, mobname));
+        }
+
+        if (block == redstone) {
+            String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), "");
+            currenttip.set(0, name);
+        }
+
+        if (block == melonStem) {
+            currenttip.set(0, SpecialChars.WHITE + "Melon stem");
+        }
+
+        if (block == pumpkinStem) {
+            currenttip.set(0, SpecialChars.WHITE + "Pumpkin stem");
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        Block block = accessor.getBlock();
+        /* Crops */
+        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));
+                else currenttip.add(
+                        String.format(
+                                "%s : %s",
+                                LangUtil.translateG("hud.msg.growth"),
+                                LangUtil.translateG("hud.msg.mature")));
+                return currenttip;
+            }
+
+        if (block == cocoa && config.getConfig("general.showcrop")) {
+
+            float growthValue = ((accessor.getMetadata() >> 2) / 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;
+        }
+
+        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));
+            else currenttip.add(
+                    String.format(
+                            "%s : %s",
+                            LangUtil.translateG("hud.msg.growth"),
+                            LangUtil.translateG("hud.msg.mature")));
+            return currenttip;
+        }
+
+        if (config.getConfig("vanilla.leverstate")) 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 ((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));
+            else currenttip.add(String.format("%s : %s ticks", LangUtil.translateG("hud.msg.delay"), tick));
+            return currenttip;
+        }
+
+        if (config.getConfig("vanilla.comparator")) 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);
+            // currenttip.add(String.format("Out : %s", outputSignal));
+            return currenttip;
+        }
+
+        if (config.getConfig("vanilla.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 (block == jukebox){ NBTTagCompound tag = accessor.getNBTData();
+         * Item record = null; if (tag.hasKey("Record")){ record = Item.itemsList[accessor.getNBTInteger(tag,
+         * "Record")]; currenttip.add(((ItemRecord)record).getRecordTitle()); } else {
+         * currenttip.add(LangUtil.translateG("hud.msg.empty")); } }
+         */
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x,
+            int y, int z) {
+        if (te != null) te.writeToNBT(tag);
+        return tag;
+    }
+
+    public static void register() {
+        ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype");
+        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.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, redstone.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, doubleplant.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, BlockRedstoneOre.class);
+        ModuleRegistrar.instance().registerStackProvider(provider, crops.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, leave.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, leave2.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, log.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, log2.getClass());
+        ModuleRegistrar.instance().registerStackProvider(provider, quartz.getClass());
+
+        // ModuleRegistrar.instance().registerStackProvider(provider, Block.class);
+        ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass());
+        ModuleRegistrar.instance().registerHeadProvider(provider, melonStem.getClass());
+        ModuleRegistrar.instance().registerHeadProvider(provider, pumpkinStem.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().registerNBTProvider(provider, mobSpawner.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, crops.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, melonStem.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, pumpkinStem.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, carrot.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, potato.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, lever.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, repeaterIdle.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, repeaterActv.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, comparatorIdl.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, comparatorAct.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, redstone.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, jukebox.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, cocoa.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, netherwart.getClass());
+        ModuleRegistrar.instance().registerNBTProvider(provider, silverfish.getClass());
+
+        // ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
+
+        // ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
+    }
 
-	
 }

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

@@ -1,21 +1,30 @@
 package mcp.mobius.waila.api;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.Map.Entry;
 
 public interface ITaggedList<E, T> extends List<E> {
-	public boolean add(E e, T tag);
-	public boolean add(E e, Collection<? extends T> taglst);
-	public Set<T>  getTags(E e);
-	public Set<T>  getTags(int index);
-	public void    addTag(E e, T tag);
-	public void    addTag(int index, T tag);
-	public void    removeTag(E e, T tag);	
-	public void    removeTag(int index, T tag);
-	public Set<E>  getEntries(T tag);
-	public void    removeEntries(T tag);
-	public String  getTagsAsString(E e);	
+
+    public boolean add(E e, T tag);
+
+    public boolean add(E e, Collection<? extends T> taglst);
+
+    public Set<T> getTags(E e);
+
+    public Set<T> getTags(int index);
+
+    public void addTag(E e, T tag);
+
+    public void addTag(int index, T tag);
+
+    public void removeTag(E e, T tag);
+
+    public void removeTag(int index, T tag);
+
+    public Set<E> getEntries(T tag);
+
+    public void removeEntries(T tag);
+
+    public String getTagsAsString(E e);
 }

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

@@ -6,29 +6,35 @@ import net.minecraft.item.ItemStack;
 
 @Deprecated
 public interface IWailaBlock {
-	/*
-	 *  Use this method to return an item stack in case the default lookup system fails.
-	 *  Return null if you want to use the default lookup system.
-	 *  You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities
-	 */
-	ItemStack    getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
-	/* Waila HUD is divided into 3 zones. The head corresponds to the item name, 
-	 * body to where you mostly want to put informations, and I reserve the tail for modname display 
-	 */ 
-	
-	/* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD.
-	 * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack().
-	 * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info.
-	 * currenttip represents the current list of text lines in the tooltip zone.
-	 * For example, getWailaHead() will have the current item name as currenttip.
-	 * You can modify the tips, add more, remove some, etc.
-	 * When you are done, just returns the currenttip and it will display in Waila.
-	 * 
-	 * Always return the currenttip is you don't want to modify the current zone.
-	 */
-	
-	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
-	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
-	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
+    /*
+     * Use this method to return an item stack in case the default lookup system fails. Return null if you want to use
+     * the default lookup system. You get the world, the player and the location of the block. With that, it is easy to
+     * gather information & tile entities
+     */
+    ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
+
+    /*
+     * Waila HUD is divided into 3 zones. The head corresponds to the item name, body to where you mostly want to put
+     * informations, and I reserve the tail for modname display
+     */
+
+    /*
+     * Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. You get in
+     * input world, player and the block location. You also get the itemstack as returned by the default lookup system
+     * or getWailaStack(). ConfigHandler provides the current Waila config state so you can show/hide elements depending
+     * on the configuration. Refer the ConfigHandler class for more info. currenttip represents the current list of text
+     * lines in the tooltip zone. For example, getWailaHead() will have the current item name as currenttip. You can
+     * modify the tips, add more, remove some, etc. When you are done, just returns the currenttip and it will display
+     * in Waila. Always return the currenttip is you don't want to modify the current zone.
+     */
+
+    List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
+
+    List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
+
+    List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
 }

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

@@ -5,20 +5,22 @@ import net.minecraft.item.ItemStack;
 /**
  * Callback class interface used to provide Block/TileEntity decorator.<br>
  * All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be
- * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method 
+ * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method
  * (cf. {@link IWailaRegistrar} documentation for more information).
+ * 
  * @author ProfMobius
  *
  */
 public interface IWailaBlockDecorator {
 
-	/**
-	 * Callback for the decorator. It provides a standard GL stack positioned on the block.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.</br>
-	 * @param itemStack Current block scanned, in ItemStack form. 
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 */
-	void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config);	
-	
+    /**
+     * Callback for the decorator. It provides a standard GL stack positioned on the block.</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.</br>
+     * 
+     * @param itemStack Current block scanned, in ItemStack form.
+     * @param accessor  Contains most of the relevant information about the current environment.
+     * @param config    Current configuration of Waila.
+     */
+    void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config);
+
 }

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

@@ -12,26 +12,42 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
- * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.<br>
- * It will also return things that are unmodified by the overriding systems (like getWailaStack).<br> 
+ * The Accessor is used to get some basic data out of the game without having to request direct access to the game
+ * engine.<br>
+ * It will also return things that are unmodified by the overriding systems (like getWailaStack).<br>
  * Common accessor for both Entity and Block/TileEntity.<br>
  * Available data depends on what it is called upon (ie : getEntity() will return null if looking at a block, etc).<br>
  *
  */
 public interface IWailaCommonAccessor {
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	Block        		 getBlock();
-	int          		 getBlockID();
-	String               getBlockQualifiedName();
-	int          		 getMetadata();
-	TileEntity           getTileEntity();
-	Entity               getEntity();
-	MovingObjectPosition getPosition();
-	Vec3                 getRenderingPosition();
-	NBTTagCompound       getNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
-	ForgeDirection       getSide();
-	ItemStack            getStack();
+
+    World getWorld();
+
+    EntityPlayer getPlayer();
+
+    Block getBlock();
+
+    int getBlockID();
+
+    String getBlockQualifiedName();
+
+    int getMetadata();
+
+    TileEntity getTileEntity();
+
+    Entity getEntity();
+
+    MovingObjectPosition getPosition();
+
+    Vec3 getRenderingPosition();
+
+    NBTTagCompound getNBTData();
+
+    int getNBTInteger(NBTTagCompound tag, String keyname);
+
+    double getPartialFrame();
+
+    ForgeDirection getSide();
+
+    ItemStack getStack();
 }

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

@@ -5,40 +5,43 @@ import java.util.Set;
 
 /**
  * Read-only interface for Waila internal config storage.<br>
- * An instance of this interface is passed to most of Waila callbacks as a way to change the behavior depending on client settings.
+ * An instance of this interface is passed to most of Waila callbacks as a way to change the behavior depending on
+ * client settings.
  * 
  * @author ProfMobius
  *
  */
 public interface IWailaConfigHandler {
-	/** Returns a set of all the currently loaded modules in the config handler.
-	 * 
-	 * @return
-	 */
-	public Set<String> getModuleNames();
-	
-	/**
-	 * Returns all the currently available options for a given module
-	 * 
-	 * @param modName Module name
-	 * @return
-	 */
-	public HashMap<String, String> getConfigKeys(String modName);
-	
-	/**
-	 * Returns the current value of an option (true/false) with a default value if not set.
-	 * 
-	 * @param key Option to lookup
-	 * @param defvalue Default values
-	 * @return Value of the option or defvalue if not set.
-	 */
-	public boolean getConfig(String key, boolean defvalue);
-	
-	/**
-	 * Returns the current value of an option (true/false) with a default value true if not set
-	 * 
-	 * @param key Option to lookup
-	 * @return Value of the option or true if not set.
-	 */
-	public boolean getConfig(String key);	
+
+    /**
+     * Returns a set of all the currently loaded modules in the config handler.
+     * 
+     * @return
+     */
+    public Set<String> getModuleNames();
+
+    /**
+     * Returns all the currently available options for a given module
+     * 
+     * @param modName Module name
+     * @return
+     */
+    public HashMap<String, String> getConfigKeys(String modName);
+
+    /**
+     * Returns the current value of an option (true/false) with a default value if not set.
+     * 
+     * @param key      Option to lookup
+     * @param defvalue Default values
+     * @return Value of the option or defvalue if not set.
+     */
+    public boolean getConfig(String key, boolean defvalue);
+
+    /**
+     * Returns the current value of an option (true/false) with a default value true if not set
+     * 
+     * @param key Option to lookup
+     * @return Value of the option or true if not set.
+     */
+    public boolean getConfig(String key);
 }

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

@@ -11,27 +11,42 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 /**
- * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.<br>
+ * The Accessor is used to get some basic data out of the game without having to request direct access to the game
+ * engine.<br>
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).<br>
  * An instance of this interface is passed to most of Waila Block/TileEntity callbacks.
+ * 
  * @author ProfMobius
  *
  */
 
-public interface IWailaDataAccessor{
-		
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	Block        		 getBlock();
-	int          		 getBlockID();
-	String               getBlockQualifiedName();
-	int          		 getMetadata();
-	TileEntity           getTileEntity();
-	MovingObjectPosition getPosition();
-	Vec3                 getRenderingPosition();
-	NBTTagCompound       getNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
-	ForgeDirection       getSide();
-	ItemStack            getStack();
+public interface IWailaDataAccessor {
+
+    World getWorld();
+
+    EntityPlayer getPlayer();
+
+    Block getBlock();
+
+    int getBlockID();
+
+    String getBlockQualifiedName();
+
+    int getMetadata();
+
+    TileEntity getTileEntity();
+
+    MovingObjectPosition getPosition();
+
+    Vec3 getRenderingPosition();
+
+    NBTTagCompound getNBTData();
+
+    int getNBTInteger(NBTTagCompound tag, String keyname);
+
+    double getPartialFrame();
+
+    ForgeDirection getSide();
+
+    ItemStack getStack();
 }

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

@@ -11,73 +11,89 @@ import net.minecraft.world.World;
 /**
  * Callback class interface used to provide Block/TileEntity tooltip informations to Waila.<br>
  * All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be
- * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method 
+ * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method
  * (cf. {@link IWailaRegistrar} documentation for more information).
+ * 
  * @author ProfMobius
  *
  */
-public interface IWailaDataProvider{
-	
-	/**
-	 * Callback used to override the default Waila lookup system.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerStackProvider}.</br>
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return null if override is not required, an ItemStack otherwise.
-	 */
-	ItemStack    getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */
-	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */	
-	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */	
-	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used server side to return a custom synchronization NBTTagCompound.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} server and client side.</br>
-	 * You are supposed to always return the modified input NBTTagCompound tag.</br>
-	 * @param player The player requesting data synchronization (The owner of the current connection).
-	 * @param te The TileEntity targeted for synchronization.
-	 * @param tag Current synchronization tag (might have been processed by other providers and might be processed by other providers).
-	 * @param world TileEntity's World.
-	 * @param x X position of the TileEntity.
-	 * @param y Y position of the TileEntity.
-	 * @param z Z position of the TileEntity.
-	 * @return Modified input NBTTagCompound tag.
-	 */
-	NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z);
+public interface IWailaDataProvider {
+
+    /**
+     * Callback used to override the default Waila lookup system.</br>
+     * Will be used if the implementing class is registered via
+     * {@link IWailaRegistrar}.{@link registerStackProvider}.</br>
+     * 
+     * @param accessor Contains most of the relevant information about the current environment.
+     * @param config   Current configuration of Waila.
+     * @return null if override is not required, an ItemStack otherwise.
+     */
+    ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used server side to return a custom synchronization NBTTagCompound.</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider}
+     * server and client side.</br>
+     * You are supposed to always return the modified input NBTTagCompound tag.</br>
+     * 
+     * @param player The player requesting data synchronization (The owner of the current connection).
+     * @param te     The TileEntity targeted for synchronization.
+     * @param tag    Current synchronization tag (might have been processed by other providers and might be processed by
+     *               other providers).
+     * @param world  TileEntity's World.
+     * @param x      X position of the TileEntity.
+     * @param y      Y position of the TileEntity.
+     * @param z      Z position of the TileEntity.
+     * @return Modified input NBTTagCompound tag.
+     */
+    NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y,
+            int z);
 }

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

@@ -8,20 +8,30 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 /**
- * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.<br>
+ * The Accessor is used to get some basic data out of the game without having to request direct access to the game
+ * engine.<br>
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).<br>
  * An instance of this interface is passed to most of Waila Entity callbacks.
+ * 
  * @author ProfMobius
  *
  */
 
 public interface IWailaEntityAccessor {
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	Entity               getEntity();
-	MovingObjectPosition getPosition();
-	Vec3                 getRenderingPosition();
-	NBTTagCompound       getNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
+
+    World getWorld();
+
+    EntityPlayer getPlayer();
+
+    Entity getEntity();
+
+    MovingObjectPosition getPosition();
+
+    Vec3 getRenderingPosition();
+
+    NBTTagCompound getNBTData();
+
+    int getNBTInteger(NBTTagCompound tag, String keyname);
+
+    double getPartialFrame();
 }

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

@@ -10,70 +10,85 @@ import net.minecraft.world.World;
 /**
  * Callback class interface used to provide Entity tooltip informations to Waila.<br>
  * All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be
- * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method 
+ * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method
  * (cf. {@link IWailaRegistrar} documentation for more information).
+ * 
  * @author ProfMobius
  *
  */
 public interface IWailaEntityProvider {
-	
-	/**
-	 * Callback used to override the default Waila lookup system.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerOverrideEntityProvider}.</br>
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return null if override is not required, an Entity otherwise.
-	 */
-	Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param entity Current Entity scanned.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */
-	List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param entity Current Entity scanned.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */	
-	List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param entity Current Entity scanned.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */	
-	List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used server side to return a custom synchronization NBTTagCompound.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider} server and client side.</br>
-	 * You are supposed to always return the modified input NBTTagCompound tag.</br>
-	 * @param player The player requesting data synchronization (The owner of the current connection).
-	 * @param ent The Entity targeted for synchronization.
-	 * @param tag Current synchronization tag (might have been processed by other providers and might be processed by other providers).
-	 * @param world TileEntity's World.
-	 * @return Modified input NBTTagCompound tag.
-	 */
-	NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world);	
+
+    /**
+     * Callback used to override the default Waila lookup system.</br>
+     * Will be used if the implementing class is registered via
+     * {@link IWailaRegistrar}.{@link registerOverrideEntityProvider}.</br>
+     * 
+     * @param accessor Contains most of the relevant information about the current environment.
+     * @param config   Current configuration of Waila.
+     * @return null if override is not required, an Entity otherwise.
+     */
+    Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param entity     Current Entity scanned.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaHead(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param entity     Current Entity scanned.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaBody(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param entity     Current Entity scanned.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaTail(Entity entity, List<String> currenttip, IWailaEntityAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used server side to return a custom synchronization NBTTagCompound.</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerNBTProvider}
+     * server and client side.</br>
+     * You are supposed to always return the modified input NBTTagCompound tag.</br>
+     * 
+     * @param player The player requesting data synchronization (The owner of the current connection).
+     * @param ent    The Entity targeted for synchronization.
+     * @param tag    Current synchronization tag (might have been processed by other providers and might be processed by
+     *               other providers).
+     * @param world  TileEntity's World.
+     * @return Modified input NBTTagCompound tag.
+     */
+    NBTTagCompound getNBTData(EntityPlayerMP player, Entity ent, NBTTagCompound tag, World world);
 }

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

@@ -8,22 +8,34 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 /**
- * The Accessor is used to get some basic data out of the game without having to request direct access to the game engine.<br>
+ * The Accessor is used to get some basic data out of the game without having to request direct access to the game
+ * engine.<br>
  * It will also return things that are unmodified by the overriding systems (like getWailaStack).<br>
  * An instance of this interface is passed to most of Waila FMP callbacks.
+ * 
  * @author ProfMobius
  *
  */
 
 public interface IWailaFMPAccessor {
-	World        		 getWorld();
-	EntityPlayer 		 getPlayer();
-	TileEntity           getTileEntity();
-	MovingObjectPosition getPosition();
-	NBTTagCompound       getNBTData();
-	NBTTagCompound       getFullNBTData();
-	int                  getNBTInteger(NBTTagCompound tag, String keyname);
-	double               getPartialFrame();
-	Vec3                 getRenderingPosition();
-	String               getID();
+
+    World getWorld();
+
+    EntityPlayer getPlayer();
+
+    TileEntity getTileEntity();
+
+    MovingObjectPosition getPosition();
+
+    NBTTagCompound getNBTData();
+
+    NBTTagCompound getFullNBTData();
+
+    int getNBTInteger(NBTTagCompound tag, String keyname);
+
+    double getPartialFrame();
+
+    Vec3 getRenderingPosition();
+
+    String getID();
 }

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

@@ -5,19 +5,21 @@ import net.minecraft.item.ItemStack;
 /**
  * Callback class interface used to provide FMP decorator.<br>
  * All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be
- * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method 
+ * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method
  * (cf. {@link IWailaRegistrar} documentation for more information).
+ * 
  * @author ProfMobius
  *
  */
 public interface IWailaFMPDecorator {
-	
-	/**
-	 * Callback for the decorator. It provides a standard GL stack positioned on the block.</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.</br>
-	 * @param itemStack Current block scanned, in ItemStack form. 
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 */	
-	void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config);	
+
+    /**
+     * Callback for the decorator. It provides a standard GL stack positioned on the block.</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerDecorator}.</br>
+     * 
+     * @param itemStack Current block scanned, in ItemStack form.
+     * @param accessor  Contains most of the relevant information about the current environment.
+     * @param config    Current configuration of Waila.
+     */
+    void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config);
 }

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

@@ -7,48 +7,59 @@ import net.minecraft.item.ItemStack;
 /**
  * Callback class interface used to provide FMP tooltip informations to Waila.<br>
  * All methods in this interface shouldn't to be called by the implementing mod. An instance of the class is to be
- * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method 
+ * registered to Waila via the {@link IWailaRegistrar} instance provided in the original registration callback method
  * (cf. {@link IWailaRegistrar} documentation for more information).
+ * 
  * @author ProfMobius
  *
  */
 public interface IWailaFMPProvider {
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */
-	List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */		
-	List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
-	
-	/**
-	 * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
-	 * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider} client side.</br>
-	 * You are supposed to always return the modified input currenttip.</br>
-	 * 
-	 * @param itemStack Current block scanned, in ItemStack form.
-	 * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be processed by other providers).
-	 * @param accessor Contains most of the relevant information about the current environment.
-	 * @param config Current configuration of Waila.
-	 * @return Modified input currenttip
-	 */		
-	List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerHeadProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerBodyProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config);
+
+    /**
+     * Callback used to add lines to one of the three sections of the tooltip (Head, Body, Tail).</br>
+     * Will be used if the implementing class is registered via {@link IWailaRegistrar}.{@link registerTailProvider}
+     * client side.</br>
+     * You are supposed to always return the modified input currenttip.</br>
+     * 
+     * @param itemStack  Current block scanned, in ItemStack form.
+     * @param currenttip Current list of tooltip lines (might have been processed by other providers and might be
+     *                   processed by other providers).
+     * @param accessor   Contains most of the relevant information about the current environment.
+     * @param config     Current configuration of Waila.
+     * @return Modified input currenttip
+     */
+    List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config);
 }

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

@@ -4,74 +4,90 @@ package mcp.mobius.waila.api;
  * Main registration interface. An instance will be provided to a method specified in an IMC msg formatted as follow<br>
  * FMLInterModComms.sendMessage("Waila", "register", "fully.qualified.path.to.registration.method");<br>
  * The registration method need to follow this signature<br>
- * public static void callbackRegister({@link IWailaRegistrar} registrar)<p>
- * If not specified otherwise, all the registration methods taking a class can take classes as well as interfaces.
- * Waila will do a lookup using instanceof on the registered classes, meaning that if all your targets inherit one interface, you only need
- * to specify it to cover the whole hierarchy.<br>
- * For the registration of blocks, both Blocks and TileEntities are accepted.<p>
+ * public static void callbackRegister({@link IWailaRegistrar} registrar)
+ * <p>
+ * If not specified otherwise, all the registration methods taking a class can take classes as well as interfaces. Waila
+ * will do a lookup using instanceof on the registered classes, meaning that if all your targets inherit one interface,
+ * you only need to specify it to cover the whole hierarchy.<br>
+ * For the registration of blocks, both Blocks and TileEntities are accepted.
+ * <p>
  * For the configuration keys :<br>
  * modname refers to a String used for display in Waila's config panel.<br>
- * keyname refers to an unique key used internally for config query (cf {@link IWailaConfigHandler}). Those keys are shared across Waila, keep them unique !<br>
+ * keyname refers to an unique key used internally for config query (cf {@link IWailaConfigHandler}). Those keys are
+ * shared across Waila, keep them unique !<br>
  * 
  * 
  * @author ProfMobius
  *
  */
 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 addConfig(String modname, String keyname, String configtext, boolean defvalue);
-	public void addConfigRemote(String modname, String keyname, String configtext);	
-	public void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue);
-	public void addConfig(String modname, String keyname);
-	public void addConfig(String modname, String keyname, boolean defvalue);	
-	public void addConfigRemote(String modname, String keyname);	
-	public void addConfigRemote(String modname, String keyname, boolean defvalue);
-	
-	/* Register a stack overrider for the given 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);	
 
-	/* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */
-	public void registerNBTProvider(IWailaDataProvider dataProvider, Class block);	
-	
-	/* Entity text registration methods */
-	public void registerHeadProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerBodyProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerTailProvider     (IWailaEntityProvider dataProvider, Class entity);
-	public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity);
+    /* 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);
 
-	/* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */
-	public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity);	
-	
-	/* FMP Providers */
-	public void registerHeadProvider(IWailaFMPProvider dataProvider, String name);
-	public void registerBodyProvider(IWailaFMPProvider dataProvider, String name);
-	public void registerTailProvider(IWailaFMPProvider dataProvider, String name);
-	
-	/* The block decorators */
-	public void registerDecorator (IWailaBlockDecorator decorator, Class block);
-	public void registerDecorator (IWailaFMPDecorator decorator,   String name);	
-	
-	/* Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent).  
-	 * Accept * as a ending wildcard 
-	 * registerNBTKey("bob.*", MyBlock.class)
-	 * registerNBTKey("data.life", MyEntity.class) 
-	 * registerNBTKey("*", MyTileEntity.class) will reproduce the full tag syncing from 1.4.5 
-	 * 
-	 * This registration method is deprecated in favor to registerNBTProvider.
-	 * It will be removed in MC 1.8 !!!
-	 * */
-	@Deprecated
-	public void registerSyncedNBTKey(String key, Class target);
-	
-	public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer);
-	
-	/* UNUSED FOR NOW (Will be used for the ingame wiki */
-	//public void registerDocTextFile  (String filename);
-	//public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item);
+    public void addConfig(String modname, String keyname, String configtext, boolean defvalue);
+
+    public void addConfigRemote(String modname, String keyname, String configtext);
+
+    public void addConfigRemote(String modname, String keyname, String configtext, boolean defvalue);
+
+    public void addConfig(String modname, String keyname);
+
+    public void addConfig(String modname, String keyname, boolean defvalue);
+
+    public void addConfigRemote(String modname, String keyname);
+
+    public void addConfigRemote(String modname, String keyname, boolean defvalue);
+
+    /* Register a stack overrider for the given 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);
+
+    /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */
+    public void registerNBTProvider(IWailaDataProvider dataProvider, Class block);
+
+    /* Entity text registration methods */
+    public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity);
+
+    public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity);
+
+    public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity);
+
+    public void registerOverrideEntityProvider(IWailaEntityProvider dataProvider, Class entity);
+
+    /* Registering an NBT Provider provides a way to override the default "writeToNBT" way of doing things. */
+    public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity);
+
+    /* FMP Providers */
+    public void registerHeadProvider(IWailaFMPProvider dataProvider, String name);
+
+    public void registerBodyProvider(IWailaFMPProvider dataProvider, String name);
+
+    public void registerTailProvider(IWailaFMPProvider dataProvider, String name);
+
+    /* The block decorators */
+    public void registerDecorator(IWailaBlockDecorator decorator, Class block);
+
+    public void registerDecorator(IWailaFMPDecorator decorator, String name);
+
+    /*
+     * Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent).
+     * Accept * as a ending wildcard registerNBTKey("bob.*", MyBlock.class) registerNBTKey("data.life", MyEntity.class)
+     * registerNBTKey("*", MyTileEntity.class) will reproduce the full tag syncing from 1.4.5 This registration method
+     * is deprecated in favor to registerNBTProvider. It will be removed in MC 1.8 !!!
+     */
+    @Deprecated
+    public void registerSyncedNBTKey(String key, Class target);
+
+    public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer);
+
+    /* UNUSED FOR NOW (Will be used for the ingame wiki */
+    // public void registerDocTextFile (String filename);
+    // public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item);
 }

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

@@ -5,17 +5,18 @@ import java.util.LinkedHashMap;
 import net.minecraft.item.ItemStack;
 
 public interface IWailaSummaryProvider {
-	/* This interface is used to control the display data in the description screen */
-	
-	/* BASIC TOOLS & ITEMS DATA */
-	//EnumToolMaterial getMaterial(ItemStack stack);
-	//String getMaterialName(ItemStack stack);
-	//String getEffectiveBlock(ItemStack stack);
-	//int getHarvestLevel(ItemStack stack);
-	//float getEfficiencyOnProperMaterial(ItemStack stack);
-	//int getEnchantability(ItemStack stack);
-	//int getDamageVsEntity(ItemStack stack);
-	//int getDurability(ItemStack stack);
-	
-	LinkedHashMap<String, String> getSummary(ItemStack stack, LinkedHashMap<String, String> currentSummary, IWailaConfigHandler config);
+    /* This interface is used to control the display data in the description screen */
+
+    /* BASIC TOOLS & ITEMS DATA */
+    // EnumToolMaterial getMaterial(ItemStack stack);
+    // String getMaterialName(ItemStack stack);
+    // String getEffectiveBlock(ItemStack stack);
+    // int getHarvestLevel(ItemStack stack);
+    // float getEfficiencyOnProperMaterial(ItemStack stack);
+    // int getEnchantability(ItemStack stack);
+    // int getDamageVsEntity(ItemStack stack);
+    // int getDurability(ItemStack stack);
+
+    LinkedHashMap<String, String> getSummary(ItemStack stack, LinkedHashMap<String, String> currentSummary,
+            IWailaConfigHandler config);
 }

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

@@ -1,24 +1,25 @@
 package mcp.mobius.waila.api;
 
 import java.awt.Dimension;
-import java.awt.Point;
-
 
 public interface IWailaTooltipRenderer {
-	/**
-	 * 
-	 * @param params Array of string parameters as passed to the RENDER arg in the tooltip ({rendername,param1,param2,...})
-	 * @param accessor A global accessor for TileEntities and Entities
-	 * @return Dimension of the reserved area
-	 */
-	Dimension getSize(String[] params, IWailaCommonAccessor accessor);
-	
-	/**
-	 * Draw method for the renderer. The GL matrice is automatically moved to the top left of the reserved zone.<br>
-	 * All calls should be relative to (0,0)
-	 * 
-	 * @param params Array of string parameters as passed to the RENDER arg in the tooltip ({rendername,param1,param2,...})
-	 * @param accessor A global accessor for TileEntities and Entities
-	 */
-	void      draw   (String[] params, IWailaCommonAccessor accessor);
+
+    /**
+     * 
+     * @param params   Array of string parameters as passed to the RENDER arg in the tooltip
+     *                 ({rendername,param1,param2,...})
+     * @param accessor A global accessor for TileEntities and Entities
+     * @return Dimension of the reserved area
+     */
+    Dimension getSize(String[] params, IWailaCommonAccessor accessor);
+
+    /**
+     * Draw method for the renderer. The GL matrice is automatically moved to the top left of the reserved zone.<br>
+     * All calls should be relative to (0,0)
+     * 
+     * @param params   Array of string parameters as passed to the RENDER arg in the tooltip
+     *                 ({rendername,param1,param2,...})
+     * @param accessor A global accessor for TileEntities and Entities
+     */
+    void draw(String[] params, IWailaCommonAccessor accessor);
 }

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

@@ -1,70 +1,83 @@
 package mcp.mobius.waila.api;
 
-import static mcp.mobius.waila.api.SpecialChars.RENDER;
-import static mcp.mobius.waila.api.SpecialChars.WailaStyle;
-
 import java.util.regex.Pattern;
 
 public class SpecialChars {
 
-	public static String MCStyle  = "\u00A7";
-	
-	public static String BLACK    = MCStyle + "0";
-	public static String DBLUE    = MCStyle + "1";
-	public static String DGREEN   = MCStyle + "2";
-	public static String DAQUA    = MCStyle + "3";
-	public static String DRED     = MCStyle + "4";
-	public static String DPURPLE  = MCStyle + "5";
-	public static String GOLD     = MCStyle + "6";
-	public static String GRAY     = MCStyle + "7";
-	public static String DGRAY    = MCStyle + "8";
-	public static String BLUE     = MCStyle + "9";
-	public static String GREEN    = MCStyle + "a";
-	public static String AQUA     = MCStyle + "b";
-	public static String RED      = MCStyle + "c";
-	public static String LPURPLE  = MCStyle + "d";
-	public static String YELLOW   = MCStyle + "e";
-	public static String WHITE    = MCStyle + "f";	
-	
-	public static String OBF      = MCStyle + "k";
-	public static String BOLD     = MCStyle + "l";
-	public static String STRIKE   = MCStyle + "m";
-	public static String UNDER    = MCStyle + "n";
-	public static String ITALIC   = MCStyle + "o";
-	public static String RESET    = MCStyle + "r";		
+    public static String MCStyle = "\u00A7";
 
-	public static String WailaStyle     = "\u00A4";
-	public static String WailaIcon      = "\u00A5";
-	public static String WailaRenderer  = "\u00A6";
-	public static String TAB         = WailaStyle + WailaStyle +"a";
-	public static String ALIGNRIGHT  = WailaStyle + WailaStyle +"b";
-	public static String ALIGNCENTER = WailaStyle + WailaStyle +"c";	
-	public static String HEART       = WailaStyle + WailaIcon  +"a";
-	public static String HHEART      = WailaStyle + WailaIcon  +"b";
-	public static String EHEART      = WailaStyle + WailaIcon  +"c";
-	public static String RENDER      = WailaStyle + WailaRenderer +"a";
-	
-	public static final Pattern patternMinecraft = Pattern.compile("(?i)"  + MCStyle + "[0-9A-FK-OR]");
-	public static final Pattern patternWaila     = Pattern.compile("(?i)(" + WailaStyle + "(?<type>..))");
-	public static final Pattern patternRender    = Pattern.compile("(?i)(" + RENDER + "\\{(?<name>[^,}]*),?(?<args>[^}]*)\\})");
-	public static final Pattern patternTab       = Pattern.compile("(?i)"  + TAB);
-	public static final Pattern patternRight     = Pattern.compile("(?i)"  + ALIGNRIGHT);
-	public static final Pattern patternCenter    = Pattern.compile("(?i)"  + ALIGNCENTER);
-	public static final Pattern patternIcon      = Pattern.compile("(?i)(" + WailaStyle + WailaIcon + "(?<type>[0-9a-z]))");
-	public static final Pattern patternLineSplit = Pattern.compile("(?i)(" + WailaStyle + WailaStyle + "[^" + WailaStyle + "]+|" + WailaStyle + WailaIcon + "[0-9A-Z]|" + WailaStyle + WailaRenderer + "a\\{([^,}]*),?([^}]*)\\}|[^" + WailaStyle + "]+)");
-	
-	/**
-	 * Helper method to get a proper RENDER string. Just put the name of the renderer and the params in, and it will give back a directly usable String for the tooltip.
-	 * @param name
-	 * @param params
-	 * @return
-	 */
-	public static String getRenderString(String name, String... params){
-		String result = RENDER + "{" + name;
-		for (String s : params){
-			result += "," + s;
-		}
-		result += "}";
-		return result;
-	}
+    public static String BLACK = MCStyle + "0";
+    public static String DBLUE = MCStyle + "1";
+    public static String DGREEN = MCStyle + "2";
+    public static String DAQUA = MCStyle + "3";
+    public static String DRED = MCStyle + "4";
+    public static String DPURPLE = MCStyle + "5";
+    public static String GOLD = MCStyle + "6";
+    public static String GRAY = MCStyle + "7";
+    public static String DGRAY = MCStyle + "8";
+    public static String BLUE = MCStyle + "9";
+    public static String GREEN = MCStyle + "a";
+    public static String AQUA = MCStyle + "b";
+    public static String RED = MCStyle + "c";
+    public static String LPURPLE = MCStyle + "d";
+    public static String YELLOW = MCStyle + "e";
+    public static String WHITE = MCStyle + "f";
+
+    public static String OBF = MCStyle + "k";
+    public static String BOLD = MCStyle + "l";
+    public static String STRIKE = MCStyle + "m";
+    public static String UNDER = MCStyle + "n";
+    public static String ITALIC = MCStyle + "o";
+    public static String RESET = MCStyle + "r";
+
+    public static String WailaStyle = "\u00A4";
+    public static String WailaIcon = "\u00A5";
+    public static String WailaRenderer = "\u00A6";
+    public static String TAB = WailaStyle + WailaStyle + "a";
+    public static String ALIGNRIGHT = WailaStyle + WailaStyle + "b";
+    public static String ALIGNCENTER = WailaStyle + WailaStyle + "c";
+    public static String HEART = WailaStyle + WailaIcon + "a";
+    public static String HHEART = WailaStyle + WailaIcon + "b";
+    public static String EHEART = WailaStyle + WailaIcon + "c";
+    public static String RENDER = WailaStyle + WailaRenderer + "a";
+
+    public static final Pattern patternMinecraft = Pattern.compile("(?i)" + MCStyle + "[0-9A-FK-OR]");
+    public static final Pattern patternWaila = Pattern.compile("(?i)(" + WailaStyle + "(?<type>..))");
+    public static final Pattern patternRender = Pattern
+            .compile("(?i)(" + RENDER + "\\{(?<name>[^,}]*),?(?<args>[^}]*)\\})");
+    public static final Pattern patternTab = Pattern.compile("(?i)" + TAB);
+    public static final Pattern patternRight = Pattern.compile("(?i)" + ALIGNRIGHT);
+    public static final Pattern patternCenter = Pattern.compile("(?i)" + ALIGNCENTER);
+    public static final Pattern patternIcon = Pattern.compile("(?i)(" + WailaStyle + WailaIcon + "(?<type>[0-9a-z]))");
+    public static final Pattern patternLineSplit = Pattern.compile(
+            "(?i)(" + WailaStyle
+                    + WailaStyle
+                    + "[^"
+                    + WailaStyle
+                    + "]+|"
+                    + WailaStyle
+                    + WailaIcon
+                    + "[0-9A-Z]|"
+                    + WailaStyle
+                    + WailaRenderer
+                    + "a\\{([^,}]*),?([^}]*)\\}|[^"
+                    + WailaStyle
+                    + "]+)");
+
+    /**
+     * Helper method to get a proper RENDER string. Just put the name of the renderer and the params in, and it will
+     * give back a directly usable String for the tooltip.
+     * 
+     * @param name
+     * @param params
+     * @return
+     */
+    public static String getRenderString(String name, String... params) {
+        String result = RENDER + "{" + name;
+        for (String s : params) {
+            result += "," + s;
+        }
+        result += "}";
+        return result;
+    }
 }

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

@@ -5,171 +5,172 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
+
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.handlers.HUDHandlerEntities;
 import mcp.mobius.waila.overlay.OverlayConfig;
 import mcp.mobius.waila.utils.Constants;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
 
 public class ConfigHandler implements IWailaConfigHandler {
 
-	/* SINGLETON */
-	private static ConfigHandler _instance = null;
-	private ConfigHandler() { _instance = this; }
-	public static ConfigHandler instance(){	return _instance == null ? new ConfigHandler() : _instance;	}	
-	/* === */
-	
-	private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
-	private ArrayList<String> serverconfigs             = new ArrayList<String>();
-	public  HashMap<String, Boolean> forcedConfigs      = new HashMap<String, Boolean>();
-	public  Configuration config = null;	
-	
-	
-	public void addModule(String modName, HashMap<String, String> options){
-		this.addModule(modName, new ConfigModule(modName, options));
-	}
+    /* SINGLETON */
+    private static ConfigHandler _instance = null;
 
-	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;
-	}
-	
-	private void saveModuleKey(String modName, String key){
-		this.saveModuleKey(modName, key, Constants.CFG_DEFAULT_VALUE);
-	}
-	
-	private void saveModuleKey(String modName, String key, boolean defvalue){
-		config.get(Constants.CATEGORY_MODULES, key, defvalue);
-		config.get(Constants.CATEGORY_SERVER , key, Constants.SERVER_FREE);			
-		config.save();		
-	}	
+    private ConfigHandler() {
+        _instance = this;
+    }
 
-	public void addConfig(String modName, String key, String name){
-		this.addConfig(modName, key, name, Constants.CFG_DEFAULT_VALUE);
-	}
-	
-	public void addConfig(String modName, String key, String name, boolean defvalue){
-		this.saveModuleKey(modName, key, defvalue);
-		
-		if (!this.modules.containsKey(modName))
-			this.modules.put(modName, new ConfigModule(modName));
-		
-		this.modules.get(modName).addOption(key, name);
-	}
+    public static ConfigHandler instance() {
+        return _instance == null ? new ConfigHandler() : _instance;
+    }
+    /* === */
 
-	public void addConfigServer(String modName, String key, String name){
-		this.addConfigServer(modName, key, name, Constants.CFG_DEFAULT_VALUE);
-	}
-	
-	public void addConfigServer(String modName, String key, String name, boolean defvalue){
-		this.saveModuleKey(modName, key, defvalue);
-		
-		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){
-		return this.getConfig(key, Constants.CFG_DEFAULT_VALUE);
-	}	
-	
-	@Override
-	public boolean getConfig(String key, boolean defvalue){
-		if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent)
-			return false;
-		
-		if (this.forcedConfigs.containsKey(key))
-			return this.forcedConfigs.get(key);
-		
-		Property prop = config.get(Constants.CATEGORY_MODULES, key, defvalue);
-		return prop.getBoolean(defvalue);		
-	}
-	
-	public boolean isServerRequired(String key){
-		return this.serverconfigs.contains(key);
-	}
+    private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
+    private ArrayList<String> serverconfigs = new ArrayList<String>();
+    public HashMap<String, Boolean> forcedConfigs = new HashMap<String, Boolean>();
+    public Configuration config = null;
 
-	
-	
-	
-	
-	
-	/* GENERAL ACCESS METHODS TO GET/SET VALUES IN THE CONFIG FILE */
-	
-	public boolean getConfig(String category, String key, boolean default_){
-		Property prop = config.get(category, key, default_);
-		return prop.getBoolean(default_);		
-	}	
-	
-	public void setConfig(String category, String key, boolean state){
-		config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.BOOLEAN));
-		config.save();		
-	}
-	
-	public int getConfig(String category, String key, int default_){
-		Property prop = config.get(category, key, default_);
-		return prop.getInt();		
-	}	
-	
-	public void setConfig(String category, String key, int state){
-		config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.INTEGER));
-		config.save();		
-	}
+    public void addModule(String modName, HashMap<String, String> options) {
+        this.addModule(modName, new ConfigModule(modName, options));
+    }
 
-	
-	/* Some accessor helpers */
-	public boolean showTooltip(){
-		return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
-	}
-	
-	
-	
-	/* Default config loading */
-	
-	public void loadDefaultConfig(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);
-		config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true);
-		
-		OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,     5000).getInt();
-		OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,     100).getInt();
-	
-		OverlayConfig.alpha =     config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,     80).getInt();
-		OverlayConfig.bgcolor =   config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR,   0x100010).getInt();
-		OverlayConfig.gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff).getInt();
-		OverlayConfig.gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f).getInt();
-		OverlayConfig.fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0).getInt();
-		OverlayConfig.scale     = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,     100).getInt() / 100.0f;
+    public void addModule(String modName, ConfigModule options) {
+        this.modules.put(modName, options);
+    }
 
-		HUDHandlerEntities.nhearts      = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NHEARTS, 20).getInt();
-		HUDHandlerEntities.maxhpfortext = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MAXHP, 40).getInt();
-		
-		config.getCategory(Constants.CATEGORY_MODULES).setComment("Those are the config keys defined in modules.\nServer side, it is used to enforce keys client side using the next section.");		
-		config.getCategory(Constants.CATEGORY_SERVER).setComment("Any key set to true here will ensure that the client is using the configuration set in the 'module' section above.\nThis is useful for enforcing false to 'cheating' keys like silverfish.");
-		
-		config.save();	
-	}
+    @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;
+    }
+
+    private void saveModuleKey(String modName, String key) {
+        this.saveModuleKey(modName, key, Constants.CFG_DEFAULT_VALUE);
+    }
+
+    private void saveModuleKey(String modName, String key, boolean defvalue) {
+        config.get(Constants.CATEGORY_MODULES, key, defvalue);
+        config.get(Constants.CATEGORY_SERVER, key, Constants.SERVER_FREE);
+        config.save();
+    }
+
+    public void addConfig(String modName, String key, String name) {
+        this.addConfig(modName, key, name, Constants.CFG_DEFAULT_VALUE);
+    }
+
+    public void addConfig(String modName, String key, String name, boolean defvalue) {
+        this.saveModuleKey(modName, key, defvalue);
+
+        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) {
+        this.addConfigServer(modName, key, name, Constants.CFG_DEFAULT_VALUE);
+    }
+
+    public void addConfigServer(String modName, String key, String name, boolean defvalue) {
+        this.saveModuleKey(modName, key, defvalue);
+
+        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) {
+        return this.getConfig(key, Constants.CFG_DEFAULT_VALUE);
+    }
+
+    @Override
+    public boolean getConfig(String key, boolean defvalue) {
+        if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent) return false;
+
+        if (this.forcedConfigs.containsKey(key)) return this.forcedConfigs.get(key);
+
+        Property prop = config.get(Constants.CATEGORY_MODULES, key, defvalue);
+        return prop.getBoolean(defvalue);
+    }
+
+    public boolean isServerRequired(String key) {
+        return this.serverconfigs.contains(key);
+    }
+
+    /* GENERAL ACCESS METHODS TO GET/SET VALUES IN THE CONFIG FILE */
+
+    public boolean getConfig(String category, String key, boolean default_) {
+        Property prop = config.get(category, key, default_);
+        return prop.getBoolean(default_);
+    }
+
+    public void setConfig(String category, String key, boolean state) {
+        config.getCategory(category).put(key, new Property(key, String.valueOf(state), Property.Type.BOOLEAN));
+        config.save();
+    }
+
+    public int getConfig(String category, String key, int default_) {
+        Property prop = config.get(category, key, default_);
+        return prop.getInt();
+    }
+
+    public void setConfig(String category, String key, int state) {
+        config.getCategory(category).put(key, new Property(key, String.valueOf(state), Property.Type.INTEGER));
+        config.save();
+    }
+
+    /* Some accessor helpers */
+    public boolean showTooltip() {
+        return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
+    }
+
+    /* Default config loading */
+
+    public void loadDefaultConfig(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);
+        config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true);
+
+        OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt();
+        OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt();
+
+        OverlayConfig.alpha = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 80).getInt();
+        OverlayConfig.bgcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0x100010)
+                .getInt();
+        OverlayConfig.gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff)
+                .getInt();
+        OverlayConfig.gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f)
+                .getInt();
+        OverlayConfig.fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0)
+                .getInt();
+        OverlayConfig.scale = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, 100).getInt()
+                / 100.0f;
+
+        HUDHandlerEntities.nhearts = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NHEARTS, 20)
+                .getInt();
+        HUDHandlerEntities.maxhpfortext = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MAXHP, 40)
+                .getInt();
+
+        config.getCategory(Constants.CATEGORY_MODULES).setComment(
+                "Those are the config keys defined in modules.\nServer side, it is used to enforce keys client side using the next section.");
+        config.getCategory(Constants.CATEGORY_SERVER).setComment(
+                "Any key set to true here will ensure that the client is using the configuration set in the 'module' section above.\nThis is useful for enforcing false to 'cheating' keys like silverfish.");
+
+        config.save();
+    }
 }

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

@@ -4,21 +4,21 @@ import java.util.HashMap;
 
 public class ConfigModule {
 
-	String modName;
-	HashMap<String, String> options;
-	
-	public ConfigModule(String _modName){
-		this.modName = _modName;
-		this.options = new HashMap<String, String>(); 
-	}
-	
-	public ConfigModule(String _modName, HashMap<String, String> _options) {
-		this.modName = _modName;
-		this.options = _options;
-	}
+    String modName;
+    HashMap<String, String> options;
+
+    public ConfigModule(String _modName) {
+        this.modName = _modName;
+        this.options = new HashMap<String, String>();
+    }
+
+    public ConfigModule(String _modName, HashMap<String, String> _options) {
+        this.modName = _modName;
+        this.options = _options;
+    }
+
+    public void addOption(String key, String name) {
+        this.options.put(key, name);
+    }
 
-	public void addOption(String key, String name){
-		this.options.put(key,name);
-	}
-	
 }

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

@@ -1,6 +1,5 @@
 package mcp.mobius.waila.api.impl;
 
-import cpw.mods.fml.common.registry.GameData;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -13,186 +12,204 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import cpw.mods.fml.common.registry.GameData;
 import mcp.mobius.waila.api.IWailaCommonAccessor;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaEntityAccessor;
 import mcp.mobius.waila.utils.NBTUtil;
 
-public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor{
+public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor {
 
-	public World world;
-	public EntityPlayer player;
-	public MovingObjectPosition mop;
-	public Vec3 renderingvec = null;
-	public Block block;
-	public int blockID;
-	public String blockResource;
-	public int metadata;
-	public TileEntity tileEntity;
-	public Entity entity;
-	public NBTTagCompound remoteNbt = null;
-	public long timeLastUpdate = System.currentTimeMillis();
-	public double partialFrame;
-	public ItemStack stack;	
-	
-	public static DataAccessorCommon instance = new DataAccessorCommon();
-	
-	public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
-		this.set(_world, _player, _mop, null, 0.0);
-	}
-	
-	public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, double partialTicks) {
-		this.world      = _world;
-		this.player     = _player;
-		this.mop        = _mop;
-		
-		if (this.mop.typeOfHit == MovingObjectType.BLOCK){
-			this.block      = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ);
-			this.metadata   = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ);
-			this.tileEntity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
-			this.entity     = null;
-			this.blockID       = Block.getIdFromBlock(this.block);
-			this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block);
-			try{ this.stack = new ItemStack(this.block, 1, this.metadata); } catch (Exception e) {}
-			
-		} else if (this.mop.typeOfHit == MovingObjectType.ENTITY){
-			this.block      = null;
-			this.metadata   = -1;
-			this.tileEntity = null;
-			this.stack      = null;
-			this.entity     = _mop.entityHit;
-		}
-		
-		if (viewEntity != null){
-			double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
-			double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks;
-			double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks;		
-			this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz);
-			this.partialFrame = partialTicks;
-		}
-	}	
-	
-	@Override
-	public World getWorld() {return this.world;}
+    public World world;
+    public EntityPlayer player;
+    public MovingObjectPosition mop;
+    public Vec3 renderingvec = null;
+    public Block block;
+    public int blockID;
+    public String blockResource;
+    public int metadata;
+    public TileEntity tileEntity;
+    public Entity entity;
+    public NBTTagCompound remoteNbt = null;
+    public long timeLastUpdate = System.currentTimeMillis();
+    public double partialFrame;
+    public ItemStack stack;
 
-	@Override
-	public EntityPlayer getPlayer() {return this.player;}
+    public static DataAccessorCommon instance = new DataAccessorCommon();
 
-	@Override
-	public Block getBlock() {return this.block;}
+    public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) {
+        this.set(_world, _player, _mop, null, 0.0);
+    }
 
-	@Override
-	public int getBlockID() {return this.blockID;}
+    public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity,
+            double partialTicks) {
+        this.world = _world;
+        this.player = _player;
+        this.mop = _mop;
 
-	@Override
-	public int getMetadata() {return this.metadata;}
+        if (this.mop.typeOfHit == MovingObjectType.BLOCK) {
+            this.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ);
+            this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ);
+            this.tileEntity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
+            this.entity = null;
+            this.blockID = Block.getIdFromBlock(this.block);
+            this.blockResource = GameData.getBlockRegistry().getNameForObject(this.block);
+            try {
+                this.stack = new ItemStack(this.block, 1, this.metadata);
+            } catch (Exception e) {}
 
-	@Override
-	public TileEntity getTileEntity() {	return this.tileEntity;}
+        } else if (this.mop.typeOfHit == MovingObjectType.ENTITY) {
+            this.block = null;
+            this.metadata = -1;
+            this.tileEntity = null;
+            this.stack = null;
+            this.entity = _mop.entityHit;
+        }
 
-	@Override
-	public Entity getEntity() {return this.entity;}
+        if (viewEntity != null) {
+            double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks;
+            double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks;
+            double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks;
+            this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz);
+            this.partialFrame = partialTicks;
+        }
+    }
 
-	@Override
-	public MovingObjectPosition getPosition() {return this.mop;}
+    @Override
+    public World getWorld() {
+        return this.world;
+    }
 
-	@Override
-	public Vec3 getRenderingPosition() {return this.renderingvec;}
+    @Override
+    public EntityPlayer getPlayer() {
+        return this.player;
+    }
 
-	@Override
-	public NBTTagCompound getNBTData() {
-		if ((this.tileEntity != null) && this.isTagCorrectTileEntity(this.remoteNbt)) 
-			return remoteNbt;
-		
-		if ((this.entity != null) && this.isTagCorrectEntity(this.remoteNbt)) 
-			return remoteNbt;		
-		
-		if (this.tileEntity != null){
-			NBTTagCompound tag = new NBTTagCompound();		
-			try{
-				this.tileEntity.writeToNBT(tag);
-			} catch (Exception e){}
-			return tag;			
-		}
-		
-		if (this.entity != null){
-			NBTTagCompound tag = new NBTTagCompound();
-			this.entity.writeToNBT(tag);
-			return tag;
-		}
-		
-		return null;
-	}
+    @Override
+    public Block getBlock() {
+        return this.block;
+    }
 
-	public void setNBTData(NBTTagCompound tag){
-		this.remoteNbt = tag;
-	}	
-	
-	private boolean isTagCorrectTileEntity(NBTTagCompound tag){
-		if (tag == null || !tag.hasKey("WailaX")){
-			this.timeLastUpdate = System.currentTimeMillis() - 250;
-			return false;
-		}
-		
-		int x = tag.getInteger("WailaX");
-		int y = tag.getInteger("WailaY");
-		int z = tag.getInteger("WailaZ");
-		
-		if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ)
-			return true;
-		else {
-			this.timeLastUpdate = System.currentTimeMillis() - 250;			
-			return false;
-		}
-	}	
-	
-	private boolean isTagCorrectEntity(NBTTagCompound tag){
-		if (tag == null || !tag.hasKey("WailaEntityID")){
-			this.timeLastUpdate = System.currentTimeMillis() - 250;
-			return false;
-		}
-		
-		int id = tag.getInteger("WailaEntityID");
-	
-		if (id == this.entity.getEntityId())
-			return true;
-		else {
-			this.timeLastUpdate = System.currentTimeMillis() - 250;			
-			return false;
-		}
-	}		
-	
-	@Override
-	public int getNBTInteger(NBTTagCompound tag, String keyname) {
-		return NBTUtil.getNBTInteger(tag, keyname);
-	}
+    @Override
+    public int getBlockID() {
+        return this.blockID;
+    }
 
-	@Override
-	public double getPartialFrame() {
-		return this.partialFrame;
-	}
+    @Override
+    public int getMetadata() {
+        return this.metadata;
+    }
 
-	@Override
-	public ForgeDirection getSide() {
-		return ForgeDirection.getOrientation(this.getPosition().sideHit);
-	}
+    @Override
+    public TileEntity getTileEntity() {
+        return this.tileEntity;
+    }
 
-	@Override
-	public ItemStack getStack() {
-		return this.stack;
-	}
+    @Override
+    public Entity getEntity() {
+        return this.entity;
+    }
 
-	public boolean isTimeElapsed(long time){
-		return System.currentTimeMillis() - this.timeLastUpdate >= time;
-	}
-	
-	public void resetTimer(){
-		this.timeLastUpdate = System.currentTimeMillis();
-	}
+    @Override
+    public MovingObjectPosition getPosition() {
+        return this.mop;
+    }
 
-	@Override
-	public String getBlockQualifiedName() {
-		return this.blockResource;
-	}	
-	
+    @Override
+    public Vec3 getRenderingPosition() {
+        return this.renderingvec;
+    }
+
+    @Override
+    public NBTTagCompound getNBTData() {
+        if ((this.tileEntity != null) && this.isTagCorrectTileEntity(this.remoteNbt)) return remoteNbt;
+
+        if ((this.entity != null) && this.isTagCorrectEntity(this.remoteNbt)) return remoteNbt;
+
+        if (this.tileEntity != null) {
+            NBTTagCompound tag = new NBTTagCompound();
+            try {
+                this.tileEntity.writeToNBT(tag);
+            } catch (Exception e) {}
+            return tag;
+        }
+
+        if (this.entity != null) {
+            NBTTagCompound tag = new NBTTagCompound();
+            this.entity.writeToNBT(tag);
+            return tag;
+        }
+
+        return null;
+    }
+
+    public void setNBTData(NBTTagCompound tag) {
+        this.remoteNbt = tag;
+    }
+
+    private boolean isTagCorrectTileEntity(NBTTagCompound tag) {
+        if (tag == null || !tag.hasKey("WailaX")) {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+
+        int x = tag.getInteger("WailaX");
+        int y = tag.getInteger("WailaY");
+        int z = tag.getInteger("WailaZ");
+
+        if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) return true;
+        else {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+    }
+
+    private boolean isTagCorrectEntity(NBTTagCompound tag) {
+        if (tag == null || !tag.hasKey("WailaEntityID")) {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+
+        int id = tag.getInteger("WailaEntityID");
+
+        if (id == this.entity.getEntityId()) return true;
+        else {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+    }
+
+    @Override
+    public int getNBTInteger(NBTTagCompound tag, String keyname) {
+        return NBTUtil.getNBTInteger(tag, keyname);
+    }
+
+    @Override
+    public double getPartialFrame() {
+        return this.partialFrame;
+    }
+
+    @Override
+    public ForgeDirection getSide() {
+        return ForgeDirection.getOrientation(this.getPosition().sideHit);
+    }
+
+    @Override
+    public ItemStack getStack() {
+        return this.stack;
+    }
+
+    public boolean isTimeElapsed(long time) {
+        return System.currentTimeMillis() - this.timeLastUpdate >= time;
+    }
+
+    public void resetTimer() {
+        this.timeLastUpdate = System.currentTimeMillis();
+    }
+
+    @Override
+    public String getBlockQualifiedName() {
+        return this.blockResource;
+    }
 }

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

@@ -6,111 +6,112 @@ 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.IWailaFMPAccessor;
 import mcp.mobius.waila.utils.NBTUtil;
 
 public class DataAccessorFMP implements IWailaFMPAccessor {
-	
-	String id;
-	World world;
-	EntityPlayer player;
-	MovingObjectPosition mop;
-	Vec3 renderingvec = null;
-	TileEntity entity;
-	NBTTagCompound partialNBT = null;	
-	NBTTagCompound remoteNBT  = null;
-	long timeLastUpdate = System.currentTimeMillis();
-	double partialFrame;
-	
-	public static DataAccessorFMP instance = new DataAccessorFMP();
-	
-	public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id) {
-		this.set(_world, _player, _mop, _partialNBT, id, null, 0.0);
-	}
-	
-	public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id, Vec3 renderVec, double partialTicks) {
-		this.world      = _world;
-		this.player     = _player;
-		this.mop        = _mop;
-		this.entity     = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
-		this.partialNBT = _partialNBT;
-		this.id         = id;
-		this.renderingvec = renderVec;
-		this.partialFrame = partialTicks;
-	}	
-	
-	@Override
-	public World getWorld() {
-		return this.world;
-	}
 
-	@Override
-	public EntityPlayer getPlayer() {
-		return this.player;
-	}
+    String id;
+    World world;
+    EntityPlayer player;
+    MovingObjectPosition mop;
+    Vec3 renderingvec = null;
+    TileEntity entity;
+    NBTTagCompound partialNBT = null;
+    NBTTagCompound remoteNBT = null;
+    long timeLastUpdate = System.currentTimeMillis();
+    double partialFrame;
 
-	@Override
-	public TileEntity getTileEntity() {
-		return this.entity;
-	}
+    public static DataAccessorFMP instance = new DataAccessorFMP();
 
-	@Override
-	public MovingObjectPosition getPosition() {
-		return this.mop;
-	}
+    public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT,
+            String id) {
+        this.set(_world, _player, _mop, _partialNBT, id, null, 0.0);
+    }
 
-	@Override
-	public NBTTagCompound getNBTData() {
-		return this.partialNBT;
-	}
+    public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT,
+            String id, Vec3 renderVec, double partialTicks) {
+        this.world = _world;
+        this.player = _player;
+        this.mop = _mop;
+        this.entity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
+        this.partialNBT = _partialNBT;
+        this.id = id;
+        this.renderingvec = renderVec;
+        this.partialFrame = partialTicks;
+    }
 
-	@Override
-	public NBTTagCompound getFullNBTData() {
-		if (this.entity == null) return null;
-		
-		if (this.isTagCorrect(this.remoteNBT))
-			return this.remoteNBT;
+    @Override
+    public World getWorld() {
+        return this.world;
+    }
 
-		NBTTagCompound tag = new NBTTagCompound();
-		this.entity.writeToNBT(tag);
-		return tag;
-	}
+    @Override
+    public EntityPlayer getPlayer() {
+        return this.player;
+    }
 
-	@Override
-	public int getNBTInteger(NBTTagCompound tag, String keyname) {
-		return NBTUtil.getNBTInteger(tag, keyname);
-	}
+    @Override
+    public TileEntity getTileEntity() {
+        return this.entity;
+    }
 
-	@Override
-	public double getPartialFrame() {
-		return this.partialFrame;
-	}
+    @Override
+    public MovingObjectPosition getPosition() {
+        return this.mop;
+    }
 
-	@Override
-	public Vec3 getRenderingPosition() {
-		return this.renderingvec;
-	}
+    @Override
+    public NBTTagCompound getNBTData() {
+        return this.partialNBT;
+    }
 
-	@Override
-	public String getID() {
-		return this.id;
-	}		
-	
-	private boolean isTagCorrect(NBTTagCompound tag){
-		if (tag == null){
-			this.timeLastUpdate = System.currentTimeMillis() - 250;
-			return false;
-		}
-		
-		int x = tag.getInteger("x");
-		int y = tag.getInteger("y");
-		int z = tag.getInteger("z");
-		
-		if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ)
-			return true;
-		else {
-			this.timeLastUpdate = System.currentTimeMillis() - 250;			
-			return false;
-		}
-	}
+    @Override
+    public NBTTagCompound getFullNBTData() {
+        if (this.entity == null) return null;
+
+        if (this.isTagCorrect(this.remoteNBT)) return this.remoteNBT;
+
+        NBTTagCompound tag = new NBTTagCompound();
+        this.entity.writeToNBT(tag);
+        return tag;
+    }
+
+    @Override
+    public int getNBTInteger(NBTTagCompound tag, String keyname) {
+        return NBTUtil.getNBTInteger(tag, keyname);
+    }
+
+    @Override
+    public double getPartialFrame() {
+        return this.partialFrame;
+    }
+
+    @Override
+    public Vec3 getRenderingPosition() {
+        return this.renderingvec;
+    }
+
+    @Override
+    public String getID() {
+        return this.id;
+    }
+
+    private boolean isTagCorrect(NBTTagCompound tag) {
+        if (tag == null) {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+
+        int x = tag.getInteger("x");
+        int y = tag.getInteger("y");
+        int z = tag.getInteger("z");
+
+        if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) return true;
+        else {
+            this.timeLastUpdate = System.currentTimeMillis() - 250;
+            return false;
+        }
+    }
 }

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

@@ -1,11 +1,19 @@
 package mcp.mobius.waila.api.impl;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaBlock;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -14,234 +22,215 @@ import mcp.mobius.waila.cbcore.Layout;
 import mcp.mobius.waila.network.Message0x01TERequest;
 import mcp.mobius.waila.network.Message0x03EntRequest;
 import mcp.mobius.waila.network.WailaPacketHandler;
-import mcp.mobius.waila.utils.Constants;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import net.minecraftforge.common.config.Configuration;
 
-public class MetaDataProvider{
-	
-	private Map<Integer, List<IWailaDataProvider>>  headBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
-	private Map<Integer, List<IWailaDataProvider>>  bodyBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
-	private Map<Integer, List<IWailaDataProvider>>  tailBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
-	
-	private Map<Integer, List<IWailaEntityProvider>>  headEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
-	private Map<Integer, List<IWailaEntityProvider>>  bodyEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
-	private Map<Integer, List<IWailaEntityProvider>>  tailEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
-	
-	private Class prevBlock = null;
-	private Class prevTile  = null;
-	
-	public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon 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);
-			}
-		}
+public class MetaDataProvider {
 
-		if(ModuleRegistrar.instance().hasStackProviders(block)){
-			for (List<IWailaDataProvider> providerList : ModuleRegistrar.instance().getStackProviders(block).values()){
-				for (IWailaDataProvider dataProvider : providerList){
-					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;
-	}
+    private Map<Integer, List<IWailaDataProvider>> headBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
+    private Map<Integer, List<IWailaDataProvider>> bodyBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
+    private Map<Integer, List<IWailaDataProvider>> tailBlockProviders = new TreeMap<Integer, List<IWailaDataProvider>>();
 
-	public List<String> handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor, List<String> currenttip, Layout layout) {
-		Block block   = accessor.getBlock();
-		
-		if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()){
-			accessor.resetTimer();
-			HashSet<String> keys = new HashSet<String>();
-			
-			if (ModuleRegistrar.instance().hasSyncedNBTKeys(block))
-				keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block));
+    private Map<Integer, List<IWailaEntityProvider>> headEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
+    private Map<Integer, List<IWailaEntityProvider>> bodyEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
+    private Map<Integer, List<IWailaEntityProvider>> tailEntityProviders = new TreeMap<Integer, List<IWailaEntityProvider>>();
 
-			if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity()))
-				keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity()));			
-			
-			if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block) || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity()))
-				WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys));
-			
-		} else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250) && ConfigHandler.instance().showTooltip()) {
-			
-			try{
-				NBTTagCompound tag = new NBTTagCompound();
-    			accessor.getTileEntity().writeToNBT(tag);			
-				accessor.setNBTData(tag);			
-			} catch (Exception e){
-				WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
-			}			
-		}
+    private Class prevBlock = null;
+    private Class prevTile = null;
 
-		/* Interface IWailaBlock */
-		if (IWailaBlock.class.isInstance(block)){
-			TileEntity entity = world.getTileEntity(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);
-				}				
-		}		
+    public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop,
+            DataAccessorCommon accessor) {
+        Block block = accessor.getBlock();
+        int blockID = accessor.getBlockID();
 
-		headBlockProviders.clear();
-		bodyBlockProviders.clear();
-		tailBlockProviders.clear();
-		
-		/* Lookup by class (for blocks)*/		
-		if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
-			headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block));
+        if (IWailaBlock.class.isInstance(block)) {
+            try {
+                return ((IWailaBlock) block).getWailaStack(accessor, ConfigHandler.instance());
+            } catch (Throwable e) {
+                WailaExceptionHandler.handleErr(e, block.getClass().toString(), null);
+            }
+        }
 
-		else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
-			bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block));
+        if (ModuleRegistrar.instance().hasStackProviders(block)) {
+            for (List<IWailaDataProvider> providerList : ModuleRegistrar.instance().getStackProviders(block).values()) {
+                for (IWailaDataProvider dataProvider : providerList) {
+                    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;
+    }
 
-		else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
-			tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block));
+    public List<String> handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player,
+            MovingObjectPosition mop, DataAccessorCommon accessor, List<String> currenttip, Layout layout) {
+        Block block = accessor.getBlock();
 
-		
-		/* Lookup by class (for tileentities)*/		
-		if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
-			headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
+        if (accessor.getTileEntity() != null && Waila.instance.serverPresent
+                && accessor.isTimeElapsed(250)
+                && ConfigHandler.instance().showTooltip()) {
+            accessor.resetTimer();
+            HashSet<String> keys = new HashSet<String>();
 
-		else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
-			bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
-	
-		else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
-			tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
-	
-		/* Apply all collected providers */
-		if (layout == Layout.HEADER)
-			for (List<IWailaDataProvider> providersList : headBlockProviders.values()){
-				for (IWailaDataProvider dataProvider : providersList)
-					try{				
-						currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
-					} catch (Throwable e){
-						currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-					}
-			}
+            if (ModuleRegistrar.instance().hasSyncedNBTKeys(block))
+                keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block));
 
-		if (layout == Layout.BODY)	
-			for (List<IWailaDataProvider> providersList : bodyBlockProviders.values()){			
-				for (IWailaDataProvider dataProvider : providersList)
-					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 (List<IWailaDataProvider> providersList : tailBlockProviders.values()){
-				for (IWailaDataProvider dataProvider : providersList)
-					try{				
-						currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
-					} catch (Throwable e){
-						currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-					}		
-			}
-		return currenttip;
-	}
-	
-	public List<String> handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorCommon accessor, List<String> currenttip, Layout layout) {
-		
-		if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){
-			accessor.resetTimer();
-			HashSet<String> keys = new HashSet<String>();
+            if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity()))
+                keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity()));
 
-			if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity()))
-				keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity()));			
-			
-			if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity()))
-				WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys));			
-			
-		} else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
-			
-			try{
-				NBTTagCompound tag = new NBTTagCompound();
-				accessor.getEntity().writeToNBT(tag);			
-				accessor.remoteNbt = tag;
-			} catch (Exception e){
-				WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
-			}
-		}
+            if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTProviders(block)
+                    || ModuleRegistrar.instance().hasNBTProviders(accessor.getTileEntity()))
+                WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys));
 
-		headEntityProviders.clear();
-		bodyEntityProviders.clear();
-		tailEntityProviders.clear();
-		
-		/* Lookup by class (for entities)*/		
-		if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity))
-			headEntityProviders.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
+        } else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent
+                && accessor.isTimeElapsed(250)
+                && ConfigHandler.instance().showTooltip()) {
 
-		else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity))
-			bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
+                    try {
+                        NBTTagCompound tag = new NBTTagCompound();
+                        accessor.getTileEntity().writeToNBT(tag);
+                        accessor.setNBTData(tag);
+                    } catch (Exception e) {
+                        WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
+                    }
+                }
 
-		else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity))
-			tailEntityProviders.putAll(ModuleRegistrar.instance().getTailEntityProviders(entity));
+        /* Interface IWailaBlock */
+        if (IWailaBlock.class.isInstance(block)) {
+            TileEntity entity = world.getTileEntity(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);
+            }
+        }
 
-		/* Apply all collected providers */
-		if (layout == Layout.HEADER)
-			for (List<IWailaEntityProvider> providersList : headEntityProviders.values()){
-				for (IWailaEntityProvider dataProvider : providersList)
-					try{				
-						currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance());
-					} catch (Throwable e){
-						currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-					}
-			}
+        headBlockProviders.clear();
+        bodyBlockProviders.clear();
+        tailBlockProviders.clear();
 
-		if (layout == Layout.BODY)		
-			for (List<IWailaEntityProvider> providersList : bodyEntityProviders.values()){
-				for (IWailaEntityProvider dataProvider : providersList)
-					try{				
-						currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance());
-					} catch (Throwable e){
-						currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-					}
-			}
-		
-		if (layout == Layout.FOOTER)	
-			for (List<IWailaEntityProvider> providersList : tailEntityProviders.values()){
-				for (IWailaEntityProvider dataProvider : providersList)
-					try{				
-						currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance());
-					} catch (Throwable e){
-						currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
-					}
-			}
-		
-		return currenttip;
-	}	
+        /* Lookup by class (for blocks) */
+        if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block))
+            headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(block));
+
+        else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block))
+            bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(block));
+
+        else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block))
+            tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(block));
+
+        /* Lookup by class (for tileentities) */
+        if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity()))
+            headBlockProviders.putAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity()));
+
+        else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity()))
+            bodyBlockProviders.putAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity()));
+
+        else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity()))
+            tailBlockProviders.putAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity()));
+
+        /* Apply all collected providers */
+        if (layout == Layout.HEADER) for (List<IWailaDataProvider> providersList : headBlockProviders.values()) {
+            for (IWailaDataProvider dataProvider : providersList) 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 (List<IWailaDataProvider> providersList : bodyBlockProviders.values()) {
+            for (IWailaDataProvider dataProvider : providersList) 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 (List<IWailaDataProvider> providersList : tailBlockProviders.values()) {
+            for (IWailaDataProvider dataProvider : providersList) try {
+                currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance());
+            } catch (Throwable e) {
+                currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
+            }
+        }
+        return currenttip;
+    }
+
+    public List<String> handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop,
+            DataAccessorCommon accessor, List<String> currenttip, Layout layout) {
+
+        if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
+            accessor.resetTimer();
+            HashSet<String> keys = new HashSet<String>();
+
+            if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity()))
+                keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity()));
+
+            if (keys.size() != 0 || ModuleRegistrar.instance().hasNBTEntityProviders(accessor.getEntity()))
+                WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys));
+
+        } else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) {
+
+            try {
+                NBTTagCompound tag = new NBTTagCompound();
+                accessor.getEntity().writeToNBT(tag);
+                accessor.remoteNbt = tag;
+            } catch (Exception e) {
+                WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
+            }
+        }
+
+        headEntityProviders.clear();
+        bodyEntityProviders.clear();
+        tailEntityProviders.clear();
+
+        /* Lookup by class (for entities) */
+        if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity))
+            headEntityProviders.putAll(ModuleRegistrar.instance().getHeadEntityProviders(entity));
+
+        else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity))
+            bodyEntityProviders.putAll(ModuleRegistrar.instance().getBodyEntityProviders(entity));
+
+        else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity))
+            tailEntityProviders.putAll(ModuleRegistrar.instance().getTailEntityProviders(entity));
+
+        /* Apply all collected providers */
+        if (layout == Layout.HEADER) for (List<IWailaEntityProvider> providersList : headEntityProviders.values()) {
+            for (IWailaEntityProvider dataProvider : providersList) try {
+                currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance());
+            } catch (Throwable e) {
+                currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
+            }
+        }
+
+        if (layout == Layout.BODY) for (List<IWailaEntityProvider> providersList : bodyEntityProviders.values()) {
+            for (IWailaEntityProvider dataProvider : providersList) try {
+                currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance());
+            } catch (Throwable e) {
+                currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
+            }
+        }
+
+        if (layout == Layout.FOOTER) for (List<IWailaEntityProvider> providersList : tailEntityProviders.values()) {
+            for (IWailaEntityProvider dataProvider : providersList) try {
+                currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance());
+            } catch (Throwable e) {
+                currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip);
+            }
+        }
+
+        return currenttip;
+    }
 }

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

@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,8 +12,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.logging.log4j.Level;
-
 import au.com.bytecode.opencsv.CSVReader;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaBlockDecorator;
@@ -30,515 +27,460 @@ import mcp.mobius.waila.utils.Constants;
 
 public class ModuleRegistrar implements IWailaRegistrar {
 
-	private static ModuleRegistrar instance = null;
+    private static ModuleRegistrar instance = null;
 
-	public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> headBlockProviders  = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
-	public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> bodyBlockProviders  = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
-	public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> tailBlockProviders  = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();	
-	public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> stackBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();	
-	public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> NBTDataProviders    = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
-	
-	public LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>> blockClassDecorators = new LinkedHashMap<Class,   ArrayList<IWailaBlockDecorator>>();
-	
-	public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> headEntityProviders      = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
-	public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> bodyEntityProviders      = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
-	public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> tailEntityProviders      = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
-	public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> overrideEntityProviders  = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();	
-	public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> NBTEntityProviders       = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
-	
-	public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> headFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
-	public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> bodyFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
-	public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> tailFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();	
+    public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> headBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> bodyBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> tailBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> stackBlockProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaDataProvider>> NBTDataProviders = new LinkedHashMap<Class, ArrayList<IWailaDataProvider>>();
 
-	public LinkedHashMap<String, ArrayList<IWailaFMPDecorator>> FMPClassDecorators = new LinkedHashMap<String, ArrayList<IWailaFMPDecorator>>();	
-	
-	public LinkedHashMap<Class, HashSet<String>> syncedNBTKeys = new LinkedHashMap<Class, HashSet<String>>();
-	
-	public LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>> wikiDescriptions = new LinkedHashMap<String, LinkedHashMap <String, LinkedHashMap <String, String>>>();
-	public LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>> summaryProviders = new LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>>();
-	
-	public LinkedHashMap<String, String> IMCRequests = new LinkedHashMap<String, String>();	
-	
-	public LinkedHashMap<String, IWailaTooltipRenderer> tooltipRenderers = new LinkedHashMap<String, IWailaTooltipRenderer>();
-	
-	private ModuleRegistrar() {
-		instance = this;
-	}
+    public LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>> blockClassDecorators = new LinkedHashMap<Class, ArrayList<IWailaBlockDecorator>>();
 
-	public static ModuleRegistrar instance(){ 
-		if (ModuleRegistrar.instance == null)
-			ModuleRegistrar.instance = new ModuleRegistrar();
-		return ModuleRegistrar.instance;
-	}
+    public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> headEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> bodyEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> tailEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> overrideEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
+    public LinkedHashMap<Class, ArrayList<IWailaEntityProvider>> NBTEntityProviders = new LinkedHashMap<Class, ArrayList<IWailaEntityProvider>>();
 
-	/* IMC HANDLING */
-	public void addIMCRequest(String method, String modname){
-		this.IMCRequests.put(method, modname);
-	}
-	
-	/* CONFIG HANDLING */
-	@Override
-	public void addConfig(String modname, String key, String configname) {
-		this.addConfig(modname, key, configname, Constants.CFG_DEFAULT_VALUE);
-	}
+    public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> headFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
+    public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> bodyFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
+    public LinkedHashMap<String, ArrayList<IWailaFMPProvider>> tailFMPProviders = new LinkedHashMap<String, ArrayList<IWailaFMPProvider>>();
 
-	@Override
-	public void addConfigRemote(String modname, String key, String configname) {
-		this.addConfigRemote(modname, key, configname, Constants.CFG_DEFAULT_VALUE);
-	}	
-	
-	@Override
-	public void addConfig(String modname, String key) {
-		this.addConfig(modname, key, Constants.CFG_DEFAULT_VALUE);
-	}
+    public LinkedHashMap<String, ArrayList<IWailaFMPDecorator>> FMPClassDecorators = new LinkedHashMap<String, ArrayList<IWailaFMPDecorator>>();
 
-	@Override
-	public void addConfigRemote(String modname, String key) {
-		this.addConfigRemote(modname, key, Constants.CFG_DEFAULT_VALUE);
-	}	
-	
-	@Override
-	public void addConfig(String modname, String key, String configname, boolean defvalue) {
-		ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname), defvalue);
-	}
+    public LinkedHashMap<Class, HashSet<String>> syncedNBTKeys = new LinkedHashMap<Class, HashSet<String>>();
 
-	@Override
-	public void addConfigRemote(String modname, String key, String configname, boolean defvalue) {
-		ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG(configname), defvalue);
-	}	
-	
-	@Override
-	public void addConfig(String modname, String key, boolean defvalue) {
-		ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG("option." + key), defvalue);
-	}
+    public LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, String>>> wikiDescriptions = new LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, String>>>();
+    public LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>> summaryProviders = new LinkedHashMap<Class, ArrayList<IWailaSummaryProvider>>();
 
-	@Override
-	public void addConfigRemote(String modname, String key, boolean defvalue) {
-		ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key), defvalue);
-	}	
-	
-	
-	/* REGISTRATION METHODS */
-	@Override
-	public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) {
-		this.registerProvider(dataProvider, block, this.headBlockProviders);		
-	}	
+    public LinkedHashMap<String, String> IMCRequests = new LinkedHashMap<String, String>();
 
-	@Override
-	public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) {
-		this.registerProvider(dataProvider, block, this.bodyBlockProviders);
-	}	
-	
-	@Override
-	public void registerTailProvider(IWailaDataProvider dataProvider, Class block) {
-		this.registerProvider(dataProvider, block, this.tailBlockProviders);
-	}		
-	
-	@Override
-	public void registerStackProvider(IWailaDataProvider dataProvider, Class block) {
-		this.registerProvider(dataProvider, block, this.stackBlockProviders);
-	}		
+    public LinkedHashMap<String, IWailaTooltipRenderer> tooltipRenderers = new LinkedHashMap<String, IWailaTooltipRenderer>();
 
-	@Override
-	public void registerNBTProvider(IWailaDataProvider dataProvider, Class entity) {
-		this.registerProvider(dataProvider, entity, this.NBTDataProviders);	
-	}	
-	
-	@Override
-	public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) {
-		this.registerProvider(dataProvider, entity, this.headEntityProviders);		
-	}	
+    private ModuleRegistrar() {
+        instance = this;
+    }
 
-	@Override
-	public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity) {
-		this.registerProvider(dataProvider, entity, this.bodyEntityProviders);			
-	}	
-	
-	@Override
-	public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity) {
-		this.registerProvider(dataProvider, entity, this.tailEntityProviders);		
-	}	
-	
-	@Override
-	public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity) {
-		this.registerProvider(dataProvider, entity, this.NBTEntityProviders);	
-	}		
-	
-	@Override
-	public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) {
-		this.registerProvider(dataProvider, name, this.headFMPProviders);		
-	}	
+    public static ModuleRegistrar instance() {
+        if (ModuleRegistrar.instance == null) ModuleRegistrar.instance = new ModuleRegistrar();
+        return ModuleRegistrar.instance;
+    }
 
-	@Override
-	public void registerBodyProvider(IWailaFMPProvider dataProvider, String name) {
-		this.registerProvider(dataProvider, name, this.bodyFMPProviders);			
-	}	
-	
-	@Override
-	public void registerTailProvider(IWailaFMPProvider dataProvider, String name) {
-		this.registerProvider(dataProvider, name, this.tailFMPProviders);		
-	}		
-	
-	@Override
-	public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity){
-		this.registerProvider(dataProvider, entity, this.overrideEntityProviders);			
-	}	
+    /* IMC HANDLING */
+    public void addIMCRequest(String method, String modname) {
+        this.IMCRequests.put(method, modname);
+    }
 
-	/*
-	@Override
-	public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item) {
-		this.registerProvider(dataProvider, item, this.summaryProviders);	
-	}
-	*/	
+    /* CONFIG HANDLING */
+    @Override
+    public void addConfig(String modname, String key, String configname) {
+        this.addConfig(modname, key, configname, Constants.CFG_DEFAULT_VALUE);
+    }
 
-	@Override
-	public void registerDecorator(IWailaBlockDecorator decorator, Class block) {
-		this.registerProvider(decorator, block, this.blockClassDecorators);	
-	}	
-	
-	@Override
-	public void registerDecorator(IWailaFMPDecorator decorator, String name) {
-		this.registerProvider(decorator, name, this.FMPClassDecorators);	
-	}	
-	
-	private <T, V> void registerProvider(T dataProvider, V clazz, LinkedHashMap<V, ArrayList<T>> target) {
-		if (clazz == null || dataProvider == null)
-			throw new RuntimeException(String.format("Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]", dataProvider.getClass().getName(), clazz));
-		
-		if (!target.containsKey(clazz))
-			target.put(clazz, new ArrayList<T>());
-		
-		ArrayList<T> providers =target.get(clazz);
-		if (providers.contains(dataProvider)) return;		
-		
-		target.get(clazz).add(dataProvider);		
-	}	
-	
-	@Deprecated
-	@Override
-	public void registerSyncedNBTKey(String key, Class target){
-		if (!this.syncedNBTKeys.containsKey(target))
-			this.syncedNBTKeys.put(target, new HashSet<String>());
-		
-		this.syncedNBTKeys.get(target).add(key);		
-	}	
-	
-	@Override
-	public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer){
-		if (!this.tooltipRenderers.containsKey(name))
-			this.tooltipRenderers.put(name, renderer);
-		else
-			Waila.log.warn(String.format("A renderer named %s already exists (Class : %s). Skipping new renderer.", name, renderer.getClass().getName()));
-	}
-	
-	/* PROVIDER GETTERS */
-	
-	public Map<Integer, List<IWailaDataProvider>> getHeadProviders(Object block) {
-		return getProviders(block, this.headBlockProviders);
-	}
+    @Override
+    public void addConfigRemote(String modname, String key, String configname) {
+        this.addConfigRemote(modname, key, configname, Constants.CFG_DEFAULT_VALUE);
+    }
 
-	public Map<Integer, List<IWailaDataProvider>> getBodyProviders(Object block) {
-		return getProviders(block, this.bodyBlockProviders);		
-	}	
+    @Override
+    public void addConfig(String modname, String key) {
+        this.addConfig(modname, key, Constants.CFG_DEFAULT_VALUE);
+    }
 
-	public Map<Integer, List<IWailaDataProvider>> getTailProviders(Object block) {
-		return getProviders(block, this.tailBlockProviders);
-	}	
+    @Override
+    public void addConfigRemote(String modname, String key) {
+        this.addConfigRemote(modname, key, Constants.CFG_DEFAULT_VALUE);
+    }
 
-	public Map<Integer, List<IWailaDataProvider>> getStackProviders(Object block) {
-		return getProviders(block, this.stackBlockProviders);
-	}		
-	
-	public Map<Integer, List<IWailaDataProvider>> getNBTProviders(Object block) {
-		return getProviders(block, this.NBTDataProviders);
-	}	
-	
-	public Map<Integer, List<IWailaEntityProvider>> getHeadEntityProviders(Object entity) {
-		return getProviders(entity, this.headEntityProviders);		
-	}
+    @Override
+    public void addConfig(String modname, String key, String configname, boolean defvalue) {
+        ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname), defvalue);
+    }
 
-	public Map<Integer, List<IWailaEntityProvider>> getBodyEntityProviders(Object entity) {
-		return getProviders(entity, this.bodyEntityProviders);
-	}	
+    @Override
+    public void addConfigRemote(String modname, String key, String configname, boolean defvalue) {
+        ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG(configname), defvalue);
+    }
 
-	public Map<Integer, List<IWailaEntityProvider>> getTailEntityProviders(Object entity) {
-		return getProviders(entity, this.tailEntityProviders);
-	}		
-	
-	public Map<Integer, List<IWailaEntityProvider>> getOverrideEntityProviders(Object entity) {
-		return getProviders(entity, this.overrideEntityProviders);
-	}		
+    @Override
+    public void addConfig(String modname, String key, boolean defvalue) {
+        ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG("option." + key), defvalue);
+    }
 
-	public Map<Integer, List<IWailaEntityProvider>> getNBTEntityProviders(Object entity) {
-		return getProviders(entity, this.NBTEntityProviders);
-	}		
-	
-	public Map<Integer, List<IWailaFMPProvider>> getHeadFMPProviders(String name) {
-		return getProviders(name, this.headFMPProviders);		
-	}	
-	
-	public Map<Integer, List<IWailaFMPProvider>> getBodyFMPProviders(String name) {
-		return getProviders(name, this.bodyFMPProviders);
-	}	
+    @Override
+    public void addConfigRemote(String modname, String key, boolean defvalue) {
+        ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key), defvalue);
+    }
 
-	public Map<Integer, List<IWailaFMPProvider>> getTailFMPProviders(String name) {
-		return getProviders(name, this.tailFMPProviders);
-	}		
-	
-	public Map<Integer, List<IWailaSummaryProvider>> getSummaryProvider(Object item){
-		return getProviders(item, this.summaryProviders);
-	}	
-	
-	public Map<Integer, List<IWailaBlockDecorator>> getBlockDecorators(Object block){
-		return getProviders(block, this.blockClassDecorators);
-	}	
-	
-	public Map<Integer, List<IWailaFMPDecorator>> getFMPDecorators(String name){
-		return getProviders(name, this.FMPClassDecorators);
-	}		
-	
-	public IWailaTooltipRenderer getTooltipRenderer(String name){
-		return this.tooltipRenderers.get(name);
-	}
-	
-	private <T> Map<Integer, List<T>> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
-		Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
-		Integer index = 0;
-		
-		for (Class clazz : target.keySet()){
-			if (clazz.isInstance(obj))
-				returnList.put(index, target.get(clazz));
-			
-			index++;
-		}
-		
-		return returnList;		
-	}	
-	
-	private <T> Map<Integer, List<T>> getProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
-		Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
-		returnList.put(0, target.get(name));
-		return returnList;		
-	}		
-	
-	@Deprecated
-	public HashSet<String> getSyncedNBTKeys(Object target){
-		HashSet<String> returnList = new HashSet<String>();
-		for (Class clazz : this.syncedNBTKeys.keySet())
-			if (clazz.isInstance(target))
-				returnList.addAll(this.syncedNBTKeys.get(clazz));
-				
-		return returnList;		
-	}
-	
-	/* HAS METHODS */
-	
-	public boolean hasStackProviders(Object block){
-		return hasProviders(block, this.stackBlockProviders);
-	}	
-	
-	public boolean hasHeadProviders(Object block){
-		return hasProviders(block, this.headBlockProviders);		
-	}
-	
-	public boolean hasBodyProviders(Object block){
-		return hasProviders(block, this.bodyBlockProviders);
-	}
+    /* REGISTRATION METHODS */
+    @Override
+    public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) {
+        this.registerProvider(dataProvider, block, this.headBlockProviders);
+    }
 
-	public boolean hasTailProviders(Object block){
-		return hasProviders(block, this.tailBlockProviders);
-	}
+    @Override
+    public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) {
+        this.registerProvider(dataProvider, block, this.bodyBlockProviders);
+    }
 
-	public boolean hasNBTProviders(Object block){
-		return hasProviders(block, this.NBTDataProviders);
-	}	
-	
-	public boolean hasHeadEntityProviders(Object entity){
-		return hasProviders(entity, this.headEntityProviders);
-	}
-	
-	public boolean hasBodyEntityProviders(Object entity){
-		return hasProviders(entity, this.bodyEntityProviders);
-	}
+    @Override
+    public void registerTailProvider(IWailaDataProvider dataProvider, Class block) {
+        this.registerProvider(dataProvider, block, this.tailBlockProviders);
+    }
 
-	public boolean hasTailEntityProviders(Object entity){
-		return hasProviders(entity, this.tailEntityProviders);
-	}	
+    @Override
+    public void registerStackProvider(IWailaDataProvider dataProvider, Class block) {
+        this.registerProvider(dataProvider, block, this.stackBlockProviders);
+    }
 
-	public boolean hasOverrideEntityProviders(Object entity){
-		return hasProviders(entity, this.overrideEntityProviders);
-	}		
-	
-	public boolean hasNBTEntityProviders(Object entity){
-		return hasProviders(entity, this.NBTEntityProviders);
-	}		
-	
-	public boolean hasHeadFMPProviders(String name){
-		return hasProviders(name, this.headFMPProviders);
-	}
-	
-	public boolean hasBodyFMPProviders(String name){
-		return hasProviders(name, this.bodyFMPProviders);
-	}
+    @Override
+    public void registerNBTProvider(IWailaDataProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.NBTDataProviders);
+    }
 
-	public boolean hasTailFMPProviders(String name){
-		return hasProviders(name, this.tailFMPProviders);
-	}		
+    @Override
+    public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.headEntityProviders);
+    }
 
-	public boolean hasBlockDecorator(Object block){
-		return hasProviders(block, this.blockClassDecorators);
-	}	
+    @Override
+    public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.bodyEntityProviders);
+    }
 
-	public boolean hasFMPDecorator(String name){
-		return hasProviders(name, this.FMPClassDecorators);
-	}		
-	
-	private <T> boolean hasProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target){
-		for (Class clazz : target.keySet())
-			if (clazz.isInstance(obj))
-				return true;
-		return false;		
-	}	
-	
-	private <T> boolean hasProviders(String name, LinkedHashMap<String, ArrayList<T>> target){
-		return target.containsKey(name);
-	}	
-	
-	public boolean hasSummaryProvider(Class item){
-		return this.summaryProviders.containsKey(item);
-	}	
-	
-	@Deprecated
-	public boolean hasSyncedNBTKeys(Object target){
-		for (Class clazz : this.syncedNBTKeys.keySet())
-			if (clazz.isInstance(target))
-				return true;
-		return false;
-	}		
-	
-	/* ----------------- */
-	/*
-	@Override
-	public void registerDocTextFile(String filename) {
-		List<String[]> docData  = null;
-		int    nentries = 0;
-		
-		
-		try{
-			docData = this.readFileAsString(filename);
-		} catch (IOException e){
-			Waila.log.log(Level.WARN, String.format("Error while accessing file %s : %s", filename, e));
-			return;
-		}
+    @Override
+    public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.tailEntityProviders);
+    }
 
-		for (String[] ss : docData){
-			String modid  = ss[0];
-			String name   = ss[1];
-			String meta   = ss[2];
-			String desc   = ss[5].replace('$', '\n');
-			if (!(desc.trim().equals(""))){
-				if (!this.wikiDescriptions.containsKey(modid))
-					this.wikiDescriptions.put(modid, new LinkedHashMap <String, LinkedHashMap <String, String>>());
-				if (!this.wikiDescriptions.get(modid).containsKey(name))
-					this.wikiDescriptions.get(modid).put(name, new LinkedHashMap<String, String>());
-				
-				this.wikiDescriptions.get(modid).get(name).put(meta, desc);
-				System.out.printf("Registered %s %s %s\n", modid, name, meta);
-				nentries += 1;			
-			}
-		}
-		
-		
-//		String[] sections = docData.split(">>>>");
-//		for (String s : sections){
-//			s.trim();
-//			if (!s.equals("")){
-//				try{
-//					String name   = s.split("\r?\n",2)[0].trim();
-//					String desc   = s.split("\r?\n",2)[1].trim();
-//					if (!this.wikiDescriptions.containsKey(modid))
-//						this.wikiDescriptions.put(modid, new LinkedHashMap <String, String>());
-//					this.wikiDescriptions.get(modid).put(name, desc);
-//					nentries += 1;
-//				}catch (Exception e){
-//					System.out.printf("%s\n", e);
-//				}
-//			}
-//		}
-		
-		Waila.log.log(Level.INFO, String.format("Registered %s entries from %s", nentries, filename));
-	}	
-	*/
+    @Override
+    public void registerNBTProvider(IWailaEntityProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.NBTEntityProviders);
+    }
 
-	public boolean hasDocTextModID(String modid){
-		return this.wikiDescriptions.containsKey(modid);
-	}
+    @Override
+    public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) {
+        this.registerProvider(dataProvider, name, this.headFMPProviders);
+    }
 
-	public boolean hasDocTextItem(String modid, String item){
-		if (this.hasDocTextModID(modid))
-			return this.wikiDescriptions.get(modid).containsKey(item);
-		return false;
-	}
-	
-	public boolean hasDocTextMeta(String modid, String item, String meta){
-		if (this.hasDocTextItem(modid, item))
-			return this.wikiDescriptions.get(modid).get(item).containsKey(meta);
-		return false;		
-	}	
+    @Override
+    public void registerBodyProvider(IWailaFMPProvider dataProvider, String name) {
+        this.registerProvider(dataProvider, name, this.bodyFMPProviders);
+    }
 
-	public LinkedHashMap<String, String> getDocText(String modid, String name){
-		return this.wikiDescriptions.get(modid).get(name);
-	}	
-	
-	public String getDocText(String modid, String name, String meta){
-		return this.wikiDescriptions.get(modid).get(name).get(meta);
-	}
-	
-	public boolean hasDocTextSpecificMeta(String modid, String name, String meta){
-		for (String s : this.getDocText(modid, name).keySet())
-			if (s.equals(meta))
-				return true;
-		return false;
-	}
-	
-	public String getDoxTextWildcardMatch(String modid, String name){
-		Set<String> keys = this.wikiDescriptions.get(modid).keySet();
-		for (String s : keys){
-			String regexed = s;
-			regexed = regexed.replace(".", "\\.");
-			regexed = regexed.replace("*", ".*");
-			
-			if (name.matches(s))
-				return s;			
-		}
-		return null;
-	}
-	
-	private List<String[]> readFileAsString(String filePath) throws IOException {
-//		URL fileURL   = this.getClass().getResource(filePath);
-//		File filedata = new File(fileURL);
-//		Reader paramReader = new InputStreamReader(this.getClass().getResourceAsStream(filePath));
-		
-		InputStream in = getClass().getResourceAsStream(filePath);
-		BufferedReader input = new BufferedReader(new InputStreamReader(in));		
-		CSVReader reader = new CSVReader(input);
-		
-		List<String[]> myEntries = reader.readAll();
-		reader.close();
-		
-		return myEntries;
-		/*
-		StringBuffer fileData = new StringBuffer();
-        //BufferedReader reader = new BufferedReader(paramReader);
-		
-        char[] buf = new char[1024];
-        int numRead=0;
-        while((numRead=input.read(buf)) != -1){
-            String readData = String.valueOf(buf, 0, numRead);
-            fileData.append(readData);
+    @Override
+    public void registerTailProvider(IWailaFMPProvider dataProvider, String name) {
+        this.registerProvider(dataProvider, name, this.tailFMPProviders);
+    }
+
+    @Override
+    public void registerOverrideEntityProvider(IWailaEntityProvider dataProvider, Class entity) {
+        this.registerProvider(dataProvider, entity, this.overrideEntityProviders);
+    }
+
+    /*
+     * @Override public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item) {
+     * this.registerProvider(dataProvider, item, this.summaryProviders); }
+     */
+
+    @Override
+    public void registerDecorator(IWailaBlockDecorator decorator, Class block) {
+        this.registerProvider(decorator, block, this.blockClassDecorators);
+    }
+
+    @Override
+    public void registerDecorator(IWailaFMPDecorator decorator, String name) {
+        this.registerProvider(decorator, name, this.FMPClassDecorators);
+    }
+
+    private <T, V> void registerProvider(T dataProvider, V clazz, LinkedHashMap<V, ArrayList<T>> target) {
+        if (clazz == null || dataProvider == null) throw new RuntimeException(
+                String.format(
+                        "Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]",
+                        dataProvider.getClass().getName(),
+                        clazz));
+
+        if (!target.containsKey(clazz)) target.put(clazz, new ArrayList<T>());
+
+        ArrayList<T> providers = target.get(clazz);
+        if (providers.contains(dataProvider)) return;
+
+        target.get(clazz).add(dataProvider);
+    }
+
+    @Deprecated
+    @Override
+    public void registerSyncedNBTKey(String key, Class target) {
+        if (!this.syncedNBTKeys.containsKey(target)) this.syncedNBTKeys.put(target, new HashSet<String>());
+
+        this.syncedNBTKeys.get(target).add(key);
+    }
+
+    @Override
+    public void registerTooltipRenderer(String name, IWailaTooltipRenderer renderer) {
+        if (!this.tooltipRenderers.containsKey(name)) this.tooltipRenderers.put(name, renderer);
+        else Waila.log.warn(
+                String.format(
+                        "A renderer named %s already exists (Class : %s). Skipping new renderer.",
+                        name,
+                        renderer.getClass().getName()));
+    }
+
+    /* PROVIDER GETTERS */
+
+    public Map<Integer, List<IWailaDataProvider>> getHeadProviders(Object block) {
+        return getProviders(block, this.headBlockProviders);
+    }
+
+    public Map<Integer, List<IWailaDataProvider>> getBodyProviders(Object block) {
+        return getProviders(block, this.bodyBlockProviders);
+    }
+
+    public Map<Integer, List<IWailaDataProvider>> getTailProviders(Object block) {
+        return getProviders(block, this.tailBlockProviders);
+    }
+
+    public Map<Integer, List<IWailaDataProvider>> getStackProviders(Object block) {
+        return getProviders(block, this.stackBlockProviders);
+    }
+
+    public Map<Integer, List<IWailaDataProvider>> getNBTProviders(Object block) {
+        return getProviders(block, this.NBTDataProviders);
+    }
+
+    public Map<Integer, List<IWailaEntityProvider>> getHeadEntityProviders(Object entity) {
+        return getProviders(entity, this.headEntityProviders);
+    }
+
+    public Map<Integer, List<IWailaEntityProvider>> getBodyEntityProviders(Object entity) {
+        return getProviders(entity, this.bodyEntityProviders);
+    }
+
+    public Map<Integer, List<IWailaEntityProvider>> getTailEntityProviders(Object entity) {
+        return getProviders(entity, this.tailEntityProviders);
+    }
+
+    public Map<Integer, List<IWailaEntityProvider>> getOverrideEntityProviders(Object entity) {
+        return getProviders(entity, this.overrideEntityProviders);
+    }
+
+    public Map<Integer, List<IWailaEntityProvider>> getNBTEntityProviders(Object entity) {
+        return getProviders(entity, this.NBTEntityProviders);
+    }
+
+    public Map<Integer, List<IWailaFMPProvider>> getHeadFMPProviders(String name) {
+        return getProviders(name, this.headFMPProviders);
+    }
+
+    public Map<Integer, List<IWailaFMPProvider>> getBodyFMPProviders(String name) {
+        return getProviders(name, this.bodyFMPProviders);
+    }
+
+    public Map<Integer, List<IWailaFMPProvider>> getTailFMPProviders(String name) {
+        return getProviders(name, this.tailFMPProviders);
+    }
+
+    public Map<Integer, List<IWailaSummaryProvider>> getSummaryProvider(Object item) {
+        return getProviders(item, this.summaryProviders);
+    }
+
+    public Map<Integer, List<IWailaBlockDecorator>> getBlockDecorators(Object block) {
+        return getProviders(block, this.blockClassDecorators);
+    }
+
+    public Map<Integer, List<IWailaFMPDecorator>> getFMPDecorators(String name) {
+        return getProviders(name, this.FMPClassDecorators);
+    }
+
+    public IWailaTooltipRenderer getTooltipRenderer(String name) {
+        return this.tooltipRenderers.get(name);
+    }
+
+    private <T> Map<Integer, List<T>> getProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target) {
+        Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
+        Integer index = 0;
+
+        for (Class clazz : target.keySet()) {
+            if (clazz.isInstance(obj)) returnList.put(index, target.get(clazz));
+
+            index++;
         }
-        input.close();
-        return fileData.toString();
-        */
-	}
+
+        return returnList;
+    }
+
+    private <T> Map<Integer, List<T>> getProviders(String name, LinkedHashMap<String, ArrayList<T>> target) {
+        Map<Integer, List<T>> returnList = new TreeMap<Integer, List<T>>();
+        returnList.put(0, target.get(name));
+        return returnList;
+    }
+
+    @Deprecated
+    public HashSet<String> getSyncedNBTKeys(Object target) {
+        HashSet<String> returnList = new HashSet<String>();
+        for (Class clazz : this.syncedNBTKeys.keySet())
+            if (clazz.isInstance(target)) returnList.addAll(this.syncedNBTKeys.get(clazz));
+
+        return returnList;
+    }
+
+    /* HAS METHODS */
+
+    public boolean hasStackProviders(Object block) {
+        return hasProviders(block, this.stackBlockProviders);
+    }
+
+    public boolean hasHeadProviders(Object block) {
+        return hasProviders(block, this.headBlockProviders);
+    }
+
+    public boolean hasBodyProviders(Object block) {
+        return hasProviders(block, this.bodyBlockProviders);
+    }
+
+    public boolean hasTailProviders(Object block) {
+        return hasProviders(block, this.tailBlockProviders);
+    }
+
+    public boolean hasNBTProviders(Object block) {
+        return hasProviders(block, this.NBTDataProviders);
+    }
+
+    public boolean hasHeadEntityProviders(Object entity) {
+        return hasProviders(entity, this.headEntityProviders);
+    }
+
+    public boolean hasBodyEntityProviders(Object entity) {
+        return hasProviders(entity, this.bodyEntityProviders);
+    }
+
+    public boolean hasTailEntityProviders(Object entity) {
+        return hasProviders(entity, this.tailEntityProviders);
+    }
+
+    public boolean hasOverrideEntityProviders(Object entity) {
+        return hasProviders(entity, this.overrideEntityProviders);
+    }
+
+    public boolean hasNBTEntityProviders(Object entity) {
+        return hasProviders(entity, this.NBTEntityProviders);
+    }
+
+    public boolean hasHeadFMPProviders(String name) {
+        return hasProviders(name, this.headFMPProviders);
+    }
+
+    public boolean hasBodyFMPProviders(String name) {
+        return hasProviders(name, this.bodyFMPProviders);
+    }
+
+    public boolean hasTailFMPProviders(String name) {
+        return hasProviders(name, this.tailFMPProviders);
+    }
+
+    public boolean hasBlockDecorator(Object block) {
+        return hasProviders(block, this.blockClassDecorators);
+    }
+
+    public boolean hasFMPDecorator(String name) {
+        return hasProviders(name, this.FMPClassDecorators);
+    }
+
+    private <T> boolean hasProviders(Object obj, LinkedHashMap<Class, ArrayList<T>> target) {
+        for (Class clazz : target.keySet()) if (clazz.isInstance(obj)) return true;
+        return false;
+    }
+
+    private <T> boolean hasProviders(String name, LinkedHashMap<String, ArrayList<T>> target) {
+        return target.containsKey(name);
+    }
+
+    public boolean hasSummaryProvider(Class item) {
+        return this.summaryProviders.containsKey(item);
+    }
+
+    @Deprecated
+    public boolean hasSyncedNBTKeys(Object target) {
+        for (Class clazz : this.syncedNBTKeys.keySet()) if (clazz.isInstance(target)) return true;
+        return false;
+    }
+
+    /* ----------------- */
+    /*
+     * @Override public void registerDocTextFile(String filename) { List<String[]> docData = null; int nentries = 0;
+     * try{ docData = this.readFileAsString(filename); } catch (IOException e){ Waila.log.log(Level.WARN,
+     * String.format("Error while accessing file %s : %s", filename, e)); return; } for (String[] ss : docData){ String
+     * modid = ss[0]; String name = ss[1]; String meta = ss[2]; String desc = ss[5].replace('$', '\n'); if
+     * (!(desc.trim().equals(""))){ if (!this.wikiDescriptions.containsKey(modid)) this.wikiDescriptions.put(modid, new
+     * LinkedHashMap <String, LinkedHashMap <String, String>>()); if
+     * (!this.wikiDescriptions.get(modid).containsKey(name)) this.wikiDescriptions.get(modid).put(name, new
+     * LinkedHashMap<String, String>()); this.wikiDescriptions.get(modid).get(name).put(meta, desc);
+     * System.out.printf("Registered %s %s %s\n", modid, name, meta); nentries += 1; } } // String[] sections =
+     * docData.split(">>>>"); // for (String s : sections){ // s.trim(); // if (!s.equals("")){ // try{ // String name =
+     * s.split("\r?\n",2)[0].trim(); // String desc = s.split("\r?\n",2)[1].trim(); // if
+     * (!this.wikiDescriptions.containsKey(modid)) // this.wikiDescriptions.put(modid, new LinkedHashMap <String,
+     * String>()); // this.wikiDescriptions.get(modid).put(name, desc); // nentries += 1; // }catch (Exception e){ //
+     * System.out.printf("%s\n", e); // } // } // } Waila.log.log(Level.INFO,
+     * String.format("Registered %s entries from %s", nentries, filename)); }
+     */
+
+    public boolean hasDocTextModID(String modid) {
+        return this.wikiDescriptions.containsKey(modid);
+    }
+
+    public boolean hasDocTextItem(String modid, String item) {
+        if (this.hasDocTextModID(modid)) return this.wikiDescriptions.get(modid).containsKey(item);
+        return false;
+    }
+
+    public boolean hasDocTextMeta(String modid, String item, String meta) {
+        if (this.hasDocTextItem(modid, item)) return this.wikiDescriptions.get(modid).get(item).containsKey(meta);
+        return false;
+    }
+
+    public LinkedHashMap<String, String> getDocText(String modid, String name) {
+        return this.wikiDescriptions.get(modid).get(name);
+    }
+
+    public String getDocText(String modid, String name, String meta) {
+        return this.wikiDescriptions.get(modid).get(name).get(meta);
+    }
+
+    public boolean hasDocTextSpecificMeta(String modid, String name, String meta) {
+        for (String s : this.getDocText(modid, name).keySet()) if (s.equals(meta)) return true;
+        return false;
+    }
+
+    public String getDoxTextWildcardMatch(String modid, String name) {
+        Set<String> keys = this.wikiDescriptions.get(modid).keySet();
+        for (String s : keys) {
+            String regexed = s;
+            regexed = regexed.replace(".", "\\.");
+            regexed = regexed.replace("*", ".*");
+
+            if (name.matches(s)) return s;
+        }
+        return null;
+    }
+
+    private List<String[]> readFileAsString(String filePath) throws IOException {
+        // URL fileURL = this.getClass().getResource(filePath);
+        // File filedata = new File(fileURL);
+        // Reader paramReader = new InputStreamReader(this.getClass().getResourceAsStream(filePath));
+
+        InputStream in = getClass().getResourceAsStream(filePath);
+        BufferedReader input = new BufferedReader(new InputStreamReader(in));
+        CSVReader reader = new CSVReader(input);
+
+        List<String[]> myEntries = reader.readAll();
+        reader.close();
+
+        return myEntries;
+        /*
+         * StringBuffer fileData = new StringBuffer(); //BufferedReader reader = new BufferedReader(paramReader); char[]
+         * buf = new char[1024]; int numRead=0; while((numRead=input.read(buf)) != -1){ String readData =
+         * String.valueOf(buf, 0, numRead); fileData.append(readData); } input.close(); return fileData.toString();
+         */
+    }
 }