Added big time protection on API calls.

Underped the proxy
Added tag v1.3.1 for changeset 38f148ebeb8f
2026-11-15 01:25:16 +00:00 · 2013-06-19 22:37:29 +02:00 · 2013-06-19 16:52:24 +02:00 · 2013-06-19 15:29:17 +02:00 · 2013-06-19 15:28:55 +02:00 · 2013-06-18 22:39:08 -04:00
255 changed files with 2051 additions and 18802 deletions
@@ -1,387 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-APACHE COMMONS MATH DERIVATIVE WORKS: 
-
-The Apache commons-math library includes a number of subcomponents
-whose implementation is derived from original sources written
-in C or Fortran.  License terms of the original sources
-are reproduced below.
-
-===============================================================================
-For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in
-the LevenbergMarquardtOptimizer class in package
-org.apache.commons.math3.optimization.general 
-Original source copyright and license statement:
-
-Minpack Copyright Notice (1999) University of Chicago.  All rights reserved
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above
-copyright notice, this list of conditions and the following
-disclaimer.
-
-2. Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-3. The end-user documentation included with the
-redistribution, if any, must include the following
-acknowledgment:
-
-   "This product includes software developed by the
-   University of Chicago, as Operator of Argonne National
-   Laboratory.
-
-Alternately, this acknowledgment may appear in the software
-itself, if and wherever such third-party acknowledgments
-normally appear.
-
-4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS"
-WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE
-UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
-THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE
-OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
-OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR
-USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF
-THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4)
-DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
-UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL
-BE CORRECTED.
-
-5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT
-HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
-ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT,
-INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF
-ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF
-PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT
-(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
-EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE
-POSSIBILITY OF SUCH LOSS OR DAMAGES.
-===============================================================================
-
-Copyright and license statement for the odex Fortran routine developed by
-E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class
-in package org.apache.commons.math3.ode.nonstiff:
-
-
-Copyright (c) 2004, Ernst Hairer
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are 
-met:
-
- Redistributions of source code must retain the above copyright 
-notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright 
-notice, this list of conditions and the following disclaimer in the 
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===============================================================================
-
-Copyright and license statement for the original lapack fortran routines
-translated in EigenDecompositionImpl class in package
-org.apache.commons.math3.linear:
-
-Copyright (c) 1992-2008 The University of Tennessee.  All rights reserved.
-
-$COPYRIGHT$
-
-Additional copyrights may follow
-
-$HEADER$
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer. 
-  
- Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer listed
-  in this license in the documentation and/or other materials
-  provided with the distribution.
-  
- Neither the name of the copyright holders nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-  
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT  
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-===============================================================================
-
-Copyright and license statement for the original Mersenne twister C
-routines translated in MersenneTwister class in package 
-org.apache.commons.math3.random:
-
-   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.                          
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-     3. The names of its contributors may not be used to endorse or promote 
-        products derived from this software without specific prior written 
-        permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===============================================================================
-
-The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" is
-an adapted version of "OrekitMessagesTest" test class for the Orekit library
-The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator"
-has been imported from the Orekit space flight dynamics library.
-
-Th Orekit library is described at:
-  https://www.orekit.org/forge/projects/orekit
-The original files are distributed under the terms of the Apache 2 license
-which is: Copyright 2010 CS Communication & Systèmes
@@ -1,4 +0,0 @@
-Waila-1.7.10
-============
-
-A port of Prof. Mobius' Minecraft mod, Waila, to Minecraft 1.7.10. Unofficial.
@@ -1,135 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-configurations {
-    deployerJars
-}
-
-//add dependency repositories
-repositories {
-	mavenLocal()
-    mavenCentral()
-    maven {
-        name = "chickenbones"
-        url = "http://chickenbones.net/maven/"
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'forge'
-apply plugin: 'maven'
-
-version = "1.5.2a"
-group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "Waila"
-
-// Define properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // Load config. It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
-
-dependencies {
-    compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev"
-    compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.mc_version}-${config.nei_version}:dev"
-    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
-}
-
-minecraft {
-    version = "1.7.10-10.13.0.1160"
-    assetDir = "eclipse/assets"
-}
-
-def root = project.projectDir.parentFile
-sourceSets {
-    main {
-        java {
-            srcDir new File(root, "src")
-        }
-        resources {
-            srcDir new File(root, "resources")
-        }
-    }
-}
-
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-jar { 
-exclude "**/client/gui/inventory/GuiContainer.class" 
-exclude "**/client/gui/inventory/GuiContainer.java" 
-}
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.java
-    from new File(root, "dev")
-    classifier = 'sources'
-}
-
-task devJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'dev'
-}
-
-artifacts {
-    archives sourceJar, devJar
-}
-
-uploadArchives {
-	dependsOn 'reobf'
-    repositories.mavenDeployer {
-        configuration = configurations.deployerJars
-        repository(url: "scp://mobiusstrip.eu/home/mobius/web/maven"){
-            authentication(userName: "mobius")
-        }
-
-        pom {
-            groupId = project.group
-            version = project.version
-            artifactId = project.archivesBaseName
-            project {
-                name project.archivesBaseName
-                packaging 'jar'
-                description 'Waila '
-                url 'http://mobiusstrip.eu'        
-            }
-        }
-    }
-
-}
@@ -1,7 +0,0 @@
-mc_version=1.7.10
-forge_version=10.13.0.1160
-ccl_version=1.1.1.93
-ccc_version=1.0.1.8
-nei_version=1.0.2.15
-mod_version=1.0
-waila_version=1.5.2a
@@ -1,6 +0,0 @@
-#Tue May 06 21:57:37 CEST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
@@ -0,0 +1,68 @@
+package mcp.mobius.waila;
+
+import java.util.logging.Level;
+
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.forge.GuiContainerManager;
+import cpw.mods.fml.client.registry.KeyBindingRegistry;
+
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.buildcraft.BCModule;
+import mcp.mobius.waila.addons.buildcraft.HUDHandlerBCTanks;
+import mcp.mobius.waila.addons.ic2.HUDHandlerIC2IEnergySource;
+import mcp.mobius.waila.addons.ic2.HUDHandlerIC2IEnergySink;
+import mcp.mobius.waila.addons.ic2.HUDHandlerIC2IEnergyStorage;
+import mcp.mobius.waila.addons.ic2.IC2Module;
+import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla;
+import mcp.mobius.waila.gui.ConfigKeyHandler;
+import mcp.mobius.waila.handlers.HUDHandlerExternal;
+import mcp.mobius.waila.handlers.HUDHandlerWaila;
+import mcp.mobius.waila.handlers.TooltipHandlerWaila;
+import mcp.mobius.waila.server.ProxyServer;
+
+public class ProxyClient extends ProxyServer {
+
+	public ProxyClient() {}
+	
+	
+	@Override
+	public void registerHandlers(){
+		GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila());
+		//GuiContainerManager.addInputHandler(new EnchantementHandler());
+		API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.HEADER);
+		API.registerHighlightHandler(new HUDHandlerExternal(), ItemInfo.Layout.BODY);
+		API.registerHighlightHandler(new HUDHandlerWaila(),    ItemInfo.Layout.FOOTER);
+		API.registerHighlightHandler(new HUDHandlerWaila(),    ItemInfo.Layout.HEADER);		
+		
+		//API.registerHighlightIdentifier(2000, new HUDHandlerExternal());
+		KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler());
+		//API.addKeyBind("showenchant", "Display enchantements", Keyboard.KEY_RSHIFT);
+		this.registerMods();		
+	}	
+
+	public void registerMods(){
+		
+		HUDHandlerVanilla.register();
+		
+		/* BETTER BARRELS */
+		/*
+		try {
+			Class ModBetterBarrels = Class.forName("mcp.mobius.betterbarrels.mod_BetterBarrels");
+			mod_Waila.log.log(Level.INFO, "BetterBarrel mod found.");
+			HUDHandlerBetterBarrels.register();
+			ConfigHandler.instance().addConfig("BetterBarrels", "betterbarrels.content", "Barrel content");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "BetterBarrel mod not found. Skipping.");			
+		}
+		*/
+		
+		/* BUILDCRAFT */
+		BCModule.register();
+		
+		/* INDUSTRIALCRAFT2 */
+		IC2Module.register();
+		
+	}	
+	
+}
@@ -0,0 +1,84 @@
+package mcp.mobius.waila.addons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Set;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import net.minecraftforge.common.Configuration;
+import net.minecraftforge.common.Property;
+
+public class ConfigHandler implements IWailaConfigHandler {
+
+	private static ConfigHandler instance = null;
+	private LinkedHashMap<String, ConfigModule> modules = new LinkedHashMap<String, ConfigModule>();
+	private ArrayList<String> serverconfigs = new ArrayList<String>();
+	
+	private ConfigHandler() {
+		instance = this;
+	}
+
+	public static ConfigHandler instance(){
+		if (ConfigHandler.instance == null)
+			ConfigHandler.instance = new ConfigHandler();
+		return ConfigHandler.instance;
+	}
+	
+	public void addModule(String modName, HashMap<String, String> options){
+		this.addModule(modName, new ConfigModule(modName, options));
+	}
+
+	public void addModule(String modName, ConfigModule options){
+		this.modules.put(modName, options);
+	}	
+	
+	@Override
+	public Set<String> getModuleNames(){
+		return this.modules.keySet();
+	}
+	
+	@Override
+	public HashMap<String, String> getConfigKeys(String modName){
+		if (this.modules.containsKey(modName))
+			return this.modules.get(modName).options;
+		else
+			return null;
+	}
+	
+	public void addConfig(String modName, String key, String name){
+		if (!this.modules.containsKey(modName))
+			this.modules.put(modName, new ConfigModule(modName));
+		
+		this.modules.get(modName).addOption(key, name);
+	}
+
+	public void addConfigServer(String modName, String key, String name){
+		if (!this.modules.containsKey(modName))
+			this.modules.put(modName, new ConfigModule(modName));
+		
+		this.modules.get(modName).addOption(key, name);
+		this.serverconfigs.add(key);
+	}	
+	
+	@Override
+	public boolean getConfig(String key, boolean defvalue){
+		mod_Waila.instance.config.load();
+		
+		if (this.serverconfigs.contains(key) && !mod_Waila.instance.serverPresent)
+			return false;
+		
+		Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, key, defvalue);
+		return prop.getBoolean(defvalue);		
+	}
+	
+	public boolean isServerRequired(String key){
+		return this.serverconfigs.contains(key);
+	}
+	
+	@Override
+	public boolean getConfig(String key){
+		return this.getConfig(key, true);
+	}	
+}
@@ -1,4 +1,4 @@
-package mcp.mobius.waila.api.impl;
+package mcp.mobius.waila.addons;

 import java.util.HashMap;

