check for NEK and version bump.

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

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

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

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

.github/workflows/release-tags.yml

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

.gitignore

@@ -1,28 +0,0 @@
-.gradle
-.settings
-/.idea/
-/run/
-/build/
-/eclipse/
-.classpath
-.project
-/bin/
-/config/
-/crash-reports/
-/logs/
-options.txt
-/saves/
-usernamecache.json
-banned-ips.json
-banned-players.json
-eula.txt
-ops.json
-server.properties
-servers.dat
-usercache.json
-whitelist.json
-/out/
-*.iml
-*.ipr
-*.iws
-src/main/resources/mixins.*.json

CODEOWNERS

@@ -1,3 +0,0 @@
-# Any Github changes require admin approval
-/.github/** @GTNewHorizons/admin
-

LICENSE

@@ -1,437 +0,0 @@
-Attribution-NonCommercial-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-NonCommercial-ShareAlike 4.0 International Public License
-("Public License"). To the extent this Public License may be
-interpreted as a contract, You are granted the Licensed Rights in
-consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the
-Licensor receives from making the Licensed Material available under
-these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-NC-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution, NonCommercial, and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. NonCommercial means not primarily intended for or directed towards
-     commercial advantage or monetary compensation. For purposes of
-     this Public License, the exchange of the Licensed Material for
-     other material subject to Copyright and Similar Rights by digital
-     file-sharing or similar means is NonCommercial provided there is
-     no payment of monetary compensation in connection with the
-     exchange.
-
-  l. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  m. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  n. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part, for NonCommercial purposes only; and
-
-            b. produce, reproduce, and Share Adapted Material for
-               NonCommercial purposes only.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties, including when
-          the Licensed Material is used other than for NonCommercial
-          purposes.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-NC-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database for NonCommercial purposes
-     only;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-     including for purposes of Section 3(b); and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.

LICENSE.txt

@@ -0,0 +1,387 @@
+
+                                 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

assets/waila/lang/de_DE.lang

@@ -18,8 +18,6 @@ choice.showhidewaila=Zeige/Verstecke Waila
 choice.showhideidmeta=Zeige ID:Metadata
 choice.toggledmaintained=Geschaltet/Gewartet
 choice.showliquids=Flüssigkeiten
-choice.shifttoggledblock=Blöcke schleichend umschalten
-choice.shifttoggledents=Lebewesen schleichend umschalten
 screen.button.configureaspect=Konfiguriere Aspekt...
 
 enchant.title.name=Name
@@ -124,7 +122,6 @@ option.vanilla.repeater=Repeater-Verzögerung
 option.vanilla.comparator=Komparatormodus
 option.vanilla.redstone=Redstone-Stärke
 option.vanilla.jukebox=Musikbox-Platte
-option.vanilla.silverfish=Silberfisch verdecken
 option.etb.displaydata=Zeige Sockeldaten
 option.enderio.inout=Zeige Input/Output
 option.enderio.storage=Zeige gespeicherte MJ
@@ -137,12 +134,4 @@ option.pr.showio=Zeige Gatter IO
 option.pr.showdata=Zeige Gatterdaten
 option.extrautilities.fluidamount=Zeige Flüssigk.-Menge
 option.openblocks.fluidamount=Zeige Flüssigk.-Menge
-option.railcraft.fluidamount=Zeige Flüssigk.-Menge
-option.secretrooms.hide=Getarnte Blöcke verdecken
-option.carpenters.hide=Getarnte Blöcke verdecken
-option.stevescarts.showall=Zeige Daten
-option.stevescarts.colorblind=Farbenblind-Modus
-option.stevescarts.shifttoggle=Schleichend Umschalten
-option.general.showhp=Zeige Gesundheit von Lebewesen
-option.general.showcrop=Zeige Pflanzenwachstum
-option.thaumcraft.aspects=Zeige Aspekte
+option.railcraft.fluidamount=Zeige Flüssigk.-Menge

assets/waila/lang/en_US.lang

@@ -143,9 +143,6 @@ option.carpenters.hide=Hide camo blocks
 option.stevescarts.showall=Show data
 option.stevescarts.colorblind=Colorblind mode
 option.stevescarts.shifttoggle=Shift toggle
-option.general.showents=Show entities
 option.general.showhp=Show entities health
 option.general.showcrop=Show crop growth
-option.thaumcraft.aspects=Show aspects
-
-nei.options.keys.showenchant=Show enchanting values
+option.thaumcraft.aspects=Show aspects

assets/waila/lang/ru_RU.lang

@@ -1,7 +1,7 @@
 screen.button.waila=Waila
 screen.button.modules=Модули
 screen.label.scale=Размер
-screen.label.dragtuto=Тащите интерфейс, чтобы изменить позицию.
+screen.label.dragtuto=Перетащите интерфейс, чтобы изменить позицию.
 
 screen.button.default=По умолчанию
 screen.button.cancel=Отмена
@@ -14,13 +14,11 @@ screen.button.visible=Показывать
 screen.button.maintained=При нажатой клавише
 screen.button.toggled=Вкл./Выкл. гор. клавишей
 
-choice.showhidewaila=Показывать/Скрывать Waila
-choice.showhideidmeta=Показывать ID:Метаданные
+choice.showhidewaila=Показать/Скрыть Waila
+choice.showhideidmeta=Показать ID:Метаданные
 choice.toggledmaintained=Переключ./Нажатая клав.
 choice.showliquids=Жидкости
-choice.shifttoggledblock=Приседание показывает блоки
-choice.shifttoggledents=Приседание показывает сущностей
-screen.button.configureaspect=Настроить внешний вид...
+screen.button.configureaspect=Настроить индикатор...
 
 enchant.title.name=Название
 enchant.title.minlvl=Мин. уровень
@@ -46,7 +44,6 @@ hud.msg.out=Из
 hud.msg.in=В
 hud.msg.power=Энергия
 hud.msg.storage=Хранилище
-hud.msg.stored=Хранится
 hud.msg.any=Всё
 hud.msg.mode=Режим
 hud.msg.maxpower=Макс. энергия
@@ -92,31 +89,26 @@ hud.msg.comparator=Компаратор
 hud.msg.substractor=Вычитатель
 hud.msg.record=Пластинка
 
-hud.msg.offers=Предложения
-hud.msg.demands=Запросы
-
 option.appeng.monitorcontent=Содержимое монитора
 option.bb.content=Содержимое бочки
 option.bc.tankamount=Кол-во жидкости
 option.bc.tanktype=Тип жидкости
 option.enderstorage.colors=Цвета
-option.ic2.inputeumach=Макс. вход EU [Механизмы]
-option.ic2.inputeuother=Макс. вход EU [Другое]
-option.ic2.inputeu=Макс. вход EU
-option.ic2.outputeu=Макс. выход EU
-option.ic2.storage=Хранится энергии
-option.ic2.consump=Показывать потребление
-option.ic2.tradeomat=Показывать запрос ресурсообменника
+option.ic2.inputeumach=Макс. ввод еЭ [Машины]
+option.ic2.inputeuother=Макс. ввод еЭ [Другое]
+option.ic2.inputeu=Макс. ввод еЭ
+option.ic2.outputeu=Макс. вывод еЭ
+option.ic2.storage=Заряд энергии
 option.thaumcraft.storedvis=Заряд конденсатора
-option.thermalexpansion.energyhandler=Показывать заряд RF
-option.thermalexpansion.energycell=Показывать ввод/вывод Э.батареи
+option.thermalexpansion.energyhandler=Показывать заряд заряжателя
+option.thermalexpansion.energycell=Показывать Ввод/Вывод Р.батареи
 option.thermalexpansion.fluidtype=Показывать тип жидкости
 option.thermalexpansion.fluidamount=Показывать кол-во жидкости
-option.thermalexpansion.tankmode=Показывать режим цистерны
+option.thermalexpansion.tankmode=Режим цистерны
 option.thermalexpansion.tesssendrecv=Режим тессеракта
 option.thermalexpansion.tessfreq=Частота тессеракта
 option.thermalexpansion.owner=Показывать владельца
-option.thermalexpansion.conditemmode=Показывать режим предметных труб
+option.thermalexpansion.conditemmode=Показывать режим труб
 option.vanilla.spawntype=Тип спаунера
 option.vanilla.growthvalue=Стадия роста
 option.vanilla.leverstate=Положение рычага
@@ -124,7 +116,6 @@ option.vanilla.repeater=Задержка повторителя
 option.vanilla.comparator=Режим компаратора
 option.vanilla.redstone=Сила красного камня
 option.vanilla.jukebox=Пластинка в проигрывателе
-option.vanilla.silverfish=Спрятать чешуйницу
 option.etb.displaydata=Показывать инф. о сокетах
 option.enderio.inout=Показывать ввод/вывод
 option.enderio.storage=Показывать заряд MJ
@@ -134,15 +125,7 @@ option.bcapi.storage=Показывать заряд MJ
 option.bcapi.consump=Показывать макс. энергию
 option.bcapi.trigger=Показывать энергию активации
 option.pr.showio=Показывать ввод/вывод схем
-option.pr.showdata=Показывать данные о схемах
+option.pr.showdata=Показывать инф. о схемах
 option.extrautilities.fluidamount=Показывать кол-во жидкости
 option.openblocks.fluidamount=Показывать кол-во жидкости
-option.railcraft.fluidamount=Показывать кол-во жидкости
-option.secretrooms.hide=Спрятать камуфляжные блоки
-option.carpenters.hide=Спрятать камуфляжные блоки
-option.stevescarts.showall=Показывать данные
-option.stevescarts.colorblind=Режим цветокоррекции
-option.stevescarts.shifttoggle=Приседание показывает
-option.general.showhp=Показывать здоровье сущностей
-option.general.showcrop=Показывать рост растений
-option.thaumcraft.aspects=Показывать аспекты
+option.railcraft.fluidamount=Показывать кол-во жидкости

au/com/bytecode/opencsv/CSVParser.java

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

au/com/bytecode/opencsv/CSVReader.java

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

au/com/bytecode/opencsv/CSVWriter.java

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

au/com/bytecode/opencsv/ResultSetHelper.java

@@ -0,0 +1,33 @@
+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;
+}

au/com/bytecode/opencsv/ResultSetHelperService.java

@@ -0,0 +1,183 @@
+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();
+	}
+}

au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java

@@ -0,0 +1,37 @@
+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;
+    }
+}

au/com/bytecode/opencsv/bean/CsvToBean.java

@@ -0,0 +1,119 @@
+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());
+    }
+
+}

au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java

@@ -0,0 +1,84 @@
+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;
+    }
+}

au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java

@@ -0,0 +1,34 @@
+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));
+       }
+    }
+}

au/com/bytecode/opencsv/bean/MappingStrategy.java

@@ -0,0 +1,46 @@
+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;
+
+}

au/com/bytecode/opencsv/bean/package.html

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

au/com/bytecode/opencsv/package.html

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

build.gradle

@@ -1,722 +0,0 @@
-//version: 1644349045
-/*
-DO NOT CHANGE THIS FILE!
-
-Also, you may replace this file at any time if there is an update available.
-Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
-*/
-
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-import java.util.concurrent.TimeUnit
-
-buildscript {
-    repositories {
-        maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-        maven {
-            name = "Scala CI dependencies"
-            url = "https://repo1.maven.org/maven2/"
-        }
-        maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
-        }
-    }
-    dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
-    }
-}
-
-plugins {
-    id 'idea'
-    id 'eclipse'
-    id 'scala'
-    id 'maven-publish'
-    id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
-    id('org.ajoberstar.grgit') version('4.1.1')
-    id('com.github.johnrengelman.shadow') version('4.0.4')
-    id('com.palantir.git-version') version('0.13.0') apply false
-    id('de.undercouch.download') version('5.0.1')
-}
-
-if (project.file('.git/HEAD').isFile()) {
-    apply plugin: 'com.palantir.git-version'
-}
-
-apply plugin: 'forge'
-
-def projectJavaVersion = JavaLanguageVersion.of(8)
-
-java {
-    toolchain {
-        languageVersion.set(projectJavaVersion)
-    }
-}
-
-idea {
-    module {
-        inheritOutputDirs = true
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
-
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
-}
-
-checkPropertyExists("modName")
-checkPropertyExists("modId")
-checkPropertyExists("modGroup")
-checkPropertyExists("autoUpdateBuildScript")
-checkPropertyExists("minecraftVersion")
-checkPropertyExists("forgeVersion")
-checkPropertyExists("replaceGradleTokenInFile")
-checkPropertyExists("gradleTokenModId")
-checkPropertyExists("gradleTokenModName")
-checkPropertyExists("gradleTokenVersion")
-checkPropertyExists("gradleTokenGroupName")
-checkPropertyExists("apiPackage")
-checkPropertyExists("accessTransformersFile")
-checkPropertyExists("usesMixins")
-checkPropertyExists("mixinPlugin")
-checkPropertyExists("mixinsPackage")
-checkPropertyExists("coreModClass")
-checkPropertyExists("containsMixinsAndOrCoreModOnly")
-checkPropertyExists("usesShadowedDependencies")
-checkPropertyExists("developmentEnvironmentUserName")
-
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-
-String javaSourceDir = "src/main/java/"
-String scalaSourceDir = "src/main/scala/"
-String kotlinSourceDir = "src/main/kotlin/"
-
-String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
-String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
-if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-}
-
-if(apiPackage) {
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
-    }
-}
-
-if(accessTransformersFile) {
-    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
-    if(!getFile(targetFile).exists()) {
-        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
-    }
-}
-
-if(usesMixins.toBoolean()) {
-    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
-        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
-    }
-
-    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
-    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
-    }
-
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-if(coreModClass) {
-    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
-    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
-    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
-    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
-        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
-    }
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
-
-    // Make sure GregTech build won't time out
-    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
-    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
-}
-
-// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
-try {
-    'git config core.fileMode false'.execute()
-}
-catch (Exception e) {
-    logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
-}
-
-// Pulls version first from the VERSION env and then git tag
-String identifiedVersion
-String versionOverride = System.getenv("VERSION") ?: null
-try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
-}
-catch (Exception e) {
-    logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
-                 "or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
-                 "clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
-    versionOverride = 'NO-GIT-TAG-SET'
-    identifiedVersion = versionOverride
-}
-version = minecraftVersion + '-' + identifiedVersion
-String modVersion = identifiedVersion
-
-if( identifiedVersion.equals(versionOverride) ) {
-    logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
-    logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
-}
-
-group = modGroup
-if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
-}
-else {
-    archivesBaseName = modId
-}
-
-
-def arguments = []
-def jvmArguments = []
-
-if(usesMixins.toBoolean()) {
-    arguments += [
-            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    jvmArguments += [
-            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
-    ]
-}
-
-minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
-
-    if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
-        if(gradleTokenModId) {
-            replace gradleTokenModId, modId
-        }
-        if(gradleTokenModName) {
-            replace gradleTokenModName, modName
-        }
-        if(gradleTokenVersion) {
-            replace gradleTokenVersion, modVersion
-        }
-        if(gradleTokenGroupName) {
-            replace gradleTokenGroupName, modGroup
-        }
-    }
-
-    clientIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-
-        if(developmentEnvironmentUserName) {
-            args("--username", developmentEnvironmentUserName)
-        }
-    }
-
-    serverIntellijRun {
-        args(arguments)
-        jvmArgs(jvmArguments)
-    }
-}
-
-if(file("addon.gradle").exists()) {
-    apply from: "addon.gradle"
-}
-
-apply from: 'repositories.gradle'
-
-configurations {
-    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
-    implementation.extendsFrom(shadowCompile)
-    implementation.extendsFrom(shadeCompile)
-}
-
-repositories {
-    maven {
-        name = "Overmind forge repo mirror"
-        url = "https://gregtech.overminddl1.com/"
-    }
-    if(usesMixins.toBoolean()) {
-        maven {
-            name = "sponge"
-            url = "https://repo.spongepowered.org/repository/maven-public"
-        }
-        maven {
-            url = "https://jitpack.io"
-        }
-    }
-}
-
-dependencies {
-    if(usesMixins.toBoolean()) {
-        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
-        annotationProcessor("com.google.guava:guava:24.1.1-jre")
-        annotationProcessor("com.google.code.gson:gson:2.8.6")
-        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
-        // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
-            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: "launchwrapper"
-            exclude module: "guava"
-            exclude module: "gson"
-            exclude module: "commons-io"
-            exclude module: "log4j-core"
-        }
-        compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
-    }
-}
-
-apply from: 'dependencies.gradle'
-
-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
-def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
-
-task generateAssets {
-    if(usesMixins.toBoolean()) {
-        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
-  "required": true,
-  "minVersion": "0.7.11",
-  "package": "${modGroup}.${mixinsPackage}",
-  "plugin": "${modGroup}.${mixinPlugin}",
-  "refmap": "${mixingConfigRefMap}",
-  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
-}
-
-"""
-    }
-}
-
-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = modGroup + ".shadow"
-}
-
-shadowJar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-    dependsOn(relocateShadowJar)
-}
-
-jar {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(shadowJar)
-        enabled = false
-    }
-}
-
-reobf {
-    if(usesMixins.toBoolean()) {
-        addExtraSrgFile mixinSrg
-    }
-}
-
-afterEvaluate {
-    if(usesMixins.toBoolean()) {
-        tasks.compileJava {
-            options.compilerArgs += [
-                    "-AreobfSrgFile=${tasks.reobf.srg}",
-                    "-AoutSrgFile=${mixinSrg}",
-                    "-AoutRefMapFile=${refMap}",
-                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
-                    "-XDenableSunApiLintControl",
-                    "-XDignore.symbol.file"
-            ]
-        }
-    }
-}
-
-runClient {
-    if(developmentEnvironmentUserName) {
-        arguments += [
-                "--username",
-                developmentEnvironmentUserName
-        ]
-    }
-
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-runServer {
-    args(arguments)
-    jvmArgs(jvmArguments)
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher.set(
-            javaToolchains.launcherFor {
-                languageVersion = projectJavaVersion
-            }
-    )
-}
-
-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 modVersion and minecraftVersion
-        expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
-    }
-
-    if(usesMixins.toBoolean()) {
-        from refMap
-    }
-
-    // copy everything else that's not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-def getManifestAttributes() {
-    def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
-        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
-    }
-
-    if(accessTransformersFile) {
-        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
-    }
-
-    if(coreModClass) {
-        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
-    }
-
-    if(usesMixins.toBoolean()) {
-        manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
-        ]
-    }
-    return manifestAttributes
-}
-
-task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
-    from (file("$projectDir/LICENSE"))
-    getArchiveClassifier().set('sources')
-}
-
-task shadowDevJar(type: ShadowJar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
-}
-
-task relocateShadowDevJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowDevJar
-    prefix = modGroup + ".shadow"
-}
-
-task circularResolverJar(type: Jar) {
-    dependsOn(relocateShadowDevJar)
-    dependsOn(shadowDevJar)
-    enabled = false
-}
-
-task devJar(type: Jar) {
-    project.configurations.shadeCompile.each { dep ->
-        from(project.zipTree(dep)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
-    from sourceSets.main.output
-    getArchiveClassifier().set("dev")
-
-    manifest {
-        attributes(getManifestAttributes())
-    }
-
-    if(usesShadowedDependencies.toBoolean()) {
-        dependsOn(circularResolverJar)
-        enabled = false
-    }
-}
-
-task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from (sourceSets.main.output) {
-        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
-    }
-
-    from (sourceSets.main.resources.srcDirs) {
-        include("LICENSE")
-    }
-
-    getArchiveClassifier().set('api')
-}
-
-artifacts {
-    if(!noPublishedSources) {
-        archives sourcesJar
-    }
-    archives devJar
-    if(apiPackage) {
-        archives apiJar
-    }
-}
-
-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID), 
-// and isn't strictly needed with the POM so just disable it.
-tasks.withType(GenerateModuleMetadata) {
-    enabled = false
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-            if(usesShadowedDependencies.toBoolean()) {
-                artifact source: shadowJar, classifier: ""
-            }
-            if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "src"
-            }
-            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
-            if (apiPackage) {
-                artifact source: apiJar, classifier: "api"
-            }
-
-            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
-            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
-            // Using the identified version, not project.version as it has the prepended 1.7.10
-            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-            
-            // remove extra garbage from who knows where
-            pom.withXml {
-                def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
-                                   'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
-                                   'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava', 
-                                   'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j', 
-                                   'org.lwjgl.lwjgl', 'tv.twitch', '']
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    badPomGroup.contains(it.groupId.text()) 
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
-            credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
-            }
-        }
-    }
-}
-
-// Updating
-task updateBuildScript {
-    doLast {
-        if (performBuildScriptUpdate(projectDir.toString())) return
-
-        print("Build script already up-to-date!")
-    }
-}
-
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
-    if (autoUpdateBuildScript.toBoolean()) {
-        performBuildScriptUpdate(projectDir.toString())
-    } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
-    }
-}
-
-static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
-}
-
-boolean performBuildScriptUpdate(String projectDir) {
-    if (isNewBuildScriptVersionAvailable(projectDir)) {
-        def buildscriptFile = getFile("build.gradle")
-        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
-        return true
-    }
-    return false
-}
-
-boolean isNewBuildScriptVersionAvailable(String projectDir) {
-    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
-
-    String currentBuildScript = getFile("build.gradle").getText()
-    String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
-
-    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
-    return !isUpToDate
-}
-
-static String getVersionHash(String buildScriptContent) {
-    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
-    if(versionLine != null) {
-        return versionLine.split(": ").last()
-    }
-    return ""
-}
-
-configure(updateBuildScript) {
-    group = 'forgegradle'
-    description = 'Updates the build script to the latest version'
-}
-
-// Deobfuscation
-
-def deobf(String sourceURL) {
-    try {
-        URL url = new URL(sourceURL)
-        String fileName = url.getFile()
-
-        //get rid of directories:
-        int lastSlash = fileName.lastIndexOf("/")
-        if(lastSlash > 0) {
-            fileName = fileName.substring(lastSlash + 1)
-        }
-        //get rid of extension:
-        if(fileName.endsWith(".jar")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
-
-        String hostName = url.getHost()
-        if(hostName.startsWith("www.")) {
-            hostName = hostName.substring(4)
-        }
-        List parts = Arrays.asList(hostName.split("\\."))
-        Collections.reverse(parts)
-        hostName = String.join(".", parts)
-
-        return deobf(sourceURL, hostName + "/" + fileName)
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/" + String.valueOf(sourceURL.hashCode()))
-    }
-}
-
-// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
-def deobf(String sourceURL, String fileName) {
-    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
-    String bon2Dir = cacheDir + "forge_gradle/deobf"
-    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
-    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
-    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
-    
-    if(file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    download.run {
-        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.CUSTOM-all.jar'
-        dest bon2File
-        quiet true
-        overwrite false
-    }
-
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
-        workingDir bon2Dir
-        standardOutput = new ByteArrayOutputStream()
-    }
-
-    return files(deobfFile)
-}
-
-// Helper methods
-
-def checkPropertyExists(String propertyName) {
-    if (project.hasProperty(propertyName) == false) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
-}
-
-def getFile(String relativePath) {
-    return new File(projectDir, relativePath)
-}

dependencies.gradle

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

gradle.properties

@@ -1,60 +0,0 @@
-modName = Waila
-
-# This is a case-sensitive string to identify your mod. Convention is to use lower case.
-modId = Waila
-
-modGroup = mcp.mobius.waila
-
-# WHY is there no version field?
-# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
-# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
-
-# Will update your build.gradle automatically whenever an update is available
-autoUpdateBuildScript = false
-
-minecraftVersion = 1.7.10
-forgeVersion = 10.13.4.1614
-
-# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
-# restart Minecraft in development. Choose this dependent on your mod:
-# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
-# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
-developmentEnvironmentUserName = Developer
-
-# Define a source file of your project with:
-# public static final String VERSION = "GRADLETOKEN_VERSION";
-# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
-# version in @Mod([...], version = VERSION, [...])
-# Leave these properties empty to skip individual token replacements
-replaceGradleTokenInFile = Waila.java
-gradleTokenModId =
-gradleTokenModName =
-gradleTokenVersion = GRADLETOKEN_VERSION
-gradleTokenGroupName =
-
-# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
-# leave this property empty.
-# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
-apiPackage = api
-
-# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
-# Example value: mymodid_at.cfg
-accessTransformersFile =
-
-# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
-usesMixins = false
-# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
-mixinPlugin =
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
-mixinsPackage =
-# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
-# This parameter is for legacy compatibility only
-# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
-coreModClass =
-# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
-# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
-containsMixinsAndOrCoreModOnly = false
-
-# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
-# responsibility check the licence and request permission for distribution, if required.
-usesShadowedDependencies = true

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,188 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# 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
-#
-#      https://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.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    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" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@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
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@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 Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-: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

jitpack.yml

@@ -1,2 +0,0 @@
-before_install:
-  - ./gradlew setupCIWorkspace

mcp/mobius/waila/Waila.java

@@ -2,9 +2,7 @@ package mcp.mobius.waila;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.logging.Logger;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -12,19 +10,20 @@ 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.WailaConnectionHandler;
 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.minecraft.src.ModLoader;
+import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
+import codechicken.lib.lang.LangUtil;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLModContainer;
 import cpw.mods.fml.common.Mod;
@@ -37,19 +36,13 @@ 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.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.network.NetworkMod;
 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;
-import mcp.mobius.waila.commands.CommandDumpHandlers;
 
-@Mod(modid="Waila", name="Waila", version="GRADLETOKEN_VERSION", dependencies="after:NotEnoughItems@[1.0.4.0,)", acceptableRemoteVersions="*")
-/*
+@Mod(modid="Waila", name="Waila", version="1.5.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.
@@ -58,7 +51,7 @@ public class Waila {
 
 	@SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer")
 	public static ProxyServer proxy;	
-	public static Logger log = LogManager.getLogger("Waila");
+	public static Logger log = Logger.getLogger("Waila");
 	public boolean serverPresent = false;
 	
     /* INIT SEQUENCE */
@@ -66,8 +59,7 @@ public class Waila {
     public void preInit(FMLPreInitializationEvent event) {
     	ConfigHandler.instance().loadDefaultConfig(event);
 		OverlayConfig.updateColors();
-		MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());	
-		WailaPacketHandler.INSTANCE.ordinal();
+		MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());		
 	}	
 	
     @EventHandler
@@ -78,14 +70,6 @@ public class Waila {
             EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this));
             FMLbus.register(this);
         } catch (Throwable t) {}
-        
-        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
-        	MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
-    		FMLCommonHandler.instance().bus().register(new KeyEvent());
-    		FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());    
-    		
-        }
-		FMLCommonHandler.instance().bus().register(new NetworkHandler());        
 	}
 
     @EventHandler
@@ -93,8 +77,7 @@ public class Waila {
 		proxy.registerHandlers();
     	ModIdentification.init();
         
-    	/*
-        if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
+        if (!ModLoader.isModLoaded("nek") && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
         
 	        for (String key: ModIdentification.keyhandlerStrings.keySet()){
 	        	String orig  = I18n.getString(key);
@@ -126,21 +109,18 @@ public class Waila {
 	        	LanguageRegistry.instance().addStringLocalization(key, modif);
 	        }
         }
-        */
         
 	}
 
     @Subscribe
     public void loadComplete(FMLLoadCompleteEvent event) {    
     	proxy.registerMods();
-    	proxy.registerIMCs();
     	
-    	/*
     	String[] ores = OreDictionary.getOreNames();
     	for (String s : ores)
     		for (ItemStack stack : OreDictionary.getOres(s))
     			System.out.printf("%s : %s\n", s, stack);
-    	*/
+    	
     }    
     	
     @EventHandler
@@ -152,7 +132,7 @@ public class Waila {
 			if (imcMessage.key.equalsIgnoreCase("addconfig")){
 				String[] params = imcMessage.getStringValue().split("\\$\\$");
 				if (params.length != 3){
-					Waila.log.warn(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue()));
+					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()));				
@@ -161,15 +141,32 @@ public class Waila {
 			
 			if (imcMessage.key.equalsIgnoreCase("register")){
 				Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue()));
-				ModuleRegistrar.instance().addIMCRequest(imcMessage.getStringValue(), imcMessage.getSender());
+				this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender());
 			}
 		}
 	}		
 	
-
-	
-	@EventHandler
-	public void serverStarting(FMLServerStartingEvent event){
-		event.registerServerCommand(new CommandDumpHandlers());
-	}	
+	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()));
+		}
+		
+	}
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.agriculture;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -21,7 +21,7 @@ public class AgricultureModule {
 		try{
 			BlockCrop = Class.forName("com.teammetallurgy.agriculture.crops.BlockCrop");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Agriculture] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Agriculture] Class not found. " + e);
 			return;
 		}
 		

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.agriculture;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -43,9 +39,4 @@ public class HUDHandlerCrop implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
-	
 }

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

@@ -0,0 +1,44 @@
+package mcp.mobius.waila.addons.appeng;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraftforge.common.ForgeDirection;
+import mcp.mobius.waila.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);
+	}
+}

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

@@ -0,0 +1,50 @@
+package mcp.mobius.waila.addons.appeng;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+
+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;
+	}	
+	
+}

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

@@ -0,0 +1,41 @@
+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.lib.lang.LangUtil;
+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);			
+		}
+	}	
+	
+}

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

@@ -0,0 +1,64 @@
+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 codechicken.lib.lang.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;
+	}	
+}

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

@@ -0,0 +1,48 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+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 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);
+	}
+	
+}

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

@@ -0,0 +1,80 @@
+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.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);
+
+	}	
+	
+}

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

@@ -1,28 +1,29 @@
 package mcp.mobius.waila.addons.buildcraft;
 
 import java.util.List;
+import java.util.logging.Level;
 
 //import buildcraft.factory.TileTank;
 
 
 
 
-import org.apache.logging.log4j.Level;
 
+
+
+import codechicken.lib.lang.LangUtil;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ConfigHandler;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
-import mcp.mobius.waila.cbcore.LangUtil;
+import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.liquids.ILiquidTank;
+import net.minecraftforge.liquids.LiquidStack;
 
 public class HUDHandlerBCTanks implements IWailaDataProvider {
 
@@ -69,15 +70,10 @@ public class HUDHandlerBCTanks implements IWailaDataProvider {
 		try{
 			tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0];
 		} catch (Exception e){
-			Waila.log.log(Level.ERROR, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
+			Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e));
 			return null;
 		}
 		return tank;
 	}
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
-	
 }

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

@@ -0,0 +1,78 @@
+package mcp.mobius.waila.addons.buildcraft;
+
+import java.util.List;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.ForgeDirection;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+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;
+	}
+
+}

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

@@ -1,5 +1,10 @@
 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;
@@ -7,7 +12,6 @@ public class CarpentersModule {
 	public static Class BlockCarpentersHatch = null;
 	
 	public static void register(){
-		/*
 		try{
 			Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks");
 			Waila.log.log(Level.INFO, "CarpentersBlocks mod found.");
@@ -34,7 +38,6 @@ public class CarpentersModule {
 		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch);
 		ModuleRegistrar.instance().registerSyncedNBTKey("data",    TEBase);
 		ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase);
-		*/
 	}	
 	
 }

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

@@ -2,11 +2,9 @@ package mcp.mobius.waila.addons.carpenters;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -15,7 +13,6 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
 		if (!config.getConfig("carpenters.hide")) return null;
 
 		NBTTagCompound tag  = accessor.getNBTData();
@@ -37,7 +34,7 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 			
 			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);			
 		}
-		*/
+		
 		return null;
 	}
 
@@ -56,11 +53,4 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,9 +1,10 @@
 package mcp.mobius.waila.addons.enderio;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.logging.Level;
 
-import org.apache.logging.log4j.Level;
-
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
@@ -39,16 +40,16 @@ public class EnderIOModule {
 			TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube");
 			
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
 			return;			
 //		} catch (NoSuchFieldException e){
 //			mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
 //			return;			
 		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
 			return;			
 		}
 		
@@ -58,8 +59,8 @@ public class EnderIOModule {
 		ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank);
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerCapacitor(), TileCapacitorBank);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTesseract(), TileTesseract);		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileCapacitorBank);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);		
 	}	
 	
 }

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

@@ -0,0 +1,61 @@
+package mcp.mobius.waila.addons.enderio;
+
+import java.util.List;
+
+import codechicken.lib.lang.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;
+	}
+
+}

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

@@ -0,0 +1,63 @@
+package mcp.mobius.waila.addons.enderio;
+
+import java.util.List;
+
+import codechicken.lib.lang.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;
+	}
+
+}

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

@@ -2,8 +2,7 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -38,21 +37,21 @@ public class EnderStorageModule {
 			TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank");
 			
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e);
 			return;			
 		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e);
 			return;			
 		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[EnderStorage] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e);
 			return;			
 		}
 		
 		ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStorage(), TileFrequencyOwner);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(),    TileFrequencyOwner);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileFrequencyOwner);
 	}
 }

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -74,11 +70,4 @@ public class HUDHandlerStorage implements IWailaDataProvider {
 		return currenttip;
 	}	
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,9 +1,9 @@
 package mcp.mobius.waila.addons.etb;
 
 import java.lang.reflect.Field;
+import java.util.logging.Level;
 
-import org.apache.logging.log4j.Level;
-
+import net.minecraft.item.Item;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
@@ -63,21 +63,21 @@ public class ETBModule {
 			
 			
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e);
 			return;
 //		} catch (NoSuchMethodException e){
-//			Waila.log.log(Level.WARN, "[Engineer Toolbox] Method not found." + e);
+//			mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Method not found." + e);
 //			return;			
 		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Field not found." + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e);
 			return;			
 		} catch (Exception e){
-			Waila.log.log(Level.WARN, "[Engineer Toolbox] Unhandled exception." + e);
+			Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e);
 			return;			
 		}		
 		
 		ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata");
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerSocket(), TileSocket);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileSocket);
 	}
 }

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

@@ -1,14 +1,11 @@
 package mcp.mobius.waila.addons.etb;
 
+import java.util.Arrays;
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -104,11 +101,4 @@ public class HUDHandlerSocket implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.exu;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -14,7 +14,7 @@ public class ExtraUtilitiesModule {
 		
 
 		try{
-			Class ModExtraUtilities = Class.forName("com.rwtema.extrautils.ExtraUtils");
+			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.");
@@ -22,14 +22,14 @@ public class ExtraUtilitiesModule {
 		}			
 		
 		try{
-			TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum");
+			TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e);
 			return;
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(),  TileEntityDrum);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerDrum(), TileEntityDrum);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityDrum);
 	}
 }

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

@@ -2,12 +2,9 @@ package mcp.mobius.waila.addons.exu;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -53,11 +50,4 @@ public class HUDHandlerDrum implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.gravestone;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -22,12 +22,12 @@ public class GravestoneModule {
 		try {
 			BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone");
 		} catch (ClassNotFoundException e) {
-			Waila.log.log(Level.WARN, "[GraveStone] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e);
 		}
 
 		
 		ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone);	
-		ModuleRegistrar.instance().registerNBTProvider  (new HUDHandlerGravestone(), BlockGraveStone);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockGraveStone);
 	}
 
 }

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

@@ -2,11 +2,7 @@ package mcp.mobius.waila.addons.gravestone;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -33,11 +29,4 @@ public class HUDHandlerGravestone implements IWailaDataProvider {
 		return currenttip;
 	}	
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.harvestcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -45,11 +41,4 @@ public class HUDHandlerPamCrop implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.harvestcraft;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -21,7 +21,7 @@ public class HarvestcraftModule {
 		try{
 			TileEntityPamCrop = Class.forName("assets.pamharvestcraft.TileEntityPamCrop");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[PamHarvestCraft] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[PamHarvestCraft] Class not found. " + e);
 			return;
 		}
 		

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

@@ -2,11 +2,8 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -77,11 +74,4 @@ public class HUDHandlerTEBaseGenerator implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,11 +2,8 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -62,11 +59,4 @@ public class HUDHandlerTEElectricBlock implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,11 +2,8 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -82,11 +79,4 @@ public class HUDHandlerTEStandardMachine implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -2,12 +2,10 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -28,7 +26,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+		
 		if (!ConfigHandler.instance().getConfig("ic2.tradeomat")) return currenttip;
 		
 		NBTTagCompound slots = accessor.getNBTData().getCompoundTag("InvSlots");
@@ -49,7 +47,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 			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;
 	}
 
@@ -58,11 +56,4 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -54,7 +54,7 @@ public class IC2Module {
 	public static ItemStack OverclockerUpgradeStack   = null;
 	
 	public static void register(){
-	/*
+
 		
 		try{
 			TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine");
@@ -133,19 +133,16 @@ public class IC2Module {
 		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;
 	}
 	
@@ -153,8 +150,7 @@ public class IC2Module {
 		
 		NBTTagCompound nbt   = accessor.getNBTData();
 		IC2Upgrades upgrades = new IC2Upgrades();
-
-		/*
+		
 		if (!nbt.hasKey("InvSlots")) return null;
 		
 		NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
@@ -179,7 +175,7 @@ public class IC2Module {
 			if (OverclockerUpgradeStack.getItemDamage()   == meta && OverclockerUpgradeStack.itemID == id)
 				upgrades.overclocker += count;			
 		}
-		*/
+		
 		return upgrades;
 	}
 	

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.magicalcrops;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -43,11 +39,4 @@ public class HUDHandlerMagicalCrops implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.magicalcrops;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -21,7 +21,7 @@ public class MagicalCropsModule {
 		try{
 			BlockMagicalCrops = Class.forName("magicalcrops.BlockMagicalCrops");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[MagicalCrops] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[MagicalCrops] Class not found. " + e);
 			return;
 		}
 		

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

@@ -2,19 +2,15 @@ package mcp.mobius.waila.addons.openblocks;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.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 {
 
@@ -37,7 +33,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
 		String name       = currenttip.get(0);
 		
 		try{
-			name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+			name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
 		} catch (NullPointerException f){
 			name += " " + LangUtil.translateG("hud.msg.empty");
 		}			
@@ -70,11 +66,4 @@ public class HUDHandlerTank implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.openblocks;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -22,13 +22,13 @@ public class OpenBlocksModule {
 		try{
 			TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e);
 			return;
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount");		
-		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank);
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank);		
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileEntityTank);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(),  TileEntityTank);
+		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(),  TileEntityTank);		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTank);
 	}
 }

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

@@ -1,8 +1,13 @@
 package mcp.mobius.waila.addons.projectred;
 
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.common.ForgeDirection;
+import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaFMPAccessor;
 import mcp.mobius.waila.api.IWailaFMPDecorator;
 import mcp.mobius.waila.gui.helpers.UIHelper;

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

@@ -1,7 +1,10 @@
 package mcp.mobius.waila.addons.projectred;
 
-import org.apache.logging.log4j.Level;
+import java.io.File;
+import java.util.logging.Level;
 
+import net.minecraft.block.Block;
+import net.minecraftforge.common.Configuration;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 

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

@@ -1,13 +1,10 @@
 package mcp.mobius.waila.addons.railcraft;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -34,7 +31,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
 			String name = currenttip.get(0);
 			
 			try{
-				name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+				name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
 			} catch (NullPointerException f){
 				name += " " + LangUtil.translateG("hud.msg.empty");
 			}			
@@ -74,11 +71,4 @@ public class HUDHandlerTank implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,8 +1,7 @@
 package mcp.mobius.waila.addons.railcraft;
 
 import java.lang.reflect.Method;
-
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -29,16 +28,16 @@ public class RailcraftModule {
 			//StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank");
 			
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e);
 			return;
 		} catch (NoSuchMethodException e){
-			Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e);
+			Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e);
 			return;			
 		}
 		
 		ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount");		
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(),  TileTankBase);
 		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(),  TileTankBase);
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerTank(), TileTankBase);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTankBase);
 	}
 }

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

@@ -2,11 +2,9 @@ package mcp.mobius.waila.addons.secretrooms;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -15,7 +13,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+	
 		if (!config.getConfig("secretrooms.hide")) return null;
 		
 		if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){
@@ -24,7 +22,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 		}
 
 		else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){
-			return new ItemStack(Blocks.torch);
+			return new ItemStack(Block.torchWood);
 		}		
 		
 		else if (accessor.getNBTData() != null){
@@ -36,7 +34,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 				return new ItemStack(copyID, 1, copyMeta);
 			}
 		}
-		*/
+		
 		return null;
 	}
 
@@ -57,7 +55,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 
 	private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor){
 		// modify coordinates to get hinge Block.
-		/*
 		int i = accessor.getMetadata();
 		int j = accessor.getPosition().blockX;
 		int k = accessor.getPosition().blockZ;
@@ -86,15 +83,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 		int blockMeta = accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k);
 		
 		return new ItemStack(blockID, 1, blockMeta);
-		*/
-		return null;
 	}
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,5 +1,10 @@
 package mcp.mobius.waila.addons.secretrooms;
 
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
 public class SecretRoomsModule {
 
 	public static Class  TileEntityCamo = null;
@@ -7,7 +12,6 @@ public class SecretRoomsModule {
 	public static Class  BlockCamoTrapDoor = null;
 	
 	public static void register(){
-		/*
 		try{
 			Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms");
 			Waila.log.log(Level.INFO, "SecretRooms mod found.");
@@ -35,7 +39,6 @@ public class SecretRoomsModule {
 		ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor);
 		ModuleRegistrar.instance().registerSyncedNBTKey("copyID",   TileEntityCamo);
 		ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo);
-		*/
 	}		
 	
 }

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

@@ -2,11 +2,8 @@ package mcp.mobius.waila.addons.statues;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -22,10 +19,11 @@ public class HUDHandlerStatues implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		
 		try {
 			String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity());
 			if (skinName.equals("")){
-				TileEntity belowEnt = accessor.getWorld().getTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
+				TileEntity belowEnt = accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
 				if (StatuesModule.TileEntityStatue.isInstance(belowEnt))
 					skinName = (String)StatuesModule.skinName.get(belowEnt);
 			}
@@ -68,11 +66,4 @@ public class HUDHandlerStatues implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
-	
 }

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

@@ -1,8 +1,7 @@
 package mcp.mobius.waila.addons.statues;
 
 import java.lang.reflect.Field;
-
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -25,16 +24,16 @@ public class StatuesModule {
 			TileEntityStatue = Class.forName("info.jbcs.minecraft.statues.TileEntityStatue");
 			skinName = TileEntityStatue.getDeclaredField("skinName");
 		} catch (ClassNotFoundException e){
-			Waila.log.log(Level.WARN, "[Statues] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
 			return;
 		} catch (NoSuchFieldException e){
-			Waila.log.log(Level.WARN, "[Statues] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e);
 			return;
 		}
 		
-		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue);
-		ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue);		
-		ModuleRegistrar.instance().registerNBTProvider (new HUDHandlerStatues(), TileEntityStatue);
+		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(),  TileEntityStatue);
+		ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(),  TileEntityStatue);		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStatue);
 	}	
 	
 }

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

@@ -3,11 +3,9 @@ package mcp.mobius.waila.addons.stevescarts;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.math.MathHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -149,11 +147,4 @@ public class HUDCargoManager implements IWailaDataProvider {
         }
     }	
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}    
-    
 }

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

@@ -2,14 +2,22 @@ package mcp.mobius.waila.addons.stevescarts;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import net.minecraftforge.common.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;
+import static mcp.mobius.waila.api.SpecialChars.*;
 
 public class HUDCartAssembler implements IWailaDataProvider {
 
@@ -25,7 +33,6 @@ public class HUDCartAssembler implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
 		if (!config.getConfig("stevescarts.showall")) return currenttip;
 		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
 			currenttip.add(ITALIC + "Press shift for more data");
@@ -68,7 +75,7 @@ public class HUDCartAssembler implements IWailaDataProvider {
 				currenttip.add(String.format("Time remaining : <Done>"));
 			else
 				currenttip.add(String.format("Time remaining : <Idle>"));
-		*/
+		
 		return currenttip;
 	}
 
@@ -77,10 +84,5 @@ public class HUDCartAssembler implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}
+
 }

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

@@ -2,11 +2,8 @@ package mcp.mobius.waila.addons.stevescarts;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -126,10 +123,4 @@ public class HUDLiquidManager implements IWailaDataProvider {
 		}
 	}	
 	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
 }

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

@@ -3,11 +3,9 @@ package mcp.mobius.waila.addons.stevescarts;
 import java.util.List;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaEntityAccessor;
 import mcp.mobius.waila.api.IWailaEntityProvider;
@@ -84,10 +82,4 @@ public class HUDMinecartModular implements IWailaEntityProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, Entity te, NBTTagCompound tag, World world) {
-		if (te != null)
-			te.writeToNBT(tag);
-		return tag;
-	}	
 }

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

@@ -2,6 +2,10 @@ package mcp.mobius.waila.addons.stevescarts;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
 public class StevesCartsModule {
 
@@ -19,7 +23,6 @@ public class StevesCartsModule {
 	public static Method GetSelectionName = null;  // CargoItemSelection.getName
 	
 	public static void register(){
-		/*
 		try{
 			Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts");
 			Waila.log.log(Level.INFO, "StevesCarts mod found.");
@@ -69,8 +72,7 @@ public class StevesCartsModule {
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);	
-		*/		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);			
 	}	
 	
 }

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

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

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

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

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

@@ -0,0 +1,63 @@
+package mcp.mobius.waila.addons.thermalexpansion;
+
+import java.util.List;
+
+import codechicken.lib.lang.LangUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraftforge.fluids.FluidStack;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
+public class HUDHandlerConduitFluid implements IWailaDataProvider {
+
+	@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("thermalexpansion.fluidtype")) return currenttip;
+		
+		boolean found   = false;
+		FluidStack fluid = null;
+		
+		if (!accessor.getNBTData().hasKey("parts")) return currenttip;
+		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
+		for (int i = 0; i < parts.tagCount(); i++){
+			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
+			String id = subtag.getString("id");
+			
+			if (id.contains("ConduitFluid")){
+				found  = true;
+				NBTTagCompound fluidTag = subtag.getCompoundTag("ConnFluid");
+				fluid = FluidStack.loadFluidStackFromNBT(fluidTag);
+			}
+		}			
+
+		if (!found) return currenttip;	
+		
+		if (fluid != null)
+			currenttip.add(fluid.getFluid().getLocalizedName());			
+		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;
+	}
+
+}

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

@@ -1,21 +1,15 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraft.nbt.NBTTagList;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 
-public class HUDHandlerIBlockInfo implements IWailaDataProvider {
+public class HUDHandlerConduitItem implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
@@ -29,6 +23,36 @@ public class HUDHandlerIBlockInfo implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		
+		if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip;
+		
+		boolean found = false;
+		int      mode  = -1;
+		
+		if (!accessor.getNBTData().hasKey("parts")) return currenttip;
+		NBTTagList parts = accessor.getNBTData().getTagList("parts"); 
+		for (int i = 0; i < parts.tagCount(); i++){
+			NBTTagCompound subtag = (NBTTagCompound)parts.tagAt(i);
+			String id = subtag.getString("id");
+			
+			if (id.contains("ConduitItem")){
+				mode   = accessor.getNBTInteger(subtag, "Mode");
+				found  = true;
+			}
+		}	
+		
+		if (!found) return currenttip;		
+		
+		if (mode == 0){}
+		else if (mode == 1)
+			currenttip.add("Mode : \u00a7fDense");
+		else if (mode == 2)
+			currenttip.add("Mode : \u00a7fVacuum");
+		else if (mode == 3)
+			currenttip.add("Mode : \u00a7fRound-Robin");			
+		else
+			currenttip.add("Mode : <UNKNOWN>");
+
 		return currenttip;
 	}
 
@@ -37,22 +61,4 @@ public class HUDHandlerIBlockInfo implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try{
-			List info = new ArrayList();
-			Block block = world.getBlock(x, y, z);
-			ThermalExpansionModule.IBlockInfo_getBlockInfo.invoke(block, world, x, y, z, ForgeDirection.UNKNOWN, player, info, false);
-			
-			for (Object i : info){
-				System.out.printf("%s\n", i);
-			}
-			
-		} catch (Exception e){
-			throw new RuntimeException(e);
-		}		
-		
-		return tag;
-	}
-
 }

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

@@ -2,15 +2,12 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerEnergyCell implements IWailaDataProvider {
 
@@ -41,17 +38,4 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			int recv = ThermalExpansionModule.TileEnergyCell_Recv.getInt(te);
-			int send = ThermalExpansionModule.TileEnergyCell_Send.getInt(te);
-			tag.setInteger("Recv", recv);
-			tag.setInteger("Send", send);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
-	
 }

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

@@ -0,0 +1,48 @@
+package mcp.mobius.waila.addons.thermalexpansion;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.ForgeDirection;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.utils.WailaExceptionHandler;
+
+public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
+
+	@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("thermalexpansion.energyhandler")) return currenttip;
+		if (!accessor.getNBTData().hasKey("Energy")) return currenttip;
+		
+		int energy = accessor.getNBTInteger(accessor.getNBTData(), "Energy");
+		try {
+			Integer maxEnergy = (Integer)ThermalExpansionModule.IEnergyHandler_getMaxStorage.invoke(accessor.getTileEntity(), ForgeDirection.UNKNOWN);
+			if (maxEnergy != 0)
+				currenttip.add(String.format("%d / %d RF", energy, maxEnergy));			
+		} 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;
+	}
+
+}

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -33,9 +29,6 @@ public class HUDHandlerISecureTile implements IWailaDataProvider {
 			String owner  = accessor.getNBTData().getString("Owner");
 			int    iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access");
 			
-			if (owner.equals("[None]"))
-				return currenttip;
-			
 			String access = "INVALID";
 			switch(iaccess){
 			case 0:
@@ -61,19 +54,6 @@ public class HUDHandlerISecureTile implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			String owner = (String) ThermalExpansionModule.ISecureTile_getOwnerName.invoke(te);
-			int    access = ((Enum) ThermalExpansionModule.ISecureTile_getAccess.invoke(te)).ordinal();
-			
-			tag.setString("Owner", owner);
-			tag.setInteger("Access", access);
-			
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
+	
 
 }

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

@@ -1,13 +1,10 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -30,7 +27,7 @@ public class HUDHandlerTank implements IWailaDataProvider {
 			String name = currenttip.get(0);
 			
 			try{
-				name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid));
+				name += String.format(" < %s >", fluid.getFluid().getLocalizedName());
 			} catch (NullPointerException f){
 				name += " " + LangUtil.translateG("hud.msg.empty");
 			}			
@@ -82,15 +79,4 @@ public class HUDHandlerTank implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te);
-			tag.setInteger("Amount", amount);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
-	
 }

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

@@ -2,12 +2,8 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
-import net.minecraft.entity.player.EntityPlayerMP;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -92,19 +88,4 @@ public class HUDHandlerTesseract implements IWailaDataProvider {
 		return currenttip;
 	}
 
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		try {
-			byte modeItem   = ThermalExpansionModule.TileTesseract_Item.getByte(te);
-			byte modeFluid  = ThermalExpansionModule.TileTesseract_Fluid.getByte(te);
-			byte modeEnergy = ThermalExpansionModule.TileTesseract_Energy.getByte(te);
-			tag.setByte("Item.Mode", modeItem);
-			tag.setByte("Fluid.Mode", modeFluid);
-			tag.setByte("Energy.Mode", modeEnergy);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-		return tag;
-	}	
-	
 }

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

@@ -0,0 +1,132 @@
+package mcp.mobius.waila.addons.thermalexpansion;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import net.minecraftforge.common.ForgeDirection;
+import mcp.mobius.waila.Waila;
+import mcp.mobius.waila.api.impl.ModuleRegistrar;
+
+public class ThermalExpansionModule {
+
+	public static Class  IEnergyHandler = null;
+	public static Method IEnergyHandler_getMaxStorage = null;
+	
+	public static Class TileEnergyCell = null;
+	
+	public static Class  TileTank = null;
+	public static Method TileTank_getTankFluid = null;
+	public static Method TileTank_getTankCapacity = null;
+	public static Field  TileTank_mode = null;
+
+	//public static Class  TileConduitFluid = null;
+	//public static Method TileConduitFluid_getRenderFluid = null;
+	//public static Method TileConduitFluid_getRenderFluidLevel = null;
+	
+	//public static Class  TileConduitItems = null;
+	
+	public static Class  TileTesseract = null;
+	
+	public static Class  ISecureTile = null;
+	
+	public static Class BlockMultipart = null;
+	
+	//public static Field  TileTesseract_modItem   = null;
+	//public static Field  TileTesseract_modFluid  = null;
+	//public static Field  TileTesseract_modEnergy = null;	
+	
+	
+	//public static Class  TileConduitBase = null;
+	//public static Field  TileConduitBase_isInput  = null;
+	//public static Field  TileConduitBase_isOutput = null;	
+	
+	public static void register(){
+
+		try{
+			Class ModThermalExpansion = Class.forName("thermalexpansion.ThermalExpansion");
+			Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.INFO, "[Thermal Expansion] ThermalExpansion mod not found.");
+			return;
+		}		
+		
+		try{
+			IEnergyHandler = Class.forName("cofh.api.energy.IEnergyHandler");
+			IEnergyHandler_getMaxStorage = IEnergyHandler.getMethod("getMaxEnergyStored", ForgeDirection.class);
+			TileEnergyCell = Class.forName("thermalexpansion.block.energycell.TileEnergyCell");
+			
+			TileTank       = Class.forName("thermalexpansion.block.tank.TileTank");
+			TileTank_getTankFluid    = TileTank.getMethod("getTankFluid");
+			TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity");
+			TileTank_mode            = TileTank.getField("mode");
+
+			//TileConduitFluid = Class.forName("thermalexpansion.block.conduit.fluid.TileConduitFluid");			
+			//TileConduitFluid_getRenderFluid      = TileConduitFluid.getMethod("getRenderFluid");
+			//TileConduitFluid_getRenderFluidLevel = TileConduitFluid.getMethod("getRenderFluidLevel");
+			//TileConduitItems = Class.forName("thermalexpansion.block.conduit.item.TileConduitItem");				
+			
+			TileTesseract = Class.forName("thermalexpansion.block.tesseract.TileTesseract");
+			
+			ISecureTile   = Class.forName("cofh.api.tileentity.ISecureTile");
+			
+			BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart");
+			
+			//TileTesseract_modItem   = TileTesseract.getField("modItem");
+			//TileTesseract_modFluid  = TileTesseract.getField("modFluid");
+			//TileTesseract_modEnergy = TileTesseract.getField("modEnergy");			
+			
+			//TileConduitBase = Class.forName("thermalexpansion.block.conduit.TileConduitBase");
+			//TileConduitBase_isInput  = TileConduitBase.getField("isInput");
+			//TileConduitBase_isOutput = TileConduitBase.getField("isOutput");			
+			
+			//TileEnergyCell_energyReceive = TileEnergyCell.getField("energyReceive");
+			//TileEnergyCell_energySend = TileEnergyCell.getField("energySend");
+			
+		} catch (ClassNotFoundException e){
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Class not found. " + e);
+			return;
+		} catch (NoSuchMethodException e){
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Method not found." + e);
+			return;			
+		} catch (NoSuchFieldException e){
+			Waila.log.log(Level.WARNING, "[Thermal Expansion] Field not found." + e);
+			return;			
+//		} catch (Exception e){
+//			mod_Waila.log.log(Level.WARNING, "[Thermal Expansion] Unhandled exception." + e);
+//			return;			
+		}		
+		
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.conditemmode");		
+		ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tesssendrecv");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.tessfreq");
+		ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner");		
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
+		ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank);
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank);
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract);
+		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile);
+
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitFluid(), BlockMultipart);		
+		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerConduitItem(),  BlockMultipart);		
+			
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", IEnergyHandler);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEnergyCell);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", ISecureTile);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
+		
+	}
+	
+	
+}

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

@@ -2,11 +2,7 @@ package mcp.mobius.waila.addons.twilightforest;
 
 import java.util.List;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -32,9 +28,4 @@ public class TwilightForestGenericOverride implements IWailaDataProvider {
 	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
 		return currenttip;
 	}
-	
-	@Override
-	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) {
-		return tag;
-	}	
 }

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

@@ -1,6 +1,6 @@
 package mcp.mobius.waila.addons.twilightforest;
 
-import org.apache.logging.log4j.Level;
+import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -26,12 +26,16 @@ public class TwilightForestModule {
 			BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant");
 			BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling");				
 		} catch (ClassNotFoundException e) {
-			Waila.log.log(Level.WARN, "[TwilightForestMod] Class not found. " + e);
+			Waila.log.log(Level.WARNING, "[TwilightForestMod] Class not found. " + e);
 		}
 
 		
 		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFRoots);
 		ModuleRegistrar.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFPlant);		
+		//ExternalModulesHandler.instance().registerStackProvider(new TwilightForestGenericOverride(), BlockTFSapling);	
+		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFRoots);
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockTFPlant);		
 	}
 
 }

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

@@ -1,6 +1,12 @@
 package mcp.mobius.waila.addons.vanillamc;
 
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;