@@ -0,0 +1,177 @@
+package mcp.mobius.waila.addons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+
+import codechicken.nei.api.API;
+
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.IWailaRegistrar;
+import mcp.mobius.waila.handlers.HUDHandlerExternal;
+
+public class ExternalModulesHandler implements IWailaRegistrar {
+
+	private static ExternalModulesHandler instance = null;
+	public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> headProviders  = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
+	public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> bodyProviders  = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();
+	public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> tailProviders  = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();	
+	public LinkedHashMap<Integer, ArrayList<IWailaDataProvider>> stackProviders = new LinkedHashMap<Integer, ArrayList<IWailaDataProvider>>();	
+
+	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>>();	
+	
+	private ExternalModulesHandler() {
+		instance = this;
+	}
+
+	public static ExternalModulesHandler instance(){
+		if (ExternalModulesHandler.instance == null)
+			ExternalModulesHandler.instance = new ExternalModulesHandler();
+		return ExternalModulesHandler.instance;
+	}
+
+	@Override
+	public void addConfig(String modname, String key, String configname) {
+		ConfigHandler.instance().addConfig(modname, key, configname);
+	}
+
+	@Override
+	public void addConfigRemote(String modname, String key, String configname) {
+		ConfigHandler.instance().addConfigServer(modname, key, configname);
+	}	
+	
+	@Override
+	public void registerHeadProvider(IWailaDataProvider dataProvider, int blockID) {
+		if (!this.headProviders.containsKey(blockID))
+			this.headProviders.put(blockID, new ArrayList<IWailaDataProvider>());
+		this.headProviders.get(blockID).add(dataProvider);
+	}
+
+	@Override
+	public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) {
+		if (!this.headBlockProviders.containsKey(block))
+			this.headBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
+		this.headBlockProviders.get(block).add(dataProvider);		
+	}	
+	
+	@Override
+	public void registerBodyProvider(IWailaDataProvider dataProvider, int blockID) {
+		if (!this.bodyProviders.containsKey(blockID))
+			this.bodyProviders.put(blockID, new ArrayList<IWailaDataProvider>());
+		this.bodyProviders.get(blockID).add(dataProvider);
+	}
+
+	@Override
+	public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) {
+		if (!this.bodyBlockProviders.containsKey(block))
+			this.bodyBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
+		this.bodyBlockProviders.get(block).add(dataProvider);
+	}	
+	
+	public void registerTailProvider(IWailaDataProvider dataProvider, int blockID) {
+		if (!this.tailProviders.containsKey(blockID))
+			this.tailProviders.put(blockID, new ArrayList<IWailaDataProvider>());
+		this.tailProviders.get(blockID).add(dataProvider);
+	}	
+
+	public void registerTailProvider(IWailaDataProvider dataProvider, Class block) {
+		if (!this.tailBlockProviders.containsKey(block))
+			this.tailBlockProviders.put(block, new ArrayList<IWailaDataProvider>());
+		this.tailBlockProviders.get(block).add(dataProvider);
+	}		
+	
+	@Override
+	public void registerStackProvider(IWailaDataProvider dataProvider, int blockID) {
+		if (!this.stackProviders.containsKey(blockID))
+			this.stackProviders.put(blockID, new ArrayList<IWailaDataProvider>());
+		this.stackProviders.get(blockID).add(dataProvider);
+		API.registerHighlightIdentifier(blockID, new HUDHandlerExternal());
+	}	
+
+	/* Arrays getters */
+	
+	public ArrayList<IWailaDataProvider> getHeadProviders(int blockID) {
+		return this.headProviders.get(blockID);
+	}
+
+	public ArrayList<IWailaDataProvider> getBodyProviders(int blockID) {
+		return this.bodyProviders.get(blockID);
+	}	
+
+	public ArrayList<IWailaDataProvider> getTailProviders(int blockID) {
+		return this.tailProviders.get(blockID);
+	}		
+
+	public ArrayList<IWailaDataProvider> getHeadProviders(Object block) {
+		ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
+		for (Class clazz : this.headBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				returnList.addAll(this.headBlockProviders.get(clazz));
+				
+		return returnList;
+	}
+
+	public ArrayList<IWailaDataProvider> getBodyProviders(Object block) {
+		ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
+		for (Class clazz : this.bodyBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				returnList.addAll(this.bodyBlockProviders.get(clazz));
+				
+		return returnList;
+	}	
+
+	public ArrayList<IWailaDataProvider> getTailProviders(Object block) {
+		ArrayList<IWailaDataProvider> returnList = new ArrayList<IWailaDataProvider>();
+		for (Class clazz : this.bodyBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				returnList.addAll(this.bodyBlockProviders.get(clazz));
+				
+		return returnList;
+	}	
+	
+	public ArrayList<IWailaDataProvider> getStackProviders(int blockID) {
+		return this.stackProviders.get(blockID);
+	}	
+	
+	/* Providers querry methods */
+	
+	public boolean hasHeadProviders(int blockID){
+		return this.headProviders.containsKey(blockID);
+	}
+	
+	public boolean hasBodyProviders(int blockID){
+		return this.bodyProviders.containsKey(blockID);
+	}
+
+	public boolean hasTailProviders(int blockID){
+		return this.tailProviders.containsKey(blockID);
+	}	
+
+	public boolean hasStackProviders(int blockID){
+		return this.stackProviders.containsKey(blockID);
+	}	
+	
+	public boolean hasHeadProviders(Object block){
+		for (Class clazz : this.headBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				return true;
+		return false;
+	}
+	
+	public boolean hasBodyProviders(Object block){
+		for (Class clazz : this.bodyBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				return true;
+		return false;
+	}
+
+	public boolean hasTailProviders(Object block){
+		for (Class clazz : this.tailBlockProviders.keySet())
+			if (clazz.isInstance(block))
+				return true;
+		return false;
+	}		
+}
@@ -0,0 +1,78 @@
+package mcp.mobius.waila.addons.betterbarrels;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+//import mcp.mobius.betterbarrels.common.TileEntityBarrel;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.api.ItemInfo.Layout;
+import codechicken.nei.api.IHighlightHandler;
+
+public class HUDHandlerBetterBarrels implements IHighlightHandler {
+
+	static private Class  TileEntityBarrel         = null;
+	static private Class  IBarrelStorage           = null;
+	static private Field  TileEntityBarrel_Storage = null;
+	static private Method IBarrelStorage_getItem   = null;
+	
+	@Override
+	public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
+		return null;
+	}
+
+	@Override
+	public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, Layout layout) {
+
+		TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
+		
+		if ((entity != null) && (TileEntityBarrel.isInstance(entity))){
+			ItemStack stack = null;
+			try {
+			 stack = (ItemStack) IBarrelStorage_getItem.invoke(TileEntityBarrel_Storage.get(entity));
+			} catch (Exception e){
+				mod_Waila.log.log(Level.SEVERE, "[BB] Unhandled exception trying to access a barrel storage for display !.\n" + String.valueOf(e));
+				currenttip.add("<ERROR!>");
+				return currenttip;
+			}
+			
+			if (stack != null){
+				currenttip.add(stack.getDisplayName());
+			} else {
+				currenttip.add("<Empty>");
+			}
+		}	
+		return currenttip;
+	}
+	
+	public static void register(){
+		try{
+			TileEntityBarrel = Class.forName("mcp.mobius.betterbarrels.common.TileEntityBarrel");
+			IBarrelStorage   = Class.forName("mcp.mobius.betterbarrels.common.IBarrelStorage");
+			TileEntityBarrel_Storage = TileEntityBarrel.getField("storage");
+			IBarrelStorage_getItem   = IBarrelStorage.getMethod("getItem");
+			
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
+		} catch (NoSuchFieldException e){
+			mod_Waila.log.log(Level.WARNING, "[BB] Storage field not found.");			
+		} catch (NoSuchMethodException e){
+			mod_Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
+		}
+		
+		if (IBarrelStorage_getItem != null){
+			mod_Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
+			API.registerHighlightHandler(new HUDHandlerBetterBarrels(), ItemInfo.Layout.BODY);
+		}
+	}
+
+}
@@ -0,0 +1,58 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.addons.ic2.HUDHandlerIC2IEnergySink;
+import net.minecraftforge.common.ForgeDirection;
+
+public class BCModule {
+
+	public static Class  TileTank       = null;
+	public static Class  IPowerReceptor = null;
+	public static Class  PipeTransportPower = null;
+	public static Class  TileGenericPipe    = null;
+	
+	public static Method TileTank_GetTanks           = null;
+	public static Method IPowerReceptor_PowerRequest = null;
+
+	public static void register(){
+		try {
+			Class ModBuildcraftFactory = Class.forName("buildcraft.BuildCraftFactory");
+			mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");	
+			return;
+		}		
+		
+		try{
+			TileTank            = Class.forName("buildcraft.factory.TileTank");
+			IPowerReceptor      = Class.forName("buildcraft.api.power.IPowerReceptor");
+			PipeTransportPower  = Class.forName("buildcraft.transport.PipeTransportPower");
+			TileGenericPipe     = Class.forName("buildcraft.transport.TileGenericPipe");
+			
+			TileTank_GetTanks   = TileTank.getMethod("getTanks", ForgeDirection.class);
+			IPowerReceptor_PowerRequest = IPowerReceptor.getMethod("powerRequest", ForgeDirection.class);
+			
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
+			return;
+		} catch (NoSuchMethodException e){
+			mod_Waila.log.log(Level.WARNING, "[BC] Method not found." + e);
+			return;	
+		}
+		
+		ExternalModulesHandler.instance().addConfig("Buildcraft", "bc.tankamount", "Liquid amount");
+		ExternalModulesHandler.instance().addConfig("Buildcraft", "bc.tanktype",   "Liquid type");
+		ExternalModulesHandler.instance().addConfigRemote("Buildcraft", "bc.powerpipe",   "Power pipes");
+		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);			
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerBCPipes(), TileGenericPipe);			
+		//ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerBCIPowerReceptor(), PipeTransportPower);
+	}
+	
+}
@@ -0,0 +1,48 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.util.List;
+import java.util.logging.Level;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.liquids.ILiquidTank;
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerBCIPowerReceptor implements IWailaDataProvider {
+
+	public HUDHandlerBCIPowerReceptor() {
+		// TODO Auto-generated constructor stub
+	}
+
+	@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) {
+//		int powerRequest = 0;
+//		try{
+//			powerRequest = (Integer)BCModule.IPowerReceptor_PowerRequest.invoke(BCModule.IPowerReceptor.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN);
+//		}
+//		catch (Exception e){
+//			mod_Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
+//			return currenttip;
+//		}
+//		currenttip.add(String.valueOf(powerRequest));
+		
+		NBTTagCompound tag = accessor.getNBTData();
+		
+		return currenttip;
+	}
+
+}
@@ -0,0 +1,47 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerBCPipes 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) {
+		NBTTagCompound tag = accessor.getNBTData();
+		if (this.hasPartialKey(tag, "internalNextPower") && config.getConfig("bc.powerpipe")){
+			double power = Math.max(0, this.getPartialKeySum(tag, "internalNextPower"));
+			currenttip.add(String.format("Power : %.1f MJ", power));
+		}
+		return currenttip;
+	}
+
+	public boolean hasPartialKey(NBTTagCompound tag, String key){
+		for (Object k : tag.tagMap.keySet())
+			if (((String)k).contains(key))
+				return true;
+		return false;
+	}
+	
+	public double getPartialKeySum(NBTTagCompound tag, String key){
+		double retVal = 0;
+		for (Object k : tag.tagMap.keySet())
+			if (((String)k).contains(key))
+				retVal += tag.getDouble((String)k);
+		return retVal;
+	}	
+	
+}
@@ -0,0 +1,71 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.logging.Level;
+
+//import buildcraft.factory.TileTank;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.liquids.ILiquidTank;
+import net.minecraftforge.liquids.LiquidStack;
+import codechicken.nei.api.ItemInfo.Layout;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IHighlightHandler;
+
+public class HUDHandlerBCTanks 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) {
+		ILiquidTank tank  = this.getTank(accessor);
+		LiquidStack stack = tank != null ? tank.getLiquid() : null;
+
+		String name = currenttip.get(0); 
+		if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype"))
+			name = name + " (" + stack.asItemStack().getDisplayName() + ")";
+		else if (stack == null &&  ConfigHandler.instance().getConfig("bc.tanktype"))
+			name = name + " <Empty>";
+		currenttip.set(0, name);		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		ILiquidTank tank  = this.getTank(accessor);
+		LiquidStack stack = tank  != null ? tank.getLiquid() : null;
+		int liquidAmount  = stack != null ? stack.amount:0;
+		int capacity      = tank  != null ? tank.getCapacity() : 0;		
+		
+		if (ConfigHandler.instance().getConfig("bc.tankamount"))
+			currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity)  + " mB");
+		
+		return currenttip;
+	}		
+	
+	public ILiquidTank getTank(IWailaDataAccessor accessor){
+		ILiquidTank tank = null;
+		try{
+			tank = ((ILiquidTank[])BCModule.TileTank_GetTanks.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
+		} catch (Exception e){
+			mod_Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
+			return null;
+		}
+		return tank;
+	}
+	
+}
@@ -0,0 +1,90 @@
+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 mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo.Layout;
+
+public class HUDHandlerIC2IEnergySink 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 (accessor.getTileEntity() != null && TEElectricBlock.isInstance(accessor.getTileEntity())){
+		int maxinput = -1;			
+		try{
+			if (IC2Module.IEnergySink.isInstance(accessor.getTileEntity()))
+				maxinput = (Integer)(IC2Module.IEnergySink_GetInput.invoke(IC2Module.IEnergySink.cast(accessor.getTileEntity())));
+		} catch (Exception e){
+			mod_Waila.log.log(Level.SEVERE, "[IC2] Unhandled exception trying to access an IEnergySink for display !.\n" + String.valueOf(e));
+			return currenttip;				
+		}
+
+		int ntransformers = this.getTransformerUpgrades(accessor);
+		if (ntransformers > 0){
+			maxinput = maxinput * (int)Math.pow(4.0D, (double)Math.min(3, ntransformers));
+		}
+		
+		
+		if (ConfigHandler.instance().getConfig("ic2.inputeuother") && (maxinput != -1) && !this.canUpgrade(accessor.getNBTData()))
+			currenttip.add(String.format("IN : %s EU/t", maxinput));
+
+		if (ConfigHandler.instance().getConfig("ic2.inputeumach") && (maxinput != -1) && this.canUpgrade(accessor.getNBTData()))
+			currenttip.add(String.format("IN : %s EU/t", maxinput));		
+		
+		if (config.getConfig("ic2.storage"))
+			if (accessor.getNBTData().hasKey("energy") && !IC2Module.IEnergyStorage.isInstance(accessor.getTileEntity()))
+				currenttip.add(String.format("Storage : %s EU", accessor.getNBTInteger(accessor.getNBTData(), "energy")));		
+		
+		return currenttip;
+	}
+	
+	public boolean canUpgrade(NBTTagCompound tag){
+		if (tag.hasKey("InvSlots"))
+			if (tag.getCompoundTag("InvSlots").hasKey("upgrade"))
+				return true;
+		return false;
+	}
+	
+	public int getTransformerUpgrades(IWailaDataAccessor accessor){
+		NBTTagCompound tag = accessor.getNBTData();
+		if (!canUpgrade(tag)) return -1;
+		
+		int ntransformers = 0;
+		NBTTagList contents = tag.getCompoundTag("InvSlots").getCompoundTag("upgrade").getTagList("Contents");
+		for (NBTTagCompound subtag : (List<NBTTagCompound>)contents.tagList){
+			ItemStack currentSlot = new ItemStack(accessor.getNBTInteger(subtag, "id"),accessor.getNBTInteger(subtag, "Count"),accessor.getNBTInteger(subtag, "Damage")); 
+			if (IC2Module.TransformerUpgradeStack.isItemEqual(currentSlot)){
+				ntransformers += currentSlot.stackSize;
+			}
+		}
+		
+		return ntransformers;
+	}
+}
@@ -0,0 +1,59 @@
+package mcp.mobius.waila.addons.ic2;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagInt;
+import net.minecraft.nbt.NBTTagShort;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo.Layout;
+
+public class HUDHandlerIC2IEnergySource 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 (accessor.getTileEntity() != null && TEElectricBlock.isInstance(accessor.getTileEntity())){
+		int output   = -1;
+		
+		try{
+			if (IC2Module.IEnergySource.isInstance(accessor.getTileEntity()))
+				output = (Integer)(IC2Module.IEnergySource_GetOutput.invoke(IC2Module.IEnergySource.cast(accessor.getTileEntity())));			
+		} catch (Exception e){
+			mod_Waila.log.log(Level.SEVERE, "[IC2] Unhandled exception trying to access an IEnergySource for display !.\n" + String.valueOf(e));
+			return currenttip;				
+		}
+
+		if (ConfigHandler.instance().getConfig("ic2.outputeu") && (output != -1))
+			currenttip.add(String.format("OUT : %s EU/t", output));
+		
+		if (config.getConfig("ic2.storage"))
+			if (accessor.getNBTData().hasKey("storage") && !IC2Module.IEnergyStorage.isInstance(accessor.getTileEntity()))
+				currenttip.add(String.format("Storage : %s EU", accessor.getNBTInteger(accessor.getNBTData(), "storage"))); 
+			
+		return currenttip;
+	}	
+}
@@ -0,0 +1,61 @@
+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 mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo.Layout;
+
+public class HUDHandlerIC2IEnergyStorage implements IWailaDataProvider {
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		if (!config.getConfig("ic2.storage"))
+			return currenttip;
+		
+		int stored   = -1;
+		int capacity = -1;
+		try{
+			if (IC2Module.IEnergyStorage.isInstance(accessor.getTileEntity()))
+				capacity = (Integer)(IC2Module.IEnergyStorage_GetCapacity.invoke(IC2Module.IEnergyStorage.cast(accessor.getTileEntity())));			
+		} catch (Exception e){
+			mod_Waila.log.log(Level.SEVERE, "[IC2] Unhandled exception trying to access an IEnergyStorage for display !.\n" + String.valueOf(e));
+			return currenttip;				
+		}
+
+		if (accessor.getNBTData().hasKey("energy"))
+			stored = accessor.getNBTInteger(accessor.getNBTData(), "energy");
+
+		if ((capacity != -1) && (stored != -1))
+			currenttip.add(String.format("%s/%s EU", stored, capacity));
+		
+		return currenttip;
+	}	
+}
@@ -0,0 +1,89 @@
+package mcp.mobius.waila.addons.ic2;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import net.minecraft.item.ItemStack;
+
+public class IC2Module {
+
+	/* Our interfaces */
+	public static Class IEnergyStorage = null;		
+	public static Class IEnergySink    = null;
+	public static Class IEnergySource  = null;
+	
+	/* Methods interfaces */
+	public static Method IEnergyStorage_GetCapacity = null;	
+	public static Method IEnergySink_GetInput       = null;
+	public static Method IEnergySource_GetOutput    = 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 void register(){
+
+		try{
+			Class ModIndustrialCraft = Class.forName("ic2.core.IC2");
+			mod_Waila.log.log(Level.INFO, "Industrialcraft2 mod found.");
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.INFO, "[IC2] Industrialcraft2 mod not found.");
+			return;
+		}
+		
+		try{
+			
+			IEnergyStorage = Class.forName("ic2.api.tile.IEnergyStorage");				
+			IEnergySink    = Class.forName("ic2.api.energy.tile.IEnergySink");
+			IEnergySource  = Class.forName("ic2.api.energy.tile.IEnergySource");			
+						
+			IEnergySink_GetInput       = IEnergySink.getMethod("getMaxSafeInput");
+			IEnergySource_GetOutput    = IEnergySource.getMethod("getMaxEnergyOutput");
+			IEnergyStorage_GetCapacity = IEnergyStorage.getMethod("getCapacity");
+			
+			IC2Items             = Class.forName("ic2.core.Ic2Items");
+			TransformerUpgrade   = IC2Items.getDeclaredField("transformerUpgrade"); 
+			EnergyStorageUpgrade = IC2Items.getDeclaredField("energyStorageUpgrade");
+			
+			TransformerUpgradeStack   = (ItemStack)TransformerUpgrade.get(null);
+			EnergyStorageUpgradeStack = (ItemStack)EnergyStorageUpgrade.get(null);
+			
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e);
+			return;
+		} catch (NoSuchMethodException e){
+			mod_Waila.log.log(Level.WARNING, "[IC2] Method not found." + e);
+			return;			
+		} catch (NoSuchFieldException e){
+			mod_Waila.log.log(Level.WARNING, "[IC2] Field not found." + e);
+			return;			
+		} catch (Exception e){
+			mod_Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e);
+			return;			
+		}		
+		
+		ExternalModulesHandler.instance().addConfigRemote("IndustrialCraft2", "ic2.inputeumach",   "Max EU input [Machines]");
+		ExternalModulesHandler.instance().addConfig("IndustrialCraft2", "ic2.inputeuother",  "Max EU input [Other]");
+		ExternalModulesHandler.instance().addConfig("IndustrialCraft2", "ic2.outputeu", "Max EU output");			
+		ExternalModulesHandler.instance().addConfigRemote("IndustrialCraft2", "ic2.storage", "Energy stored");	
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIC2IEnergySink(),    IEnergySink);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIC2IEnergySource(),  IEnergySource);		
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerIC2IEnergyStorage(), IEnergyStorage);
+	}
+
+
+	
+
+
+	
+
+	
+	
+}
@@ -0,0 +1,132 @@
+package mcp.mobius.waila.addons.vanillamc;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLever;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityComparator;
+import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+public class HUDHandlerVanilla implements IWailaDataProvider {
+
+	static int mobSpawnerID  = Block.mobSpawner.blockID;
+	static int cropsID       = Block.crops.blockID;
+	static int melonStemID   = Block.melonStem.blockID;
+	static int pumpkinStemID = Block.pumpkinStem.blockID;
+	static int carrotID      = Block.carrot.blockID;
+	static int potatoID      = Block.potato.blockID;
+	static int leverID       = Block.lever.blockID;
+	static int repeaterIdle  = Block.redstoneRepeaterIdle.blockID;
+	static int repeaterActv  = Block.redstoneRepeaterActive.blockID;
+	static int comparatorIdl = Block.redstoneComparatorIdle.blockID;
+	static int comparatorAct = Block.redstoneComparatorActive.blockID;
+	static int redstone      = Block.redstoneWire.blockID;
+	
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return null;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		int blockID       = accessor.getBlockID();
+		
+		/* Mob spawner handler */
+		if (blockID == mobSpawnerID && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
+			String name = currenttip.get(0);
+			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_98049_a().getEntityNameToSpawn();
+			currenttip.set(0, String.format("%s (%s)", name, mobname));
+		}
+
+		if (blockID == redstone){
+			String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), "");
+			currenttip.set(0, name);
+		}		
+		
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+		int blockID       = accessor.getBlockID();
+		/* Crops */
+		if (config.getConfig("vanilla.growthvalue"))
+			if (blockID == cropsID || blockID == melonStemID || blockID == pumpkinStemID || blockID == carrotID || blockID == potatoID){
+				float growthValue = ((float)accessor.getMetadata() / 7.0F) * 100.0F;
+				if (growthValue != 100.0)
+					currenttip.add(String.format("Growth : %.0f %%", growthValue));
+				else
+					currenttip.add("Growth : Mature");
+				return currenttip;
+			}		
+
+		if (config.getConfig("vanilla.leverstate"))
+			if (blockID == leverID){
+				String redstoneOn = (accessor.getMetadata() & 8) == 0 ? "Off" : "On";
+				currenttip.add("State : " + redstoneOn);
+				return currenttip;				
+			}				
+
+		if (config.getConfig("vanilla.repeater"))
+			if ((blockID == repeaterIdle) ||(blockID == repeaterActv)){
+				int tick = (accessor.getMetadata() >> 2) + 1 ;
+				if (tick == 1)
+					currenttip.add(String.format("Delay : %s tick", tick));
+				else
+					currenttip.add(String.format("Delay : %s ticks", tick));
+				return currenttip;				
+			}		
+
+		if (config.getConfig("vanilla.comparator"))
+			if ((blockID == comparatorIdl) ||(blockID == comparatorAct)){
+				String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? "Comparator" : "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 (blockID == redstone){
+				currenttip.add(String.format("Power : %s" , accessor.getMetadata()));
+				return currenttip;				
+			}		
+		
+		return currenttip;
+	}	
+	
+	public static void register(){
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.spawntype", "Spawner type");
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.growthvalue", "Growth value");
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.leverstate", "Lever state");
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.repeater", "Repeater delay");
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.comparator", "Comparator mode");
+		ExternalModulesHandler.instance().addConfig("VanillaMC", "vanilla.redstone", "Redstone power");			
+		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), mobSpawnerID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), cropsID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), melonStemID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), pumpkinStemID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), carrotID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), potatoID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), leverID);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterIdle);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), repeaterActv);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorIdl);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), comparatorAct);
+		ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerVanilla(), redstone);
+		ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerVanilla(), redstone);			
+	}
+
+
+	
+}
@@ -2,9 +2,13 @@ package mcp.mobius.waila.api;

 import java.util.List;

+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;

-@Deprecated
 public interface IWailaBlock {
 	/*
 	 *  Use this method to return an item stack in case the default lookup system fails.
@@ -30,5 +34,4 @@ public interface IWailaBlock {
 	
 	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);
 }
@@ -23,6 +23,4 @@ public interface IWailaConfigHandler {
 	
 	/* Returns the current value of an option (true/false) with a default value true if not set*/	
 	public boolean getConfig(String key);	
-	
-	//public void setConfig(String key, boolean value);
 }
@@ -0,0 +1,23 @@
+package mcp.mobius.waila.api;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public interface IWailaDataAccessor {
+	World        getWorld();
+	EntityPlayer getPlayer();
+	Block        getBlock();
+	int          getBlockID();
+	int          getMetadata();
+	TileEntity           getTileEntity();
+	MovingObjectPosition getPosition();
+	NBTTagCompound       getNBTData();
+	int          getNBTInteger(NBTTagCompound tag, String keyname);
+}
@@ -0,0 +1,4 @@
+package mcp.mobius.waila.api;
+
+public interface IWailaDataProvider extends IWailaBlock{
+}
@@ -0,0 +1,19 @@
+package mcp.mobius.waila.api;
+
+public interface IWailaRegistrar {
+	/* Add a config option in the section modname with displayed text configtext and access key keyname */
+	public void addConfig(String modname, String keyname, String configtext);
+	public void addConfigRemote(String modname, String keyname, String configtext);	
+	
+	/* Register a IWailaDataProvider for the given blockID, either for the Head section or the Body section */
+	public void registerHeadProvider (IWailaDataProvider dataProvider, int blockID);
+	public void registerBodyProvider (IWailaDataProvider dataProvider, int blockID);
+	
+	/* Register a stack overrider for the given blockID */
+	public void registerStackProvider(IWailaDataProvider dataProvider, int blockID);
+	
+	
+	/* Same thing, but works on a class hierarchy instead */
+	public void registerHeadProvider (IWailaDataProvider dataProvider, Class block);
+	public void registerBodyProvider (IWailaDataProvider dataProvider, Class block);
+}
@@ -0,0 +1,123 @@
+package mcp.mobius.waila.gui;
+
+import java.util.EnumSet;
+
+import org.lwjgl.input.Keyboard;
+
+import codechicken.nei.NEIClientConfig;
+
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.handlers.DataAccessor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagByteArray;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import cpw.mods.fml.client.registry.KeyBindingRegistry.KeyHandler;
+import cpw.mods.fml.common.TickType;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+
+public class ConfigKeyHandler extends KeyHandler {
+
+    public ConfigKeyHandler()
+    {
+        super(new KeyBinding[]{
+                new KeyBinding("key.wailaconfig", Keyboard.KEY_NUMPAD0),
+                new KeyBinding("key.wailadisplay", Keyboard.KEY_NUMPAD1),
+                //new KeyBinding("key.wailatedump", Keyboard.KEY_NUMPAD1),
+            }, new boolean[]{
+                false,
+                false,
+                //false
+            });
+        
+        LanguageRegistry.instance().addStringLocalization("key.wailaconfig", "[Waila] Config screen");
+        LanguageRegistry.instance().addStringLocalization("key.wailadisplay", "[Waila] Show/Hide");
+        //LanguageRegistry.instance().addStringLocalization("key.wailatedump", "[Waila] Dump server TE");        
+    }	
+
+	@Override
+	public void keyDown(EnumSet<TickType> types, KeyBinding kb,	boolean tickEnd, boolean isRepeat) {
+		if (!tickEnd) return;
+		Minecraft mc = Minecraft.getMinecraft();
+		if (kb.keyDescription == "key.wailaconfig"){
+			if(mc.currentScreen == null)
+				mc.displayGuiScreen(new GuiConfigScreen(mc.currentScreen));
+		}
+		else if (kb.keyDescription == "key.wailadisplay" && ConfigHandler.instance().getConfig("waila.showmode")){
+			boolean status = NEIClientConfig.getSetting("options.inworld tooltips").getBooleanValue();
+			NEIClientConfig.getSetting("options.inworld tooltips").setBooleanValue(!status);
+		}
+		else if (kb.keyDescription == "key.wailadisplay" && !ConfigHandler.instance().getConfig("waila.showmode")){
+			NEIClientConfig.getSetting("options.inworld tooltips").setBooleanValue(true);
+		}
+		else if (kb.keyDescription == "key.wailatedump"){
+			this.dumpTag(DataAccessor.instance.remoteNbt, 0);
+		}
+			
+	}
+
+	private void dumpTag(NBTTagCompound nbt, int tab){
+		if (nbt == null) return;
+		
+		for (Object s : nbt.tagMap.keySet()){
+			for (int i = 0; i < tab; i++)
+				System.out.printf("\t");
+
+			String  key = (String)s;
+			NBTBase tag = nbt.getTag(key);
+			String  tagtype = tag.getClass().getSimpleName();
+			
+			if (!(tag instanceof NBTTagCompound) && !(tag instanceof NBTTagList))
+				System.out.printf("[%s]%s : %s\n", tagtype, key, tag);
+
+			if (tag instanceof NBTTagByteArray){
+				byte[] array = nbt.getByteArray(key);
+				for (int i = 0; i < array.length; i++)
+					System.out.printf("%s ", array[i]);
+				System.out.printf("\n");
+			}
+			
+			if (tag instanceof NBTTagCompound){
+				System.out.printf("[%s]%s\n", tagtype, s);
+				this.dumpTag(nbt.getCompoundTag(key), tab + 1);
+			}
+			
+			if (tag instanceof NBTTagList){
+				System.out.printf("[%s]%s\n", tagtype, s);
+				
+				for (Object o : nbt.getTagList(key).tagList){
+					NBTBase subtag = (NBTBase)o;
+					
+					if (!(subtag instanceof NBTTagCompound))
+						System.out.printf("[%s]%s : %s\n", subtag.getClass().getSimpleName(), subtag.getName(), subtag);
+
+					if (subtag instanceof NBTTagCompound)
+						this.dumpTag((NBTTagCompound)subtag, tab + 1);
+				}
+			}			
+
+
+		}
+	}	
+	
+	@Override
+	public void keyUp(EnumSet<TickType> types, KeyBinding kb, boolean tickEnd) {
+		if (!tickEnd) return;
+		if (kb.keyDescription == "key.wailadisplay" && !ConfigHandler.instance().getConfig("waila.showmode")){
+			NEIClientConfig.getSetting("options.inworld tooltips").setBooleanValue(false);
+		}		
+	}
+
+	@Override
+	public EnumSet<TickType> ticks() {
+        return EnumSet.of(TickType.CLIENT);
+	}
+
+	@Override
+	public String getLabel() {
+		return "Waila Config Screen Keybind";
+	}	
+	
+}
@@ -0,0 +1,41 @@
+package mcp.mobius.waila.gui;
+
+import mcp.mobius.waila.gui.widget.Button2States;
+import mcp.mobius.waila.gui.widget.ButtonChangeScreen;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiBaseConfigScreen extends GuiScreen {
+
+    protected GuiScreen parentGui;	// GUI we will return to in the case we are call from a GUI
+	
+	public GuiBaseConfigScreen(GuiScreen _parentGui) {
+		this.parentGui = _parentGui;
+	}
+
+   @Override
+   /* Here we draw anything special, and super takes care of the buttons for us */
+   public void drawScreen(int i, int j, float f)
+   {
+       drawDefaultBackground();        
+       super.drawScreen(i, j, f);
+   }   
+
+   @Override
+   /* Here we handle key presses. Super will just close the gui on ESC, and we like it like that */
+   public void keyTyped(char keyChar, int keyID)
+   {
+       super.keyTyped(keyChar, keyID);
+   }   
+   
+   @Override
+   protected void actionPerformed(GuiButton guibutton)
+   {
+	   if (guibutton instanceof ButtonChangeScreen)
+		   ((ButtonChangeScreen)guibutton).pressButton();
+	   
+	   else if (guibutton instanceof Button2States)
+		   ((Button2States)guibutton).pressButton();	   
+   }
+   
+}
@@ -0,0 +1,23 @@
+package mcp.mobius.waila.gui;
+
+import mcp.mobius.waila.gui.widget.ButtonChangeScreen;
+import mcp.mobius.waila.gui.widget.ContainerButtons;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiConfigScreen extends GuiBaseConfigScreen {
+
+	public GuiConfigScreen(GuiScreen _parentGui) {
+		super(_parentGui);
+	}
+
+   @Override
+   /* We init the GUI data here (buttons, etc) */
+	public void initGui()
+    {
+        buttonList.add(new ButtonChangeScreen(200, width / 2 - 100, height / 6 + 168, "Done", null));
+        ContainerButtons container = new ContainerButtons(this, 5, height/2-10, width - 10, height);
+        container.addButton(new ButtonChangeScreen(201, "Waila",   new GuiWailaConfig(this) ));
+        container.addButton(new ButtonChangeScreen(202, "Modules", new GuiModules(this)));
+    }	
+	
+}
@@ -0,0 +1,33 @@
+package mcp.mobius.waila.gui;
+
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.gui.widget.ButtonChangeScreen;
+import mcp.mobius.waila.gui.widget.ButtonConfigOption;
+import mcp.mobius.waila.gui.widget.ButtonConfigRemote;
+import mcp.mobius.waila.gui.widget.ContainerButtons;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiModuleOptions extends GuiBaseConfigScreen {
+
+	private String modName;
+	
+	public GuiModuleOptions(GuiScreen _parentGui, String _modName) {
+		super(_parentGui);
+		this.modName = _modName;
+	}
+
+	@Override
+	public void initGui()
+    {
+        buttonList.add(new ButtonChangeScreen(200, width / 2 - 100, height / 6 + 168, "Back", this.parentGui));
+        ContainerButtons container = new ContainerButtons(this, 5, 0, width - 10, height);
+        
+        for (String key:ConfigHandler.instance().getConfigKeys(this.modName).keySet()){
+        	if (ConfigHandler.instance().isServerRequired(key))
+        		container.addButton(new ButtonConfigRemote(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key ));
+        	else
+        		container.addButton(new ButtonConfigOption(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key ));
+        }
+    }
+	
+}
@@ -0,0 +1,31 @@
+package mcp.mobius.waila.gui;
+
+import java.util.HashMap;
+
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.gui.widget.ButtonChangeScreen;
+import mcp.mobius.waila.gui.widget.ContainerButtons;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiModules extends GuiBaseConfigScreen {
+
+	private HashMap<String, GuiScreen> screens = new HashMap<String, GuiScreen>();
+	
+	public GuiModules(GuiScreen _parentGui) {
+		super(_parentGui);
+        for (String key : ConfigHandler.instance().getModuleNames())
+        	screens.put(key, new GuiModuleOptions(this, key));
+		
+	}
+
+	@Override
+	public void initGui()
+    {
+        buttonList.add(new ButtonChangeScreen(200, width / 2 - 100, height / 6 + 168, "Back", this.parentGui));
+        ContainerButtons container = new ContainerButtons(this, 5, 0, width - 10, height);
+
+        for (String key : ConfigHandler.instance().getModuleNames())
+        	container.addButton(new ButtonChangeScreen(-1, key,   screens.get(key)));
+    }	
+	
+}
@@ -0,0 +1,28 @@
+package mcp.mobius.waila.gui;
+
+import mcp.mobius.waila.gui.widget.ButtonChangeScreen;
+import mcp.mobius.waila.gui.widget.ButtonConfigNEI;
+import mcp.mobius.waila.gui.widget.ButtonConfigOption;
+import mcp.mobius.waila.gui.widget.ContainerButtons;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiWailaConfig extends GuiBaseConfigScreen {
+
+	public GuiWailaConfig(GuiScreen _parentGui) {
+		super(_parentGui);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void initGui()
+    {
+        buttonList.add(new ButtonChangeScreen(200, width / 2 - 100, height / 6 + 168, "Back", this.parentGui));
+        
+        ContainerButtons container = new ContainerButtons(this, 5, 0, width - 10, height);
+        container.addButton(new ButtonConfigNEI(-1, "Hidden",   "Shown", "Show/Hide Waila", "options.inworld tooltips" ));
+        container.addButton(new ButtonConfigOption(-1, "Maintened", "Toggled", "Toggle/Maintened", "waila.showmode" ));
+        container.addButton(new ButtonConfigOption(-1, "Hidden", "Visible", "Show ID:Metadata", "waila.showmetadata", false ));
+       
+    }
+	
+}
@@ -1,11 +1,10 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import org.lwjgl.opengl.GL11;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.ResourceLocation;

 public class Button2States extends GuiButton {

@@ -51,11 +50,7 @@ public class Button2States extends GuiButton {
        if (this.drawButton)
        {
            FontRenderer fontrenderer = par1Minecraft.fontRenderer;
-
-            //DONE : Changed from v1.5.2 to 1.6.2 resource handling
-            //par1Minecraft.renderEngine.bindTexture("/gui/gui.png");
-            ResourceLocation guipng = new ResourceLocation("textures/gui/widgets.png");
-            par1Minecraft.renderEngine.func_110577_a(guipng);
+            par1Minecraft.renderEngine.bindTexture("/gui/gui.png");
        	
        	if (this.labelSize == -1)
        		labelSize = fontrenderer.getStringWidth(this.label) + 5;
@@ -1,4 +1,4 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -1,4 +1,4 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import codechicken.nei.NEIClientConfig;

@@ -1,4 +1,4 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import mcp.mobius.waila.mod_Waila;
 import net.minecraftforge.common.Configuration;
@@ -1,4 +1,4 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import mcp.mobius.waila.mod_Waila;
 import net.minecraft.client.Minecraft;
@@ -1,4 +1,4 @@
-package mcp.mobius.waila.gui_old.widget_old;
+package mcp.mobius.waila.gui.widget;

 import java.util.ArrayList;

@@ -1,50 +1,41 @@
-package mcp.mobius.waila.api.impl;
+package mcp.mobius.waila.handlers;

-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagInt;
+import net.minecraft.nbt.NBTTagLong;
 import net.minecraft.nbt.NBTTagShort;
+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.IWailaEntityAccessor;
-import mcp.mobius.waila.utils.NBTUtil;
+import mcp.mobius.waila.api.IWailaDataAccessor;

-public class DataAccessorEntity implements IWailaEntityAccessor {
+public class DataAccessor implements IWailaDataAccessor {

 	public World world;
 	public EntityPlayer player;
 	public MovingObjectPosition mop;
-	public Vec3 renderingvec = null;
-	public Entity entity;
+	public Block block;
+	public int blockID;
+	public int metadata;
+	public TileEntity entity;
 	public NBTTagCompound remoteNbt = null;
 	public long timeLastUpdate = System.currentTimeMillis();
-	public double partialFrame;
 	
-	public static DataAccessorEntity instance = new DataAccessorEntity();
+	public static DataAccessor instance = new DataAccessor();

 	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;
-		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;
-		}
-	}	
+		this.blockID  = world.getBlockId(_mop.blockX, _mop.blockY, _mop.blockZ);
+		this.block    = Block.blocksList[this.blockID];
+		this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ);
+		this.entity   = world.getBlockTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ);
+	}
 	
 	@Override
 	public World getWorld() {
@@ -57,7 +48,17 @@ public class DataAccessorEntity implements IWailaEntityAccessor {
 	}

 	@Override
-	public Entity getEntity() {
+	public Block getBlock() {
+		return this.block;
+	}
+
+	@Override
+	public int getMetadata() {
+		return this.metadata;
+	}
+
+	@Override
+	public TileEntity getTileEntity() {
 		return this.entity;
 	}

@@ -78,6 +79,24 @@ public class DataAccessorEntity implements IWailaEntityAccessor {
 		return tag;
 	}

+	@Override
+	public int getNBTInteger(NBTTagCompound tag, String keyname){
+		NBTBase subtag = tag.getTag(keyname);
+		if (subtag instanceof NBTTagInt)
+			return tag.getInteger(keyname);
+		if (subtag instanceof NBTTagShort)
+			return tag.getShort(keyname);
+		if (subtag instanceof NBTTagByte)
+			return tag.getByte(keyname);
+
+		return 0;
+	}
+	
+	@Override
+	public int getBlockID() {
+		return this.blockID;
+	}
+
 	private boolean isTagCorrect(NBTTagCompound tag){
 		if (tag == null){
 			this.timeLastUpdate = System.currentTimeMillis() - 250;
@@ -94,29 +113,6 @@ public class DataAccessorEntity implements IWailaEntityAccessor {
 			this.timeLastUpdate = System.currentTimeMillis() - 250;			
 			return false;
 		}
-	}	
-	
-	@Override
-	public int getNBTInteger(NBTTagCompound tag, String keyname){
-		return NBTUtil.getNBTInteger(tag, keyname);
 	}
-
-	@Override
-	public Vec3 getRenderingPosition() {
-		return this.renderingvec;
-	}
-
-	@Override
-	public double getPartialFrame() {
-		return this.partialFrame;
-	}
-
-	public boolean isTimeElapsed(long time){
-		return System.currentTimeMillis() - this.timeLastUpdate >= time;
-	}
-	
-	public void resetTimer(){
-		this.timeLastUpdate = System.currentTimeMillis();
-	}	
 	
 }
@@ -0,0 +1,111 @@
+package mcp.mobius.waila.handlers;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.item.ItemStack;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.forge.IContainerInputHandler;
+
+public class EnchantementHandler implements IContainerInputHandler {
+
+	@Override
+	public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+		ItemStack stackover = gui.manager.getStackMouseOver();
+		if(stackover == null)
+			return false;		
+		
+		if(keyID == NEIClientConfig.getKeyBinding("showenchant")){
+			try{
+				System.out.printf("==== ENCHANTS ====\n");
+				
+				int itemEnchantability = stackover.getItem().getItemEnchantability();	
+				if (itemEnchantability == 0){return false;}
+				
+				for(Enchantment enchant : Enchantment.enchantmentsList){
+					if (enchant == null){continue;}
+					if (enchant.canApplyAtEnchantingTable(stackover)){
+						for (int lvl = enchant.getMinLevel(); lvl <= enchant.getMaxLevel(); lvl++){
+							int minEnchantEnchantability = enchant.getMinEnchantability(lvl);
+							int maxEnchantEnchantability = enchant.getMaxEnchantability(lvl);
+							
+							int minItemEnchantability  = 1;
+							int meanItemEnchantability = 1 + itemEnchantability/4;
+							int maxItemEnchantability  = 1 + itemEnchantability/2;
+							
+							int minModifiedEnchantability =  (int)(0.85*minItemEnchantability + 0.5);
+							int meanModifiedEnchantability =  (int)(1.00*meanItemEnchantability + 0.5);
+							int maxModifiedEnchantability =  (int)(1.15*maxItemEnchantability + 0.5);
+							
+							int minLevel = (int) ((minEnchantEnchantability - minModifiedEnchantability)/1.15);
+							int maxLevel = (int) ((maxEnchantEnchantability - maxModifiedEnchantability)/0.85);
+							
+							int meanMinLevel = (int) ((minEnchantEnchantability - meanModifiedEnchantability)/1.0);
+							int meanMaxLevel = (int) ((maxEnchantEnchantability - meanModifiedEnchantability)/1.0);
+							
+							System.out.printf("%s [%s / %s / %s / %s]\n", enchant.getTranslatedName(lvl), minLevel, maxLevel, meanMinLevel, meanMaxLevel);
+
+						}
+					}
+				}
+			}				
+			catch (NullPointerException e){
+				System.out.printf("%s\n", e);
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean mouseClicked(GuiContainer gui, int mousex, int mousey,
+			int button) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onMouseClicked(GuiContainer gui, int mousex, int mousey,
+			int button) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey,
+			int scrolled) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onMouseScrolled(GuiContainer gui, int mousex, int mousey,
+			int scrolled) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void onMouseDragged(GuiContainer gui, int mousex, int mousey,
+			int button, long heldTime) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
@@ -0,0 +1,148 @@
+package mcp.mobius.waila.handlers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.api.IWailaBlock;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.network.Packet0x01TERequest;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo.Layout;
+import cpw.mods.fml.common.network.PacketDispatcher;
+
+public class HUDHandlerExternal implements IHighlightHandler {
+	
+	private ArrayList<String> errs = new ArrayList<String>(); 
+	
+	private void handleErr(Throwable e, String className){
+		if (!errs.contains(className)){
+			errs.add(className);
+			mod_Waila.log.log(Level.WARNING, String.format("Catched unhandled exception : [%s] %s",className,e));
+		}
+	}
+	
+	@Override
+	public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
+		DataAccessor accessor = DataAccessor.instance;
+		accessor.set(world, player, mop);
+		Block block   = accessor.getBlock();
+		int   blockID = accessor.getBlockID();
+		
+		if (IWailaBlock.class.isInstance(block)){
+			try{
+				return ((IWailaBlock)block).getWailaStack(accessor, ConfigHandler.instance());
+			}catch (Throwable e){
+				handleErr(e, block.getClass().toString());
+			}
+		}
+
+		if(ExternalModulesHandler.instance().hasStackProviders(blockID)){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getStackProviders(blockID)){
+				try{
+					ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance());
+					if (retval != null)
+						return retval;					
+				}catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());					
+				}				
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, Layout layout) {
+		DataAccessor accessor = DataAccessor.instance;
+		accessor.set(world, player, mop);
+		Block block   = accessor.getBlock();
+		int   blockID = accessor.getBlockID();
+		
+		if (accessor.getTileEntity() != null && mod_Waila.instance.serverPresent && (System.currentTimeMillis() - accessor.timeLastUpdate >= 250) ){
+			accessor.timeLastUpdate = System.currentTimeMillis();
+			PacketDispatcher.sendPacketToServer(Packet0x01TERequest.create(world, mop));
+		}
+		
+		if (IWailaBlock.class.isInstance(block)){
+			TileEntity entity = world.getBlockTileEntity(mop.blockX, mop.blockY, mop.blockZ);
+			if (layout == Layout.HEADER)
+				try{				
+					return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, block.getClass().toString());
+				}					
+			else if (layout == Layout.BODY)
+				try{					
+					return ((IWailaBlock)block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, block.getClass().toString());
+				}						
+		}
+		
+		if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(blockID)){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getHeadProviders(blockID))
+				try{
+					currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}
+		}
+
+		if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(blockID)){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getBodyProviders(blockID))
+				try{				
+					currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}			
+		}
+		
+		if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(block)){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getHeadProviders(block))
+				try{				
+					currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}			
+		}
+
+		if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(block)){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getBodyProviders(block))
+				try{				
+					currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}			
+		}		
+
+		if (layout == Layout.HEADER && ExternalModulesHandler.instance().hasHeadProviders(accessor.getTileEntity())){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getHeadProviders(accessor.getTileEntity()))
+				try{				
+					currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}			
+		}
+
+		if (layout == Layout.BODY && ExternalModulesHandler.instance().hasBodyProviders(accessor.getTileEntity())){
+			for (IWailaDataProvider dataProvider : ExternalModulesHandler.instance().getBodyProviders(accessor.getTileEntity()))
+				try{
+					currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance());
+				} catch (Throwable e){
+					handleErr(e, dataProvider.getClass().toString());
+				}			
+		}		
+		
+		return currenttip;
+	}
+
+}
@@ -0,0 +1,35 @@
+package mcp.mobius.waila.handlers;
+
+import java.util.List;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.addons.ConfigHandler;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import codechicken.nei.api.ItemInfo.Layout;
+import codechicken.nei.api.IHighlightHandler;
+
+public class HUDHandlerWaila implements IHighlightHandler {
+
+	@Override
+	public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
+		return null;
+	}
+
+	@Override
+	public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop,	List<String> currenttip, Layout layout) {
+		
+		if (layout == Layout.FOOTER){
+			String modName = mod_Waila.instance.getCanonicalName(itemStack);
+			if (modName != null && !modName.equals(""))
+				currenttip.add("\u00a79\u00a7o" + modName);
+		} else if (layout == Layout.HEADER && ConfigHandler.instance().getConfig("waila.showmetadata", false)){
+			String name = currenttip.get(0);
+			currenttip.set(0, name + String.format(" %s:%s", world.getBlockId(mop.blockX, mop.blockY, mop.blockZ), world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ)));
+		}
+		return currenttip;		
+	};		
+	
+}
@@ -0,0 +1,26 @@
+package mcp.mobius.waila.handlers;
+
+import java.util.List;
+import mcp.mobius.waila.mod_Waila;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+import codechicken.nei.forge.IContainerTooltipHandler;
+
+public class TooltipHandlerWaila implements IContainerTooltipHandler {
+
+	private mod_Waila waila = mod_Waila.instance;
+	
+	@Override
+	public List<String> handleTooltipFirst(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, List<String> currenttip) {
+		String canonicalName = waila.getCanonicalName(itemstack);
+		if (canonicalName != null && !canonicalName.equals(""))
+			currenttip.add("\u00a79\u00a7o" + canonicalName);
+		return currenttip;
+	}
+
+}
@@ -0,0 +1,136 @@
+package mcp.mobius.waila;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
+import mcp.mobius.waila.addons.ConfigHandler;
+import mcp.mobius.waila.addons.ExternalModulesHandler;
+import mcp.mobius.waila.api.IWailaRegistrar;
+import mcp.mobius.waila.network.WailaConnectionHandler;
+import mcp.mobius.waila.network.WailaPacketHandler;
+import mcp.mobius.waila.server.ProxyServer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.common.Configuration;
+import codechicken.core.CommonUtils;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.IMCCallback;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.Mod.Init;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.Mod.PostInit;
+import cpw.mods.fml.common.Mod.PreInit;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkMod;
+import cpw.mods.fml.common.registry.GameData;
+import cpw.mods.fml.common.registry.ItemData;
+
+@Mod(modid="Waila", name="Waila", version="1.3.2")
+@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class)
+
+public class mod_Waila {
+    // The instance of your mod that Forge uses.
+	@Instance("Waila")
+	public static mod_Waila instance;
+
+	@SidedProxy(clientSide="mcp.mobius.waila.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer")
+	public static ProxyServer proxy;	
+	
+	public static Logger log = Logger.getLogger("Waila");
+	private HashMap<Integer, String> itemMap = new HashMap<Integer, String>();	
+	public  Configuration config = null;	
+	public boolean serverPresent = false;
+	
+	@PreInit
+	public void preInit(FMLPreInitializationEvent event) {
+		config = new Configuration(event.getSuggestedConfigurationFile());
+	}	
+	
+	@Init
+	public void load(FMLInitializationEvent event) {
+		proxy.registerHandlers();
+	}
+
+	@PostInit
+	public void postInit(FMLPostInitializationEvent event) {
+		/* This section is about preloading the name/modid of the items in a table, so we don't look it up at every cycle */
+		
+        NBTTagList itemDataList = new NBTTagList();
+        GameData.writeItemData(itemDataList);
+        
+        for(int i = 0; i < itemDataList.tagCount(); i++)
+        {
+            ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i));
+            this.itemMap.put(itemData.getItemId(), itemData.getModId());
+        } 	
+	}
+
+	@IMCCallback
+	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){
+					mod_Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));					
+					continue;
+				}
+				mod_Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));				
+				ConfigHandler.instance().addConfig(params[0], params[1], params[2]);
+			}
+			
+			if (imcMessage.key.equalsIgnoreCase("register")){
+				mod_Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
+				this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender());
+			}
+		}
+	}		
+	
+	public void callbackRegistration(String method, String modname){
+		String[] splitName = method.split("\\.");
+		String methodName = splitName[splitName.length-1];
+		String className  = method.substring(0, method.length()-methodName.length()-1);
+		
+		mod_Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
+		
+		try{
+			Class  reflectClass  = Class.forName(className);
+			Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class);
+			reflectMethod.invoke(null, (IWailaRegistrar)ExternalModulesHandler.instance());
+			
+			mod_Waila.log.info(String.format("Success in registering %s", modname));
+			
+		} catch (ClassNotFoundException e){
+			mod_Waila.log.warning(String.format("Could not find class %s", className));
+		} catch (NoSuchMethodException e){
+			mod_Waila.log.warning(String.format("Could not find method %s", methodName));
+		} catch (Exception e){
+			mod_Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
+		}
+		
+	}
+	
+	public String getCanonicalName(ItemStack itemstack){
+		try{
+			String modID = this.itemMap.get(itemstack.itemID);
+			ModContainer mod = CommonUtils.findModContainer(modID);
+			String modname = mod == null ? modID : mod.getName();		
+			return modname;
+		} catch (NullPointerException e){
+			//System.out.printf("NPE : %s\n",itemstack.toString());
+			return "";
+		}
+	}
+	
+
+	
+}
@@ -6,31 +6,29 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;

-import mcp.mobius.waila.utils.NBTUtil;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
+import cpw.mods.fml.common.network.Player;
+
+import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;

-public class Packet0x02TENBTData {
+public class Packet0x00ServerPing {
+	
 	public byte header;
-	public NBTTagCompound tag;

-	public Packet0x02TENBTData(Packet250CustomPayload packet){
+	public Packet0x00ServerPing(Packet250CustomPayload packet){
 		DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
 		try{
-			this.header  = inputStream.readByte();
-			this.tag     = NBTUtil.readNBTTagCompound(inputStream);
+			this.header = inputStream.readByte();
 		} catch (IOException e){}		
 	}	
 	
-	public static Packet250CustomPayload create(NBTTagCompound tag){
+	public static Packet250CustomPayload create(){
 		Packet250CustomPayload packet = new Packet250CustomPayload();
-		ByteArrayOutputStream bos     = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
+		ByteArrayOutputStream bos     = new ByteArrayOutputStream(1);
 		DataOutputStream outputStream = new DataOutputStream(bos);
 		
 		try{
-			outputStream.writeByte(0x02);
-			NBTUtil.writeNBTTagCompound(tag, outputStream);
+			outputStream.writeByte(0x00);
 		}catch(IOException e){}
 		
 		packet.channel = "Waila";
@@ -38,5 +36,7 @@ public class Packet0x02TENBTData {
 		packet.length  = bos.size();
 		
 		return packet;
-	}	
+	}
+	
+
 }
@@ -5,9 +5,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.HashSet;

-import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
@@ -19,43 +17,29 @@ public class Packet0x01TERequest {
 	public int posX;
 	public int posY;
 	public int posZ;
-	public HashSet<String> keys = new HashSet<String> ();
-	
+
 	public Packet0x01TERequest(Packet250CustomPayload packet){
 		DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
-		keys.clear();
 		try{
 			this.header  = inputStream.readByte();
 			this.worldID = inputStream.readInt();
 			this.posX    = inputStream.readInt();
 			this.posY    = inputStream.readInt();
 			this.posZ    = inputStream.readInt();
-			
-			int nkeys    = inputStream.readInt();
-			for (int i = 0; i < nkeys; i++)
-				keys.add(Packet.readString(inputStream, 250));
-			
 		} catch (IOException e){}		
 	}	
 	
-	public static Packet250CustomPayload create(World world, MovingObjectPosition mop, HashSet<String> keys){
+	public static Packet250CustomPayload create(World world, MovingObjectPosition mop){
 		Packet250CustomPayload packet = new Packet250CustomPayload();
 		ByteArrayOutputStream bos     = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
 		DataOutputStream outputStream = new DataOutputStream(bos);
 		
-		keys.add("x"); keys.add("y"); keys.add("z");
-		
 		try{
 			outputStream.writeByte(0x01);
-			outputStream.writeInt(world.provider.dimensionId);
+			outputStream.writeInt(world.getWorldInfo().getDimension());
 			outputStream.writeInt(mop.blockX);
 			outputStream.writeInt(mop.blockY);
-			outputStream.writeInt(mop.blockZ);
-			outputStream.writeInt(keys.size());
-			
-			for (String key : keys)
-				Packet.writeString(key, outputStream);
-			
+			outputStream.writeInt(mop.blockZ);			
 		}catch(IOException e){}
 		
 		packet.channel = "Waila";
@@ -0,0 +1,75 @@
+package mcp.mobius.waila.network;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+public class Packet0x02TENBTData {
+	public byte header;
+	public NBTTagCompound tag;
+
+	public Packet0x02TENBTData(Packet250CustomPayload packet){
+		DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
+		try{
+			this.header  = inputStream.readByte();
+			this.tag     = Packet0x02TENBTData.readNBTTagCompound(inputStream);
+		} catch (IOException e){}		
+	}	
+	
+	public static Packet250CustomPayload create(NBTTagCompound tag){
+		Packet250CustomPayload packet = new Packet250CustomPayload();
+		ByteArrayOutputStream bos     = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4);
+		DataOutputStream outputStream = new DataOutputStream(bos);
+		
+		try{
+			outputStream.writeByte(0x02);
+			Packet0x02TENBTData.writeNBTTagCompound(tag, outputStream);
+		}catch(IOException e){}
+		
+		packet.channel = "Waila";
+		packet.data    = bos.toByteArray();
+		packet.length  = bos.size();
+		
+		return packet;
+	}	
+
+    public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) throws IOException
+    {
+        if (par0NBTTagCompound == null)
+        {
+            par1DataOutputStream.writeShort(-1);
+        }
+        else
+        {
+            byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound);
+            par1DataOutputStream.writeShort((short)abyte.length);
+            par1DataOutputStream.write(abyte);
+        }
+    }	
+
+    public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException
+    {
+        short short1 = par0DataInputStream.readShort();
+
+        if (short1 < 0)
+        {
+            return null;
+        }
+        else
+        {
+            byte[] abyte = new byte[short1];
+            par0DataInputStream.readFully(abyte);
+            return CompressedStreamTools.decompress(abyte);
+        }
+    }    
+    
+}
@@ -0,0 +1,58 @@
+package mcp.mobius.waila.network;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import mcp.mobius.waila.mod_Waila;
+import mcp.mobius.waila.handlers.DataAccessor;
+import net.minecraft.nbt.NBTTagByteArray;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.PacketDispatcher;
+import cpw.mods.fml.common.network.Player;
+import cpw.mods.fml.server.FMLServerHandler;
+
+public class WailaPacketHandler implements IPacketHandler {
+
+	@Override
+	public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player){
+        if (packet.channel.equals("Waila")) {
+			byte header = this.getHeader(packet);
+			if (header == 0x00){
+				mod_Waila.log.info("Received server authentication msg. Remote sync will be activated");
+				mod_Waila.instance.serverPresent = true;
+			}
+			else if (header == 0x01){
+				Packet0x01TERequest castedPacket = new Packet0x01TERequest(packet);
+		        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
+		        TileEntity      entity = server.worldServers[castedPacket.worldID].getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ);
+		        if (entity != null){
+		        	NBTTagCompound tag = new NBTTagCompound();
+		        	entity.writeToNBT(tag);
+		        	PacketDispatcher.sendPacketToPlayer(Packet0x02TENBTData.create(tag), player);
+		        }
+			}
+			else if (header == 0x02){
+				Packet0x02TENBTData castedPacket = new Packet0x02TENBTData(packet);
+				DataAccessor.instance.remoteNbt = castedPacket.tag;
+			}
+        }		
+	}
+
+	public byte getHeader(Packet250CustomPayload packet){
+		DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data));
+		try{
+			return inputStream.readByte();
+		} catch (IOException e){
+			return -1;
+		}
+	}
+	
+		
+}
@@ -5,7 +5,5 @@ public class ProxyServer {
 	public ProxyServer() {}

 	public void registerHandlers(){}	
-	public void registerMods(){}
 	
-	public Object getFont(){return null;}
 }
@@ -1,323 +0,0 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV parser released under a commercial-friendly license.
- * This just implements splitting a single line into fields.
- *
- * @author Glen Smith
- * @author Rainer Pruy
- */
-public class CSVParser {
-
-    private final char separator;
-
-    private final char quotechar;
-
-    private final char escape;
-
-    private final boolean strictQuotes;
-
-    private String pending;
-    private boolean inField = false;
-
-    private final boolean ignoreLeadingWhiteSpace;
-
-    /**
-     * The default separator to use if none is supplied to the constructor.
-     */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    public static final int INITIAL_READ_SIZE = 128;
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-
-
-    /**
-     * The default escape character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
-
-    /**
-     * The default strict quote behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_STRICT_QUOTES = false;
-
-    /**
-     * The default leading whitespace behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
-
-    /**
-     * This is the "null" character - if a value is set to this then it is ignored.
-     * I.E. if the quote character is set to null then there is no quote character.
-     */
-    public static final char NULL_CHARACTER = '\0';
-
-    /**
-     * Constructs CSVParser using a comma for the separator.
-     */
-    public CSVParser() {
-        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVParser with supplied separator.
-     *
-     * @param separator the delimiter to use for separating entries.
-     */
-    public CSVParser(char separator) {
-        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-
-    /**
-     * Constructs CSVParser with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     */
-    public CSVParser(char separator, char quotechar) {
-        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     * @param escape    the character to use for escaping a separator or quote
-     */
-    public CSVParser(char separator, char quotechar, char escape) {
-        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" flag
-     *
-     * @param separator    the delimiter to use for separating entries
-     * @param quotechar    the character to use for quoted elements
-     * @param escape       the character to use for escaping a separator or quote
-     * @param strictQuotes if true, characters outside the quotes are ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
-        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
-     *
-     * @param separator               the delimiter to use for separating entries
-     * @param quotechar               the character to use for quoted elements
-     * @param escape                  the character to use for escaping a separator or quote
-     * @param strictQuotes            if true, characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace if true, white space in front of a quote in a field is ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        if (anyCharactersAreTheSame(separator, quotechar, escape)) {
-            throw new UnsupportedOperationException("The separator, quote, and escape characters must be different!");
-        }
-        if (separator == NULL_CHARACTER) {
-            throw new UnsupportedOperationException("The separator character must be defined!");
-        }
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escape = escape;
-        this.strictQuotes = strictQuotes;
-        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
-    }
-
-    private boolean anyCharactersAreTheSame(char separator, char quotechar, char escape) {
-        return isSameCharacter(separator, quotechar) || isSameCharacter(separator, escape) || isSameCharacter(quotechar, escape);
-    }
-
-    private boolean isSameCharacter(char c1, char c2) {
-        return c1 != NULL_CHARACTER && c1 == c2;
-    }
-
-    /**
-     * @return true if something was left over from last call(s)
-     */
-    public boolean isPending() {
-        return pending != null;
-    }
-
-    public String[] parseLineMulti(String nextLine) throws IOException {
-        return parseLine(nextLine, true);
-    }
-
-    public String[] parseLine(String nextLine) throws IOException {
-        return parseLine(nextLine, false);
-    }
-
-    /**
-     * Parses an incoming String and returns an array of elements.
-     *
-     * @param nextLine the string to parse
-     * @param multi
-     * @return the comma-tokenized list of elements, or null if nextLine is null
-     * @throws IOException if bad things happen during the read
-     */
-    private String[] parseLine(String nextLine, boolean multi) throws IOException {
-
-        if (!multi && pending != null) {
-            pending = null;
-        }
-
-        if (nextLine == null) {
-            if (pending != null) {
-                String s = pending;
-                pending = null;
-                return new String[]{s};
-            } else {
-                return null;
-            }
-        }
-
-        List<String> tokensOnThisLine = new ArrayList<String>();
-        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
-        boolean inQuotes = false;
-        if (pending != null) {
-            sb.append(pending);
-            pending = null;
-            inQuotes = true;
-        }
-        for (int i = 0; i < nextLine.length(); i++) {
-
-            char c = nextLine.charAt(i);
-            if (c == this.escape) {
-                if (isNextCharacterEscapable(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                }
-            } else if (c == quotechar) {
-                if (isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                } else {
-                    //inQuotes = !inQuotes;
-
-                    // the tricky case of an embedded quote in the middle: a,bc"d"ef,g
-                    if (!strictQuotes) {
-                        if (i > 2 //not on the beginning of the line
-                                && nextLine.charAt(i - 1) != this.separator //not at the beginning of an escape sequence
-                                && nextLine.length() > (i + 1) &&
-                                nextLine.charAt(i + 1) != this.separator //not at the	end of an escape sequence
-                                ) {
-
-                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
-                                sb.setLength(0);  //discard white space leading up to quote
-                            } else {
-                                sb.append(c);
-                                //continue;
-                            }
-
-                        }
-                    }
-
-                    inQuotes = !inQuotes;
-                }
-                inField = !inField;
-            } else if (c == separator && !inQuotes) {
-                tokensOnThisLine.add(sb.toString());
-                sb.setLength(0); // start work on next token
-                inField = false;
-            } else {
-                if (!strictQuotes || inQuotes) {
-                    sb.append(c);
-                    inField = true;
-                }
-            }
-        }
-        // line is done - check status
-        if (inQuotes) {
-            if (multi) {
-                // continuing a quoted section, re-append newline
-                sb.append("\n");
-                pending = sb.toString();
-                sb = null; // this partial content is not to be added to field list yet
-            } else {
-                throw new IOException("Un-terminated quoted field at end of CSV line");
-            }
-        }
-        if (sb != null) {
-            tokensOnThisLine.add(sb.toString());
-        }
-        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
-
-    }
-
-    /**
-     * precondition: the current character is a quote or an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && nextLine.charAt(i + 1) == quotechar;
-    }
-
-    /**
-     * precondition: the current character is an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && (nextLine.charAt(i + 1) == quotechar || nextLine.charAt(i + 1) == this.escape);
-    }
-
-    /**
-     * precondition: sb.length() > 0
-     *
-     * @param sb A sequence of characters to examine
-     * @return true if every character in the sequence is whitespace
-     */
-    protected boolean isAllWhiteSpace(CharSequence sb) {
-        boolean result = true;
-        for (int i = 0; i < sb.length(); i++) {
-            char c = sb.charAt(i);
-
-            if (!Character.isWhitespace(c)) {
-                return false;
-            }
-        }
-        return result;
-    }
-}
@@ -1,282 +0,0 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV reader released under a commercial-friendly license.
- * 
- * @author Glen Smith
- * 
- */
-public class CSVReader implements Closeable {
-
-    private BufferedReader br;
-
-    private boolean hasNext = true;
-
-    private CSVParser parser;
-    
-    private int skipLines;
-
-    private boolean linesSkiped;
-
-    /**
-     * The default line to start reading.
-     */
-    public static final int DEFAULT_SKIP_LINES = 0;
-
-    /**
-     * Constructs CSVReader using a comma for the separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     */
-    public CSVReader(Reader reader) {
-        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVReader(Reader reader, char separator) {
-        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVReader(Reader reader, char separator, char quotechar) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator, quote char and quote handling
-     * behavior.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
-    }
-
-   /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     */
-
-    public CSVReader(Reader reader, char separator,
-			char quotechar, char escape) {
-        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-	}
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param line
-     *            the line number to skip for start reading 
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, int line) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
-        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
-        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace
-     *            it true, parser should ignore white space before a quote in a field
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        this.br = new BufferedReader(reader);
-        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
-        this.skipLines = line;
-    }
-
-   /**
-     * Reads the entire file into a List with each element being a String[] of
-     * tokens.
-     * 
-     * @return a List of String[], with each String[] representing a line of the
-     *         file.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public List<String[]> readAll() throws IOException {
-
-        List<String[]> allElements = new ArrayList<String[]>();
-        while (hasNext) {
-            String[] nextLineAsTokens = readNext();
-            if (nextLineAsTokens != null)
-                allElements.add(nextLineAsTokens);
-        }
-        return allElements;
-
-    }
-
-    /**
-     * Reads the next line from the buffer and converts to a string array.
-     * 
-     * @return a string array with each comma-separated element as a separate
-     *         entry.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public String[] readNext() throws IOException {
-    	
-    	String[] result = null;
-    	do {
-    		String nextLine = getNextLine();
-    		if (!hasNext) {
-    			return result; // should throw if still pending?
-    		}
-    		String[] r = parser.parseLineMulti(nextLine);
-    		if (r.length > 0) {
-    			if (result == null) {
-    				result = r;
-    			} else {
-    				String[] t = new String[result.length+r.length];
-    				System.arraycopy(result, 0, t, 0, result.length);
-    				System.arraycopy(r, 0, t, result.length, r.length);
-    				result = t;
-    			}
-    		}
-    	} while (parser.isPending());
-    	return result;
-    }
-
-    /**
-     * Reads the next line from the file.
-     * 
-     * @return the next line from the file without trailing newline
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    private String getNextLine() throws IOException {
-    	if (!this.linesSkiped) {
-            for (int i = 0; i < skipLines; i++) {
-                br.readLine();
-            }
-            this.linesSkiped = true;
-        }
-        String nextLine = br.readLine();
-        if (nextLine == null) {
-            hasNext = false;
-        }
-        return hasNext ? nextLine : null;
-    }
-
-    /**
-     * Closes the underlying reader.
-     * 
-     * @throws IOException if the close fails
-     */
-    public void close() throws IOException{
-    	br.close();
-    }
-    
-}
@@ -1,302 +0,0 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * A very simple CSV writer released under a commercial-friendly license.
- *
- * @author Glen Smith
- *
- */
-public class CSVWriter implements Closeable {
-    
-    public static final int INITIAL_STRING_SIZE = 128;
-
-	private Writer rawWriter;
-
-    private PrintWriter pw;
-
-    private char separator;
-
-    private char quotechar;
-    
-    private char escapechar;
-    
-    private String lineEnd;
-
-    /** The character used for escaping quotes. */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
-
-    /** The default separator to use if none is supplied to the constructor. */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-    
-    /** The quote constant to use when you wish to suppress all quoting. */
-    public static final char NO_QUOTE_CHARACTER = '\u0000';
-    
-    /** The escape constant to use when you wish to suppress all escaping. */
-    public static final char NO_ESCAPE_CHARACTER = '\u0000';
-    
-    /** Default line terminator uses platform encoding. */
-    public static final String DEFAULT_LINE_END = "\n";
-
-    private ResultSetHelper resultService = new ResultSetHelperService();
-    
-    /**
-     * Constructs CSVWriter using a comma for the separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     */
-    public CSVWriter(Writer writer) {
-        this(writer, DEFAULT_SEPARATOR);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVWriter(Writer writer, char separator) {
-        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar) {
-    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
-        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
-    }
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
-        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
-    }   
-    
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
-        this.rawWriter = writer;
-        this.pw = new PrintWriter(writer);
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escapechar = escapechar;
-        this.lineEnd = lineEnd;
-    }
-    
-    /**
-     * Writes the entire list to a CSV file. The list is assumed to be a
-     * String[]
-     *
-     * @param allLines
-     *            a List of String[], with each String[] representing a line of
-     *            the file.
-     */
-    public void writeAll(List<String[]> allLines)  {
-    	for (String[] line : allLines) {
-			writeNext(line);
-		}
-    }
-
-    protected void writeColumnNames(ResultSet rs)
-    	throws SQLException {
-
-    	writeNext(resultService.getColumnNames(rs));
-    }
-    
-    /**
-     * Writes the entire ResultSet to a CSV file.
-     *
-     * The caller is responsible for closing the ResultSet.
-     *
-     * @param rs the recordset to write
-     * @param includeColumnNames true if you want column names in the output, false otherwise
-     *
-     * @throws java.io.IOException thrown by getColumnValue
-     * @throws java.sql.SQLException thrown by getColumnValue
-     */
-    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
-    	
-    	
-    	if (includeColumnNames) {
-			writeColumnNames(rs);
-		}
-    	
-    	while (rs.next())
-    	{
-    		writeNext(resultService.getColumnValues(rs));
-    	}
-    }
-
-    
-    /**
-     * Writes the next line to the file.
-     *
-     * @param nextLine
-     *            a string array with each comma-separated element as a separate
-     *            entry.
-     */
-    public void writeNext(String[] nextLine) {
-    	
-    	if (nextLine == null)
-    		return;
-    	
-        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-        for (int i = 0; i < nextLine.length; i++) {
-
-            if (i != 0) {
-                sb.append(separator);
-            }
-
-            String nextElement = nextLine[i];
-            if (nextElement == null)
-                continue;
-            if (quotechar !=  NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-            
-            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
-
-            if (quotechar != NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-        }
-        
-        sb.append(lineEnd);
-        pw.write(sb.toString());
-
-    }
-
-	private boolean stringContainsSpecialCharacters(String line) {
-	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
-    }
-
-	protected StringBuilder processLine(String nextElement)
-    {
-		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-	    for (int j = 0; j < nextElement.length(); j++) {
-	        char nextChar = nextElement.charAt(j);
-	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else {
-	            sb.append(nextChar);
-	        }
-	    }
-	    
-	    return sb;
-    }
-
-    /**
-     * Flush underlying stream to writer.
-     * 
-     * @throws IOException if bad things happen
-     */
-    public void flush() throws IOException {
-
-        pw.flush();
-
-    } 
-
-    /**
-     * Close the underlying stream writer flushing any buffered content.
-     *
-     * @throws IOException if bad things happen
-     *
-     */
-    public void close() throws IOException {
-        flush();
-        pw.close();
-        rawWriter.close();
-    }
-
-    /**
-     *  Checks to see if the there has been an error in the printstream. 
-     */
-    public boolean checkError() {
-        return pw.checkError();
-    }
-
-    public void setResultService(ResultSetHelper resultService) {
-        this.resultService = resultService;
-    }
-
-}
@@ -1,33 +0,0 @@
-package au.com.bytecode.opencsv;
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * 
- * 
- * 
- * 
- * 
- */
-public interface ResultSetHelper {
-    public String[] getColumnNames(ResultSet rs) throws SQLException;
-
-    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException;
-}
@@ -1,183 +0,0 @@
-package au.com.bytecode.opencsv;
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-import java.io.IOException;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.sql.*;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 
- * 
- *  helper class for processing JDBC ResultSet objects
- * 
- * 
- */
-public class ResultSetHelperService implements ResultSetHelper {
-    public static final int CLOBBUFFERSIZE = 2048;
-    
-    // note: we want to maintain compatibility with Java 5 VM's
-    // These types don't exist in Java 5
-	private static final int NVARCHAR = -9;
-	private static final int NCHAR = -15; 
-	private static final int LONGNVARCHAR = -16;
-	private static final int NCLOB = 2011;
-
-    public String[] getColumnNames(ResultSet rs) throws SQLException {
-        List<String> names = new ArrayList<String>();
-        ResultSetMetaData metadata = rs.getMetaData();
-
-        for (int i = 0; i < metadata.getColumnCount(); i++) {
-            names.add(metadata.getColumnName(i+1));
-        }
-
-        String[] nameArray = new String[names.size()];
-        return names.toArray(nameArray);
-    }
-
-    public String[] getColumnValues(ResultSet rs) throws SQLException, IOException {
-
-        List<String> values = new ArrayList<String>();
-        ResultSetMetaData metadata = rs.getMetaData();
-
-        for (int i = 0; i < metadata.getColumnCount(); i++) {
-            values.add(getColumnValue(rs, metadata.getColumnType(i + 1), i + 1));
-        }
-
-        String[] valueArray = new String[values.size()];
-        return values.toArray(valueArray);
-    }
-
-    private String handleObject(Object obj){
-        return obj == null ? "" : String.valueOf(obj);
-    }
-
-    private String handleBigDecimal(BigDecimal decimal) {
-        return decimal == null ? "" : decimal.toString();
-    }
-
-    private String handleLong(ResultSet rs, int columnIndex) throws SQLException {
-        long lv = rs.getLong(columnIndex);
-        return rs.wasNull() ? "" : Long.toString(lv);
-    }
-
-    private String handleInteger(ResultSet rs, int columnIndex) throws SQLException {
-        int i = rs.getInt(columnIndex);
-        return rs.wasNull() ? "" : Integer.toString(i);
-    }
-
-    private String handleDate(ResultSet rs, int columnIndex) throws SQLException {
-        java.sql.Date date = rs.getDate(columnIndex);
-        String value = null;
-        if (date != null) {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yyyy");
-            value =  dateFormat.format(date);
-        }
-        return value;
-    }
-
-    private String handleTime(Time time) {
-        return time == null ? null : time.toString();
-    }
-
-    private String handleTimestamp(Timestamp timestamp) {
-        SimpleDateFormat timeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
-        return timestamp == null ? null : timeFormat.format(timestamp);
-    }
-
-    private String getColumnValue(ResultSet rs, int colType, int colIndex)
-    		throws SQLException, IOException {
-
-    	String value = "";
-
-		switch (colType)
-		{
-			case Types.BIT:
-            case Types.JAVA_OBJECT:
-				value = handleObject(rs.getObject(colIndex));
-			    break;
-			case Types.BOOLEAN:
-				boolean b = rs.getBoolean(colIndex);
-				value = Boolean.valueOf(b).toString();
-			    break;
-			case NCLOB: // todo : use rs.getNClob
-			case Types.CLOB:
-				Clob c = rs.getClob(colIndex);
-				if (c != null) {
-					value = read(c);
-				}
-			    break;
-			case Types.BIGINT:
-				value = handleLong(rs, colIndex);
-				break;
-			case Types.DECIMAL:
-			case Types.DOUBLE:
-			case Types.FLOAT:
-			case Types.REAL:
-			case Types.NUMERIC:
-				value = handleBigDecimal(rs.getBigDecimal(colIndex));
-			    break;
-			case Types.INTEGER:
-			case Types.TINYINT:
-			case Types.SMALLINT:
-                value = handleInteger(rs, colIndex);
-			    break;
-			case Types.DATE:
-				value = handleDate(rs, colIndex);
-			    break;
-			case Types.TIME:
-				value = handleTime(rs.getTime(colIndex));
-			    break;
-			case Types.TIMESTAMP:
-				value = handleTimestamp(rs.getTimestamp(colIndex));
-			    break;
-			case NVARCHAR: // todo : use rs.getNString
-			case NCHAR: // todo : use rs.getNString
-			case LONGNVARCHAR: // todo : use rs.getNString
-			case Types.LONGVARCHAR:
-			case Types.VARCHAR:
-			case Types.CHAR:
-				value = rs.getString(colIndex);
-			    break;
-			default:
-				value = "";
-		}
-
-
-		if (value == null)
-		{
-			value = "";
-		}
-
-		return value;
-
-    }
-
-    private static String read(Clob c) throws SQLException, IOException
-	{
-		StringBuilder sb = new StringBuilder( (int) c.length());
-		Reader r = c.getCharacterStream();
-		char[] cbuf = new char[CLOBBUFFERSIZE];
-		int n;
-		while ((n = r.read(cbuf, 0, cbuf.length)) != -1) {
-				sb.append(cbuf, 0, n);
-		}
-		return sb.toString();
-	}
-}
@@ -1,37 +0,0 @@
-package au.com.bytecode.opencsv.bean;
-
-import au.com.bytecode.opencsv.CSVReader;
-
-import java.io.IOException;
-
-/**
- Copyright 2007 Kyle Miller.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-public class ColumnPositionMappingStrategy<T> extends HeaderColumnNameMappingStrategy<T> {
-    private String[] columnMapping = new String[] {};
-    public void captureHeader(CSVReader reader) throws IOException {
-        //do nothing, first line is not header
-    }
-    protected String getColumnName(int col) {
-        return (null != columnMapping && col < columnMapping.length) ? columnMapping[col] : null ;
-    }
-    public String[] getColumnMapping() {
-        return columnMapping != null ? columnMapping.clone() : null;
-    }
-    public void setColumnMapping(String[] columnMapping) {
-        this.columnMapping = columnMapping != null ? columnMapping.clone() : null;
-    }
-}
@@ -1,119 +0,0 @@
-package au.com.bytecode.opencsv.bean;
-
-/**
- Copyright 2007 Kyle Miller.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import au.com.bytecode.opencsv.CSVReader;
-
-import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
-import java.io.Reader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CsvToBean<T> {
-    private Map<Class<?>, PropertyEditor> editorMap = null;
-
-    public CsvToBean() {
-    }
-
-    public List<T> parse(MappingStrategy<T> mapper, Reader reader) {
-        return parse(mapper, new CSVReader(reader));
-    }
-
-    public List<T> parse(MappingStrategy<T> mapper, CSVReader csv) {
-        try {
-            mapper.captureHeader(csv);
-            String[] line;
-            List<T> list = new ArrayList<T>();
-            while (null != (line = csv.readNext())) {
-                T obj = processLine(mapper, line);
-                list.add(obj); // TODO: (Kyle) null check object
-            }
-            return list;
-        } catch (Exception e) {
-            throw new RuntimeException("Error parsing CSV!", e);
-        }
-    }
-
-    protected T processLine(MappingStrategy<T> mapper, String[] line) throws IllegalAccessException, InvocationTargetException, InstantiationException, IntrospectionException {
-        T bean = mapper.createBean();
-        for (int col = 0; col < line.length; col++) {
-            PropertyDescriptor prop = mapper.findDescriptor(col);
-            if (null != prop) {
-                String value = checkForTrim(line[col], prop);
-                Object obj = convertValue(value, prop);
-                prop.getWriteMethod().invoke(bean, obj);
-            }
-        }
-        return bean;
-    }
-
-    private String checkForTrim(String s, PropertyDescriptor prop) {
-        return trimmableProperty(prop) ? s.trim() : s;
-    }
-
-    private boolean trimmableProperty(PropertyDescriptor prop) {
-        return !prop.getPropertyType().getName().contains("String");
-    }
-
-    protected Object convertValue(String value, PropertyDescriptor prop) throws InstantiationException, IllegalAccessException {
-        PropertyEditor editor = getPropertyEditor(prop);
-        Object obj = value;
-        if (null != editor) {
-            editor.setAsText(value);
-            obj = editor.getValue();
-        }
-        return obj;
-    }
-
-    private PropertyEditor getPropertyEditorValue(Class<?> cls) {
-        if (editorMap == null) {
-            editorMap = new HashMap<Class<?>, PropertyEditor>();
-        }
-
-        PropertyEditor editor = editorMap.get(cls);
-
-        if (editor == null) {
-            editor = PropertyEditorManager.findEditor(cls);
-            addEditorToMap(cls, editor);
-        }
-
-        return editor;
-    }
-
-    private void addEditorToMap(Class<?> cls, PropertyEditor editor) {
-        if (editor != null) {
-            editorMap.put(cls, editor);
-        }
-    }
-
-
-    /*
-     * Attempt to find custom property editor on descriptor first, else try the propery editor manager.
-     */
-    protected PropertyEditor getPropertyEditor(PropertyDescriptor desc) throws InstantiationException, IllegalAccessException {
-        Class<?> cls = desc.getPropertyEditorClass();
-        if (null != cls) return (PropertyEditor) cls.newInstance();
-        return getPropertyEditorValue(desc.getPropertyType());
-    }
-
-}
@@ -1,84 +0,0 @@
-package au.com.bytecode.opencsv.bean;
-
-import au.com.bytecode.opencsv.CSVReader;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Copyright 2007 Kyle Miller.
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class HeaderColumnNameMappingStrategy<T> implements MappingStrategy<T> {
-    protected String[] header;
-    protected Map<String, PropertyDescriptor> descriptorMap = null;
-    protected Class<T> type;
-
-    public void captureHeader(CSVReader reader) throws IOException {
-        header = reader.readNext();
-    }
-
-    public PropertyDescriptor findDescriptor(int col) throws IntrospectionException {
-        String columnName = getColumnName(col);
-        return (null != columnName && columnName.trim().length() > 0) ? findDescriptor(columnName) : null;
-    }
-
-    protected String getColumnName(int col) {
-        return (null != header && col < header.length) ? header[col] : null;
-    }
-
-    protected PropertyDescriptor findDescriptor(String name) throws IntrospectionException {
-        if (null == descriptorMap) descriptorMap = loadDescriptorMap(getType()); //lazy load descriptors
-        return descriptorMap.get(name.toUpperCase().trim());
-    }
-
-    protected boolean matches(String name, PropertyDescriptor desc) {
-        return desc.getName().equals(name.trim());
-    }
-
-    protected Map<String, PropertyDescriptor> loadDescriptorMap(Class<T> cls) throws IntrospectionException {
-        Map<String, PropertyDescriptor> map = new HashMap<String, PropertyDescriptor>();
-
-        PropertyDescriptor[] descriptors;
-        descriptors = loadDescriptors(getType());
-        for (PropertyDescriptor descriptor : descriptors) {
-            map.put(descriptor.getName().toUpperCase().trim(), descriptor);
-        }
-
-        return map;
-    }
-
-    private PropertyDescriptor[] loadDescriptors(Class<T> cls) throws IntrospectionException {
-        BeanInfo beanInfo = Introspector.getBeanInfo(cls);
-        return beanInfo.getPropertyDescriptors();
-    }
-
-    public T createBean() throws InstantiationException, IllegalAccessException {
-        return type.newInstance();
-    }
-
-    public Class<T> getType() {
-        return type;
-    }
-
-    public void setType(Class<T> type) {
-        this.type = type;
-    }
-}
@@ -1,34 +0,0 @@
-package au.com.bytecode.opencsv.bean;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- Copyright 2007,2010 Kyle Miller.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-public class HeaderColumnNameTranslateMappingStrategy<T> extends HeaderColumnNameMappingStrategy<T> {
-    private Map<String, String> columnMapping = new HashMap<String, String>();
-    protected String getColumnName(int col) {
-        return col < header.length ? columnMapping.get(header[col].toUpperCase()) : null;
-    }
-    public Map<String, String> getColumnMapping() {
-        return columnMapping;
-    }
-    public void setColumnMapping(Map<String, String> columnMapping) {
-       for (String key : columnMapping.keySet()) {
-          this.columnMapping.put(key.toUpperCase(), columnMapping.get(key));
-       }
-    }
-}
@@ -1,46 +0,0 @@
-package au.com.bytecode.opencsv.bean;
-
-
-/**
- Copyright 2007 Kyle Miller.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import au.com.bytecode.opencsv.CSVReader;
-
-import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
-import java.io.IOException;
-
-public interface MappingStrategy<T> {
-
-    /**
-     * Implementation will have to return a property descriptor from a bean based on the current column.
-     * @param col the column to find the description for
-     * @throws java.beans.IntrospectionException
-     * @return the related PropertyDescriptor
-     */
-    public abstract PropertyDescriptor findDescriptor(int col) throws IntrospectionException;
-
-    public abstract T createBean() throws InstantiationException, IllegalAccessException;
-
-    /**
-     * Implementation of this method can grab the header line before parsing begins to use to map columns
-     * to bean properties.
-     * @param reader the CSVReader to use for header parsing
-     * @throws java.io.IOException if parsing fails
-     */
-    public void captureHeader(CSVReader reader) throws IOException;
-
-}
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A simple bean binding interface for use with opencsv.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A very simple CSV parser for Java released under a commercial-friendly license.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
@@ -1,184 +0,0 @@
-package mcp.mobius.waila;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.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;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import mcp.mobius.waila.cbcore.LangUtil;
-import mcp.mobius.waila.client.KeyEvent;
-
-@Mod(modid="Waila", name="Waila", version="1.5.2_1.7.2", dependencies="required-after:NotEnoughItems")
-/*
-@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 = Logger.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());		
-	}	
-	
-    @EventHandler
-    public void initialize(FMLInitializationEvent event) {
-        try {
-            Field eBus = FMLModContainer.class.getDeclaredField("eventBus");
-            eBus.setAccessible(true);
-            EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this));
-            FMLbus.register(this);
-        } catch (Throwable t) {}
-        
-        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
-        	MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
-    		FMLCommonHandler.instance().bus().register(new KeyEvent());
-    		FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());        	
-        }
-		FMLCommonHandler.instance().bus().register(new NetworkHandler());        
-	}
-
-    @EventHandler
-    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);
-	        }
-        }
-        */
-        
-	}
-
-    @Subscribe
-    public void loadComplete(FMLLoadCompleteEvent event) {    
-    	proxy.registerMods();
-    	
-    	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.warning(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()));
-				this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender());
-			}
-		}
-	}		
-	
-	public void callbackRegistration(String method, String modname){
-		String[] splitName = method.split("\\.");
-		String methodName = splitName[splitName.length-1];
-		String className  = method.substring(0, method.length()-methodName.length()-1);
-		
-		Waila.log.info(String.format("Trying to reflect %s %s", className, methodName));
-		
-		try{
-			Class  reflectClass  = Class.forName(className);
-			Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class);
-			reflectMethod.invoke(null, (IWailaRegistrar)ModuleRegistrar.instance());
-			
-			Waila.log.info(String.format("Success in registering %s", modname));
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.warning(String.format("Could not find class %s", className));
-		} catch (NoSuchMethodException e){
-			Waila.log.warning(String.format("Could not find method %s", methodName));
-		} catch (Exception e){
-			Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString()));
-		}
-		
-	}
-}
@@ -1,30 +0,0 @@
-package mcp.mobius.waila.addons.agriculture;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class AgricultureModule {
-	public static Class BlockCrop  = null;
-
-	
-	public static void register(){
-		try{
-			Class Agriculture = Class.forName("com.teammetallurgy.agriculture.Agriculture");
-			Waila.log.log(Level.INFO, "Agriculture mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[Agriculture] Agriculture mod not found.");
-			return;
-		}			
-		
-		try{
-			BlockCrop = Class.forName("com.teammetallurgy.agriculture.crops.BlockCrop");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[Agriculture] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(),  BlockCrop);
-	}
-}
@@ -1,42 +0,0 @@
-package mcp.mobius.waila.addons.agriculture;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDHandlerCrop implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;		
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("general.showcrop")) return currenttip;
-		
-		int growthStage = accessor.getMetadata();
-
-		float growthValue = (growthStage / 6.0F) * 100.0F;
-		if (growthValue < 100.0)
-			currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
-		else
-			currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,42 +0,0 @@
-package mcp.mobius.waila.addons.appeng;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class AppEngModule {
-
-	public static Class  TileStorageMonitor = null;
-	public static Class  IAEItemStack       = null;
-	public static Method TileStorageMonitor_getItem = null;
-	public static Method IAEItemStack_getItemStack  = null;
-	
-	public static void register(){
-		try{
-			TileStorageMonitor = Class.forName("appeng.me.tile.TileStorageMonitor");
-			IAEItemStack       = Class.forName("appeng.api.IAEItemStack");
-			
-			
-			TileStorageMonitor_getItem = TileStorageMonitor.getMethod("getItem");
-			IAEItemStack_getItemStack  = IAEItemStack.getMethod("getItemStack");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e);
-			return;
-		} catch (SecurityException e) {
-			Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e);
-			return;
-		} catch (NoSuchMethodException e) {
-			Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e);
-			return;
-		}
-		
-		Waila.log.log(Level.INFO, "AppEng mod found.");
-		ModuleRegistrar.instance().addConfig("Applied Energetic", "appeng.monitorcontent");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileStorageMonitor);
-	}
-}
@@ -1,50 +0,0 @@
-package mcp.mobius.waila.addons.appeng;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-
-public class HUDAppEngMonitor 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) {
-		TileEntity entity = accessor.getTileEntity();
-		if (entity != null){
-			if (config.getConfig("appeng.monitorcontent")){
-				try {
-					ItemStack stack = (ItemStack)AppEngModule.IAEItemStack_getItemStack.invoke(AppEngModule.IAEItemStack.cast(AppEngModule.TileStorageMonitor_getItem.invoke(entity)));
-					if (stack != null)
-						currenttip.add(stack.getDisplayName());
-					else
-						currenttip.add(LangUtil.translateG("hud.msg.none"));
-				} catch (Exception e) {
-					System.out.printf("%s\n", e);
-				}			
-			}
-		}
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}	
-	
-}
@@ -1,40 +0,0 @@
-package mcp.mobius.waila.addons.betterbarrels;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-
-public class BetterBarrelsModule {
-	public static Class  TileEntityBarrel         = null;
-	public static Class  IBarrelStorage           = null;
-	public static Field  TileEntityBarrel_Storage = null;
-	public static Method IBarrelStorage_getItem   = null;
-
-	public static void register(){
-		try{
-			TileEntityBarrel = Class.forName("mcp.mobius.betterbarrels.common.TileEntityBarrel");
-			IBarrelStorage   = Class.forName("mcp.mobius.betterbarrels.common.IBarrelStorage");
-			TileEntityBarrel_Storage = TileEntityBarrel.getField("storage");
-			IBarrelStorage_getItem   = IBarrelStorage.getMethod("getItem");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found.");
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARNING, "[BB] Storage field not found.");			
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARNING, "[BB] getItem() not found.");
-		}
-		
-		if (IBarrelStorage_getItem != null){
-			Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked.");
-			ModuleRegistrar.instance().addConfig("BetterBarrels", "bb.content");			
-			ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBBContent(), TileEntityBarrel);			
-		}
-	}	
-	
-}
@@ -1,64 +0,0 @@
-package mcp.mobius.waila.addons.betterbarrels;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.logging.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.betterbarrels.common.TileEntityBarrel;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import mcp.mobius.waila.cbcore.LangUtil;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.api.ItemInfo.Layout;
-import codechicken.nei.api.IHighlightHandler;
-
-public class HUDHandlerBBContent 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) {
-		TileEntity entity = accessor.getTileEntity();
-		
-		if (!config.getConfig("bb.content")) return currenttip;
-		
-		if ((entity != null) && (BetterBarrelsModule.TileEntityBarrel.isInstance(entity))){
-			ItemStack stack = null;
-			try {
-			 stack = (ItemStack) BetterBarrelsModule.IBarrelStorage_getItem.invoke(BetterBarrelsModule.TileEntityBarrel_Storage.get(entity));
-			} catch (Exception e){
-				Waila.log.log(Level.SEVERE, "[BB] Unhandled exception trying to access a barrel storage for display !.\n" + String.valueOf(e));
-				currenttip.add("<ERROR!>");
-				return currenttip;
-			}
-			
-			if (stack != null){
-				currenttip.add(stack.getDisplayName());
-			} 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;
-	}	
-}
@@ -1,48 +0,0 @@
-package mcp.mobius.waila.addons.buildcraft;
-
-import java.lang.reflect.Method;
-import java.util.logging.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 Class  IPowerReceptor = null;
-	public static Class  PipeTransportPower = null;
-	public static Class  TileGenericPipe    = null;
-	public static Class  TileEngine         = null;
-	
-	public static Method TileTank_getTankInfo      = null;
-
-	public static void register(){
-		try {
-			Class ModBuildcraftFactory = Class.forName("buildcraft.BuildCraftFactory");
-			Waila.log.log(Level.INFO, "Buildcraft|Factory mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping.");	
-			return;
-		}		
-		
-		try{
-			TileTank            = Class.forName("buildcraft.factory.TileTank");
-			TileTank_getTankInfo      = TileTank.getMethod("getTankInfo", ForgeDirection.class);
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[BC] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARNING, "[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);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
-	}
-	
-}
@@ -1,80 +0,0 @@
-package mcp.mobius.waila.addons.buildcraft;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import net.minecraftforge.common.util.ForgeDirection;
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class BCPowerAPIModule {
-
-	public static Class  PowerHandler = null;
-	public static Method PH_getMinEnergyReceived = null;
-	public static Method PH_getMaxEnergyReceived = null;
-	public static Method PH_getMaxEnergyStored = null;
-	public static Method PH_getEnergyStored = null;
-	public static Method PH_getActivationEnergy = null;	
-	
-	public static Class  IPowerReceptor = null;
-	public static Method IPowerReceptor_getPowerReceiver = null;
-	
-	public static Class  PowerReceiver  = null;
-	public static Method PR_getMinEnergyReceived = null;
-	public static Method PR_getMaxEnergyReceived = null;
-	public static Method PR_getMaxEnergyStored = null;
-	public static Method PR_getEnergyStored = null;
-	public static Method PR_getActivationEnergy = null;		
-	
-	public static void register(){	
-		try{
-			Class ModClass = Class.forName("buildcraft.api.power.IPowerReceptor");
-			Waila.log.log(Level.INFO, "Buildcraft Power API found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found.");
-			return;
-		}
-		
-		try{
-			PowerHandler = Class.forName("buildcraft.api.power.PowerHandler");
-			PH_getMinEnergyReceived = PowerHandler.getMethod("getMinEnergyReceived");
-			PH_getMaxEnergyReceived = PowerHandler.getMethod("getMaxEnergyReceived");
-			PH_getMaxEnergyStored   = PowerHandler.getMethod("getMaxEnergyStored");
-			PH_getEnergyStored      = PowerHandler.getMethod("getEnergyStored");
-			PH_getActivationEnergy  = PowerHandler.getMethod("getActivationEnergy");			
-			
-			IPowerReceptor = Class.forName("buildcraft.api.power.IPowerReceptor");
-			IPowerReceptor_getPowerReceiver = IPowerReceptor.getMethod("getPowerReceiver", ForgeDirection.class);
-			
-			PowerReceiver = Class.forName("buildcraft.api.power.PowerHandler$PowerReceiver");
-			PR_getMinEnergyReceived = PowerReceiver.getMethod("getMinEnergyReceived");
-			PR_getMaxEnergyReceived = PowerReceiver.getMethod("getMaxEnergyReceived");
-			PR_getMaxEnergyStored   = PowerReceiver.getMethod("getMaxEnergyStored");
-			PR_getEnergyStored      = PowerReceiver.getMethod("getEnergyStored");
-			PR_getActivationEnergy  = PowerReceiver.getMethod("getActivationEnergy");			
-			
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
-			return;			
-//		} catch (NoSuchFieldException e){
-//			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
-//			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("BuildcraftAPI", "bcapi.storage");
-		ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.consump");
-		ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.trigger");
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", IPowerReceptor);
-
-	}	
-	
-}
@@ -1,71 +0,0 @@
-package mcp.mobius.waila.addons.buildcraft;
-
-import java.util.List;
-import java.util.logging.Level;
-
-//import buildcraft.factory.TileTank;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.api.impl.ConfigHandler;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
-import mcp.mobius.waila.cbcore.LangUtil;
-
-public class HUDHandlerBCTanks 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) {
-		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;
-	}
-
-	@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;
-	}		
-
-	@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.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
-			return null;
-		}
-		return tank;
-	}
-	
-}
@@ -1,78 +0,0 @@
-package mcp.mobius.waila.addons.buildcraft;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
-public class HUDHandlerIPowerReceptor implements IWailaDataProvider {
-
-	@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{
-			
-			String maxPowerStr = LangUtil.translateG("hud.msg.maxpower");
-			String triggerStr = LangUtil.translateG("hud.msg.trigger");
-			
-			Object powerReceiver = BCPowerAPIModule.IPowerReceptor_getPowerReceiver.invoke(accessor.getTileEntity(), ForgeDirection.UNKNOWN);
-			if (powerReceiver != null){
-				
-				Float minEnergyRecv = (Float)BCPowerAPIModule.PR_getMinEnergyReceived.invoke(powerReceiver);
-				Float maxEnergyRecv = (Float)BCPowerAPIModule.PR_getMaxEnergyReceived.invoke(powerReceiver);
-				Float activation    = (Float)BCPowerAPIModule.PR_getActivationEnergy.invoke(powerReceiver);				
-	
-				
-				if(accessor.getNBTData().hasKey("powerProvider") && accessor.getNBTData().getCompoundTag("powerProvider").hasKey("storedEnergy") && config.getConfig("bcapi.storage")){
-					Float energyStored  = (Float)accessor.getNBTData().getCompoundTag("powerProvider").getFloat("storedEnergy");
-					Float maxEnergyStor = (Float)BCPowerAPIModule.PR_getMaxEnergyStored.invoke(powerReceiver);
-					if (maxEnergyStor != 0.0f)
-						currenttip.add(String.format("%.1f / %.1f MJ", energyStored, maxEnergyStor));
-				}
-	
-				if(accessor.getNBTData().hasKey("storedEnergy") && config.getConfig("bcapi.storage")){
-					Float energyStored  = (Float)accessor.getNBTData().getFloat("storedEnergy");
-					Float maxEnergyStor = (Float)BCPowerAPIModule.PR_getMaxEnergyStored.invoke(powerReceiver);
-					if (maxEnergyStor != 0.0f)
-						currenttip.add(String.format("%.1f / %.1f MJ", energyStored, maxEnergyStor));
-				}			
-				
-				/*
-				if (maxEnergyRecv != 0.0f && config.getConfig("bcapi.consump"))
-					//currenttip.add(String.format("Min/Max Input : %.1f / %.1f MJ/t", minEnergyRecv, maxEnergyRecv));
-					currenttip.add(String.format("%s : %.1f MJ/t", maxPowerStr, maxEnergyRecv));
-				
-				if (activation != 0.0f && config.getConfig("bcapi.trigger"))
-					currenttip.add(String.format("%s : %.1f MJ", triggerStr, activation));
-				*/			
-			
-			}
-			
-		} 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;
-	}
-
-}
@@ -1,2 +0,0 @@
->>>>buildcraft.transport.ItemPlug:*
-This is a plug for pipes.
@@ -1,45 +0,0 @@
-package mcp.mobius.waila.addons.carpenters;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class CarpentersModule {
-
-	public static Class TEBase = null;
-	public static Class BlockCarpentersDoor = null;
-	public static Class BlockCarpentersHatch = null;
-	
-	public static void register(){
-		/*
-		try{
-			Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks");
-			Waila.log.log(Level.INFO, "CarpentersBlocks mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[CarpentersBlocks] CarpentersBlocks mod not found.");
-			return;
-		}			
-		
-		try{
-			TEBase    = Class.forName("carpentersblocks.tileentity.TEBase");
-			BlockCarpentersDoor  = Class.forName("carpentersblocks.block.BlockCarpentersDoor");
-			BlockCarpentersHatch = Class.forName("carpentersblocks.block.BlockCarpentersHatch");
-			
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[CarpentersBlocks] Class not found. " + e);
-			return;
-		} catch (Exception e) {
-			Waila.log.log(Level.WARNING, "[CarpentersBlocks] Error while loading module. " + e);
-			return;
-		}			
-
-		ModuleRegistrar.instance().addConfig("Carpenter's Blocks", "carpenters.hide");
-		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersDoor);
-		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch);
-		ModuleRegistrar.instance().registerSyncedNBTKey("data",    TEBase);
-		ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase);
-		*/
-	}	
-	
-}
@@ -1,56 +0,0 @@
-package mcp.mobius.waila.addons.carpenters;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDCarpentersBlocksTE implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
-		if (!config.getConfig("carpenters.hide")) return null;
-
-		NBTTagCompound tag  = accessor.getNBTData();
-		short         data  = tag.getShort("data");
-		short         cover = tag.getShort("cover_6");        
-		
-		if(CarpentersModule.BlockCarpentersDoor.isInstance(accessor.getBlock())){
-			int type   = data & 0x7;
-			if (type != 5)  return null;
-			if (cover == 0) return null;
-			
-			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);
-		}
-		
-		else if (CarpentersModule.BlockCarpentersHatch.isInstance(accessor.getBlock())){
-			int type = data & 0x7;
-			if (type  != 0) return null;
-			if (cover == 0) return null;
-			
-			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);			
-		}
-		*/
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,65 +0,0 @@
-package mcp.mobius.waila.addons.enderio;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class 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 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.WARNING, "[EnderStorage] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
-			return;			
-//		} catch (NoSuchFieldException e){
-//			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
-//			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARNING, "[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().registerSyncedNBTKey("*", TileCapacitorBank);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);		
-	}	
-	
-}
@@ -1,61 +0,0 @@
-package mcp.mobius.waila.addons.enderio;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
-public class HUDHandlerCapacitor 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{
-			
-			String maxIOStr  = LangUtil.translateG("hud.msg.maxio");
-			String inputStr  = LangUtil.translateG("hud.msg.input");
-			String outputStr = LangUtil.translateG("hud.msg.output");
-			
-			Integer maxEnergyStored = (Integer)EnderIOModule.TCB_getMaxEnergyStored.invoke(accessor.getTileEntity());
-			Float   energyStored    = (Float)EnderIOModule.TCB_getEnergyStored.invoke(accessor.getTileEntity());
-			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());
-			
-			if (config.getConfig("enderio.storage"))
-				currenttip.add(String.format("%.1f / %d MJ", energyStored, maxEnergyStored));
-			
-			if (config.getConfig("enderio.inout")){
-				currenttip.add(String.format("%s : %d MJ/t ", maxIOStr, maxIO));
-				currenttip.add(String.format("%s : %d MJ/t ", inputStr, maxInput));
-				currenttip.add(String.format("%s : %d MJ/t ", outputStr, maxOutput));
-			}
-			
-			
-		} 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;
-	}
-
-}
@@ -1,63 +0,0 @@
-package mcp.mobius.waila.addons.enderio;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDHandlerTesseract 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) {
-		
-		String channel = "%s : \u00a7f%s\u00a7r %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 = "[ \u00a7f" + accessor.getNBTData().getString("channelUser") + " \u00a7r]";
-				else
-					frequser = "[ \u00a7f" + LangUtil.translateG("hud.msg.public") + " \u00a7r]";
-					
-			}
-			else{
-				freq     = LangUtil.translateG("hud.msg.none");
-				frequser = "";
-			}
-			
-			currenttip.add(String.format(channel, LangUtil.translateG("hud.msg.frequency"), freq, frequser));
-		}
-
-		if (config.getConfig("enderio.owner")){
-			if (accessor.getNBTData().hasKey("owner"))
-				currenttip.add(String.format("%s : \u00a7f%s", LangUtil.translateG("hud.msg.owner"), accessor.getNBTData().getString("owner")));
-		}
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,57 +0,0 @@
-package mcp.mobius.waila.addons.enderstorage;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class 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.WARNING, "[EnderStorage] Class not found. " + e);
-			return;
-		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
-			return;			
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
-			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
-			return;			
-		}
-		
-		ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(),    TileFrequencyOwner);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileFrequencyOwner);
-	}
-}
@@ -1,73 +0,0 @@
-package mcp.mobius.waila.addons.enderstorage;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-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;
-	}
-
-	@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;
-	}	
-	
-}
@@ -1,83 +0,0 @@
-package mcp.mobius.waila.addons.etb;
-
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-
-import net.minecraft.item.Item;
-import mcp.mobius.waila.Waila;
-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.WARNING, "[Engineer Toolbox] Class not found. " + e);
-			return;
-//		} catch (NoSuchMethodException e){
-//			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Method not found." + e);
-//			return;			
-		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
-			return;			
-		} catch (Exception e){
-			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
-			return;			
-		}		
-		
-		ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileSocket);
-	}
-}
@@ -1,104 +0,0 @@
-package mcp.mobius.waila.addons.etb;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.utils.WailaExceptionHandler;
-
-public class HUDHandlerSocket implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-			if (!config.getConfig("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) + " ";
-
-							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;
-	}
-
-}
@@ -1,35 +0,0 @@
-package mcp.mobius.waila.addons.exu;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class ExtraUtilitiesModule {
-
-	public static Class ModExtraUtilities = null;
-	public static Class TileEntityDrum    = null;	
-	
-	public static void register(){
-		
-
-		try{
-			Class ModExtraUtilities = Class.forName("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("extrautils.tileentity.TileEntityDrum");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityDrum);
-	}
-}
@@ -1,53 +0,0 @@
-package mcp.mobius.waila.addons.exu;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-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 List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		
-		if (!config.getConfig("extrautilities.fluidamount")) return currenttip;
-		
-		int amount = 0;
-		
-		NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank");
-		if (subtag.hasKey("Amount"))
-			amount = accessor.getNBTInteger(subtag, "Amount");
-		
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity));
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,33 +0,0 @@
-package mcp.mobius.waila.addons.gravestone;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class GravestoneModule {
-
-	public static Class BlockGraveStone = null;	
-	
-	public static void register(){
-
-		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;
-		}		
-
-		try {
-			BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
-		} catch (ClassNotFoundException e) {
-			Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
-		}
-
-		
-		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);	
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockGraveStone);
-	}
-
-}
@@ -1,32 +0,0 @@
-package mcp.mobius.waila.addons.gravestone;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDHandlerGravestone implements IWailaDataProvider {
-
-	@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> 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;
-	}	
-	
-}
@@ -1,44 +0,0 @@
-package mcp.mobius.waila.addons.harvestcraft;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.utils.NBTUtil;
-
-public class HUDHandlerPamCrop implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("general.showcrop")) 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;
-	}
-
-}
@@ -1,30 +0,0 @@
-package mcp.mobius.waila.addons.harvestcraft;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class HarvestcraftModule {
-	public static Class TileEntityPamCrop  = null;
-
-	
-	public static void register(){
-		try{
-			Class PamHarvestCraft = Class.forName("assets.pamharvestcraft.PamHarvestCraft");
-			Waila.log.log(Level.INFO, "PamHarvestCraft mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[PamHarvestCraft] PamHarvestCraft mod not found.");
-			return;
-		}			
-		
-		try{
-			TileEntityPamCrop = Class.forName("assets.pamharvestcraft.TileEntityPamCrop");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[PamHarvestCraft] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(),  TileEntityPamCrop);
-	}
-}
@@ -1,77 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-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;
-	}
-
-}
@@ -1,62 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-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;
-	}
-
-}
@@ -1,82 +0,0 @@
-package mcp.mobius.waila.addons.ic2;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-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;
-	}
-
-}
@@ -1,59 +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 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;
-	}
-
-}
@@ -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;
-	}
-	
-}
@@ -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;
-}
@@ -1,42 +0,0 @@
-package mcp.mobius.waila.addons.magicalcrops;
-
-import java.util.List;
-
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.item.ItemStack;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-
-public class HUDHandlerMagicalCrops implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("general.showcrop")) return currenttip;
-		
-		int growthStage = accessor.getMetadata();
-
-		float growthValue = (growthStage / 7.0F) * 100.0F;
-		if (growthValue < 100.0)
-			currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue));
-		else
-			currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature")));
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,30 +0,0 @@
-package mcp.mobius.waila.addons.magicalcrops;
-
-import java.util.logging.Level;
-
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.impl.ModuleRegistrar;
-
-public class MagicalCropsModule {
-	public static Class BlockMagicalCrops  = null;
-
-	
-	public static void register(){
-		try{
-			Class MagicalCrops = Class.forName("magicalcrops.mod_sCrops");
-			Waila.log.log(Level.INFO, "MagicalCrops mod found.");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.INFO, "[MagicalCrops] MagicalCrops mod not found.");
-			return;
-		}			
-		
-		try{
-			BlockMagicalCrops = Class.forName("magicalcrops.BlockMagicalCrops");
-		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARNING, "[MagicalCrops] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(),  BlockMagicalCrops);
-	}
-}
@@ -1,69 +0,0 @@
-package mcp.mobius.waila.addons.openblocks;
-
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidTankInfo;
-import net.minecraftforge.fluids.IFluidHandler;
-import mcp.mobius.waila.api.IWailaConfigHandler;
-import mcp.mobius.waila.api.IWailaDataAccessor;
-import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
-
-public class HUDHandlerTank implements IWailaDataProvider {
-
-	@Override
-	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return null;
-	}
-
-	@Override
-	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
-		if (!config.getConfig("openblocks.fluidamount")) return currenttip;		
-	
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		FluidStack  fluid = tanks[0].fluid; 
-		String name       = currenttip.get(0);
-		
-		try{
-			name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
-		} catch (NullPointerException f){
-			name += " " + LangUtil.translateG("hud.msg.empty");
-		}			
-		
-		currenttip.set(0, name);		
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		if (!config.getConfig("openblocks.fluidamount")) return currenttip;
-		
-		IFluidHandler handler = (IFluidHandler)accessor.getTileEntity();
-		if (handler == null) return currenttip;
-		
-		FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN);
-		if (tanks.length != 1) return currenttip;
-		
-		if(tanks[0].fluid != null)
-			currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity));
-		else
-			currenttip.add(String.format("0 / %d mB", tanks[0].capacity));
-		
-		return currenttip;
-	}
-
-	@Override
-	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		return currenttip;
-	}
-
-}
@@ -1,34 +0,0 @@
-package mcp.mobius.waila.addons.openblocks;
-
-import java.util.logging.Level;
-
-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.WARNING, "[OpenBlocks] Class not found. " + e);
-			return;
-		}
-		
-		ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(),  TileEntityTank);
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(),  TileEntityTank);		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTank);
-	}
-}
Author	SHA1	Message	Date
Thomas Guimbretiere	987d5556ef	Added big time protection on API calls.	2013-06-19 22:37:29 +02:00
Thomas Guimbretiere	6598e693f9	Underped the proxy	2013-06-19 16:52:24 +02:00
Thomas Guimbretiere	a984e2e8bd	Added tag v1.3.1 for changeset 38f148ebeb8f	2013-06-19 15:29:17 +02:00
Thomas Guimbretiere	71aba4006b	Fix for the nbt casting prb.	2013-06-19 15:28:55 +02:00
Freyja	73cf134212	Added Enchanting Plus' enchantment description. eplus will nto be required to build as it is impelmented via reflection. :)	2013-06-18 22:39:08 -04:00
Thomas Guimbretiere	ae641e642d	New handler for power pipes.	2013-06-17 19:03:54 +02:00
Thomas Guimbretiere	58feff48f9	Missing changes.	2013-06-17 18:07:10 +02:00
Thomas Guimbretiere	c77306ae4f	Refactored IC2 module. Included proper handling of transformers Refactored BC module to match API. Fixed TE dumper.	2013-06-17 18:06:57 +02:00
Thomas Guimbretiere	0ce1661a7f	Added NBT server data dumper for testing purpose.	2013-06-17 14:30:41 +02:00
Thomas Guimbretiere	95adb69f55	Update limiter is in. It is set to 250ms between updates.	2013-06-17 14:05:26 +02:00
Thomas Guimbretiere	b52b110852	Added a new config type : ConfigRemote. Can be added by IWailaRegistrar.addConfigRemote. Use as the same as other configs, but will return false if server do not have waila module & will be desactivated in the config menu.	2013-06-17 11:35:41 +02:00
Thomas Guimbretiere	7f1cb7d710	Finished server nbt data request. Reworked IC2 module to handle the next type of interface and remote data sync. Now has 3 modules, for the 3 main interfaces.	2013-06-17 02:20:04 +02:00
Thomas Guimbretiere	94d0f4d681	Added packet handling. Added server ping on connection (identify if server side is present)	2013-06-16 18:51:23 +02:00
Thomas Guimbretiere	5f168bb1bc	Fixed registration by class.	2013-06-16 16:03:30 +02:00
Thomas Guimbretiere	d29ecd09ce	Added tag v1.2.0 for changeset 28ccc9a07b54	2013-06-16 15:42:49 +02:00
Thomas Guimbretiere	1fd33e8d7c	Added registration based on class as well as registration based on IDs	2013-06-16 15:42:26 +02:00
Thomas Guimbretiere	f43bfad3d8	Changed the signature of IWailaBlock. Now the methods are taking in a IWailaDataAccessor instead of 10 arguments. The IWailaDataAccessor gives access to all the required values for the block (world, player, Block, id, metadata, entity, etc)	2013-06-16 13:44:32 +02:00
Thomas Guimbretiere	953e255189	Changed API signature to include Block & TileEntity for optimization	2013-06-15 18:17:39 +02:00
Thomas Guimbretiere	e953471d3e	Added Vanilla module. Added ID:Metadata display (optional)	2013-06-15 18:09:22 +02:00
Thomas Guimbretiere	78c8c9a2ad	Smaller buttons.	2013-06-15 16:57:30 +02:00
Thomas Guimbretiere	db75285bc5	Import cleanup Eclipse source cleanup is NOT RECURSIVE !	2013-06-15 16:50:14 +02:00
Thomas Guimbretiere	cbd8b81f90	Added an external module API. Some refactoring.	2013-06-15 13:03:03 +02:00
Thomas Guimbretiere	f7d397211f	Added helper method for config registration. Some interface renaming.	2013-06-14 18:33:52 +02:00
Thomas Guimbretiere	0eb9f813f7	Added API, menus, keybinds and more.	2013-06-14 18:10:05 +02:00
Thomas Guimbretiere	8387373850	Added IC2 integration (In/out voltages)	2013-06-13 00:29:27 +02:00
Thomas Guimbretiere	fa6218a526	Updated to match current NEI version. Should be compatible with NEI 1.5.2.28	2013-06-12 12:13:32 +02:00
Thomas Guimbretiere	5dd15fd727	Removed old versions of modules.	2013-06-09 17:12:29 +02:00
Thomas Guimbretiere	5206ab683e	First public push. Internal version 0.0.3	2013-06-09 16:58:28 +02:00