diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..0333373 --- /dev/null +++ b/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 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e48605f --- /dev/null +++ b/build.gradle @@ -0,0 +1,135 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +configurations { + deployerJars +} + +//add dependency repositories +repositories { + mavenLocal() + mavenCentral() + maven { + name = "chickenbones" + url = "http://chickenbones.net/maven/" + } +} + +apply plugin: 'java' +apply plugin: 'forge' +apply plugin: 'maven' + +version = "1.5.2a" +group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "Waila" + +// Define properties file +ext.configFile = file "build.properties" + +configFile.withReader { + // Load config. It shall from now be referenced as simply config or project.config + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +dependencies { + compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev" + compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev" + compile "codechicken:NotEnoughItems:${config.mc_version}-${config.nei_version}:dev" + deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" +} + +minecraft { + version = "1.7.10-10.13.0.1160" + assetDir = "eclipse/assets" +} + +def root = project.projectDir.parentFile +sourceSets { + main { + java { + srcDir new File(root, "src") + } + resources { + srcDir new File(root, "resources") + } + } +} + +processResources +{ + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} + +jar { +exclude "**/client/gui/inventory/GuiContainer.class" +exclude "**/client/gui/inventory/GuiContainer.java" +} + +task sourceJar(type: Jar) { + from sourceSets.main.java + from new File(root, "dev") + classifier = 'sources' +} + +task devJar(type: Jar) { + from sourceSets.main.output + classifier = 'dev' +} + +artifacts { + archives sourceJar, devJar +} + +uploadArchives { + dependsOn 'reobf' + repositories.mavenDeployer { + configuration = configurations.deployerJars + repository(url: "scp://mobiusstrip.eu/home/mobius/web/maven"){ + authentication(userName: "mobius") + } + + pom { + groupId = project.group + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'Waila ' + url 'http://mobiusstrip.eu' + } + } + } + +} diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..6bd0950 --- /dev/null +++ b/build.properties @@ -0,0 +1,7 @@ +mc_version=1.7.10 +forge_version=10.13.0.1160 +ccl_version=1.1.1.93 +ccc_version=1.0.1.8 +nei_version=1.0.2.15 +mod_version=1.0 +waila_version=1.5.2a \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..0087cd3 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..662430a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue May 06 21:57:37 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/au/com/bytecode/opencsv/CSVParser.java b/src/main/java/au/com/bytecode/opencsv/CSVParser.java new file mode 100644 index 0000000..5eb6264 --- /dev/null +++ b/src/main/java/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 tokensOnThisLine = new ArrayList(); + 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; + } +} diff --git a/src/main/java/au/com/bytecode/opencsv/CSVReader.java b/src/main/java/au/com/bytecode/opencsv/CSVReader.java new file mode 100644 index 0000000..98b5651 --- /dev/null +++ b/src/main/java/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 readAll() throws IOException { + + List allElements = new ArrayList(); + 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(); + } + +} diff --git a/src/main/java/au/com/bytecode/opencsv/CSVWriter.java b/src/main/java/au/com/bytecode/opencsv/CSVWriter.java new file mode 100644 index 0000000..32e617a --- /dev/null +++ b/src/main/java/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 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; + } + +} diff --git a/src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java new file mode 100644 index 0000000..aa61d4a --- /dev/null +++ b/src/main/java/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; +} diff --git a/src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java new file mode 100644 index 0000000..23d9661 --- /dev/null +++ b/src/main/java/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 names = new ArrayList(); + 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 values = new ArrayList(); + 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(); + } +} diff --git a/src/main/java/au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java new file mode 100644 index 0000000..86db1d1 --- /dev/null +++ b/src/main/java/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 extends HeaderColumnNameMappingStrategy { + 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; + } +} diff --git a/src/main/java/au/com/bytecode/opencsv/bean/CsvToBean.java b/src/main/java/au/com/bytecode/opencsv/bean/CsvToBean.java new file mode 100644 index 0000000..1d12cb6 --- /dev/null +++ b/src/main/java/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 { + private Map, PropertyEditor> editorMap = null; + + public CsvToBean() { + } + + public List parse(MappingStrategy mapper, Reader reader) { + return parse(mapper, new CSVReader(reader)); + } + + public List parse(MappingStrategy mapper, CSVReader csv) { + try { + mapper.captureHeader(csv); + String[] line; + List list = new ArrayList(); + 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 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, 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()); + } + +} diff --git a/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java new file mode 100644 index 0000000..b9c1b0d --- /dev/null +++ b/src/main/java/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. + *

+ * 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 HeaderColumnNameMappingStrategy implements MappingStrategy { + protected String[] header; + protected Map descriptorMap = null; + protected Class 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 loadDescriptorMap(Class cls) throws IntrospectionException { + Map map = new HashMap(); + + PropertyDescriptor[] descriptors; + descriptors = loadDescriptors(getType()); + for (PropertyDescriptor descriptor : descriptors) { + map.put(descriptor.getName().toUpperCase().trim(), descriptor); + } + + return map; + } + + private PropertyDescriptor[] loadDescriptors(Class cls) throws IntrospectionException { + BeanInfo beanInfo = Introspector.getBeanInfo(cls); + return beanInfo.getPropertyDescriptors(); + } + + public T createBean() throws InstantiationException, IllegalAccessException { + return type.newInstance(); + } + + public Class getType() { + return type; + } + + public void setType(Class type) { + this.type = type; + } +} diff --git a/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java new file mode 100644 index 0000000..49365d1 --- /dev/null +++ b/src/main/java/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 extends HeaderColumnNameMappingStrategy { + private Map columnMapping = new HashMap(); + protected String getColumnName(int col) { + return col < header.length ? columnMapping.get(header[col].toUpperCase()) : null; + } + public Map getColumnMapping() { + return columnMapping; + } + public void setColumnMapping(Map columnMapping) { + for (String key : columnMapping.keySet()) { + this.columnMapping.put(key.toUpperCase(), columnMapping.get(key)); + } + } +} diff --git a/src/main/java/au/com/bytecode/opencsv/bean/MappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/MappingStrategy.java new file mode 100644 index 0000000..528e8de --- /dev/null +++ b/src/main/java/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 { + + /** + * 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; + +} \ No newline at end of file diff --git a/src/main/java/au/com/bytecode/opencsv/bean/package.html b/src/main/java/au/com/bytecode/opencsv/bean/package.html new file mode 100644 index 0000000..ea760db --- /dev/null +++ b/src/main/java/au/com/bytecode/opencsv/bean/package.html @@ -0,0 +1,12 @@ + + + + + +

+A simple bean binding interface for use with opencsv. +

+
+opencsv.sourceforge.net + + diff --git a/src/main/java/au/com/bytecode/opencsv/package.html b/src/main/java/au/com/bytecode/opencsv/package.html new file mode 100644 index 0000000..c5ebb12 --- /dev/null +++ b/src/main/java/au/com/bytecode/opencsv/package.html @@ -0,0 +1,12 @@ + + + + + +

+A very simple CSV parser for Java released under a commercial-friendly license. +

+
+opencsv.sourceforge.net + + diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java new file mode 100644 index 0000000..33a7872 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -0,0 +1,184 @@ +package mcp.mobius.waila; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Logger; + +import com.google.common.eventbus.EventBus; +import com.google.common.eventbus.Subscribe; + +import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.network.NetworkHandler; +import mcp.mobius.waila.network.WailaPacketHandler; +import mcp.mobius.waila.overlay.OverlayConfig; +import mcp.mobius.waila.overlay.DecoratorRenderer; +import mcp.mobius.waila.overlay.WailaTickHandler; +import mcp.mobius.waila.server.ProxyServer; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLModContainer; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.client.KeyEvent; + +@Mod(modid="Waila", name="Waila", version="1.5.2_1.7.2", dependencies="required-after:NotEnoughItems") +/* +@NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, + packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") + //packetHandler = WailaPacketHandler.class) +*/ + +public class Waila { + // The instance of your mod that Forge uses. + @Instance("Waila") + public static Waila instance; + + @SidedProxy(clientSide="mcp.mobius.waila.client.ProxyClient", serverSide="mcp.mobius.waila.server.ProxyServer") + public static ProxyServer proxy; + public static Logger log = Logger.getLogger("Waila"); + public boolean serverPresent = false; + + /* INIT SEQUENCE */ + @EventHandler + public void preInit(FMLPreInitializationEvent event) { + ConfigHandler.instance().loadDefaultConfig(event); + OverlayConfig.updateColors(); + MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); + } + + @EventHandler + public void initialize(FMLInitializationEvent event) { + try { + Field eBus = FMLModContainer.class.getDeclaredField("eventBus"); + eBus.setAccessible(true); + EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this)); + FMLbus.register(this); + } catch (Throwable t) {} + + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){ + MinecraftForge.EVENT_BUS.register(new DecoratorRenderer()); + FMLCommonHandler.instance().bus().register(new KeyEvent()); + FMLCommonHandler.instance().bus().register(WailaTickHandler.instance()); + } + FMLCommonHandler.instance().bus().register(new NetworkHandler()); + } + + @EventHandler + public void postInit(FMLPostInitializationEvent event) { + proxy.registerHandlers(); + ModIdentification.init(); + + /* + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){ + + for (String key: ModIdentification.keyhandlerStrings.keySet()){ + String orig = I18n.getString(key); + if (orig.equals(key)) + orig = LanguageRegistry.instance().getStringLocalization(key); + if (orig.equals(key)) + orig = LangUtil.translateG(key); + if (orig.isEmpty()) + orig = key; + + String modif; + if (orig.startsWith("[") || orig.contains(":")) + modif = orig; + else{ + String id = ModIdentification.keyhandlerStrings.get(key); + + if (id.contains(".")) + id = id.split("\\.")[0]; + + if (id.length() > 10) + id = id.substring(0, 11); + + if (id.isEmpty()) + id = "????"; + + modif = String.format("[%s] %s", id, orig); + } + + LanguageRegistry.instance().addStringLocalization(key, modif); + } + } + */ + + } + + @Subscribe + public void loadComplete(FMLLoadCompleteEvent event) { + proxy.registerMods(); + + String[] ores = OreDictionary.getOreNames(); + for (String s : ores) + for (ItemStack stack : OreDictionary.getOres(s)) + System.out.printf("%s : %s\n", s, stack); + + } + + @EventHandler + public void processIMC(FMLInterModComms.IMCEvent event) + { + for (IMCMessage imcMessage : event.getMessages()){ + if (!imcMessage.isStringMessage()) continue; + + if (imcMessage.key.equalsIgnoreCase("addconfig")){ + String[] params = imcMessage.getStringValue().split("\\$\\$"); + if (params.length != 3){ + Waila.log.warning(String.format("Error while parsing config option from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue())); + continue; + } + Waila.log.info(String.format("Receiving config request from [ %s ] for %s", imcMessage.getSender(), imcMessage.getStringValue())); + ConfigHandler.instance().addConfig(params[0], params[1], params[2]); + } + + if (imcMessage.key.equalsIgnoreCase("register")){ + Waila.log.info(String.format("Receiving registration request from [ %s ] for method %s", imcMessage.getSender(), imcMessage.getStringValue())); + this.callbackRegistration(imcMessage.getStringValue(), imcMessage.getSender()); + } + } + } + + public void callbackRegistration(String method, String modname){ + String[] splitName = method.split("\\."); + String methodName = splitName[splitName.length-1]; + String className = method.substring(0, method.length()-methodName.length()-1); + + Waila.log.info(String.format("Trying to reflect %s %s", className, methodName)); + + try{ + Class reflectClass = Class.forName(className); + Method reflectMethod = reflectClass.getDeclaredMethod(methodName, IWailaRegistrar.class); + reflectMethod.invoke(null, (IWailaRegistrar)ModuleRegistrar.instance()); + + Waila.log.info(String.format("Success in registering %s", modname)); + + } catch (ClassNotFoundException e){ + Waila.log.warning(String.format("Could not find class %s", className)); + } catch (NoSuchMethodException e){ + Waila.log.warning(String.format("Could not find method %s", methodName)); + } catch (Exception e){ + Waila.log.warning(String.format("Exception while trying to access the method : %s", e.toString())); + } + + } +} \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java new file mode 100644 index 0000000..b5a9a6e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java @@ -0,0 +1,30 @@ +package mcp.mobius.waila.addons.agriculture; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class AgricultureModule { + public static Class BlockCrop = null; + + + public static void register(){ + try{ + Class Agriculture = Class.forName("com.teammetallurgy.agriculture.Agriculture"); + Waila.log.log(Level.INFO, "Agriculture mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Agriculture] Agriculture mod not found."); + return; + } + + try{ + BlockCrop = Class.forName("com.teammetallurgy.agriculture.crops.BlockCrop"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[Agriculture] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCrop(), BlockCrop); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java new file mode 100644 index 0000000..f8025a1 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java @@ -0,0 +1,42 @@ +package mcp.mobius.waila.addons.agriculture; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerCrop implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; + + int growthStage = accessor.getMetadata(); + + float growthValue = (growthStage / 6.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java b/src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java new file mode 100644 index 0000000..10ca255 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java @@ -0,0 +1,42 @@ +package mcp.mobius.waila.addons.appeng; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class AppEngModule { + + public static Class TileStorageMonitor = null; + public static Class IAEItemStack = null; + public static Method TileStorageMonitor_getItem = null; + public static Method IAEItemStack_getItemStack = null; + + public static void register(){ + try{ + TileStorageMonitor = Class.forName("appeng.me.tile.TileStorageMonitor"); + IAEItemStack = Class.forName("appeng.api.IAEItemStack"); + + + TileStorageMonitor_getItem = TileStorageMonitor.getMethod("getItem"); + IAEItemStack_getItemStack = IAEItemStack.getMethod("getItemStack"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[AppEng] Class not found. " + e); + return; + } catch (SecurityException e) { + Waila.log.log(Level.WARNING, "[AppEng] Security Exception. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARNING, "[AppEng] Method not found. " + e); + return; + } + + Waila.log.log(Level.INFO, "AppEng mod found."); + ModuleRegistrar.instance().addConfig("Applied Energetic", "appeng.monitorcontent"); + ModuleRegistrar.instance().registerBodyProvider(new HUDAppEngMonitor(), TileStorageMonitor); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileStorageMonitor); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java b/src/main/java/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java new file mode 100644 index 0000000..b0a6de5 --- /dev/null +++ b/src/main/java/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 net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; + +public class HUDAppEngMonitor implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java b/src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java new file mode 100644 index 0000000..9a597fd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java @@ -0,0 +1,40 @@ +package mcp.mobius.waila.addons.betterbarrels; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import codechicken.nei.api.API; +import codechicken.nei.api.ItemInfo; + +public class BetterBarrelsModule { + public static Class TileEntityBarrel = null; + public static Class IBarrelStorage = null; + public static Field TileEntityBarrel_Storage = null; + public static Method IBarrelStorage_getItem = null; + + public static void register(){ + try{ + TileEntityBarrel = Class.forName("mcp.mobius.betterbarrels.common.TileEntityBarrel"); + IBarrelStorage = Class.forName("mcp.mobius.betterbarrels.common.IBarrelStorage"); + TileEntityBarrel_Storage = TileEntityBarrel.getField("storage"); + IBarrelStorage_getItem = IBarrelStorage.getMethod("getItem"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[BB] BetterBarrel classes not found."); + } catch (NoSuchFieldException e){ + Waila.log.log(Level.WARNING, "[BB] Storage field not found."); + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[BB] getItem() not found."); + } + + if (IBarrelStorage_getItem != null){ + Waila.log.log(Level.INFO, "Waila module BetterBarrel succefully hooked."); + ModuleRegistrar.instance().addConfig("BetterBarrels", "bb.content"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBBContent(), TileEntityBarrel); + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java b/src/main/java/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java new file mode 100644 index 0000000..1bb6baf --- /dev/null +++ b/src/main/java/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 mcp.mobius.waila.cbcore.LangUtil; +import codechicken.nei.api.API; +import codechicken.nei.api.ItemInfo; +import codechicken.nei.api.ItemInfo.Layout; +import codechicken.nei.api.IHighlightHandler; + +public class HUDHandlerBBContent implements IWailaDataProvider { + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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(""); + return currenttip; + } + + if (stack != null){ + currenttip.add(stack.getDisplayName()); + } else { + currenttip.add(LangUtil.translateG("hud.msg.empty")); + } + } + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java new file mode 100644 index 0000000..989bddd --- /dev/null +++ b/src/main/java/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 net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class BCModule { + + public static Class TileTank = null; + public static Class IPowerReceptor = null; + public static Class PipeTransportPower = null; + public static Class TileGenericPipe = null; + public static Class TileEngine = null; + + public static Method TileTank_getTankInfo = null; + + public static void register(){ + try { + Class ModBuildcraftFactory = Class.forName("buildcraft.BuildCraftFactory"); + Waila.log.log(Level.INFO, "Buildcraft|Factory mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "Buildcraft|Factory mod not found. Skipping."); + return; + } + + try{ + TileTank = Class.forName("buildcraft.factory.TileTank"); + TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[BC] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[BC] Method not found." + e); + return; + } + + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount"); + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype"); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java new file mode 100644 index 0000000..bf32d2b --- /dev/null +++ b/src/main/java/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.util.ForgeDirection; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class BCPowerAPIModule { + + public static Class PowerHandler = null; + public static Method PH_getMinEnergyReceived = null; + public static Method PH_getMaxEnergyReceived = null; + public static Method PH_getMaxEnergyStored = null; + public static Method PH_getEnergyStored = null; + public static Method PH_getActivationEnergy = null; + + public static Class IPowerReceptor = null; + public static Method IPowerReceptor_getPowerReceiver = null; + + public static Class PowerReceiver = null; + public static Method PR_getMinEnergyReceived = null; + public static Method PR_getMaxEnergyReceived = null; + public static Method PR_getMaxEnergyStored = null; + public static Method PR_getEnergyStored = null; + public static Method PR_getActivationEnergy = null; + + public static void register(){ + try{ + Class ModClass = Class.forName("buildcraft.api.power.IPowerReceptor"); + Waila.log.log(Level.INFO, "Buildcraft Power API found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Buildcraft Power API] Buildcraft Power API mod not found."); + return; + } + + try{ + PowerHandler = Class.forName("buildcraft.api.power.PowerHandler"); + PH_getMinEnergyReceived = PowerHandler.getMethod("getMinEnergyReceived"); + PH_getMaxEnergyReceived = PowerHandler.getMethod("getMaxEnergyReceived"); + PH_getMaxEnergyStored = PowerHandler.getMethod("getMaxEnergyStored"); + PH_getEnergyStored = PowerHandler.getMethod("getEnergyStored"); + PH_getActivationEnergy = PowerHandler.getMethod("getActivationEnergy"); + + IPowerReceptor = Class.forName("buildcraft.api.power.IPowerReceptor"); + IPowerReceptor_getPowerReceiver = IPowerReceptor.getMethod("getPowerReceiver", ForgeDirection.class); + + PowerReceiver = Class.forName("buildcraft.api.power.PowerHandler$PowerReceiver"); + PR_getMinEnergyReceived = PowerReceiver.getMethod("getMinEnergyReceived"); + PR_getMaxEnergyReceived = PowerReceiver.getMethod("getMaxEnergyReceived"); + PR_getMaxEnergyStored = PowerReceiver.getMethod("getMaxEnergyStored"); + PR_getEnergyStored = PowerReceiver.getMethod("getEnergyStored"); + PR_getActivationEnergy = PowerReceiver.getMethod("getActivationEnergy"); + + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e); + return; +// } catch (NoSuchFieldException e){ +// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e); +// return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("BuildcraftAPI", "bcapi.storage"); + ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.consump"); + ModuleRegistrar.instance().addConfig("BuildcraftAPI", "bcapi.trigger"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIPowerReceptor(), IPowerReceptor); + ModuleRegistrar.instance().registerSyncedNBTKey("*", IPowerReceptor); + + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java new file mode 100644 index 0000000..cb05b6f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java @@ -0,0 +1,71 @@ +package mcp.mobius.waila.addons.buildcraft; + +import java.util.List; +import java.util.logging.Level; + +//import buildcraft.factory.TileTank; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.cbcore.LangUtil; + +public class HUDHandlerBCTanks implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + FluidTankInfo tank = this.getTank(accessor); + FluidStack stack = tank != null ? tank.fluid : null; + + + String name = currenttip.get(0); + if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype")) + name = name + " (" + stack.getFluid().getName() + ")"; + else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype")) + name = name + " " + LangUtil.translateG("hud.msg.empty"); + currenttip.set(0, name); + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + FluidTankInfo tank = this.getTank(accessor); + FluidStack stack = tank != null ? tank.fluid : null; + int liquidAmount = stack != null ? stack.amount:0; + int capacity = tank != null ? tank.capacity : 0; + + if (ConfigHandler.instance().getConfig("bc.tankamount")) + currenttip.add(String.valueOf(liquidAmount) + "/" + String.valueOf(capacity) + " mB"); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + public FluidTankInfo getTank(IWailaDataAccessor accessor){ + FluidTankInfo tank = null; + try{ + tank = ((FluidTankInfo[])BCModule.TileTank_getTankInfo.invoke(BCModule.TileTank.cast(accessor.getTileEntity()), ForgeDirection.UNKNOWN))[0]; + } catch (Exception e){ + Waila.log.log(Level.SEVERE, "[BC] Unhandled exception trying to access a tank for display !.\n" + String.valueOf(e)); + return null; + } + return tank; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java new file mode 100644 index 0000000..a537d5b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java @@ -0,0 +1,78 @@ +package mcp.mobius.waila.addons.buildcraft; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerIPowerReceptor implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/WikiData.txt b/src/main/java/mcp/mobius/waila/addons/buildcraft/WikiData.txt new file mode 100644 index 0000000..6b15cb0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/WikiData.txt @@ -0,0 +1,2 @@ +>>>>buildcraft.transport.ItemPlug:* +This is a plug for pipes. \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java new file mode 100644 index 0000000..a56abf5 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java @@ -0,0 +1,45 @@ +package mcp.mobius.waila.addons.carpenters; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class CarpentersModule { + + public static Class TEBase = null; + public static Class BlockCarpentersDoor = null; + public static Class BlockCarpentersHatch = null; + + public static void register(){ + /* + try{ + Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks"); + Waila.log.log(Level.INFO, "CarpentersBlocks mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[CarpentersBlocks] CarpentersBlocks mod not found."); + return; + } + + try{ + TEBase = Class.forName("carpentersblocks.tileentity.TEBase"); + BlockCarpentersDoor = Class.forName("carpentersblocks.block.BlockCarpentersDoor"); + BlockCarpentersHatch = Class.forName("carpentersblocks.block.BlockCarpentersHatch"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[CarpentersBlocks] Class not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARNING, "[CarpentersBlocks] Error while loading module. " + e); + return; + } + + ModuleRegistrar.instance().addConfig("Carpenter's Blocks", "carpenters.hide"); + ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersDoor); + ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch); + ModuleRegistrar.instance().registerSyncedNBTKey("data", TEBase); + ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase); + */ + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java new file mode 100644 index 0000000..d940137 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java @@ -0,0 +1,56 @@ +package mcp.mobius.waila.addons.carpenters; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDCarpentersBlocksTE implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + /* + if (!config.getConfig("carpenters.hide")) return null; + + NBTTagCompound tag = accessor.getNBTData(); + short data = tag.getShort("data"); + short cover = tag.getShort("cover_6"); + + if(CarpentersModule.BlockCarpentersDoor.isInstance(accessor.getBlock())){ + int type = data & 0x7; + if (type != 5) return null; + if (cover == 0) return null; + + return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12); + } + + else if (CarpentersModule.BlockCarpentersHatch.isInstance(accessor.getBlock())){ + int type = data & 0x7; + if (type != 0) return null; + if (cover == 0) return null; + + return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12); + } + */ + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java new file mode 100644 index 0000000..a71830e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java @@ -0,0 +1,65 @@ +package mcp.mobius.waila.addons.enderio; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class EnderIOModule { + + public static Class TileCapacitorBank = null; + public static Method TCB_getMaxInput = null; + public static Method TCB_getMaxOutput = null; + public static Method TCB_getEnergyStored = null; + public static Method TCB_getMaxEnergyStored = null; + public static Method TCB_getMaxIO = null; + + public static Class TileTesseract = null; + + public static void register(){ + try{ + Class ModClass = Class.forName("crazypants.enderio.EnderIO"); + Waila.log.log(Level.INFO, "EnderIO mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[EnderIO] EnderIO mod not found."); + return; + } + + try{ + + TileCapacitorBank = Class.forName("crazypants.enderio.machine.power.TileCapacitorBank"); + TCB_getEnergyStored = TileCapacitorBank.getMethod("getEnergyStored"); + TCB_getMaxInput = TileCapacitorBank.getMethod("getMaxInput"); + TCB_getMaxOutput = TileCapacitorBank.getMethod("getMaxOutput"); + TCB_getMaxEnergyStored = TileCapacitorBank.getMethod("getMaxEnergyStored"); + TCB_getMaxIO = TileCapacitorBank.getMethod("getMaxIO"); + + TileTesseract = Class.forName("crazypants.enderio.machine.hypercube.TileHyperCube"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e); + return; +// } catch (NoSuchFieldException e){ +// mod_Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e); +// return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.inout"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.storage"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.owner"); + ModuleRegistrar.instance().addConfig("EnderIO", "enderio.channel"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCapacitor(), TileCapacitorBank); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileCapacitorBank); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java new file mode 100644 index 0000000..2986884 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java @@ -0,0 +1,61 @@ +package mcp.mobius.waila.addons.enderio; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerCapacitor implements IWailaDataProvider{ + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java new file mode 100644 index 0000000..c31dd46 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java @@ -0,0 +1,63 @@ +package mcp.mobius.waila.addons.enderio; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerTesseract implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java new file mode 100644 index 0000000..eb04950 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java @@ -0,0 +1,57 @@ +package mcp.mobius.waila.addons.enderstorage; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class EnderStorageModule { + + public static Class TileFrequencyOwner = null; + public static Field TileFrequencyOwner_Freq = null; + + public static Class EnderStorageManager = null; + public static Method GetColourFromFreq = null; + + public static Class TileEnderTank = null; + + public static void register(){ + try{ + Class EnderStorage = Class.forName("codechicken.enderstorage.EnderStorage"); + Waila.log.log(Level.INFO, "EnderStorage mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[EnderStorage] EnderStorage mod not found."); + return; + } + + try{ + + TileFrequencyOwner = Class.forName("codechicken.enderstorage.common.TileFrequencyOwner"); + TileFrequencyOwner_Freq = TileFrequencyOwner.getField("freq"); + + EnderStorageManager = Class.forName("codechicken.enderstorage.api.EnderStorageManager"); + GetColourFromFreq = EnderStorageManager.getDeclaredMethod("getColourFromFreq", Integer.TYPE, Integer.TYPE); + + TileEnderTank = Class.forName("codechicken.enderstorage.storage.liquid.TileEnderTank"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Method not found." + e); + return; + } catch (NoSuchFieldException e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Field not found." + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[EnderStorage] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("EnderStorage", "enderstorage.colors"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerStorage(), TileFrequencyOwner); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileFrequencyOwner); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java new file mode 100644 index 0000000..4793aaa --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java @@ -0,0 +1,73 @@ +package mcp.mobius.waila.addons.enderstorage; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerStorage implements IWailaDataProvider { + + private static String[] colors = { + LangUtil.translateG("hud.msg.white"), + LangUtil.translateG("hud.msg.orange"), + LangUtil.translateG("hud.msg.magenta"), + LangUtil.translateG("hud.msg.lblue"), + LangUtil.translateG("hud.msg.yellow"), + LangUtil.translateG("hud.msg.lime"), + LangUtil.translateG("hud.msg.pink"), + LangUtil.translateG("hud.msg.gray"), + LangUtil.translateG("hud.msg.lgray"), + LangUtil.translateG("hud.msg.cyan"), + LangUtil.translateG("hud.msg.purple"), + LangUtil.translateG("hud.msg.blue"), + LangUtil.translateG("hud.msg.brown"), + LangUtil.translateG("hud.msg.green"), + LangUtil.translateG("hud.msg.red"), + LangUtil.translateG("hud.msg.black") + }; + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if(config.getConfig("enderstorage.colors")){ + try{ + + int freq = EnderStorageModule.TileFrequencyOwner_Freq.getInt(accessor.getTileEntity()); + int freqLeft = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 0); + int freqCenter = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 1); + int freqRight = (Integer)EnderStorageModule.GetColourFromFreq.invoke(null, freq, 2); + + if (!EnderStorageModule.TileEnderTank.isInstance(accessor.getTileEntity())) + currenttip.add(String.format("%s/%s/%s", colors[freqLeft], colors[freqCenter], colors[freqRight])); + else + currenttip.add(String.format("%s/%s/%s", colors[freqRight], colors[freqCenter], colors[freqLeft])); + + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + } + + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java new file mode 100644 index 0000000..c06abb9 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java @@ -0,0 +1,83 @@ +package mcp.mobius.waila.addons.etb; + +import java.lang.reflect.Field; +import java.util.logging.Level; + +import net.minecraft.item.Item; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class ETBModule { + + public static Class TileSocket = null; + public static Field Socket_sides = null; + public static Field Socket_configs = null; + //public static Field Socket_sideID = null; + //public static Field Socket_sideMeta = null; + //public static Field Socket_facID = null; + //public static Field Socket_facMeta = null; + + public static Class SocketsMod = null; + public static Field module = null; + + public static Class SideConfig = null; + public static Field SC_tank = null; + public static Field SC_inventory = null; + public static Field SC_rsControl = null; + public static Field SC_rsLatch = null; + + public static void register(){ + try{ + Class ModClass = Class.forName("emasher.sockets.TileSocket"); + Waila.log.log(Level.INFO, "Engineer Toolbox mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Engineer Toolbox] Engineer Toolbox mod not found."); + return; + } + + try{ + + TileSocket = Class.forName("emasher.sockets.TileSocket"); + Socket_sides = TileSocket.getField("sides"); + Socket_configs = TileSocket.getField("configs"); + //Socket_sideID = TileSocket.getField("sideID"); + //Socket_sideMeta = TileSocket.getField("sideMeta"); + //Socket_facID = TileSocket.getField("facID"); + //Socket_facMeta = TileSocket.getField("facMeta"); + + SocketsMod = Class.forName("emasher.sockets.SocketsMod"); + module = SocketsMod.getField("module"); + //module = (Item)SocketsMod.getField("module").get(null); + /* + if (module == null){ + mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] module field is null !"); + return; + } + */ + + SideConfig = Class.forName("emasher.api.SideConfig"); + SC_tank = SideConfig.getField("tank"); + SC_inventory = SideConfig.getField("inventory"); + SC_rsControl = SideConfig.getField("rsControl"); + SC_rsLatch = SideConfig.getField("rsLatch"); + + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[Engineer Toolbox] Class not found. " + e); + return; +// } catch (NoSuchMethodException e){ +// mod_Waila.log.log(Level.WARNING, "[Engineer Toolbox] Method not found." + e); +// return; + } catch (NoSuchFieldException e){ + Waila.log.log(Level.WARNING, "[Engineer Toolbox] Field not found." + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[Engineer Toolbox] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().addConfig("Engineer Toolbox", "etb.displaydata"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerSocket(), TileSocket); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileSocket); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java new file mode 100644 index 0000000..bff0079 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -0,0 +1,104 @@ +package mcp.mobius.waila.addons.etb; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerSocket implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("etb.displaydata")) return currenttip; + + try { + int[] sides = (int[])ETBModule.Socket_sides.get(accessor.getTileEntity()); + Object[] configs = (Object[])ETBModule.Socket_configs.get(accessor.getTileEntity()); + Item module = (Item)ETBModule.module.get(null); + + + for( int s = 0; s < 6; s++){ + if (sides[s] != 0){ + + int tank = (Integer)ETBModule.SC_tank.get(configs[s]); + int inventory = (Integer)ETBModule.SC_inventory.get(configs[s]); + boolean[] rsControl = (boolean[])ETBModule.SC_rsControl.get(configs[s]); + boolean[] rsLatch = (boolean[])ETBModule.SC_rsLatch.get(configs[s]); + + + ItemStack stack = new ItemStack(module, 1, sides[s]); + String tipstr = String.format("%-5s : %s ", ForgeDirection.getOrientation(s), stack.getDisplayName()); + + String configstr = "[ "; + + if (tank != -1) + configstr += "\u00a79" + String.valueOf(tank) + " "; + + if (inventory != -1) + configstr += "\u00a7a" + String.valueOf(inventory) + " "; + + if (rsControl[0] || rsControl[1] || rsControl[2]){ + configstr += "\u00a7c"; + configstr += rsControl[0] ? "1" : "0"; + configstr += rsControl[1] ? "1" : "0"; + configstr += rsControl[2] ? "1" : "0"; + configstr += " "; + } + + if (rsLatch[0] || rsLatch[1] || rsLatch[2]){ + configstr += "\u00a75"; + configstr += rsLatch[0] ? "1" : "0"; + configstr += rsLatch[1] ? "1" : "0"; + configstr += rsLatch[2] ? "1" : "0"; + configstr += " "; + } + + configstr += "\u00a7r]"; + + if (!configstr.equals("[ \u00a7r]")) + tipstr += " " + configstr; + + /* + if ((tank != -1) && (inventory != -1)) + tipstr += String.format("[ \u00a79%d \u00a7a%d \u00a7r]", tank, inventory); + else if (tank != -1) + tipstr += String.format("[ \u00a79%d \u00a7r]", tank); + else if (inventory != -1) + tipstr += String.format("[ \u00a7a%d \u00a7r]", inventory); + */ + + currenttip.add(tipstr); + } + } + + + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java new file mode 100644 index 0000000..ad6bc59 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java @@ -0,0 +1,35 @@ +package mcp.mobius.waila.addons.exu; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class ExtraUtilitiesModule { + + public static Class ModExtraUtilities = null; + public static Class TileEntityDrum = null; + + public static void register(){ + + + try{ + Class ModExtraUtilities = Class.forName("extrautils.ExtraUtils"); + Waila.log.log(Level.INFO, "ExtraUtilities mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found."); + return; + } + + try{ + TileEntityDrum = Class.forName("extrautils.tileentity.TileEntityDrum"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[ExtraUtilities] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityDrum); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java new file mode 100644 index 0000000..c73b439 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java @@ -0,0 +1,53 @@ +package mcp.mobius.waila.addons.exu; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerDrum implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (!config.getConfig("extrautilities.fluidamount")) return currenttip; + + int amount = 0; + + NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank"); + if (subtag.hasKey("Amount")) + amount = accessor.getNBTInteger(subtag, "Amount"); + + IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java new file mode 100644 index 0000000..d92aa62 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java @@ -0,0 +1,33 @@ +package mcp.mobius.waila.addons.gravestone; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class GravestoneModule { + + public static Class BlockGraveStone = null; + + public static void register(){ + + try{ + Class ModGravestone = Class.forName("GraveStone.ModGraveStone"); + Waila.log.log(Level.INFO, "GraveStone mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[GraveStone] GraveStone mod not found."); + return; + } + + try { + BlockGraveStone = Class.forName("GraveStone.block.BlockGSGraveStone"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.WARNING, "[GraveStone] Class not found. " + e); + } + + + ModuleRegistrar.instance().registerStackProvider(new HUDHandlerGravestone(), BlockGraveStone); + ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockGraveStone); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java new file mode 100644 index 0000000..e067331 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java @@ -0,0 +1,32 @@ +package mcp.mobius.waila.addons.gravestone; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerGravestone implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java new file mode 100644 index 0000000..7d60f3a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java @@ -0,0 +1,44 @@ +package mcp.mobius.waila.addons.harvestcraft; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.NBTUtil; + +public class HUDHandlerPamCrop implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; + + int growthStage = NBTUtil.getNBTInteger(accessor.getNBTData(), "growthStage"); + + float growthValue = (growthStage / 2.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java new file mode 100644 index 0000000..348ed55 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java @@ -0,0 +1,30 @@ +package mcp.mobius.waila.addons.harvestcraft; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class HarvestcraftModule { + public static Class TileEntityPamCrop = null; + + + public static void register(){ + try{ + Class PamHarvestCraft = Class.forName("assets.pamharvestcraft.PamHarvestCraft"); + Waila.log.log(Level.INFO, "PamHarvestCraft mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[PamHarvestCraft] PamHarvestCraft mod not found."); + return; + } + + try{ + TileEntityPamCrop = Class.forName("assets.pamharvestcraft.TileEntityPamCrop"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[PamHarvestCraft] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerPamCrop(), TileEntityPamCrop); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java new file mode 100644 index 0000000..8dc2da9 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java @@ -0,0 +1,77 @@ +package mcp.mobius.waila.addons.ic2; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerTEBaseGenerator implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + try{ + int storage = -1; + int production = -1; + + if (IC2Module.TileEntityBaseGenerator.isInstance(accessor.getTileEntity())){ + storage = IC2Module.TEBG_MaxStorage.getShort(accessor.getTileEntity()); + production = IC2Module.TEBG_Production.getInt(accessor.getTileEntity()); + } + else if (IC2Module.TileEntityGeoGenerator.isInstance(accessor.getTileEntity())){ + storage = IC2Module.TEGG_MaxStorage.getShort(accessor.getTileEntity()); + production = IC2Module.TEGG_Production.getInt(accessor.getTileEntity()); + } + else if (IC2Module.TileEntitySemifluidGenerator.isInstance(accessor.getTileEntity())){ + storage = IC2Module.TESG_MaxStorage.getShort(accessor.getTileEntity()); + production = (int)IC2Module.TESG_Production.getDouble(accessor.getTileEntity()); + } + + String storedStr = LangUtil.translateG("hud.msg.stored"); + String outputStr = LangUtil.translateG("hud.msg.output"); + + /* EU Storage */ + if (ConfigHandler.instance().getConfig("ic2.storage")){ + double stored = IC2Module.getStoredEnergy(accessor); + + if ( stored >= 0.0 && storage > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage)); + + //else if (stored >= 0.0) + // currenttip.add(String.format("Stored : %d EU", stored)); + } + + if (ConfigHandler.instance().getConfig("ic2.outputeu")){ + if ( production > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production)); + } + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java new file mode 100644 index 0000000..ab1d29b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java @@ -0,0 +1,62 @@ +package mcp.mobius.waila.addons.ic2; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerTEElectricBlock implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, + IWailaConfigHandler config) { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + try{ + String storedStr = LangUtil.translateG("hud.msg.stored"); + String outputStr = LangUtil.translateG("hud.msg.output"); + + /* EU Storage */ + if (ConfigHandler.instance().getConfig("ic2.storage")){ + double stored = IC2Module.getStoredEnergy(accessor); + int storage = IC2Module.TEEB_MaxStorage.getInt(accessor.getTileEntity()); + + if ( stored >= 0.0 ) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage)); + } + + if (ConfigHandler.instance().getConfig("ic2.outputeu")){ + int production = IC2Module.TEEB_Output.getInt(accessor.getTileEntity()); + if ( production > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", outputStr, TAB + ALIGNRIGHT, production)); + } + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java new file mode 100644 index 0000000..0a4876f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java @@ -0,0 +1,82 @@ +package mcp.mobius.waila.addons.ic2; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerTEStandardMachine implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, + IWailaConfigHandler config) { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + try{ + + IC2Upgrades upgrades = IC2Module.getUpgrades(accessor); + int baseConsumption = IC2Module.TESM_DefaultEnergyConsume.getInt(accessor.getTileEntity()); + int baseOpTime = IC2Module.TESM_DefaultOperationLength.getInt(accessor.getTileEntity()); + int baseStorage = IC2Module.TESM_DefaultEnergyStorage.getInt(accessor.getTileEntity()); + + long consumption = Math.round(Math.min(baseConsumption * Math.pow(1.6D, upgrades.overclocker), 2147483647)); + + double stackOpLen = baseOpTime * 64.0D * Math.pow(0.7D, upgrades.overclocker); + int opPerTick = ((int)Math.min(Math.ceil(64.0D / stackOpLen), 2147483647.0D)); + int opTime = ((int)Math.round(stackOpLen * opPerTick / 64.0D)); + + int storage = Math.round(Math.min(baseStorage + 10000 * upgrades.storage + opTime * consumption, 2147483647));; + + + int maxinput = (Integer)IC2Module.IES_GetMaxSafeInput.invoke(accessor.getTileEntity()) * (int)Math.pow(4.0D, Math.min(4, upgrades.transform)); + double stored = IC2Module.getStoredEnergy(accessor); + + String storedStr = LangUtil.translateG("hud.msg.stored"); + String powerStr = LangUtil.translateG("hud.msg.power"); + String maxPowerStr = LangUtil.translateG("hud.msg.maxpower"); + + /* EU Storage */ + if (ConfigHandler.instance().getConfig("ic2.storage")){ + if ( stored >= 0.0 ) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r / \u00a7f%d\u00a7r EU", storedStr, TAB + ALIGNRIGHT, Math.round(Math.min(stored,storage)), storage)); + } + + if (ConfigHandler.instance().getConfig("ic2.consump")){ + if ( consumption > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", powerStr, TAB + ALIGNRIGHT, consumption )); + } + + if (ConfigHandler.instance().getConfig("ic2.inputeu")){ + if ( maxinput > 0) + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r EU/t", maxPowerStr, TAB + ALIGNRIGHT, maxinput )); + } + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java new file mode 100644 index 0000000..93f1423 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java @@ -0,0 +1,59 @@ +package mcp.mobius.waila.addons.ic2; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerTETradeOMat implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack,List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + /* + if (!ConfigHandler.instance().getConfig("ic2.tradeomat")) return currenttip; + + NBTTagCompound slots = accessor.getNBTData().getCompoundTag("InvSlots"); + NBTTagList offer = slots.getCompoundTag("offer").getTagList("Contents"); + NBTTagList demand = slots.getCompoundTag("demand").getTagList("Contents"); + String offersStr = LangUtil.translateG("hud.msg.offers"); + String demandsStr = LangUtil.translateG("hud.msg.demands"); + + + if (offer.tagCount() == 1){ + NBTTagCompound subtag = (NBTTagCompound)offer.tagAt(0); + ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage")); + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", offersStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName())); + } + + if (demand.tagCount() == 1){ + NBTTagCompound subtag = (NBTTagCompound)demand.tagAt(0); + ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage")); + currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName())); + } + */ + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java new file mode 100644 index 0000000..0a50589 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -0,0 +1,186 @@ +package mcp.mobius.waila.addons.ic2; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.List; +import java.util.logging.Level; + +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.AccessHelper; + +public class IC2Module { + + public static Class TileEntityStandardMachine = null; + public static Field TESM_DefaultEnergyStorage = null; + public static Field TESM_DefaultEnergyConsume = null; + public static Field TESM_DefaultOperationLength = null; + public static Field TESM_MaxEnergy = null; + + public static Class TileEntityBaseGenerator = null; + public static Field TEBG_MaxStorage = null; + public static Field TEBG_Production = null; + + public static Class TileEntitySemifluidGenerator = null; + public static Field TESG_MaxStorage = null; + public static Field TESG_Production = null; + + public static Class TileEntityGeoGenerator = null; + public static Field TEGG_MaxStorage = null; + public static Field TEGG_Production = null; + + public static Class TileEntityElectricBlock = null; + public static Field TEEB_MaxStorage = null; + public static Field TEEB_Output = null; + + public static Class IEnergySink = null; + public static Method IES_GetMaxSafeInput = null; + + public static Class TileEntityTradeOMat = null; + + /* Some required items */ + public static Class IC2Items = null; + public static Field TransformerUpgrade = null; + public static ItemStack TransformerUpgradeStack = null; + public static Field EnergyStorageUpgrade = null; + public static ItemStack EnergyStorageUpgradeStack = null; + public static Field OverclockerUpgrade = null; + public static ItemStack OverclockerUpgradeStack = null; + + public static void register(){ + /* + + try{ + TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine"); + TESM_DefaultEnergyStorage = TileEntityStandardMachine.getField("defaultEnergyStorage"); + TESM_DefaultEnergyConsume = TileEntityStandardMachine.getField("defaultEnergyConsume"); + TESM_DefaultOperationLength = TileEntityStandardMachine.getField("defaultOperationLength"); + TESM_MaxEnergy = TileEntityStandardMachine.getField("maxEnergy"); + + TileEntityBaseGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityBaseGenerator"); + TEBG_MaxStorage = TileEntityBaseGenerator.getField("maxStorage"); + TEBG_Production = TileEntityBaseGenerator.getField("production"); + + TileEntitySemifluidGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntitySemifluidGenerator"); + TESG_MaxStorage = TileEntitySemifluidGenerator.getDeclaredField("maxStorage"); + TESG_Production = TileEntitySemifluidGenerator.getDeclaredField("production"); + TESG_MaxStorage.setAccessible(true); + TESG_Production.setAccessible(true); + + TileEntityGeoGenerator = Class.forName("ic2.core.block.generator.tileentity.TileEntityGeoGenerator"); + TEGG_MaxStorage = TileEntityGeoGenerator.getField("maxStorage"); + TEGG_Production = TileEntityGeoGenerator.getField("production"); + + TileEntityElectricBlock = Class.forName("ic2.core.block.wiring.TileEntityElectricBlock"); + TEEB_MaxStorage = TileEntityElectricBlock.getField("maxStorage"); + TEEB_Output = TileEntityElectricBlock.getField("output"); + + IEnergySink = Class.forName("ic2.api.energy.tile.IEnergySink"); + IES_GetMaxSafeInput = IEnergySink.getMethod("getMaxSafeInput"); + + IC2Items = Class.forName("ic2.core.Ic2Items"); + TransformerUpgrade = IC2Items.getField("transformerUpgrade"); + EnergyStorageUpgrade = IC2Items.getField("energyStorageUpgrade"); + OverclockerUpgrade = IC2Items.getField("overclockerUpgrade"); + + TransformerUpgradeStack = (ItemStack)TransformerUpgrade.get(null); + EnergyStorageUpgradeStack = (ItemStack)EnergyStorageUpgrade.get(null); + OverclockerUpgradeStack = (ItemStack)OverclockerUpgrade.get(null); + + TileEntityTradeOMat = Class.forName("ic2.core.block.personal.TileEntityTradeOMat"); + + } catch (ClassNotFoundException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Method not found." + e); + return; + } catch (NoSuchFieldException e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Field not found." + e); + return; + } catch (Exception e){ + //e.printStackTrace(); + Waila.log.log(Level.WARNING, "[IC2] Unhandled exception." + e); + return; + } + + + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.storage"); + ModuleRegistrar.instance().addConfig("IndustrialCraft2", "ic2.outputeu"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.inputeu"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.consump"); + ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.tradeomat"); + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEStandardMachine(), TileEntityStandardMachine); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityBaseGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntitySemifluidGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEBaseGenerator(), TileEntityGeoGenerator); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTEElectricBlock(), TileEntityElectricBlock); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTETradeOMat(), TileEntityTradeOMat); + + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStandardMachine); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityBaseGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntitySemifluidGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat); + */ + } + + /* Retuns the current stored energy if available in the nbt and config is true */ + public static double getStoredEnergy(IWailaDataAccessor accessor){ + /* + if (ConfigHandler.instance().getConfig("ic2.storage")){ + if (accessor.getNBTData().hasKey("energy")) + return accessor.getNBTData().getDouble("energy"); + else if (accessor.getNBTData().hasKey("storage")) + return accessor.getNBTData().getDouble("storage"); + } + */ + return -1.0; + } + + public static IC2Upgrades getUpgrades(IWailaDataAccessor accessor){ + + NBTTagCompound nbt = accessor.getNBTData(); + IC2Upgrades upgrades = new IC2Upgrades(); + + /* + if (!nbt.hasKey("InvSlots")) return null; + + NBTTagCompound inventory = nbt.getCompoundTag("InvSlots"); + if (!inventory.hasKey("upgrade")) return null; + + NBTTagList nbtupgrades = inventory.getCompoundTag("upgrade").getTagList("Contents"); + + //List tagList = (List)AccessHelper.getField("net.minecraft.nbt.NBTTagList", "tagList", nbtupgrades); + List tagList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtupgrades, "field_74747_a"); + + for (Object subobj : tagList){ + NBTTagCompound subtag = (NBTTagCompound)subobj; + int id = subtag.getShort("id"); + int meta = subtag.getShort("Damage"); + int count = subtag.getByte("Count"); + + //ItemStack is = new ItemStack(id, 1, count); + if (TransformerUpgradeStack.getItemDamage() == meta && TransformerUpgradeStack.itemID == id) + upgrades.transform += count; + if (EnergyStorageUpgradeStack.getItemDamage() == meta && EnergyStorageUpgradeStack.itemID == id) + upgrades.storage += count; + if (OverclockerUpgradeStack.getItemDamage() == meta && OverclockerUpgradeStack.itemID == id) + upgrades.overclocker += count; + } + */ + return upgrades; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java new file mode 100644 index 0000000..eb990f2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java @@ -0,0 +1,7 @@ +package mcp.mobius.waila.addons.ic2; + +public class IC2Upgrades { + public int transform = 0; + public int storage = 0; + public int overclocker = 0; +} diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java new file mode 100644 index 0000000..deacf41 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java @@ -0,0 +1,42 @@ +package mcp.mobius.waila.addons.magicalcrops; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerMagicalCrops implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("general.showcrop")) return currenttip; + + int growthStage = accessor.getMetadata(); + + float growthValue = (growthStage / 7.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java new file mode 100644 index 0000000..0c0bf02 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java @@ -0,0 +1,30 @@ +package mcp.mobius.waila.addons.magicalcrops; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class MagicalCropsModule { + public static Class BlockMagicalCrops = null; + + + public static void register(){ + try{ + Class MagicalCrops = Class.forName("magicalcrops.mod_sCrops"); + Waila.log.log(Level.INFO, "MagicalCrops mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[MagicalCrops] MagicalCrops mod not found."); + return; + } + + try{ + BlockMagicalCrops = Class.forName("magicalcrops.BlockMagicalCrops"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[MagicalCrops] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerMagicalCrops(), BlockMagicalCrops); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java new file mode 100644 index 0000000..f4e4718 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java @@ -0,0 +1,69 @@ +package mcp.mobius.waila.addons.openblocks; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; + +public class HUDHandlerTank implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; + + IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + FluidStack fluid = tanks[0].fluid; + String name = currenttip.get(0); + + try{ + name += String.format(" < %s >", fluid.getFluid().getLocalizedName()); + } catch (NullPointerException f){ + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; + + IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + if(tanks[0].fluid != null) + currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity)); + else + currenttip.add(String.format("0 / %d mB", tanks[0].capacity)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java new file mode 100644 index 0000000..98cdb15 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -0,0 +1,34 @@ +package mcp.mobius.waila.addons.openblocks; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class OpenBlocksModule { + + public static Class ModOpenBlocks = null; + public static Class TileEntityTank = null; + + public static void register(){ + try{ + Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks"); + Waila.log.log(Level.INFO, "OpenBlocks mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); + return; + } + + try{ + TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTank); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java new file mode 100644 index 0000000..ae93233 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java @@ -0,0 +1,215 @@ +package mcp.mobius.waila.addons.projectred; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaBlockDecorator; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaFMPAccessor; +import mcp.mobius.waila.api.IWailaFMPDecorator; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.utils.NBTUtil; + +public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator { + + static byte[][] IOARRAY={ + {1,1,2,1} /* OR */, {1,1,2,1} /* NOR */, {1,2,2,2} /* NOT */, {1,1,2,1} /* AND */, + {1,1,2,1} /* NAND */, {0,1,2,1} /* XOR */, {0,1,2,1} /* XNOR */, {1,2,2,2} /* Buf */, + {3,4,2,5} /* Multi */, {1,0,2,0} /* Pulse */, {1,0,2,0} /* Repeat */, {1,2,2,2} /* Rand */, + {2,1,2,1} /* Latch */, {2,1,2,1} /* Toggle*/, {6,1,2,2} /* Transp */, {2,0,0,0} /* Light */, + {2,0,0,0} /* Rain */, {1,7,2,7} /* Timer */, {2,2,2,2} /* Sequen */, {2,9,2,8} /* Count */, + {1,2,2,6} /* State */, {6,1,2,1} /* Sync */, {10,1,10,1} /* Bus */, {11,12,11,12} /* Null */, + {11,12,11,12} /* Inver */, {11,12,11,12} /* Buff */, {1,9,2,8} /* Cmp */, {1,12,2,12} /* And */, + }; + + + static byte[][] IOARRAYALTER={ + {1,8,2,9} /* Cmp 1*/, {1,6,2,2} /* State 1*/, {2,8,2,9} /* Count 1*/, {6,2,2,1} /* Transp 1*/, + {2,1,2,1} /* Latch 1*/, {2,1,2,1} /* Latch 2*/, {2,1,2,1} /* Latch 3*/ + }; + + static String[] IONAMES={ "", "IN", "OUT", "SWAP", "IN_A", "IN_B", "LOCK", "IO", "POS", "NEG", "BUS", "A", "B"}; + + @Override + public void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + + if (!config.getConfig("pr.showio")) return; + + + int orient = 0; + int subID = 0; + int shape = 0; + + orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient"); + subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID"); + shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape"); + + //orient = orient - ((orient & 0x10) + (orient & 0x8) + (orient & 0x4)); + int hOrient = orient & 0x3; + ForgeDirection vOrient = ForgeDirection.getOrientation((orient - (orient & 0x3)) >> 2); + + //System.out.printf("%s\n", ForgeDirection.getOrientation(vOrient)); + + if (vOrient == ForgeDirection.EAST) + hOrient -= 1; + + if (vOrient == ForgeDirection.WEST) + hOrient += 1; + + if (hOrient == -1) + hOrient = 3; + + String[] IOStr = new String[4]; + if (shape != 0){ + int altIndex = -1; + if (subID == 26 && shape == 1) altIndex = 0; + if (subID == 20 && shape == 1) altIndex = 1; + if (subID == 19 && shape == 1) altIndex = 2; + if (subID == 14 && shape == 1) altIndex = 3; + if (subID == 12 && shape == 1) altIndex = 4; + if (subID == 12 && shape == 2) altIndex = 5; + if (subID == 12 && shape == 3) altIndex = 6; + + if (altIndex == -1) + for (int i = 0; i < 4; i++) + IOStr[i] = IONAMES[IOARRAY[subID][i]]; + else + for (int i = 0; i < 4; i++) + IOStr[i] = IONAMES[IOARRAYALTER[altIndex][i]]; + } else { + for (int i = 0; i < 4; i++) + IOStr[i] = IONAMES[IOARRAY[subID][i]]; + + } + + String[] IOStrRot = new String[4]; + + for (int i = 0; i < 4 ; i++){ + int j = i + hOrient; + if (j >= 4) j -= 4; + IOStrRot[j] = IOStr[i]; + } + + switch(vOrient){ + case DOWN: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.2F, 1.4F, 90F, 0F, 0F); // Orient 0 + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.2F, 0.5F, 90F, 270F, 0F); // Orient 1 + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, 0.2F, -0.4F, 90F, 180F, 0F); // Orient 2 + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.2F, 0.5F, 90F, 90F, 0F); // Orient 3 + break; + case EAST: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.8F, 0.5F, 1.4F, 0F, 90F, 90F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 0.8F, -0.4F, 0.5F, 0F, 90F, 180F); + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.8F, 0.5F, -0.4F, 0F, 90F, 270F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.8F, 1.4F, 0.5F, 0F, 90F, 0F); + break; + case NORTH: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.2F, 0F, 180F, 0F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.2F, 0F, 180F, 90F); + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, -0.4F, 0.2F, 0F, 180F, 180F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.2F, 0F, 180F, 270F); + break; + case SOUTH: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 1.4F, 0.8F, 0F, 0F, 0F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), -0.4F, 0.5F, 0.8F, 0F, 0F, 90F); + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, -0.4F, 0.8F, 0F, 0F, 180F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 1.4F, 0.5F, 0.8F, 0F, 0F, 270F); + break; + case UP: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.5F, 0.8F, 1.4F, 270F, 180F, 0F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 1.4F, 0.8F, 0.5F, 270F, 270F, 0F); + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.5F, 0.8F, -0.4F, 270F, 0F, 0F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), -0.4F, 0.8F, 0.5F, 270F, 90F, 0F); + break; + case WEST: + UIHelper.drawFloatingText(IOStrRot[0], accessor.getRenderingPosition(), 0.2F, 0.5F, 1.4F, 180F, 90F, 90F); + UIHelper.drawFloatingText(IOStrRot[1], accessor.getRenderingPosition(), 0.2F, 1.4F, 0.5F, 180F, 90F, 180F); + UIHelper.drawFloatingText(IOStrRot[2], accessor.getRenderingPosition(), 0.2F, 0.5F, -0.4F, 180F, 90F, 270F); + UIHelper.drawFloatingText(IOStrRot[3], accessor.getRenderingPosition(), 0.2F, -0.4F, 0.5F, 180F, 90F, 0F); + break; + default: + break; + } + + double x = accessor.getRenderingPosition().xCoord; + double y = accessor.getRenderingPosition().yCoord; + double z = accessor.getRenderingPosition().zCoord; + + switch(vOrient){ + case DOWN: + UIHelper.drawRectangle(x - 0.1, y + 0.1, z, x, y + 0.1, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 0.65, x, y + 0.1, z + 1.0, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.0, y + 0.1, z, x + 1.1, y + 0.1, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.0, y + 0.1, z + 0.65, x + 1.1, y + 0.1, z + 1.0, 255, 255, 255, 150 ); + + UIHelper.drawRectangle(x - 0.1, y + 0.1, z - 0.1, x + 0.35, y + 0.1, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.65, y + 0.1, z - 0.1, x + 1.1, y + 0.1, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y + 0.1, z + 1.0, x + 0.35, y + 0.1, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.65, y + 0.1, z + 1.0, x + 1.1, y + 0.1, z + 1.1, 255, 255, 255, 150 ); + break; + case EAST: + UIHelper.drawRectangleEW(x + 0.9, y, z - 0.1, x + 0.9, y + 0.35, z, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z - 0.1, x + 0.9, y + 1.0, z, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y, z + 1.0, x + 0.9, y + 0.35, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y + 0.65, z + 1.0, x + 0.9, y + 1.0, z + 1.1, 255, 255, 255, 150 ); + + UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z - 0.1, x + 0.9, y, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y - 0.1, z + 0.65, x + 0.9, y, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z - 0.1, x + 0.9, y + 1.1, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.9, y + 1.0, z + 0.65, x + 0.9, y + 1.1, z + 1.1, 255, 255, 255, 150 ); + break; + case NORTH: + UIHelper.drawRectangle(x - 0.1, y, z + 0.1, x, y + 0.35, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y + 0.65, z + 0.1, x, y + 1.0, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.0, y, z + 0.1, x + 1.1, y + 0.35, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.0, y + 0.65, z + 0.1, x + 1.1, y + 1.0, z + 0.1, 255, 255, 255, 150 ); + + UIHelper.drawRectangle(x - 0.1, y - 0.1, z + 0.1, x + 0.35, y, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.65, y - 0.1, z + 0.1, x + 1.1, y, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x - 0.1, y + 1.0, z + 0.1, x + 0.35, y + 1.1, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.65, y + 1.0, z + 0.1, x + 1.1, y + 1.1, z + 0.1, 255, 255, 255, 150 ); + break; + case SOUTH: + UIHelper.drawRectangle(x, y, z + 0.9, x - 0.1, y + 0.35, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x, y + 0.65, z + 0.9, x - 0.1, y + 1.0, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y, z + 0.9, x + 1.0, y + 0.35, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 0.65, z + 0.9, x + 1.0, y + 1.0, z + 0.9, 255, 255, 255, 150 ); + + UIHelper.drawRectangle(x + 0.35, y - 0.1, z + 0.9, x - 0.1, y, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.10, y - 0.1, z + 0.9, x + 0.65, y, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 0.35, y + 1.0, z + 0.9, x - 0.1, y + 1.1, z + 0.9, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 1.0, z + 0.9, x + 0.65, y + 1.1, z + 0.9, 255, 255, 255, 150 ); + break; + case UP: + UIHelper.drawRectangle(x, y + 0.9, z, x - 0.1, y + 0.9, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x, y + 0.9, z + 0.65, x - 0.1, y + 0.9, z + 1.0, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z, x + 1.0, y + 0.9, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 0.65, x + 1.0, y + 0.9, z + 1.0, 255, 255, 255, 150 ); + + UIHelper.drawRectangle(x + 0.35, y + 0.9, z - 0.1, x - 0.1, y + 0.9, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z - 0.1, x + 0.65, y + 0.9, z + 0.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x +0.35, y + 0.9, z + 1.0, x - 0.1, y + 0.9, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangle(x + 1.1, y + 0.9, z + 1.0, x + 0.65, y + 0.9, z + 1.1, 255, 255, 255, 150 ); + + break; + case WEST: + UIHelper.drawRectangleEW(x + 0.1, y+ 0.35, z - 0.1, x + 0.1, y , z, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z - 0.1, x + 0.1, y + 0.65, z, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y + 0.35, z + 1.0, x + 0.1, y, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y + 1.0, z + 1.0, x + 0.1, y + 0.65, z + 1.1, 255, 255, 255, 150 ); + + UIHelper.drawRectangleEW(x + 0.1, y, z - 0.1, x + 0.1, y - 0.1, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y, z + 0.65, x + 0.1, y - 0.1, z + 1.1, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z - 0.1, x + 0.1, y + 1.0, z + 0.35, 255, 255, 255, 150 ); + UIHelper.drawRectangleEW(x + 0.1, y + 1.1, z + 0.65, x + 0.1, y + 1.0, z + 1.1, 255, 255, 255, 150 ); + break; + default: + break; + + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java new file mode 100644 index 0000000..261f562 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java @@ -0,0 +1,82 @@ +package mcp.mobius.waila.addons.projectred; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaFMPAccessor; +import mcp.mobius.waila.api.IWailaFMPProvider; +import mcp.mobius.waila.utils.NBTUtil; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDFMPGateLogic implements IWailaFMPProvider { + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("pr.showdata")) return currenttip; + + int orient = 0; + int subID = 0; + int shape = 0; + int pmax = 0; + int val = 0; + int max = 0; + int dec = 0; + int inc = 0; + + orient = NBTUtil.getNBTInteger(accessor.getNBTData(), "orient"); + subID = NBTUtil.getNBTInteger(accessor.getNBTData(), "subID"); + shape = NBTUtil.getNBTInteger(accessor.getNBTData(), "shape"); + + if (subID == 17) + pmax = NBTUtil.getNBTInteger(accessor.getNBTData(), "pmax"); + + if (subID == 19){ + val = NBTUtil.getNBTInteger(accessor.getNBTData(), "val"); + max = NBTUtil.getNBTInteger(accessor.getNBTData(), "max"); + dec = NBTUtil.getNBTInteger(accessor.getNBTData(), "dec"); + inc = NBTUtil.getNBTInteger(accessor.getNBTData(), "inc"); + } + + switch(subID){ + case 10: + currenttip.add(String.format("[Repeater]" + TAB + ALIGNRIGHT + WHITE + "%d" + GRAY + " ticks", (int)Math.pow(2, shape))); + break; + + case 15: + if (shape == 0) + currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Open"); + if (shape == 1) + currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Half closed"); + if (shape == 2) + currenttip.add("[Sensor]" + TAB + ALIGNRIGHT + WHITE + "Closed"); + break; + + case 17: + currenttip.add(String.format("[Timer delay]" + TAB + ALIGNRIGHT + WHITE + "%d " + GRAY + "ms", (pmax + 2) * 50)); + break; + + case 19: + + + currenttip.add(String.format("[Counter value]"+ TAB + ALIGNRIGHT + WHITE + "%d " + GRAY + "/ " + WHITE + "%d", val, max)); + currenttip.add(String.format("[Counter step]" + TAB + ALIGNRIGHT + WHITE + "-%d " + GRAY + "/ " + WHITE + "+%d", dec, inc)); + + default: + break; + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java new file mode 100644 index 0000000..ddaf823 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java @@ -0,0 +1,44 @@ +package mcp.mobius.waila.addons.projectred; + +import java.io.File; +import java.util.logging.Level; + +import net.minecraft.block.Block; +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class ProjectRedModule { + + public static void register(){ + try{ + Class ModClass = Class.forName("mrtjp.projectred.ProjectRedIntegration"); + Waila.log.log(Level.INFO, "ProjectRed|Integration mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[ProjectRed] ProjectRed|Integration mod not found."); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio"); + ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata"); + + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_sgate"); + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_igate"); + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_tgate"); + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_bgate"); + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_agate"); + ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_rgate"); + + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_sgate"); + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_igate"); + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_tgate"); + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_bgate"); + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_agate"); + ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_rgate"); + + //ModuleRegistrar.instance().registerBlockDecorator(new HUDDecoratorRsGateLogic(), BlockMultipart); + //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerRsGateLogic(), BlockMultipart); + //ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java new file mode 100644 index 0000000..010d91f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java @@ -0,0 +1,74 @@ +package mcp.mobius.waila.addons.railcraft; + +import java.lang.reflect.InvocationTargetException; +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerTank implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + try { + IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); + if (tank == null) return currenttip; + + FluidStack fluid = tank.getFluid(); + + String name = currenttip.get(0); + + try{ + name += String.format(" < %s >", fluid.getFluid().getLocalizedName()); + } catch (NullPointerException f){ + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + + try { + IFluidTank tank = (IFluidTank)RailcraftModule.ITankTile_getTank.invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); + if (tank == null) return currenttip; + + FluidStack fluid = tank.getFluid(); + if (fluid != null) + currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity)); + else + currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity)); + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java new file mode 100644 index 0000000..4dc1520 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java @@ -0,0 +1,43 @@ +package mcp.mobius.waila.addons.railcraft; + +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class RailcraftModule { + public static Class TileTankBase = null; + public static Class ITankTile = null; + public static Method ITankTile_getTank = null; + //public static Class StandardTank = null; + + public static void register(){ + try{ + Class ModRailcraft = Class.forName("mods.railcraft.common.core.Railcraft"); + Waila.log.log(Level.INFO, "Railcraft mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found."); + return; + } + + try{ + TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase"); + ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile"); + ITankTile_getTank = ITankTile.getMethod("getTank"); + //StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[Railcraft] Class not found. " + e); + return; + } catch (NoSuchMethodException e){ + Waila.log.log(Level.WARNING, "[Railcraft] Method not found." + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase); + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTankBase); + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java new file mode 100644 index 0000000..dba5069 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -0,0 +1,92 @@ +package mcp.mobius.waila.addons.secretrooms; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDTileEntityCamo implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + /* + if (!config.getConfig("secretrooms.hide")) return null; + + if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){ + return this.getTrapDoorBlock(accessor); + + } + + else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){ + return new ItemStack(Blocks.torch); + } + + else if (accessor.getNBTData() != null){ + NBTTagCompound tag = accessor.getNBTData(); + + if (tag.hasKey("copyID") && tag.hasKey("copyMeta")){ + int copyID = accessor.getNBTInteger(tag, "copyID"); + int copyMeta = accessor.getNBTInteger(tag, "copyMeta"); + return new ItemStack(copyID, 1, copyMeta); + } + } + */ + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor){ + // modify coordinates to get hinge Block. + /* + int i = accessor.getMetadata(); + int j = accessor.getPosition().blockX; + int k = accessor.getPosition().blockZ; + + if ((i & 3) == 0) + { + k++; + } + + if ((i & 3) == 1) + { + k--; + } + + if ((i & 3) == 2) + { + j++; + } + + if ((i & 3) == 3) + { + j--; + } + + int blockID = accessor.getWorld().getBlockId(j, accessor.getPosition().blockY, k); + int blockMeta = accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k); + + return new ItemStack(blockID, 1, blockMeta); + */ + return null; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java new file mode 100644 index 0000000..f0ba904 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java @@ -0,0 +1,46 @@ +package mcp.mobius.waila.addons.secretrooms; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class SecretRoomsModule { + + public static Class TileEntityCamo = null; + public static Class BlockTorchLever = null; + public static Class BlockCamoTrapDoor = null; + + public static void register(){ + /* + try{ + Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms"); + Waila.log.log(Level.INFO, "SecretRooms mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[SecretRooms] SecretRooms mod not found."); + return; + } + + try{ + TileEntityCamo = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.TileEntityCamo"); + BlockTorchLever = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockTorchLever"); + BlockCamoTrapDoor = Class.forName("com.github.AbrarSyed.secretroomsmod.blocks.BlockCamoTrapDoor"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[SecretRooms] Class not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARNING, "[SecretRooms] Error while loading module. " + e); + return; + } + + ModuleRegistrar.instance().addConfig("SecretRooms", "secretrooms.hide"); + ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), TileEntityCamo); + ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockTorchLever); + ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor); + ModuleRegistrar.instance().registerSyncedNBTKey("copyID", TileEntityCamo); + ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo); + */ + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java new file mode 100644 index 0000000..e012793 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java @@ -0,0 +1,68 @@ +package mcp.mobius.waila.addons.statues; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerStatues implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + try { + String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity()); + if (skinName.equals("")){ + TileEntity belowEnt = accessor.getWorld().getTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ); + if (StatuesModule.TileEntityStatue.isInstance(belowEnt)) + skinName = (String)StatuesModule.skinName.get(belowEnt); + } + + + + if (skinName.equals("")){ + currenttip.clear(); + currenttip.add(WHITE + "Statue : Unknown"); + } else { + currenttip.clear(); + currenttip.add(WHITE + "Statue : " + skinName); + } + + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + /* + String skinName = accessor.getNBTData().getString("skin"); + if (skinName.equals("")){ + if (accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ) != null){ + + } + } + */ + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + currenttip.add(BLUE + ITALIC + "Statues" ); + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java new file mode 100644 index 0000000..9d829b2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java @@ -0,0 +1,39 @@ +package mcp.mobius.waila.addons.statues; + +import java.lang.reflect.Field; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class StatuesModule { + + public static Class TileEntityStatue = null; + public static Field skinName = null; + + public static void register(){ + try{ + Class Statues = Class.forName("info.jbcs.minecraft.statues.Statues"); + Waila.log.log(Level.INFO, "Statues mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Statues] Statues mod not found."); + return; + } + + try{ + TileEntityStatue = Class.forName("info.jbcs.minecraft.statues.TileEntityStatue"); + skinName = TileEntityStatue.getDeclaredField("skinName"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e); + return; + } catch (NoSuchFieldException e){ + Waila.log.log(Level.WARNING, "[Statues] Class not found. " + e); + return; + } + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerStatues(), TileEntityStatue); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerStatues(), TileEntityStatue); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityStatue); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java new file mode 100644 index 0000000..c20db92 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -0,0 +1,150 @@ +package mcp.mobius.waila.addons.stevescarts; + +import java.util.ArrayList; +import java.util.List; + +import codechicken.lib.math.MathHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDCargoManager implements IWailaDataProvider { + + private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."}; + private static String sides[] = {"Yellow", "Blue", "Green", "Red"}; + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("stevescarts.showall")) return currenttip; + if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){ + currenttip.add(ITALIC + "Press shift for more data"); + return currenttip; + } + + NBTTagCompound tag = accessor.getNBTData(); + + if (config.getConfig("stevescarts.colorblind")){ + int side = accessor.getSide().ordinal() - 2; + if (side >= 0) + currenttip.add("Looking at side " + WHITE + sides[side]); + } + + int layout = accessor.getNBTInteger(tag, "layout"); + switch(layout){ + case 0: + currenttip.add("Slots : "+ WHITE + "Shared"); + break; + case 1: + currenttip.add("Slots : "+ WHITE + "By side"); + break; + case 2: + currenttip.add("Slots : "+ WHITE + "By color"); + break; + } + + try{ + ArrayList itemSelection = (ArrayList) StevesCartsModule.ItemSelections.get(accessor.getTileEntity()); + + int toCart = accessor.getNBTInteger(tag, "tocart"); + int doReturn = accessor.getNBTInteger(tag, "doReturn"); + + for (int i = 0; i < 4; i++){ + int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i)); + int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i)); + int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i)); + if (color == 5) continue; + + + String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload"; + String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont."; + String sAmount = amount == 0 ? "All" : String.valueOf(this.getAmount(amount) + " " + this.getAmountType(amount)); + + String selection = (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target))); + currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY, + TAB + ALIGNRIGHT, WHITE + selection + GRAY, + TAB + ALIGNRIGHT, WHITE + direction + GRAY, + TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY, + TAB + ALIGNRIGHT, WHITE + sAmount + GRAY)); + } + + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + public int getAmount(int id) + { + switch (id) + { + case 1: + return 1; + + case 2: + return 3; + + case 3: + return 8; + + case 4: + return 16; + + case 5: + return 32; + + case 6: + return 64; + + case 7: + return 1; + + case 8: + return 2; + + case 9: + return 3; + + case 10: + return 5; + + default: + return 0; + } + } + + //0 - MAX + //1 - Items + //2 - Stacks + public String getAmountType(int id) + { + if (id <= 6) + { + return "I"; + } + else + { + return "S"; + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java new file mode 100644 index 0000000..ea817ae --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -0,0 +1,88 @@ +package mcp.mobius.waila.addons.stevescarts; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDCartAssembler implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + /* + if (!config.getConfig("stevescarts.showall")) return currenttip; + if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){ + currenttip.add(ITALIC + "Press shift for more data"); + return currenttip; + } + + int currTime = accessor.getNBTInteger(accessor.getNBTData(), "currentTime"); + int maxTime = accessor.getNBTInteger(accessor.getNBTData(), "maxTime"); + int isAssembling = accessor.getNBTInteger(accessor.getNBTData(), "isAssembling"); + NBTTagList slots = accessor.getNBTData().getTagList("Items"); + boolean hasOutput = false; + Item ItemCartModule = null; + try { + ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null); + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + return currenttip; + } + + for (int i = 0; i < slots.tagCount(); i++){ + NBTTagCompound subtag = (NBTTagCompound)(slots.tagAt(i)); + byte slot = subtag.getByte("Slot"); + if (slot == 30) + hasOutput = true; + } + + if (isAssembling == 1){ + currenttip.add(String.format("Time remaining : %.1f sec", (maxTime - currTime) / 20.0f)); + + NBTTagCompound output = accessor.getNBTData().getCompoundTag("Output"); + short outID = output.getShort("id"); + byte[] metas = output.getCompoundTag("tag").getByteArray("Modules"); + + for (byte b : metas){ + currenttip.add(new ItemStack(ItemCartModule, 1, b).getDisplayName()); + } + } + else + if (hasOutput) + currenttip.add(String.format("Time remaining : ")); + else + currenttip.add(String.format("Time remaining : ")); + */ + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + +} diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java new file mode 100644 index 0000000..7ba39a3 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java @@ -0,0 +1,126 @@ +package mcp.mobius.waila.addons.stevescarts; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import static mcp.mobius.waila.api.SpecialChars.*; + + +public class HUDLiquidManager implements IWailaDataProvider { + + private static String colors[] = {"NA", "Red", "Blue", "Yellow", "Green", "Dis."}; + private static String sides[] = {"Yellow", "Blue", "Green", "Red"}; + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("stevescarts.showall")) return currenttip; + if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){ + currenttip.add(ITALIC + "Press shift for more data"); + return currenttip; + } + + NBTTagCompound tag = accessor.getNBTData(); + + if (config.getConfig("stevescarts.colorblind")){ + int side = accessor.getSide().ordinal() - 2; + if (side >= 0) + currenttip.add("Looking at side " + WHITE + sides[side]); + } + + int layout = accessor.getNBTInteger(tag, "layout"); + switch(layout){ + case 0: + currenttip.add("Tanks : "+ WHITE + "Shared"); + break; + case 1: + currenttip.add("Tanks : "+ WHITE + "By side"); + break; + case 2: + currenttip.add("Tanks : "+ WHITE + "By color"); + break; + } + + int toCart = accessor.getNBTInteger(tag, "tocart"); + int doReturn = accessor.getNBTInteger(tag, "doReturn"); + + for (int i = 0; i < 4; i++){ + int target = accessor.getNBTInteger(tag, "target" + String.valueOf(i)); + int color = accessor.getNBTInteger(tag, "color" + String.valueOf(i)); + int amount = accessor.getNBTInteger(tag, "amount" + String.valueOf(i)); + + String fluidName = ""; + int fluidAmount = 0; + if (tag.hasKey("Fluid" + i)){ + fluidName = tag.getCompoundTag("Fluid" + i).getString("FluidName"); + fluidAmount = tag.getCompoundTag("Fluid" + i).getInteger("Amount"); + } + + String fluidString = fluidAmount == 0 ? "" : String.format("%s mB of %s", fluidAmount, fluidName); + + if (color == 5) continue; + + + String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload"; + String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont."; + String sAmount = amount == 0 ? "All" : String.valueOf(this.getMaxAmountBuckets(amount)) + " mB"; + + //String selection = (String) StevesCartsModule.GetSelectionName.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target))); + currenttip.add(String.format("Side %s %s[ %s ]%s[ %s , %s]%s[ %s ]", WHITE + colors[color] + GRAY, + TAB + ALIGNRIGHT, WHITE + fluidString + GRAY, + TAB + ALIGNRIGHT, WHITE + direction + GRAY, + TAB + ALIGNRIGHT + WHITE + shouldReturn + GRAY, + TAB + ALIGNRIGHT, WHITE + sAmount + GRAY)); + + + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + public int getMaxAmountBuckets(int id) { + switch(id) { + case 1: + return 250; + case 2: + return 500; + case 3: + return 750; + case 4: + return 1000; + case 5: + return 2000; + case 6: + return 3000; + case 7: + return 5000; + case 8: + return 7500; + case 9: + return 10000; + case 10: + return 15000; + default: + return 0; + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java new file mode 100644 index 0000000..ef518cd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -0,0 +1,85 @@ +package mcp.mobius.waila.addons.stevescarts; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDMinecartModular implements IWailaEntityProvider { + + @Override + public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + if (currenttip.get(0).contains("entity.StevesCarts.Minecart")){ + currenttip.remove(0); + currenttip.add(WHITE + "Modular Minecart"); + } + + return currenttip; + } + + @Override + public List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("stevescarts.showall")) return currenttip; + if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){ + currenttip.add(ITALIC + "Press shift for more data"); + return currenttip; + } + + Item ItemCartModule = null; + try { + ItemCartModule = (Item)StevesCartsModule.ItemCartModule.get(null); + } catch (Exception e) { + currenttip = WailaExceptionHandler.handleErr(e, accessor.getEntity().getClass().getName(), currenttip); + return currenttip; + } + + NBTTagCompound tag = accessor.getNBTData(); + if (tag.hasKey("Modules")){ + byte[] metas = tag.getByteArray("Modules"); + + for (int i = 0; i < metas.length; i++){ + if (tag.hasKey("module" + String.valueOf(i) + "Fuel")){ + + int fuel = accessor.getNBTInteger(tag, "module" + String.valueOf(i) + "Fuel"); + currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + fuel + GRAY + " POW ]"); + + } else if (tag.hasKey("module" + String.valueOf(i) + "Fluid")){ + + NBTTagCompound subtag = tag.getCompoundTag("module" + String.valueOf(i) + "Fluid"); + if (subtag.hasKey("Amount")){ + int amount = accessor.getNBTInteger(subtag, "Amount"); + String fluid = subtag.getString("FluidName"); + currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " [ " + WHITE + String.valueOf(amount) + GRAY + " mB of " + WHITE + fluid + GRAY + " ]"); + } else { + currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB + ALIGNRIGHT + " < " + WHITE + "Empty" + GRAY + " > "); + } + + }else{ + + currenttip.add(new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName()); + + } + } + } + + return currenttip; + } + + @Override + public List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java new file mode 100644 index 0000000..a3b0d62 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java @@ -0,0 +1,80 @@ +package mcp.mobius.waila.addons.stevescarts; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class StevesCartsModule { + + public static Class TileEntityCartAssembler = null; + public static Class TileEntityCargo = null; + public static Class TileEntityLiquid = null; + public static Class MinecartModular = null; + public static Class StevesItems = null; + public static Class CargoItemSelection = null; + + public static Field ItemCartComponent = null; //Items.component + public static Field ItemCartModule = null; //Items.modules + public static Field ItemSelections = null; //TileEntityCargo.itemSelections + + public static Method GetSelectionName = null; // CargoItemSelection.getName + + public static void register(){ + /* + try{ + Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts"); + Waila.log.log(Level.INFO, "StevesCarts mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[StevesCarts] StevesCarts mod not found."); + return; + } + + try{ + TileEntityCartAssembler = Class.forName("vswe.stevescarts.TileEntities.TileEntityCartAssembler"); + TileEntityCargo = Class.forName("vswe.stevescarts.TileEntities.TileEntityCargo"); + TileEntityLiquid = Class.forName("vswe.stevescarts.TileEntities.TileEntityLiquid"); + MinecartModular = Class.forName("vswe.stevescarts.Carts.MinecartModular"); + StevesItems = Class.forName("vswe.stevescarts.Items.Items"); + CargoItemSelection = Class.forName("vswe.stevescarts.Helpers.CargoItemSelection"); + + ItemCartComponent = StevesItems.getDeclaredField("component"); + ItemCartModule = StevesItems.getDeclaredField("modules"); + ItemSelections = TileEntityCargo.getDeclaredField("itemSelections"); + + GetSelectionName = CargoItemSelection.getDeclaredMethod("getName"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[StevesCarts] Class not found. " + e); + return; + } catch (NoSuchFieldException e) { + Waila.log.log(Level.WARNING, "[StevesCarts] Field not found. " + e); + return; + } catch (NoSuchMethodException e) { + Waila.log.log(Level.WARNING, "[StevesCarts] Method not found. " + e); + return; + } catch (Exception e) { + Waila.log.log(Level.WARNING, "[StevesCarts] Error while loading module. " + e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.showall"); + ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.colorblind"); + ModuleRegistrar.instance().addConfigRemote("Steve's carts", "stevescarts.shifttoggle"); + + ModuleRegistrar.instance().registerBodyProvider(new HUDCartAssembler(), TileEntityCartAssembler); + ModuleRegistrar.instance().registerBodyProvider(new HUDCargoManager(), TileEntityCargo); + ModuleRegistrar.instance().registerBodyProvider(new HUDLiquidManager(), TileEntityLiquid); + ModuleRegistrar.instance().registerHeadProvider(new HUDMinecartModular(), MinecartModular); + ModuleRegistrar.instance().registerBodyProvider(new HUDMinecartModular(), MinecartModular); + + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler); + ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo); + ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid); + */ + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java new file mode 100644 index 0000000..b23d23e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -0,0 +1,112 @@ +package mcp.mobius.waila.addons.thaumcraft; + +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.StringUtils; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerIAspectContainer implements IWailaDataProvider { + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List 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)known).get(accessor.getPlayer().username); + //Object research = ThaumcraftModule.playerResearch.get(proxy); + //Object aspect = ThaumcraftModule.getAspect.invoke(null, name); + //Object knownaspects = ThaumcraftModule.aspectsDiscovered.get(research); + //Boolean known = (Boolean)ThaumcraftModule.hasDiscoveredAspect.invoke(research, accessor.getPlayer().username, aspect); + + Object[] aspects = (Object[])ThaumcraftModule.list_getAspects.invoke(listAspc); + for (Object o : aspects){ + if (ThaumcraftModule.aspect_tag.get(o).equals(name)){ + return true; + } + } + + return false; + + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + return false; + } + */ + return false; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java new file mode 100644 index 0000000..1cb4064 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -0,0 +1,92 @@ +package mcp.mobius.waila.addons.thaumcraft; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class ThaumcraftModule { + + public static Class IAspectContainer = null; + public static Class TileAlchemyFurnace = null; + public static Class ItemGoggles = null; + public static Class ItemRevealingHelm = null; + public static Class ItemGemHelm = null; + + public static Class Thaumcraft = null; + public static Class TCClientProxy = null; + public static Class TCCommonProxy = null; + //public static Class PlayerKnowledge = null; + public static Class Aspect = null; + public static Class AspectList = null; + + public static Field TC_proxy = null; //Thaumcraft.proxy + //public static Field playerResearch = null; //ClientProxy.playerResearch + //public static Field aspectsDiscovered = null; //PlayerKnowledge.aspectsDiscovered + public static Field aspect_tag = null; //Aspect.tag + + //public static Method hasDiscoveredAspect = null; //PlayerKnowledge.hasDiscoveredAspect + //public static Method getAspect = null; //Aspect.getAspect + public static Method getKnownAspects = null; //CommonProxy.getKnownAspects + public static Method list_getAspects = null; //AspectList.getAspects + + public static void register(){ + /* + try{ + Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft"); + Waila.log.log(Level.INFO, "Thaumcraft mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found."); + return; + } + + try{ + ItemRevealingHelm = Class.forName("vazkii.tinkerer.common.item.ItemRevealingHelm"); + } catch (ClassNotFoundException e){ } + + try{ + ItemGemHelm = Class.forName("vazkii.tinkerer.common.item.kami.armor.ItemGemHelm"); + } catch (ClassNotFoundException e){ } + + try{ + IAspectContainer = Class.forName("thaumcraft.api.aspects.IAspectContainer"); + TileAlchemyFurnace = Class.forName("thaumcraft.common.tiles.TileAlchemyFurnace"); + ItemGoggles = Class.forName("thaumcraft.common.items.armor.ItemGoggles"); + TCClientProxy = Class.forName("thaumcraft.client.ClientProxy"); + TCCommonProxy = Class.forName("thaumcraft.common.CommonProxy"); + //PlayerKnowledge = Class.forName("thaumcraft.common.lib.research.PlayerKnowledge"); + Aspect = Class.forName("thaumcraft.api.aspects.Aspect"); + AspectList = Class.forName("thaumcraft.api.aspects.AspectList"); + + TC_proxy = Thaumcraft.getDeclaredField("proxy"); + //playerResearch = TCClientProxy.getDeclaredField("playerResearch"); + //aspectsDiscovered = PlayerKnowledge.getDeclaredField("aspectsDiscovered"); + //playerResearch.setAccessible(true); + aspect_tag = Aspect.getDeclaredField("tag"); + aspect_tag.setAccessible(true); + + //hasDiscoveredAspect = PlayerKnowledge.getDeclaredMethod("hasDiscoveredAspect", String.class, Aspect); + //getAspect = Aspect.getDeclaredMethod("getAspect", String.class); + getKnownAspects = TCCommonProxy.getDeclaredMethod("getKnownAspects"); + list_getAspects = AspectList.getDeclaredMethod("getAspects"); + + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[Thaumcraft] Class not found. " + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[Thaumcraft] Unhandled exception." + e); + //WailaExceptionHandler.handleErr(e, null, null); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Thaumcraft", "thaumcraft.aspects"); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace); + ModuleRegistrar.instance().registerSyncedNBTKey("*", IAspectContainer); + */ + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java new file mode 100644 index 0000000..2755412 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java @@ -0,0 +1,63 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.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 getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java new file mode 100644 index 0000000..e95574f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java @@ -0,0 +1,64 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerConduitItem implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 : "); + */ + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java new file mode 100644 index 0000000..e41087f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -0,0 +1,41 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerEnergyCell implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.energycell")) return currenttip; + + int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv"); + int energySend = accessor.getNBTInteger(accessor.getNBTData(), "Send"); + + currenttip.add(String.format("%s/%s : %d / %d RF/t", LangUtil.translateG("hud.msg.in"), LangUtil.translateG("hud.msg.out"), energyReceive, energySend)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java new file mode 100644 index 0000000..fd36cc9 --- /dev/null +++ b/src/main/java/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.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class HUDHandlerIEnergyHandler implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List 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 getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java new file mode 100644 index 0000000..5c1a0fe --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -0,0 +1,59 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + + +public class HUDHandlerISecureTile implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (config.getConfig("thermalexpansion.owner")){ + + String owner = accessor.getNBTData().getString("Owner"); + int iaccess = accessor.getNBTInteger(accessor.getNBTData(), "Access"); + + String access = "INVALID"; + switch(iaccess){ + case 0: + access = LangUtil.translateG("hud.msg.public"); + break; + case 1: + access = LangUtil.translateG("hud.msg.restricted"); + break; + case 2: + access = LangUtil.translateG("hud.msg.private"); + break; + } + + currenttip.add(String.format("%s : \u00a7f%s\u00a7r [ %s ]", LangUtil.translateG("hud.msg.owner"), owner, access)); + + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java new file mode 100644 index 0000000..3818218 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -0,0 +1,82 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.lang.reflect.InvocationTargetException; +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +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 HUDHandlerTank implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip; + + try { + FluidStack fluid = (FluidStack)ThermalExpansionModule.TileTank_getTankFluid.invoke(accessor.getTileEntity()); + String name = currenttip.get(0); + + try{ + name += String.format(" < %s >", fluid.getFluid().getLocalizedName()); + } catch (NullPointerException f){ + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + try { + if (config.getConfig("thermalexpansion.fluidamount")){ + int amount = 0; + if (accessor.getNBTData().hasKey("Amount")) + amount = accessor.getNBTInteger(accessor.getNBTData(), "Amount"); + + Integer capacity = (Integer)ThermalExpansionModule.TileTank_getTankCapacity.invoke(accessor.getTileEntity()); + + currenttip.add(String.format("%d / %d mB", amount, capacity)); + } + + if (config.getConfig("thermalexpansion.tankmode")){ + Byte mode = (Byte)ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity()); + if (mode == 0) + currenttip.add(String.format("%s : \u00a7a%s", LangUtil.translateG("hud.msg.mode"), LangUtil.translateG("hud.msg.input"))); + else if (mode == 1) + currenttip.add(String.format("%s : \u00a7c%s", LangUtil.translateG("hud.msg.mode"), LangUtil.translateG("hud.msg.output"))); + else + currenttip.add(String.format("Mode : Unknown (%d)", mode)); + } + + + + } catch (Exception e){ + currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } + + + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java new file mode 100644 index 0000000..c5c57fc --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java @@ -0,0 +1,91 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerTesseract implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (config.getConfig("thermalexpansion.tesssendrecv")){ + String send = String.format("%s : ", LangUtil.translateG("hud.msg.send")); + String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv")); + String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item")); + String fluid= String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid")); + String energ= String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ")); + + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")){ + case 0: + send += item; + break; + case 1: + recv += item; + break; + case 2: + send += item; + recv += item; + break; + } + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Fluid.Mode")){ + case 0: + send += fluid; + break; + case 1: + recv += fluid; + break; + case 2: + send += fluid; + recv += fluid; + break; + } + + switch (accessor.getNBTInteger(accessor.getNBTData(), "Energy.Mode")){ + case 0: + send += energ; + break; + case 1: + recv += energ; + break; + case 2: + send += energ; + recv += energ; + break; + } + + if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.send")))) + currenttip.add(send); + + if (!send.equals(String.format("%s : ", LangUtil.translateG("hud.msg.recv")))) + currenttip.add(recv); + } + + if (config.getConfig("thermalexpansion.tessfreq")) + currenttip.add(String.format("%s : %d",LangUtil.translateG("hud.msg.frequency"), accessor.getNBTInteger(accessor.getNBTData(), "Frequency"))); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java new file mode 100644 index 0000000..b21d02d --- /dev/null +++ b/src/main/java/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.util.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); + */ + } + + +} diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java new file mode 100644 index 0000000..b2d3e18 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java @@ -0,0 +1,31 @@ +package mcp.mobius.waila.addons.twilightforest; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class TwilightForestGenericOverride implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return new ItemStack(accessor.getBlock(), 0, accessor.getMetadata()); + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } +} diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java new file mode 100644 index 0000000..4de4925 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java @@ -0,0 +1,41 @@ +package mcp.mobius.waila.addons.twilightforest; + +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class TwilightForestModule { + + public static Class BlockTFRoots = null; + public static Class BlockTFPlant = null; + public static Class BlockTFSapling = null; + + public static void register(){ + + try{ + Class TwilightForestMod = Class.forName("twilightforest.TwilightForestMod"); + Waila.log.log(Level.INFO, "TwilightForestMod mod found."); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.INFO, "[TwilightForestMod] TwilightForestMod mod not found."); + return; + } + + try { + BlockTFRoots = Class.forName("twilightforest.block.BlockTFRoots"); + BlockTFPlant = Class.forName("twilightforest.block.BlockTFPlant"); + BlockTFSapling = Class.forName("twilightforest.block.BlockTFSapling"); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.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); + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java new file mode 100644 index 0000000..1577e0d --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java @@ -0,0 +1,85 @@ +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; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.gui.helpers.UIHelper; + +public class HUDDecoratorVanilla implements IWailaBlockDecorator { + + @Override + public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { + +Tessellator tessellator = Tessellator.instance; + + //UIHelper.drawBillboardText(itemStack.getDisplayName(), accessor.getRenderingPosition(), 0.5F, 1.5F, 0.5F, accessor.getPartialFrame()); + UIHelper.drawFloatingText("IN", accessor.getRenderingPosition(), 0.5F, 0.2F, -0.2F, 90F, 0F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), -0.2F, 0.2F, 0.5F, 90F, 90F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 1.2F, 0.2F, 0.5F, 90F, -90F, 0F); + UIHelper.drawFloatingText("OUT", accessor.getRenderingPosition(), 0.5F, 0.2F, 1.2F, 90F, -180F, 0F); + + double offset = 0.1; + double delta = 1 + 2 * offset; + + double x = accessor.getRenderingPosition().xCoord - offset; + double y = accessor.getRenderingPosition().yCoord - offset; + double z = accessor.getRenderingPosition().zCoord - offset; + + tessellator.startDrawingQuads(); + + tessellator.setColorRGBA(255, 255, 255, 150); + + tessellator.addVertex(x, y + 0.2 , z); + tessellator.addVertex(x, y + 0.2 , z + delta/2 - 0.1); + tessellator.addVertex(x + offset, y + 0.2, z + delta/2 - 0.1); + tessellator.addVertex(x + offset, y + 0.2, z); + + tessellator.addVertex(x, y + 0.2 , z + delta/2 + 0.1); + tessellator.addVertex(x, y + 0.2 , z + delta); + tessellator.addVertex(x + offset, y + 0.2, z + delta); + tessellator.addVertex(x + offset, y + 0.2, z + delta/2 + 0.1); + + tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta/2 - 0.1); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta/2 - 0.1); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + 0.1); + + tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta/2 + 0.1); + tessellator.addVertex(x + delta - 0.1, y + 0.2 , z + delta); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta); + tessellator.addVertex(x + delta + offset - 0.1, y + 0.2, z + delta/2 + 0.1); + + + tessellator.addVertex(x+ 0.1, y + 0.2, z); + tessellator.addVertex(x+ 0.1, y + 0.2, z+ offset); + tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ offset); + tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z); + + tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z); + tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ offset); + tessellator.addVertex(x+ delta, y + 0.2, z+ offset); + tessellator.addVertex(x+ delta, y + 0.2, z); + + tessellator.addVertex(x + 0.1, y + 0.2, z+ delta - 0.1); + tessellator.addVertex(x + 0.1, y + 0.2, z+ offset+ delta - 0.1); + tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ offset+ delta - 0.1); + tessellator.addVertex(x+ delta/2 - 0.1, y + 0.2, z+ delta - 0.1); + + tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ delta - 0.1); + tessellator.addVertex(x+ delta/2 + 0.1, y + 0.2, z+ offset+ delta - 0.1); + tessellator.addVertex(x+ delta - 0.1, y + 0.2, z+ offset+ delta - 0.1); + tessellator.addVertex(x+ delta - 0.1, y + 0.2, z+ delta - 0.1); + + tessellator.draw(); + + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java new file mode 100644 index 0000000..a335147 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -0,0 +1,226 @@ +package mcp.mobius.waila.addons.vanillamc; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockSilverfish; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemRecord; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityMobSpawner; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.cbcore.LangUtil; + +public class HUDHandlerVanilla implements IWailaDataProvider { + + static Block mobSpawner = Blocks.mob_spawner; + static Block crops = Blocks.wheat; + static Block melonStem = Blocks.melon_stem; + static Block pumpkinStem = Blocks.pumpkin_stem; + static Block carrot = Blocks.carrots; + static Block potato = Blocks.potatoes; + static Block lever = Blocks.lever; + static Block repeaterIdle = Blocks.unpowered_repeater; + static Block repeaterActv = Blocks.powered_repeater; + static Block comparatorIdl = Blocks.unpowered_comparator; + static Block comparatorAct = Blocks.powered_comparator; + static Block redstone = Blocks.redstone_wire; + static Block jukebox = Blocks.jukebox; + static Block cocoa = Blocks.cocoa; + static Block netherwart = Blocks.nether_wart; + static Block silverfish = Blocks.monster_egg; + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + Block block = accessor.getBlock(); + + if (block == silverfish && config.getConfig("vanilla.silverfish")){ + int metadata = accessor.getMetadata(); + switch(metadata){ + case 0: + return new ItemStack(Blocks.stone); + case 1: + return new ItemStack(Blocks.cobblestone); + case 2: + return new ItemStack(Blocks.brick_block); + default: + return null; + } + } + + if (block == redstone){ + return new ItemStack(Items.redstone); + } + + return null; + + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + Block block = accessor.getBlock(); + + /* Mob spawner handler */ + if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){ + String name = currenttip.get(0); + String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn(); + currenttip.set(0, String.format("%s (%s)", name, mobname)); + } + + if (block == redstone){ + String name = currenttip.get(0).replaceFirst(String.format(" %s", accessor.getMetadata()), ""); + currenttip.set(0, name); + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + Block block = accessor.getBlock(); + /* Crops */ + boolean iscrop = crops.getClass().isInstance(block); //Done to cover all inheriting mods + if (config.getConfig("general.showcrop")) + if (iscrop || block == melonStem || block == pumpkinStem || block == carrot || block == potato){ + float growthValue = (accessor.getMetadata() / 7.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + if (block == cocoa && config.getConfig("general.showcrop")){ + + float growthValue = ((accessor.getMetadata() >> 2) / 2.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + if (block == netherwart && config.getConfig("general.showcrop")){ + float growthValue = (accessor.getMetadata() / 3.0F) * 100.0F; + if (growthValue < 100.0) + currenttip.add(String.format("%s : %.0f %%", LangUtil.translateG("hud.msg.growth"), growthValue)); + else + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.growth"), LangUtil.translateG("hud.msg.mature"))); + return currenttip; + } + + if (config.getConfig("vanilla.leverstate")) + if (block == lever){ + String redstoneOn = (accessor.getMetadata() & 8) == 0 ? LangUtil.translateG("hud.msg.off") : LangUtil.translateG("hud.msg.on"); + currenttip.add(String.format("%s : %s", LangUtil.translateG("hud.msg.state"), redstoneOn)); + return currenttip; + } + + if (config.getConfig("vanilla.repeater")) + if ((block == repeaterIdle) ||(block == repeaterActv)){ + int tick = (accessor.getMetadata() >> 2) + 1 ; + if (tick == 1) + currenttip.add(String.format("%s : %s tick", LangUtil.translateG("hud.msg.delay"), tick)); + else + currenttip.add(String.format("%s : %s ticks", LangUtil.translateG("hud.msg.delay"), tick)); + return currenttip; + } + + if (config.getConfig("vanilla.comparator")) + if ((block == comparatorIdl) ||(block == comparatorAct)){ + String mode = ((accessor.getMetadata() >> 2) & 1) == 0 ? LangUtil.translateG("hud.msg.comparator") : LangUtil.translateG("hud.msg.substractor"); + //int outputSignal = ((TileEntityComparator)entity).func_96100_a(); + currenttip.add("Mode : " + mode); + //currenttip.add(String.format("Out : %s", outputSignal)); + return currenttip; + } + + if (config.getConfig("vanilla.redstone")) + if (block == redstone){ + currenttip.add(String.format("%s : %s" , LangUtil.translateG("hud.msg.power"), accessor.getMetadata())); + return currenttip; + } + + /* + if (config.getConfig("vanilla.jukebox")) + if (block == jukebox){ + NBTTagCompound tag = accessor.getNBTData(); + Item record = null; + if (tag.hasKey("Record")){ + record = Item.itemsList[accessor.getNBTInteger(tag, "Record")]; + currenttip.add(((ItemRecord)record).getRecordTitle()); + } else { + currenttip.add(LangUtil.translateG("hud.msg.empty")); + } + } + */ + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + + public static void register(){ + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.spawntype"); + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.leverstate"); + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.repeater"); + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.comparator"); + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.redstone"); + ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.silverfish"); + ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.jukebox"); + + IWailaDataProvider provider = new HUDHandlerVanilla(); + + ModuleRegistrar.instance().registerStackProvider(provider, silverfish.getClass()); + ModuleRegistrar.instance().registerStackProvider(provider, redstone.getClass()); + ModuleRegistrar.instance().registerHeadProvider(provider, mobSpawner.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, crops.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, melonStem.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, pumpkinStem.getClass()); + //ModuleRegistrar.instance().registerBodyProvider(provider, carrot.getClass()); + //ModuleRegistrar.instance().registerBodyProvider(provider, potato.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, lever.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, repeaterIdle.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, repeaterActv.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, comparatorIdl.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, comparatorAct.getClass()); + ModuleRegistrar.instance().registerHeadProvider(provider, redstone.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, redstone.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, jukebox.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, cocoa.getClass()); + ModuleRegistrar.instance().registerBodyProvider(provider, netherwart.getClass()); + + ModuleRegistrar.instance().registerSyncedNBTKey("*", mobSpawner.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", crops.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", melonStem.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", pumpkinStem.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", carrot.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", potato.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", lever.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterIdle.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterActv.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorIdl.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorAct.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", redstone.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", jukebox.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", cocoa.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", netherwart.getClass()); + ModuleRegistrar.instance().registerSyncedNBTKey("*", silverfish.getClass()); + + //ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv"); + + //ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle); + } + + + +} diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.csv b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.csv new file mode 100644 index 0000000..9729c82 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.csv @@ -0,0 +1,667 @@ +Minecraft,tile.*,0,Stone,net.minecraft.item.ItemBlock,This is a crazy test ! +Minecraft,tile.grass,0,Grass Block,net.minecraft.item.ItemBlock, +Minecraft,tile.dirt,0,Dirt,net.minecraft.item.ItemBlock, +Minecraft,tile.stonebrick,0,Cobblestone,net.minecraft.item.ItemBlock, +Minecraft,tile.wood.oak,0,Oak Wood Planks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.wood.spruce,1,Spruce Wood Planks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.wood.birch,2,Birch Wood Planks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.wood.jungle,3,Jungle Wood Planks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sapling.oak,0,Oak Sapling,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sapling.spruce,1,Spruce Sapling,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sapling.birch,2,Birch Sapling,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sapling.jungle,3,Jungle Sapling,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.bedrock,0,Bedrock,net.minecraft.item.ItemBlock, +Minecraft,tile.water,0,Water,net.minecraft.item.ItemBlock, +Minecraft,tile.water,0,Water,net.minecraft.item.ItemBlock, +Minecraft,tile.lava,0,Lava,net.minecraft.item.ItemBlock, +Minecraft,tile.lava,0,Lava,net.minecraft.item.ItemBlock, +Minecraft,tile.sand,0,Sand,net.minecraft.item.ItemBlock, +Minecraft,tile.gravel,0,Gravel,net.minecraft.item.ItemBlock, +Minecraft,tile.oreGold,0,Gold Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.oreIron,0,Iron Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.oreCoal,0,Coal Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.log.oak,0,Oak Wood,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.log.spruce,1,Spruce Wood,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.log.birch,2,Birch Wood,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.log.jungle,3,Jungle Wood,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.leaves.oak,0,Oak Leaves,net.minecraft.item.ItemLeaves, +Minecraft,tile.leaves.spruce,1,Spruce Leaves,net.minecraft.item.ItemLeaves, +Minecraft,tile.leaves.birch,2,Birch Leaves,net.minecraft.item.ItemLeaves, +Minecraft,tile.leaves.jungle,3,Jungle Leaves,net.minecraft.item.ItemLeaves, +Minecraft,tile.sponge,0,Sponge,net.minecraft.item.ItemBlock, +Minecraft,tile.glass,0,Glass,net.minecraft.item.ItemBlock, +Minecraft,tile.oreLapis,0,Lapis Lazuli Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.blockLapis,0,Lapis Lazuli Block,net.minecraft.item.ItemBlock, +Minecraft,tile.dispenser,0,Dispenser,net.minecraft.item.ItemBlock, +Minecraft,tile.sandStone.default,0,Sandstone,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sandStone.chiseled,1,Chiseled Sandstone,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.sandStone.smooth,2,Smooth Sandstone,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.musicBlock,0,Note Block,net.minecraft.item.ItemBlock, +Minecraft,tile.goldenRail,0,Powered Rail,net.minecraft.item.ItemBlock, +Minecraft,tile.detectorRail,0,Detector Rail,net.minecraft.item.ItemBlock, +Minecraft,tile.pistonStickyBase,0,Sticky Piston,net.minecraft.item.ItemPiston, +Minecraft,tile.web,0,Cobweb,net.minecraft.item.ItemBlock, +Minecraft,tile.tallgrass.grass,1,Grass,net.minecraft.item.ItemColored, +Minecraft,tile.tallgrass.fern,2,Fern,net.minecraft.item.ItemColored, +Minecraft,tile.deadbush,0,Dead Bush,net.minecraft.item.ItemBlock, +Minecraft,tile.pistonBase,0,Piston,net.minecraft.item.ItemPiston, +Minecraft,tile.cloth.white,0,Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.orange,1,Orange Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.magenta,2,Magenta Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.lightBlue,3,Light Blue Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.yellow,4,Yellow Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.lime,5,Lime Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.pink,6,Pink Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.gray,7,Gray Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.silver,8,Light Gray Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.cyan,9,Cyan Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.purple,10,Purple Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.blue,11,Blue Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.brown,12,Brown Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.green,13,Green Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.red,14,Red Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.cloth.black,15,Black Wool,net.minecraft.item.ItemCloth, +Minecraft,tile.flower,0,Flower,net.minecraft.item.ItemBlock, +Minecraft,tile.rose,0,Rose,net.minecraft.item.ItemBlock, +Minecraft,tile.mushroom,0,Mushroom,net.minecraft.item.ItemBlock, +Minecraft,tile.mushroom,0,Mushroom,net.minecraft.item.ItemBlock, +Minecraft,tile.blockGold,0,Block of Gold,net.minecraft.item.ItemBlock, +Minecraft,tile.blockIron,0,Block of Iron,net.minecraft.item.ItemBlock, +Minecraft,tile.stoneSlab.stone,0,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.sand,1,Sandstone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.wood,2,Wooden Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.cobble,3,Cobblestone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.brick,4,Bricks Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.smoothStoneBrick,5,Stone Bricks Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.netherBrick,6,Nether Brick Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.quartz,7,Quartz Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,8,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,9,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,10,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,11,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,12,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,13,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,14,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,15,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.stone,0,Stone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.sand,1,Sandstone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.cobble,3,Cobblestone Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.brick,4,Bricks Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.smoothStoneBrick,5,Stone Bricks Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.netherBrick,6,Nether Brick Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.stoneSlab.quartz,7,Quartz Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.brick,0,Bricks,net.minecraft.item.ItemBlock, +Minecraft,tile.tnt,0,TNT,net.minecraft.item.ItemBlock, +Minecraft,tile.bookshelf,0,Bookshelf,net.minecraft.item.ItemBlock, +Minecraft,tile.stoneMoss,0,Moss Stone,net.minecraft.item.ItemBlock, +Minecraft,tile.obsidian,0,Obsidian,net.minecraft.item.ItemBlock, +Minecraft,tile.torch,0,Torch,net.minecraft.item.ItemBlock, +Minecraft,tile.fire,0,Fire,net.minecraft.item.ItemBlock, +Minecraft,tile.mobSpawner,90,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,50,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,51,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,52,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,53,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,54,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,55,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,56,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,57,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,58,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,59,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,60,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,61,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,62,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,64,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,65,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,66,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,91,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,92,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,93,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,94,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,95,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,96,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,97,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,98,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,99,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.mobSpawner,120,Monster Spawner,codechicken.nei.ItemMobSpawner, +Minecraft,tile.stairsWood,0,Oak Wood Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.chest,0,Chest,net.minecraft.item.ItemBlock, +Minecraft,tile.oreDiamond,0,Diamond Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.blockDiamond,0,Block of Diamond,net.minecraft.item.ItemBlock, +Minecraft,tile.workbench,0,Crafting Table,net.minecraft.item.ItemBlock, +Minecraft,tile.farmland,0,Farmland,net.minecraft.item.ItemBlock, +Minecraft,tile.furnace,0,Furnace,net.minecraft.item.ItemBlock, +Minecraft,tile.ladder,0,Ladder,net.minecraft.item.ItemBlock, +Minecraft,tile.rail,0,Rail,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsStone,0,Stone Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.lever,0,Lever,net.minecraft.item.ItemBlock, +Minecraft,tile.pressurePlate,0,Pressure Plate,net.minecraft.item.ItemBlock, +Minecraft,tile.pressurePlate,0,Pressure Plate,net.minecraft.item.ItemBlock, +Minecraft,tile.oreRedstone,0,Redstone Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.notGate,0,Redstone Torch,net.minecraft.item.ItemBlock, +Minecraft,tile.button,0,Button,net.minecraft.item.ItemBlock, +Minecraft,tile.snow,0,Snow,net.minecraft.item.ItemSnow, +Minecraft,tile.ice,0,Ice,net.minecraft.item.ItemBlock, +Minecraft,tile.snow,0,Snow,net.minecraft.item.ItemBlock, +Minecraft,tile.cactus,0,Cactus,net.minecraft.item.ItemBlock, +Minecraft,tile.clay,0,Clay,net.minecraft.item.ItemBlock, +Minecraft,tile.jukebox,0,Jukebox,net.minecraft.item.ItemBlock, +Minecraft,tile.fence,0,Fence,net.minecraft.item.ItemBlock, +Minecraft,tile.pumpkin,0,Pumpkin,net.minecraft.item.ItemBlock, +Minecraft,tile.hellrock,0,Netherrack,net.minecraft.item.ItemBlock, +Minecraft,tile.hellsand,0,Soul Sand,net.minecraft.item.ItemBlock, +Minecraft,tile.lightgem,0,Glowstone,net.minecraft.item.ItemBlock, +Minecraft,tile.portal,0,Portal,net.minecraft.item.ItemBlock, +Minecraft,tile.litpumpkin,0,Jack 'o' Lantern,net.minecraft.item.ItemBlock, +Minecraft,tile.cake,0,Cake,net.minecraft.item.ItemBlock, +Minecraft,tile.lockedchest,0,Locked chest,net.minecraft.item.ItemBlock, +Minecraft,tile.trapdoor,0,Trapdoor,net.minecraft.item.ItemBlock, +Minecraft,tile.monsterStoneEgg.stone,0,Stone Monster Egg,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.monsterStoneEgg.cobble,1,Cobblestone Monster Egg,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.monsterStoneEgg.brick,2,Stone Brick Monster Egg,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.stonebricksmooth.default,0,Stone Bricks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.stonebricksmooth.mossy,1,Mossy Stone Bricks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.stonebricksmooth.cracked,2,Cracked Stone Bricks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.stonebricksmooth.chiseled,3,Chiseled Stone Bricks,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.mushroom,0,Mushroom,net.minecraft.item.ItemBlock, +Minecraft,tile.mushroom,0,Mushroom,net.minecraft.item.ItemBlock, +Minecraft,tile.fenceIron,0,Iron Bars,net.minecraft.item.ItemBlock, +Minecraft,tile.thinGlass,0,Glass Pane,net.minecraft.item.ItemBlock, +Minecraft,tile.melon,0,Melon,net.minecraft.item.ItemBlock, +Minecraft,tile.vine,0,Vines,net.minecraft.item.ItemColored, +Minecraft,tile.fenceGate,0,Fence Gate,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsBrick,0,Brick Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsStoneBrickSmooth,0,Stone Brick Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.mycel,0,Mycelium,net.minecraft.item.ItemBlock, +Minecraft,tile.waterlily,0,Lily Pad,net.minecraft.item.ItemLilyPad, +Minecraft,tile.netherBrick,0,Nether Brick,net.minecraft.item.ItemBlock, +Minecraft,tile.netherFence,0,Nether Brick Fence,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsNetherBrick,0,Nether Brick Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.enchantmentTable,0,Enchantment Table,net.minecraft.item.ItemBlock, +Minecraft,tile.null,0,,net.minecraft.item.ItemBlock, +Minecraft,tile.endPortalFrame,0,End Portal,net.minecraft.item.ItemBlock, +Minecraft,tile.whiteStone,0,End Stone,net.minecraft.item.ItemBlock, +Minecraft,tile.dragonEgg,0,Dragon Egg,net.minecraft.item.ItemBlock, +Minecraft,tile.redstoneLight,0,Redstone Lamp,net.minecraft.item.ItemBlock, +Minecraft,tile.woodSlab.oak,0,Oak Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.spruce,1,Spruce Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.birch,2,Birch Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.jungle,3,Jungle Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.oak,9,Oak Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.oak,10,Oak Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.oak,11,Oak Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.oak,0,Oak Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.spruce,1,Spruce Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.birch,2,Birch Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.woodSlab.jungle,3,Jungle Wood Slab,net.minecraft.item.ItemSlab, +Minecraft,tile.cocoa,0,Cocoa,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsSandStone,0,Sandstone Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.oreEmerald,0,Emerald Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.tripWireSource,0,Tripwire Hook,net.minecraft.item.ItemBlock, +Minecraft,tile.blockEmerald,0,Block of Emerald,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsWoodSpruce,0,Spruce Wood Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsWoodBirch,0,Birch Wood Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.stairsWoodJungle,0,Jungle Wood Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.commandBlock,0,Command Block,net.minecraft.item.ItemBlock, +Minecraft,tile.beacon,0,Beacon,net.minecraft.item.ItemBlock, +Minecraft,tile.cobbleWall.normal,0,Cobblestone Wall,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.cobbleWall.mossy,1,Mossy Cobblestone Wall,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.button,0,Button,net.minecraft.item.ItemBlock, +Minecraft,tile.anvil.intact,0,Anvil,net.minecraft.item.ItemAnvilBlock, +Minecraft,tile.anvil.slightlyDamaged,1,Slightly Damaged Anvil,net.minecraft.item.ItemAnvilBlock, +Minecraft,tile.anvil.veryDamaged,2,Very Damaged Anvil,net.minecraft.item.ItemAnvilBlock, +Minecraft,tile.chestTrap,0,Trapped Chest,net.minecraft.item.ItemBlock, +Minecraft,tile.weightedPlate_light,0,Weighted Pressure Plate (Light),net.minecraft.item.ItemBlock, +Minecraft,tile.weightedPlate_heavy,0,Weighted Pressure Plate (Heavy),net.minecraft.item.ItemBlock, +Minecraft,tile.comparator,0,,net.minecraft.item.ItemBlock, +Minecraft,tile.comparator,0,,net.minecraft.item.ItemBlock, +Minecraft,tile.daylightDetector,0,Daylight Sensor,net.minecraft.item.ItemBlock, +Minecraft,tile.blockRedstone,0,Block of Redstone,net.minecraft.item.ItemBlock, +Minecraft,tile.netherquartz,0,Nether Quartz Ore,net.minecraft.item.ItemBlock, +Minecraft,tile.hopper,0,Hopper,net.minecraft.item.ItemBlock, +Minecraft,tile.quartzBlock.default,0,Block of Quartz,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.quartzBlock.chiseled,1,Chiseled Quartz Block,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.quartzBlock.lines,2,Pillar Quartz Block,net.minecraft.item.ItemMultiTextureTile, +Minecraft,tile.stairsQuartz,0,Quartz Stairs,net.minecraft.item.ItemBlock, +Minecraft,tile.activatorRail,0,Activator Rail,net.minecraft.item.ItemBlock, +Minecraft,tile.dropper,0,Dropper,net.minecraft.item.ItemBlock, +EnderStorage,tile.enderchest|0,0,Ender Chest,codechicken.enderstorage.common.ItemEnderStorage, +EnderStorage,tile.enderchest|1,4096,Ender Tank,codechicken.enderstorage.common.ItemEnderStorage, +Minecraft,item.shovelIron,0,Iron Shovel,net.minecraft.item.ItemSpade, +Minecraft,item.pickaxeIron,0,Iron Pickaxe,net.minecraft.item.ItemPickaxe, +Minecraft,item.hatchetIron,0,Iron Axe,net.minecraft.item.ItemAxe, +Minecraft,item.flintAndSteel,0,Flint and Steel,net.minecraft.item.ItemFlintAndSteel, +Minecraft,item.apple,0,Apple,net.minecraft.item.ItemFood, +Minecraft,item.bow,0,Bow,net.minecraft.item.ItemBow, +Minecraft,item.arrow,0,Arrow,net.minecraft.item.Item, +Minecraft,item.coal,0,Coal,net.minecraft.item.ItemCoal, +Minecraft,item.charcoal,1,Charcoal,net.minecraft.item.ItemCoal, +Minecraft,item.diamond,0,Diamond,net.minecraft.item.Item, +Minecraft,item.ingotIron,0,Iron Ingot,net.minecraft.item.Item, +Minecraft,item.ingotGold,0,Gold Ingot,net.minecraft.item.Item, +Minecraft,item.swordIron,0,Iron Sword,net.minecraft.item.ItemSword, +Minecraft,item.swordWood,0,Wooden Sword,net.minecraft.item.ItemSword, +Minecraft,item.shovelWood,0,Wooden Shovel,net.minecraft.item.ItemSpade, +Minecraft,item.pickaxeWood,0,Wooden Pickaxe,net.minecraft.item.ItemPickaxe, +Minecraft,item.hatchetWood,0,Wooden Axe,net.minecraft.item.ItemAxe, +Minecraft,item.swordStone,0,Stone Sword,net.minecraft.item.ItemSword, +Minecraft,item.shovelStone,0,Stone Shovel,net.minecraft.item.ItemSpade, +Minecraft,item.pickaxeStone,0,Stone Pickaxe,net.minecraft.item.ItemPickaxe, +Minecraft,item.hatchetStone,0,Stone Axe,net.minecraft.item.ItemAxe, +Minecraft,item.swordDiamond,0,Diamond Sword,net.minecraft.item.ItemSword, +Minecraft,item.shovelDiamond,0,Diamond Shovel,net.minecraft.item.ItemSpade, +Minecraft,item.pickaxeDiamond,0,Diamond Pickaxe,net.minecraft.item.ItemPickaxe, +Minecraft,item.hatchetDiamond,0,Diamond Axe,net.minecraft.item.ItemAxe, +Minecraft,item.stick,0,Stick,net.minecraft.item.Item, +Minecraft,item.bowl,0,Bowl,net.minecraft.item.Item, +Minecraft,item.mushroomStew,0,Mushroom Stew,net.minecraft.item.ItemSoup, +Minecraft,item.swordGold,0,Golden Sword,net.minecraft.item.ItemSword, +Minecraft,item.shovelGold,0,Golden Shovel,net.minecraft.item.ItemSpade, +Minecraft,item.pickaxeGold,0,Golden Pickaxe,net.minecraft.item.ItemPickaxe, +Minecraft,item.hatchetGold,0,Golden Axe,net.minecraft.item.ItemAxe, +Minecraft,item.string,0,String,net.minecraft.item.ItemReed, +Minecraft,item.feather,0,Feather,net.minecraft.item.Item, +Minecraft,item.sulphur,0,Gunpowder,net.minecraft.item.Item, +Minecraft,item.hoeWood,0,Wooden Hoe,net.minecraft.item.ItemHoe, +Minecraft,item.hoeStone,0,Stone Hoe,net.minecraft.item.ItemHoe, +Minecraft,item.hoeIron,0,Iron Hoe,net.minecraft.item.ItemHoe, +Minecraft,item.hoeDiamond,0,Diamond Hoe,net.minecraft.item.ItemHoe, +Minecraft,item.hoeGold,0,Golden Hoe,net.minecraft.item.ItemHoe, +Minecraft,item.seeds,0,Seeds,net.minecraft.item.ItemSeeds, +Minecraft,item.wheat,0,Wheat,net.minecraft.item.Item, +Minecraft,item.bread,0,Bread,net.minecraft.item.ItemFood, +Minecraft,item.helmetCloth,0,Leather Cap,net.minecraft.item.ItemArmor, +Minecraft,item.chestplateCloth,0,Leather Tunic,net.minecraft.item.ItemArmor, +Minecraft,item.leggingsCloth,0,Leather Pants,net.minecraft.item.ItemArmor, +Minecraft,item.bootsCloth,0,Leather Boots,net.minecraft.item.ItemArmor, +Minecraft,item.helmetChain,0,Chain Helmet,net.minecraft.item.ItemArmor, +Minecraft,item.chestplateChain,0,Chain Chestplate,net.minecraft.item.ItemArmor, +Minecraft,item.leggingsChain,0,Chain Leggings,net.minecraft.item.ItemArmor, +Minecraft,item.bootsChain,0,Chain Boots,net.minecraft.item.ItemArmor, +Minecraft,item.helmetIron,0,Iron Helmet,net.minecraft.item.ItemArmor, +Minecraft,item.chestplateIron,0,Iron Chestplate,net.minecraft.item.ItemArmor, +Minecraft,item.leggingsIron,0,Iron Leggings,net.minecraft.item.ItemArmor, +Minecraft,item.bootsIron,0,Iron Boots,net.minecraft.item.ItemArmor, +Minecraft,item.helmetDiamond,0,Diamond Helmet,net.minecraft.item.ItemArmor, +Minecraft,item.chestplateDiamond,0,Diamond Chestplate,net.minecraft.item.ItemArmor, +Minecraft,item.leggingsDiamond,0,Diamond Leggings,net.minecraft.item.ItemArmor, +Minecraft,item.bootsDiamond,0,Diamond Boots,net.minecraft.item.ItemArmor, +Minecraft,item.helmetGold,0,Golden Helmet,net.minecraft.item.ItemArmor, +Minecraft,item.chestplateGold,0,Golden Chestplate,net.minecraft.item.ItemArmor, +Minecraft,item.leggingsGold,0,Golden Leggings,net.minecraft.item.ItemArmor, +Minecraft,item.bootsGold,0,Golden Boots,net.minecraft.item.ItemArmor, +Minecraft,item.flint,0,Flint,net.minecraft.item.Item, +Minecraft,item.porkchopRaw,0,Raw Porkchop,net.minecraft.item.ItemFood, +Minecraft,item.porkchopCooked,0,Cooked Porkchop,net.minecraft.item.ItemFood, +Minecraft,item.painting,0,Painting,net.minecraft.item.ItemHangingEntity, +Minecraft,item.appleGold,0,Golden Apple,net.minecraft.item.ItemAppleGold, +Minecraft,item.sign,0,Sign,net.minecraft.item.ItemSign, +Minecraft,item.doorWood,0,Wooden Door,net.minecraft.item.ItemDoor, +Minecraft,item.bucket,0,Bucket,net.minecraft.item.ItemBucket, +Minecraft,item.bucketWater,0,Water Bucket,net.minecraft.item.ItemBucket, +Minecraft,item.bucketLava,0,Lava Bucket,net.minecraft.item.ItemBucket, +Minecraft,item.minecart,0,Minecart,net.minecraft.item.ItemMinecart, +Minecraft,item.saddle,0,Saddle,net.minecraft.item.ItemSaddle, +Minecraft,item.doorIron,0,Iron Door,net.minecraft.item.ItemDoor, +Minecraft,item.redstone,0,Redstone,net.minecraft.item.ItemRedstone, +Minecraft,item.snowball,0,Snowball,net.minecraft.item.ItemSnowball, +Minecraft,item.boat,0,Boat,net.minecraft.item.ItemBoat, +Minecraft,item.leather,0,Leather,net.minecraft.item.Item, +Minecraft,item.milk,0,Milk,net.minecraft.item.ItemBucketMilk, +Minecraft,item.brick,0,Brick,net.minecraft.item.Item, +Minecraft,item.clay,0,Clay,net.minecraft.item.Item, +Minecraft,item.reeds,0,Sugar Canes,net.minecraft.item.ItemReed, +Minecraft,item.paper,0,Paper,net.minecraft.item.Item, +Minecraft,item.book,0,Book,net.minecraft.item.ItemBook, +Minecraft,item.slimeball,0,Slimeball,net.minecraft.item.Item, +Minecraft,item.minecartChest,0,Minecart with Chest,net.minecraft.item.ItemMinecart, +Minecraft,item.minecartFurnace,0,Minecart with Furnace,net.minecraft.item.ItemMinecart, +Minecraft,item.egg,0,Egg,net.minecraft.item.ItemEgg, +Minecraft,item.compass,0,Compass,net.minecraft.item.Item, +Minecraft,item.fishingRod,0,Fishing Rod,net.minecraft.item.ItemFishingRod, +Minecraft,item.clock,0,Clock,net.minecraft.item.Item, +Minecraft,item.yellowDust,0,Glowstone Dust,net.minecraft.item.Item, +Minecraft,item.fishRaw,0,Raw Fish,net.minecraft.item.ItemFood, +Minecraft,item.fishCooked,0,Cooked Fish,net.minecraft.item.ItemFood, +Minecraft,item.dyePowder.black,0,Ink Sac,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.red,1,Rose Red,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.green,2,Cactus Green,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.brown,3,Cocoa Beans,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.blue,4,Lapis Lazuli,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.purple,5,Purple Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.cyan,6,Cyan Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.silver,7,Light Gray Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.gray,8,Gray Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.pink,9,Pink Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.lime,10,Lime Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.yellow,11,Dandelion Yellow,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.lightBlue,12,Light Blue Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.magenta,13,Magenta Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.orange,14,Orange Dye,net.minecraft.item.ItemDye, +Minecraft,item.dyePowder.white,15,Bone Meal,net.minecraft.item.ItemDye, +Minecraft,item.bone,0,Bone,net.minecraft.item.Item, +Minecraft,item.sugar,0,Sugar,net.minecraft.item.Item, +Minecraft,item.cake,0,Cake,net.minecraft.item.ItemReed, +Minecraft,item.bed,0,Bed,net.minecraft.item.ItemBed, +Minecraft,item.diode,0,Redstone Repeater,net.minecraft.item.ItemReed, +Minecraft,item.cookie,0,Cookie,net.minecraft.item.ItemFood, +Minecraft,item.map,0,Map,net.minecraft.item.ItemMap, +Minecraft,item.shears,0,Shears,net.minecraft.item.ItemShears, +Minecraft,item.melon,0,Melon,net.minecraft.item.ItemFood, +Minecraft,item.seeds_pumpkin,0,Pumpkin Seeds,net.minecraft.item.ItemSeeds, +Minecraft,item.seeds_melon,0,Melon Seeds,net.minecraft.item.ItemSeeds, +Minecraft,item.beefRaw,0,Raw Beef,net.minecraft.item.ItemFood, +Minecraft,item.beefCooked,0,Steak,net.minecraft.item.ItemFood, +Minecraft,item.chickenRaw,0,Raw Chicken,net.minecraft.item.ItemFood, +Minecraft,item.chickenCooked,0,Cooked Chicken,net.minecraft.item.ItemFood, +Minecraft,item.rottenFlesh,0,Rotten Flesh,net.minecraft.item.ItemFood, +Minecraft,item.enderPearl,0,Ender Pearl,net.minecraft.item.ItemEnderPearl, +Minecraft,item.blazeRod,0,Blaze Rod,net.minecraft.item.Item, +Minecraft,item.ghastTear,0,Ghast Tear,net.minecraft.item.Item, +Minecraft,item.goldNugget,0,Gold Nugget,net.minecraft.item.Item, +Minecraft,item.netherStalkSeeds,0,Nether Wart,net.minecraft.item.ItemSeeds, +Minecraft,item.potion,0,Water Bottle,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16,Awkward Potion,net.minecraft.item.ItemPotion, +Minecraft,item.potion,32,Thick Potion,net.minecraft.item.ItemPotion, +Minecraft,item.potion,64,Mundane Potion,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8193,Potion of Regeneration,net.minecraft.item.ItemPotion,Potion of Regeneration +Minecraft,item.potion,8194,Potion of Swiftness,net.minecraft.item.ItemPotion,Potion of Swiftness +Minecraft,item.potion,8195,Potion of Fire Resistance,net.minecraft.item.ItemPotion,Potion of Fire Resistance +Minecraft,item.potion,8196,Potion of Poison,net.minecraft.item.ItemPotion,Potion of Poison +Minecraft,item.potion,8197,Potion of Healing,net.minecraft.item.ItemPotion,Potion of Healing +Minecraft,item.potion,8198,Potion of Night Vision,net.minecraft.item.ItemPotion,Potion of Night Vision +Minecraft,item.potion,8200,Potion of Weakness,net.minecraft.item.ItemPotion,Potion of Weakness +Minecraft,item.potion,8201,Potion of Strength,net.minecraft.item.ItemPotion,Potion of Strength +Minecraft,item.potion,8202,Potion of Slowness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8204,Potion of Harming,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8206,Potion of Invisibility,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8225,Potion of Regeneration,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8226,Potion of Swiftness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8228,Potion of Poison,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8229,Potion of Healing,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8233,Potion of Strength,net.minecraft.item.ItemPotion, +Minecraft,item.potion,*,Potion of Harming,net.minecraft.item.ItemPotion,This is a generic potion entry +Minecraft,item.potion,8257,Potion of Regeneration,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8258,Potion of Swiftness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8259,Potion of Fire Resistance,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8260,Potion of Poison,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8262,Potion of Night Vision,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8264,Potion of Weakness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8265,Potion of Strength,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8266,Potion of Slowness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,8270,Potion of Invisibility,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16384,Mundane Potion,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16385,Splash Potion of Regeneration,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16386,Splash Potion of Swiftness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16387,Splash Potion of Fire Resistance,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16388,Splash Potion of Poison,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16389,Splash Potion of Healing,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16390,Splash Potion of Night Vision,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16392,Splash Potion of Weakness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16393,Splash Potion of Strength,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16394,Splash Potion of Slowness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16396,Splash Potion of Harming,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16398,Splash Potion of Invisibility,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16417,Splash Potion of Regeneration,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16418,Splash Potion of Swiftness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16420,Splash Potion of Poison,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16421,Splash Potion of Healing,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16425,Splash Potion of Strength,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16428,Splash Potion of Harming,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16449,Splash Potion of Regeneration,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16450,Splash Potion of Swiftness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16451,Splash Potion of Fire Resistance,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16452,Splash Potion of Poison,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16454,Splash Potion of Night Vision,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16456,Splash Potion of Weakness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16457,Splash Potion of Strength,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16458,Splash Potion of Slowness,net.minecraft.item.ItemPotion, +Minecraft,item.potion,16462,Splash Potion of Invisibility,net.minecraft.item.ItemPotion, +Minecraft,item.glassBottle,0,Glass Bottle,net.minecraft.item.ItemGlassBottle, +Minecraft,item.spiderEye,0,Spider Eye,net.minecraft.item.ItemFood, +Minecraft,item.fermentedSpiderEye,0,Fermented Spider Eye,net.minecraft.item.Item, +Minecraft,item.blazePowder,0,Blaze Powder,net.minecraft.item.Item, +Minecraft,item.magmaCream,0,Magma Cream,net.minecraft.item.Item, +Minecraft,item.brewingStand,0,Brewing Stand,net.minecraft.item.ItemReed, +Minecraft,item.cauldron,0,Cauldron,net.minecraft.item.ItemReed, +Minecraft,item.eyeOfEnder,0,Eye of Ender,net.minecraft.item.ItemEnderEye, +Minecraft,item.speckledMelon,0,Glistering Melon,net.minecraft.item.Item, +Minecraft,item.monsterPlacer,50,Spawn Creeper,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,51,Spawn Skeleton,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,52,Spawn Spider,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,54,Spawn Zombie,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,55,Spawn Slime,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,56,Spawn Ghast,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,57,Spawn Zombie Pigman,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,58,Spawn Enderman,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,59,Spawn Cave Spider,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,60,Spawn Silverfish,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,61,Spawn Blaze,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,62,Spawn Magma Cube,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,65,Spawn Bat,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,66,Spawn Witch,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,90,Spawn Pig,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,91,Spawn Sheep,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,92,Spawn Cow,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,93,Spawn Chicken,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,94,Spawn Squid,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,95,Spawn Wolf,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,96,Spawn Mooshroom,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,97,Spawn Snow Golem,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,98,Spawn Ocelot,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,99,Spawn Iron Golem,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.monsterPlacer,120,Spawn Villager,net.minecraft.item.ItemMonsterPlacer, +Minecraft,item.expBottle,0,Bottle o' Enchanting,net.minecraft.item.ItemExpBottle, +Minecraft,item.fireball,0,Fire Charge,net.minecraft.item.ItemFireball, +Minecraft,item.writingBook,0,Book and Quill,net.minecraft.item.ItemWritableBook, +Minecraft,item.writtenBook,0,Written Book,net.minecraft.item.ItemEditableBook, +Minecraft,item.emerald,0,Emerald,net.minecraft.item.Item, +Minecraft,item.frame,0,Item Frame,net.minecraft.item.ItemHangingEntity, +Minecraft,item.flowerPot,0,Flower Pot,net.minecraft.item.ItemReed, +Minecraft,item.carrots,0,Carrot,net.minecraft.item.ItemSeedFood, +Minecraft,item.potato,0,Potato,net.minecraft.item.ItemSeedFood, +Minecraft,item.potatoBaked,0,Baked Potato,net.minecraft.item.ItemFood, +Minecraft,item.potatoPoisonous,0,Poisonous Potato,net.minecraft.item.ItemFood, +Minecraft,item.emptyMap,0,Empty Map,net.minecraft.item.ItemEmptyMap, +Minecraft,item.carrotGolden,0,Golden Carrot,net.minecraft.item.ItemFood, +Minecraft,item.skull.skeleton,0,Skeleton Skull,net.minecraft.item.ItemSkull, +Minecraft,item.skull.wither,1,Wither Skeleton Skull,net.minecraft.item.ItemSkull, +Minecraft,item.skull.zombie,2,Zombie Head,net.minecraft.item.ItemSkull, +Minecraft,item.skull.char,3,Head,net.minecraft.item.ItemSkull, +Minecraft,item.skull.creeper,4,Creeper Head,net.minecraft.item.ItemSkull, +Minecraft,item.carrotOnAStick,0,Carrot on a Stick,net.minecraft.item.ItemCarrotOnAStick, +Minecraft,item.netherStar,0,Nether Star,net.minecraft.item.ItemSimpleFoiled, +Minecraft,item.pumpkinPie,0,Pumpkin Pie,net.minecraft.item.ItemFood, +Minecraft,item.fireworks,0,Firework Rocket,net.minecraft.item.ItemFirework, +Minecraft,item.fireworksCharge,0,Firework Star,net.minecraft.item.ItemFireworkCharge, +Minecraft,item.enchantedBook,0,Enchanted Book,net.minecraft.item.ItemEnchantedBook, +Minecraft,item.comparator,0,Redstone Comparator,net.minecraft.item.ItemReed, +Minecraft,item.netherbrick,0,Nether Brick,net.minecraft.item.Item, +Minecraft,item.netherquartz,0,Nether Quartz,net.minecraft.item.Item, +Minecraft,item.minecartTnt,0,Minecart with TNT,net.minecraft.item.ItemMinecart, +Minecraft,item.minecartHopper,0,Minecart with Hopper,net.minecraft.item.ItemMinecart, +BuildCraft|Factory,tile.miningWellBlock,0,Mining Well,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.plainPipeBlock,0,Mining Pipe,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.autoWorkbenchBlock,0,Autocrafting Table,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.machineBlock,0,Quarry,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Builders,tile.markerBlock,0,Land Mark,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Builders,tile.fillerBlock,0,Filler,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Builders,tile.builderBlock,0,Builder,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Builders,tile.architectBlock,0,Architect Table,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.frameBlock,0,Frame,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Energy,tile.engineWood,0,Redstone Engine,buildcraft.energy.ItemEngine, +BuildCraft|Energy,tile.engineStone,1,Stirling Engine,buildcraft.energy.ItemEngine, +BuildCraft|Energy,tile.engineIron,2,Combustion Engine,buildcraft.energy.ItemEngine, +BuildCraft|Factory,tile.pumpBlock,0,Pump,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.tankBlock,0,Tank,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Transport,tile.null,0,,net.minecraft.item.ItemBlock, +BuildCraft|Factory,tile.refineryBlock,0,Refinery,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Builders,tile.libraryBlock,0,Blueprint Library,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Silicon,tile.laserBlock,0,Laser,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Silicon,block.assemblyTableBlock,0,Assembly Table,buildcraft.silicon.ItemLaserTable, +BuildCraft|Silicon,block.assemblyWorkbenchBlock,1,Advanced Crafting Table,buildcraft.silicon.ItemLaserTable, +BuildCraft|Builders,tile.pathMarkerBlock,0,Path Marker,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Factory,tile.blockHopper,0,Chute,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Energy,tile.oilMoving,0,Oil,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Energy,tile.oilStill,0,Oil,buildcraft.core.ItemBlockBuildCraft, +BuildCraft|Core,tile.spring.water,0,Water Spring,buildcraft.core.ItemSpring, +BuildCraft|Core,tile.spring.oil,1,Oil Spring,buildcraft.core.ItemSpring, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +Minecraft,item.record,0,Music Disc,net.minecraft.item.ItemRecord, +EnderStorage,item.enderpouch,0,Ender Pouch,codechicken.enderstorage.storage.item.ItemEnderPouch, +BuildCraft|Core,item.woodenGearItem,0,Wood Gear,buildcraft.core.ItemBuildCraft, +BuildCraft|Core,item.stoneGearItem,0,Stone Gear,buildcraft.core.ItemBuildCraft, +BuildCraft|Core,item.ironGearItem,0,Iron Gear,buildcraft.core.ItemBuildCraft, +BuildCraft|Core,item.goldGearItem,0,Gold Gear,buildcraft.core.ItemBuildCraft, +BuildCraft|Core,item.diamondGearItem,0,Diamond Gear,buildcraft.core.ItemBuildCraft, +BuildCraft|Builders,item.templateItem,0,Template,buildcraft.builders.ItemBptTemplate, +BuildCraft|Core,item.wrenchItem,0,Wrench,buildcraft.core.ItemWrench, +BuildCraft|Energy,item.bucketOil,0,Oil Bucket,buildcraft.energy.ItemBucketOil, +BuildCraft|Energy,item.fuel,0,Fuel,buildcraft.core.ItemBuildCraft, +BuildCraft|Transport,item.pipeWaterproof,0,Pipe Waterproof,buildcraft.core.ItemBuildCraft, +BuildCraft|Energy,item.bucketFuel,0,Fuel Bucket,buildcraft.core.ItemBuildCraft, +BuildCraft|Transport,item.pipeGate.0,0,Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.1,1,Iron AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.2,2,Iron OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.3,3,Gold AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.4,4,Gold OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.5,5,Diamond AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGate.6,6,Diamond OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.redPipeWire,0,Red Pipe Wire,buildcraft.core.ItemBuildCraft, +BuildCraft|Transport,item.bluePipeWire,0,Blue Pipe Wire,buildcraft.core.ItemBuildCraft, +BuildCraft|Transport,item.greenPipeWire,0,Green Pipe Wire,buildcraft.core.ItemBuildCraft, +BuildCraft|Transport,item.yellowPipeWire,0,Yellow Pipe Wire,buildcraft.core.ItemBuildCraft, +BuildCraft|Silicon,item.redstoneChipset.0,0,Redstone Chipset,buildcraft.core.ItemRedstoneChipset, +BuildCraft|Silicon,item.redstoneChipset.1,1,Redstone Iron Chipset,buildcraft.core.ItemRedstoneChipset, +BuildCraft|Silicon,item.redstoneChipset.2,2,Redstone Golden Chipset,buildcraft.core.ItemRedstoneChipset, +BuildCraft|Silicon,item.redstoneChipset.3,3,Redstone Diamond Chipset,buildcraft.core.ItemRedstoneChipset, +BuildCraft|Silicon,item.redstoneChipset.4,4,Pulsating Chipset,buildcraft.core.ItemRedstoneChipset, +BuildCraft|Builders,item.blueprintItem,0,Blueprint,buildcraft.builders.ItemBptBluePrint, +BuildCraft|Transport,item.pipeGateAutarchic.0,0,Autarchic Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.1,1,Autarchic Iron AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.2,2,Autarchic Iron OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.3,3,Autarchic Gold AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.4,4,Autarchic Gold OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.5,5,Autarchic Diamond AND Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.pipeGateAutarchic.6,6,Autarchic Diamond OR Gate,buildcraft.transport.ItemGate, +BuildCraft|Transport,item.Facade,16,Facade: Stone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,48,Facade: Dirt,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,64,Facade: Cobblestone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,80,Facade: Oak Wood Planks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,81,Facade: Spruce Wood Planks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,82,Facade: Birch Wood Planks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,83,Facade: Jungle Wood Planks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,192,Facade: Sand,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,208,Facade: Gravel,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,224,Facade: Gold Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,240,Facade: Iron Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,256,Facade: Coal Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,272,Facade: Oak Wood,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,273,Facade: Spruce Wood,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,274,Facade: Birch Wood,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,275,Facade: Jungle Wood,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,320,Facade: Glass,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,336,Facade: Lapis Lazuli Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,352,Facade: Lapis Lazuli Block,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,384,Facade: Sandstone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,385,Facade: Chiseled Sandstone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,386,Facade: Smooth Sandstone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,560,Facade: Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,561,Facade: Orange Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,562,Facade: Magenta Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,563,Facade: Light Blue Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,564,Facade: Yellow Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,565,Facade: Lime Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,566,Facade: Pink Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,567,Facade: Gray Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,568,Facade: Light Gray Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,569,Facade: Cyan Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,570,Facade: Purple Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,571,Facade: Blue Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,572,Facade: Brown Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,573,Facade: Green Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,574,Facade: Red Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,575,Facade: Black Wool,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,656,Facade: Block of Gold,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,672,Facade: Block of Iron,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,688,Facade: Stone Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,689,Facade: Sandstone Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,690,Facade: Wooden Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,691,Facade: Cobblestone Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,692,Facade: Bricks Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,693,Facade: Stone Bricks Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,694,Facade: Nether Brick Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,695,Facade: Quartz Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,720,Facade: Bricks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,736,Facade: TNT,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,752,Facade: Bookshelf,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,768,Facade: Moss Stone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,784,Facade: Obsidian,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,896,Facade: Diamond Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,912,Facade: Block of Diamond,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,928,Facade: Crafting Table,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1168,Facade: Redstone Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1280,Facade: Snow,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1312,Facade: Clay,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1376,Facade: Pumpkin,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1392,Facade: Netherrack,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1408,Facade: Soul Sand,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1424,Facade: Glowstone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1456,Facade: Jack 'o' Lantern,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1552,Facade: Stone Monster Egg,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1553,Facade: Cobblestone Monster Egg,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1554,Facade: Stone Brick Monster Egg,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1568,Facade: Stone Bricks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1569,Facade: Mossy Stone Bricks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1570,Facade: Cracked Stone Bricks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1571,Facade: Chiseled Stone Bricks,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1584,Facade: Mushroom,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1648,Facade: Melon,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1760,Facade: Mycelium,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1792,Facade: Nether Brick,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1936,Facade: End Stone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,1968,Facade: Redstone Lamp,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2000,Facade: Oak Wood Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2001,Facade: Spruce Wood Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2002,Facade: Birch Wood Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2003,Facade: Jungle Wood Slab,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2064,Facade: Emerald Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2128,Facade: Block of Emerald,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2432,Facade: Block of Redstone,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2448,Facade: Nether Quartz Ore,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2480,Facade: Block of Quartz,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2481,Facade: Chiseled Quartz Block,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.Facade,2482,Facade: Pillar Quartz Block,buildcraft.transport.ItemFacade, +BuildCraft|Transport,item.PipePlug,0,Pipe Plug,buildcraft.transport.ItemPlug, +BuildCraft|Transport,item.PipeItemsWood,0,Wooden Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsCobblestone,0,Cobblestone Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsStone,0,Stone Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsIron,0,Iron Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsGold,0,Golden Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsDiamond,0,Diamond Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsObsidian,0,Obsidian Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsEmerald,0,Emerald Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsWood,0,Wooden Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsCobblestone,0,Cobblestone Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsStone,0,Stone Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsIron,0,Iron Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsGold,0,Golden Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsEmerald,0,Emerald Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipePowerWood,0,Wooden Conductive Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipePowerStone,0,Stone Conductive Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipePowerGold,0,Golden Conductive Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsVoid,0,Void Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsVoid,0,Void Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeItemsSandstone,0,Sandstone Transport Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeLiquidsSandstone,0,Sandstone Waterproof Pipe,buildcraft.transport.ItemPipe, +BuildCraft|Transport,item.PipeStructureCobblestone,0,Cobblestone Structure Pipe,buildcraft.transport.ItemPipe, diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.txt b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.txt new file mode 100644 index 0000000..b91e6e8 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.txt @@ -0,0 +1,13 @@ +>>>>tile.stone +This is basic stone. +>>>>item.swordDiamond +This is a diamond sword. +Good at killing zombies and creepers. +>>>>item.pickaxeWood +Your very first pickaxe. +Not good at anything, beside getting splinters. +>>>>item.pickaxeDiamond +The ultimate pickaxe, made out of refined diamonds. +Shinnnnyyyy. +>>>>item.pickaxeIron +Sturdy, solid, efficient. Your best friend. \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv new file mode 100644 index 0000000..1f321f3 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv @@ -0,0 +1,5 @@ +Minecraft,tile.stone,,,This is basic stone. +Minecraft,item.swordDiamond,,,This is a diamond sword.$Good at killing zombies and creepers. +Minecraft,item.pickaxeWood,,,"Your very first pickaxe.$Not good at anything, beside getting splinters." +Minecraft,item.pickaxeDiamond,,,"The ultimate pickaxe, made out of refined diamonds." +Minecraft,item.pickaxeIron,,,"Sturdy, solid, efficient. Your best friend." diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlock.java b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java new file mode 100644 index 0000000..8b4dd13 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java @@ -0,0 +1,34 @@ +package mcp.mobius.waila.api; + +import java.util.List; + +import net.minecraft.item.ItemStack; + +@Deprecated +public interface IWailaBlock { + /* + * Use this method to return an item stack in case the default lookup system fails. + * Return null if you want to use the default lookup system. + * You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities + */ + ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); + + /* Waila HUD is divided into 3 zones. The head corresponds to the item name, + * body to where you mostly want to put informations, and I reserve the tail for modname display + */ + + /* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. + * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack(). + * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info. + * currenttip represents the current list of text lines in the tooltip zone. + * For example, getWailaHead() will have the current item name as currenttip. + * You can modify the tips, add more, remove some, etc. + * When you are done, just returns the currenttip and it will display in Waila. + * + * Always return the currenttip is you don't want to modify the current zone. + */ + + List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); + List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); + List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java new file mode 100644 index 0000000..935d475 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java @@ -0,0 +1,9 @@ +package mcp.mobius.waila.api; + +import net.minecraft.item.ItemStack; + +public interface IWailaBlockDecorator { + + void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config); + +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java new file mode 100644 index 0000000..faede63 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java @@ -0,0 +1,28 @@ +package mcp.mobius.waila.api; + +import java.util.HashMap; +import java.util.Set; + +public interface IWailaConfigHandler { + /* Returns a set of all the currently loaded modules in the config handler */ + public Set getModuleNames(); + + /* Returns all the currently available options for a given module */ + public HashMap getConfigKeys(String modName); + + /* Add a new option to a given module + * + * modName is the name of the module to add the option to (ie : Buildcraft, IndustrialCraft2, etc) + * key is the config key (ie : bc.tankcontent, ic2.inputvalue) + * name is the human readable name of the option (ie : "Tank content", "Max EU Input") + * */ + //public void addConfig(String modName, String key, String name); + + /* Returns the current value of an option (true/false) with a default value defvalue if not set*/ + public boolean getConfig(String key, boolean defvalue); + + /* Returns the current value of an option (true/false) with a default value true if not set*/ + public boolean getConfig(String key); + + //public void setConfig(String key, boolean value); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java new file mode 100644 index 0000000..0288624 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java @@ -0,0 +1,33 @@ +package mcp.mobius.waila.api; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +/* The Accessor is used to get some basic data out of the game without having to request + * direct access to the game engine. + * It will also return things that are unmodified by the overriding systems (like getWailaStack). + */ + +public interface IWailaDataAccessor { + + World getWorld(); + EntityPlayer getPlayer(); + Block getBlock(); + int getBlockID(); + int getMetadata(); + TileEntity getTileEntity(); + MovingObjectPosition getPosition(); + Vec3 getRenderingPosition(); + NBTTagCompound getNBTData(); + int getNBTInteger(NBTTagCompound tag, String keyname); + double getPartialFrame(); + ForgeDirection getSide(); + ItemStack getStack(); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java new file mode 100644 index 0000000..4859d9c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java @@ -0,0 +1,33 @@ +package mcp.mobius.waila.api; + +import java.util.List; + +import net.minecraft.item.ItemStack; + +public interface IWailaDataProvider{ + /* + * Use this method to return an item stack in case the default lookup system fails. + * Return null if you want to use the default lookup system. + * You get the world, the player and the location of the block. With that, it is easy to gather information & tile entities + */ + ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config); + + /* Waila HUD is divided into 3 zones. The head corresponds to the item name, + * body to where you mostly want to put informations, and I reserve the tail for modname display + */ + + /* Those 2 methods works exactly the same way, except they are related to a different zone in Waila HUD. + * You get in input world, player and the block location. You also get the itemstack as returned by the default lookup system or getWailaStack(). + * ConfigHandler provides the current Waila config state so you can show/hide elements depending on the configuration. Refer the ConfigHandler class for more info. + * currenttip represents the current list of text lines in the tooltip zone. + * For example, getWailaHead() will have the current item name as currenttip. + * You can modify the tips, add more, remove some, etc. + * When you are done, just returns the currenttip and it will display in Waila. + * + * Always return the currenttip is you don't want to modify the current zone. + */ + + List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); + List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); + List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java new file mode 100644 index 0000000..788067a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java @@ -0,0 +1,24 @@ +package mcp.mobius.waila.api; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +/* The Accessor is used to get some basic data out of the game without having to request + * direct access to the game engine. + * It will also return things that are unmodified by the overriding systems (like getWailaStack). + */ + +public interface IWailaEntityAccessor { + World getWorld(); + EntityPlayer getPlayer(); + Entity getEntity(); + MovingObjectPosition getPosition(); + Vec3 getRenderingPosition(); + NBTTagCompound getNBTData(); + int getNBTInteger(NBTTagCompound tag, String keyname); + double getPartialFrame(); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java new file mode 100644 index 0000000..9548289 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java @@ -0,0 +1,16 @@ +package mcp.mobius.waila.api; + +import java.util.List; + +import net.minecraft.entity.Entity; + +public interface IWailaEntityProvider { + + /* A way to get an override on the entity returned by the raytracing */ + Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config); + + /* The classical HEAD/BODY/TAIL text getters */ + List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); + List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); + List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java new file mode 100644 index 0000000..19e01fa --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java @@ -0,0 +1,27 @@ +package mcp.mobius.waila.api; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +/* The Accessor is used to get some basic data out of the game without having to request + * direct access to the game engine. + * It will also return things that are unmodified by the overriding systems (like getWailaStack). + */ + +public interface IWailaFMPAccessor { + World getWorld(); + EntityPlayer getPlayer(); + TileEntity getTileEntity(); + MovingObjectPosition getPosition(); + NBTTagCompound getNBTData(); + NBTTagCompound getFullNBTData(); + int getNBTInteger(NBTTagCompound tag, String keyname); + double getPartialFrame(); + Vec3 getRenderingPosition(); + String getID(); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java new file mode 100644 index 0000000..839af31 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java @@ -0,0 +1,7 @@ +package mcp.mobius.waila.api; + +import net.minecraft.item.ItemStack; + +public interface IWailaFMPDecorator { + void decorateBlock(ItemStack itemStack, IWailaFMPAccessor accessor, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java new file mode 100644 index 0000000..232c83e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java @@ -0,0 +1,12 @@ +package mcp.mobius.waila.api; + +import java.util.List; + +import net.minecraft.item.ItemStack; + +public interface IWailaFMPProvider { + /* The classical HEAD/BODY/TAIL text getters */ + List getWailaHead(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); + List getWailaBody(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); + List getWailaTail(ItemStack itemStack, List currenttip, IWailaFMPAccessor accessor, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java new file mode 100644 index 0000000..162aeb6 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java @@ -0,0 +1,44 @@ +package mcp.mobius.waila.api; + +public interface IWailaRegistrar { + /* Add a config option in the section modname with displayed text configtext and access key keyname */ + public void addConfig(String modname, String keyname, String configtext); + public void addConfigRemote(String modname, String keyname, String configtext); + public void addConfig(String modname, String keyname); + public void addConfigRemote(String modname, String keyname); + + /* Register a stack overrider for the given blockID */ + public void registerStackProvider(IWailaDataProvider dataProvider, Class block); + + /* Same thing, but works on a class hierarchy instead */ + public void registerHeadProvider (IWailaDataProvider dataProvider, Class block); + public void registerBodyProvider (IWailaDataProvider dataProvider, Class block); + public void registerTailProvider (IWailaDataProvider dataProvider, Class block); + + /* Entity text registration methods */ + public void registerHeadProvider (IWailaEntityProvider dataProvider, Class entity); + public void registerBodyProvider (IWailaEntityProvider dataProvider, Class entity); + public void registerTailProvider (IWailaEntityProvider dataProvider, Class entity); + public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity); + + /* FMP Providers */ + public void registerHeadProvider(IWailaFMPProvider dataProvider, String name); + public void registerBodyProvider(IWailaFMPProvider dataProvider, String name); + public void registerTailProvider(IWailaFMPProvider dataProvider, String name); + + /* The block decorators */ + public void registerDecorator (IWailaBlockDecorator decorator, Class block); + public void registerDecorator (IWailaFMPDecorator decorator, String name); + + /* Selective NBT key syncing. Will register a key to sync over the network for the given class (block, te or ent). + * Accept * as a ending wildcard + * registerNBTKey("bob.*", MyBlock.class) + * registerNBTKey("data.life", MyEntity.class) + * registerNBTKey("*", MyTileEntity.class) will reproduce the full tag syncing from 1.4.5 + * */ + public void registerSyncedNBTKey(String key, Class target); + + /* UNUSED FOR NOW (Will be used for the ingame wiki */ + public void registerDocTextFile (String filename); + public void registerShortDataProvider (IWailaSummaryProvider dataProvider, Class item); +} diff --git a/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java new file mode 100644 index 0000000..f790649 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java @@ -0,0 +1,21 @@ +package mcp.mobius.waila.api; + +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; + +public interface IWailaSummaryProvider { + /* This interface is used to control the display data in the description screen */ + + /* BASIC TOOLS & ITEMS DATA */ + //EnumToolMaterial getMaterial(ItemStack stack); + //String getMaterialName(ItemStack stack); + //String getEffectiveBlock(ItemStack stack); + //int getHarvestLevel(ItemStack stack); + //float getEfficiencyOnProperMaterial(ItemStack stack); + //int getEnchantability(ItemStack stack); + //int getDamageVsEntity(ItemStack stack); + //int getDurability(ItemStack stack); + + LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config); +} diff --git a/src/main/java/mcp/mobius/waila/api/SpecialChars.java b/src/main/java/mcp/mobius/waila/api/SpecialChars.java new file mode 100644 index 0000000..5bd92a8 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/SpecialChars.java @@ -0,0 +1,40 @@ +package mcp.mobius.waila.api; + +public class SpecialChars { + + public static String MCStyle = "\u00A7"; + + public static String BLACK = MCStyle + "0"; + public static String DBLUE = MCStyle + "1"; + public static String DGREEN = MCStyle + "2"; + public static String DAQUA = MCStyle + "3"; + public static String DRED = MCStyle + "4"; + public static String DPURPLE = MCStyle + "5"; + public static String GOLD = MCStyle + "6"; + public static String GRAY = MCStyle + "7"; + public static String DGRAY = MCStyle + "8"; + public static String BLUE = MCStyle + "9"; + public static String GREEN = MCStyle + "a"; + public static String AQUA = MCStyle + "b"; + public static String RED = MCStyle + "c"; + public static String LPURPLE = MCStyle + "d"; + public static String YELLOW = MCStyle + "e"; + public static String WHITE = MCStyle + "f"; + + public static String OBF = MCStyle + "k"; + public static String BOLD = MCStyle + "l"; + public static String STRIKE = MCStyle + "m"; + public static String UNDER = MCStyle + "n"; + public static String ITALIC = MCStyle + "o"; + public static String RESET = MCStyle + "r"; + + public static String WailaStyle = "\u00A4"; + public static String WailaIcon = "\u00A5"; + public static String TAB = WailaStyle + WailaStyle +"a"; + public static String ALIGNRIGHT = WailaStyle + WailaStyle +"b"; + public static String ALIGNCENTER = WailaStyle + WailaStyle +"c"; + public static String HEART = WailaStyle + WailaIcon +"a"; + public static String HHEART = WailaStyle + WailaIcon +"b"; + public static String EHEART = WailaStyle + WailaIcon +"c"; + +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java new file mode 100644 index 0000000..af41c7d --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java @@ -0,0 +1,159 @@ +package mcp.mobius.waila.api.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Set; + +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.handlers.HUDHandlerEntities; +import mcp.mobius.waila.overlay.OverlayConfig; +import mcp.mobius.waila.utils.Constants; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +public class ConfigHandler implements IWailaConfigHandler { + + /* SINGLETON */ + private static ConfigHandler _instance = null; + private ConfigHandler() { _instance = this; } + public static ConfigHandler instance(){ return _instance == null ? new ConfigHandler() : _instance; } + /* === */ + + private LinkedHashMap modules = new LinkedHashMap(); + private ArrayList serverconfigs = new ArrayList(); + public HashMap forcedConfigs = new HashMap(); + public Configuration config = null; + + + public void addModule(String modName, HashMap options){ + this.addModule(modName, new ConfigModule(modName, options)); + } + + public void addModule(String modName, ConfigModule options){ + this.modules.put(modName, options); + } + + @Override + public Set getModuleNames(){ + return this.modules.keySet(); + } + + @Override + public HashMap getConfigKeys(String modName){ + if (this.modules.containsKey(modName)) + return this.modules.get(modName).options; + else + return null; + } + + private void saveModuleKey(String modName, String key){ + config.get(Constants.CATEGORY_MODULES, key, true); + config.get(Constants.CATEGORY_SERVER , key, Constants.SERVER_FREE); + config.save(); + } + + public void addConfig(String modName, String key, String name){ + this.saveModuleKey(modName, key); + + if (!this.modules.containsKey(modName)) + this.modules.put(modName, new ConfigModule(modName)); + + this.modules.get(modName).addOption(key, name); + } + + public void addConfigServer(String modName, String key, String name){ + this.saveModuleKey(modName, key); + + if (!this.modules.containsKey(modName)) + this.modules.put(modName, new ConfigModule(modName)); + + this.modules.get(modName).addOption(key, name); + this.serverconfigs.add(key); + } + + @Override + public boolean getConfig(String key){ + return this.getConfig(key, true); + } + + @Override + public boolean getConfig(String key, boolean defvalue){ + if (this.serverconfigs.contains(key) && !Waila.instance.serverPresent) + return false; + + if (this.forcedConfigs.containsKey(key)) + return this.forcedConfigs.get(key); + + Property prop = config.get(Constants.CATEGORY_MODULES, key, defvalue); + return prop.getBoolean(defvalue); + } + + public boolean isServerRequired(String key){ + return this.serverconfigs.contains(key); + } + + + + + + + /* GENERAL ACCESS METHODS TO GET/SET VALUES IN THE CONFIG FILE */ + + public boolean getConfig(String category, String key, boolean default_){ + Property prop = config.get(category, key, default_); + return prop.getBoolean(default_); + } + + public void setConfig(String category, String key, boolean state){ + config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.BOOLEAN)); + config.save(); + } + + public int getConfig(String category, String key, int default_){ + Property prop = config.get(category, key, default_); + return prop.getInt(); + } + + public void setConfig(String category, String key, int state){ + config.getCategory(category).put(key, new Property(key,String.valueOf(state),Property.Type.INTEGER)); + config.save(); + } + + + + + + + /* Default config loading */ + + public void loadDefaultConfig(FMLPreInitializationEvent event){ + config = new Configuration(event.getSuggestedConfigurationFile()); + + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, false); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, false); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true); + + OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt(); + OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt(); + + OverlayConfig.alpha = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 80).getInt(); + OverlayConfig.bgcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0x100010).getInt(); + OverlayConfig.gradient1 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0x5000ff).getInt(); + OverlayConfig.gradient2 = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0x28007f).getInt(); + OverlayConfig.fontcolor = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR, 0xA0A0A0).getInt(); + OverlayConfig.scale = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, 100).getInt() / 100.0f; + + HUDHandlerEntities.nhearts = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NHEARTS, 20).getInt(); + HUDHandlerEntities.maxhpfortext = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MAXHP, 40).getInt(); + + config.getCategory(Constants.CATEGORY_MODULES).setComment("Those are the config keys defined in modules.\nServer side, it is used to enforce keys client side using the next section."); + config.getCategory(Constants.CATEGORY_SERVER).setComment("Any key set to true here will ensure that the client is using the configuration set in the 'module' section above.\nThis is useful for enforcing false to 'cheating' keys like silverfish."); + + config.save(); + } +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java new file mode 100644 index 0000000..b6b1f55 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java @@ -0,0 +1,24 @@ +package mcp.mobius.waila.api.impl; + +import java.util.HashMap; + +public class ConfigModule { + + String modName; + HashMap options; + + public ConfigModule(String _modName){ + this.modName = _modName; + this.options = new HashMap(); + } + + public ConfigModule(String _modName, HashMap _options) { + this.modName = _modName; + this.options = _options; + } + + public void addOption(String key, String name){ + this.options.put(key,name); + } + +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java new file mode 100644 index 0000000..0b7a085 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java @@ -0,0 +1,172 @@ +package mcp.mobius.waila.api.impl; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.utils.NBTUtil; + +public class DataAccessorBlock implements IWailaDataAccessor { + + public World world; + public EntityPlayer player; + public MovingObjectPosition mop; + public Vec3 renderingvec = null; + public Block block; + public int blockID; + public int metadata; + public TileEntity entity; + public NBTTagCompound remoteNbt = null; + public long timeLastUpdate = System.currentTimeMillis(); + public double partialFrame; + public ItemStack stack; + + public static DataAccessorBlock instance = new DataAccessorBlock(); + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) { + this.set(_world, _player, _mop, null, 0.0); + } + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, double partialTicks) { + this.world = _world; + this.player = _player; + this.mop = _mop; + //this.blockID = world.getBlockId(_mop.blockX, _mop.blockY, _mop.blockZ); + //this.block = Block.blocksList[this.blockID]; + this.block = world.getBlock(_mop.blockX, _mop.blockY, _mop.blockZ); + this.metadata = world.getBlockMetadata(_mop.blockX, _mop.blockY, _mop.blockZ); + this.entity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); + try{ this.stack = new ItemStack(this.block, 1, this.metadata); } catch (Exception e) {} + + + if (viewEntity != null){ + double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks; + double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks; + double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks; + this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz); + this.partialFrame = partialTicks; + } + } + + @Override + public World getWorld() { + return this.world; + } + + @Override + public EntityPlayer getPlayer() { + return this.player; + } + + @Override + public Block getBlock() { + return this.block; + } + + @Override + public int getBlockID() { + return this.blockID; + } + + @Override + public int getMetadata() { + return this.metadata; + } + + public void setBlock(Block block) { + this.block = block; + } + + public void setBlockID(int val) { + this.blockID = val; + } + + public void setMetadata(int val) { + this.metadata = val; + } + + @Override + public TileEntity getTileEntity() { + return this.entity; + } + + @Override + public MovingObjectPosition getPosition() { + return this.mop; + } + + @Override + public NBTTagCompound getNBTData() { + if (this.entity == null) return null; + + if (this.isTagCorrect(this.remoteNbt)) + return this.remoteNbt; + + NBTTagCompound tag = new NBTTagCompound(); + this.entity.writeToNBT(tag); + return tag; + } + + @Override + public int getNBTInteger(NBTTagCompound tag, String keyname){ + return NBTUtil.getNBTInteger(tag, keyname); + } + + private boolean isTagCorrect(NBTTagCompound tag){ + if (tag == null){ + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + + int x = tag.getInteger("x"); + int y = tag.getInteger("y"); + int z = tag.getInteger("z"); + + if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) + return true; + else { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + } + + @Override + public Vec3 getRenderingPosition() { + return this.renderingvec; + } + + @Override + public double getPartialFrame() { + return this.partialFrame; + } + + @Override + public ForgeDirection getSide(){ + return ForgeDirection.getOrientation(this.getPosition().sideHit); + } + + public boolean isTimeElapsed(long time){ + return System.currentTimeMillis() - this.timeLastUpdate >= time; + } + + public void resetTimer(){ + this.timeLastUpdate = System.currentTimeMillis(); + } + + @Override + public ItemStack getStack() { + return this.stack; + } + +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java new file mode 100644 index 0000000..a2a69cd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java @@ -0,0 +1,122 @@ +package mcp.mobius.waila.api.impl; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.utils.NBTUtil; + +public class DataAccessorEntity implements IWailaEntityAccessor { + + public World world; + public EntityPlayer player; + public MovingObjectPosition mop; + public Vec3 renderingvec = null; + public Entity entity; + public NBTTagCompound remoteNbt = null; + public long timeLastUpdate = System.currentTimeMillis(); + public double partialFrame; + + public static DataAccessorEntity instance = new DataAccessorEntity(); + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop) { + this.set(_world, _player, _mop, null, 0.0); + } + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, EntityLivingBase viewEntity, double partialTicks) { + this.world = _world; + this.player = _player; + this.mop = _mop; + this.entity = _mop.entityHit; + + if (viewEntity != null){ + double px = viewEntity.lastTickPosX + (viewEntity.posX - viewEntity.lastTickPosX) * partialTicks; + double py = viewEntity.lastTickPosY + (viewEntity.posY - viewEntity.lastTickPosY) * partialTicks; + double pz = viewEntity.lastTickPosZ + (viewEntity.posZ - viewEntity.lastTickPosZ) * partialTicks; + this.renderingvec = Vec3.createVectorHelper(_mop.blockX - px, _mop.blockY - py, _mop.blockZ - pz); + this.partialFrame = partialTicks; + } + } + + @Override + public World getWorld() { + return this.world; + } + + @Override + public EntityPlayer getPlayer() { + return this.player; + } + + @Override + public Entity getEntity() { + return this.entity; + } + + @Override + public MovingObjectPosition getPosition() { + return this.mop; + } + + @Override + public NBTTagCompound getNBTData() { + if (this.entity == null) return null; + + if (this.isTagCorrect(this.remoteNbt)) + return this.remoteNbt; + + NBTTagCompound tag = new NBTTagCompound(); + this.entity.writeToNBT(tag); + return tag; + } + + private boolean isTagCorrect(NBTTagCompound tag){ + if (tag == null){ + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + + int x = tag.getInteger("x"); + int y = tag.getInteger("y"); + int z = tag.getInteger("z"); + + if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) + return true; + else { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + } + + @Override + public int getNBTInteger(NBTTagCompound tag, String keyname){ + return NBTUtil.getNBTInteger(tag, keyname); + } + + @Override + public Vec3 getRenderingPosition() { + return this.renderingvec; + } + + @Override + public double getPartialFrame() { + return this.partialFrame; + } + + public boolean isTimeElapsed(long time){ + return System.currentTimeMillis() - this.timeLastUpdate >= time; + } + + public void resetTimer(){ + this.timeLastUpdate = System.currentTimeMillis(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java new file mode 100644 index 0000000..2890378 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java @@ -0,0 +1,118 @@ +package mcp.mobius.waila.api.impl; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaFMPAccessor; +import mcp.mobius.waila.utils.NBTUtil; + +public class DataAccessorFMP implements IWailaFMPAccessor { + + public String id; + public World world; + public EntityPlayer player; + public MovingObjectPosition mop; + public Vec3 renderingvec = null; + public TileEntity entity; + public NBTTagCompound partialNBT = null; + public NBTTagCompound remoteNBT = null; + public long timeLastUpdate = System.currentTimeMillis(); + public double partialFrame; + + public static DataAccessorFMP instance = new DataAccessorFMP(); + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id) { + this.set(_world, _player, _mop, _partialNBT, id, null, 0.0); + } + + public void set(World _world, EntityPlayer _player, MovingObjectPosition _mop, NBTTagCompound _partialNBT, String id, Vec3 renderVec, double partialTicks) { + this.world = _world; + this.player = _player; + this.mop = _mop; + this.entity = world.getTileEntity(_mop.blockX, _mop.blockY, _mop.blockZ); + this.partialNBT = _partialNBT; + this.id = id; + this.renderingvec = renderVec; + this.partialFrame = partialTicks; + } + + @Override + public World getWorld() { + return this.world; + } + + @Override + public EntityPlayer getPlayer() { + return this.player; + } + + @Override + public TileEntity getTileEntity() { + return this.entity; + } + + @Override + public MovingObjectPosition getPosition() { + return this.mop; + } + + @Override + public NBTTagCompound getNBTData() { + return this.partialNBT; + } + + @Override + public NBTTagCompound getFullNBTData() { + if (this.entity == null) return null; + + if (this.isTagCorrect(this.remoteNBT)) + return this.remoteNBT; + + NBTTagCompound tag = new NBTTagCompound(); + this.entity.writeToNBT(tag); + return tag; + } + + @Override + public int getNBTInteger(NBTTagCompound tag, String keyname) { + return NBTUtil.getNBTInteger(tag, keyname); + } + + @Override + public double getPartialFrame() { + return this.partialFrame; + } + + @Override + public Vec3 getRenderingPosition() { + return this.renderingvec; + } + + @Override + public String getID() { + return this.id; + } + + private boolean isTagCorrect(NBTTagCompound tag){ + if (tag == null){ + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + + int x = tag.getInteger("x"); + int y = tag.getInteger("y"); + int z = tag.getInteger("z"); + + if (x == this.mop.blockX && y == this.mop.blockY && z == this.mop.blockZ) + return true; + else { + this.timeLastUpdate = System.currentTimeMillis() - 250; + return false; + } + } +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java new file mode 100644 index 0000000..27d5ebd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -0,0 +1,230 @@ +package mcp.mobius.waila.api.impl; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaBlock; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.network.Message0x01TERequest; +import mcp.mobius.waila.network.Message0x03EntRequest; +import mcp.mobius.waila.network.WailaPacketHandler; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import codechicken.nei.api.ItemInfo.Layout; + +public class MetaDataProvider{ + + private ArrayList headBlockProviders = new ArrayList(); + private ArrayList bodyBlockProviders = new ArrayList(); + private ArrayList tailBlockProviders = new ArrayList(); + + private ArrayList headEntityProviders = new ArrayList(); + private ArrayList bodyEntityProviders = new ArrayList(); + private ArrayList tailEntityProviders = new ArrayList(); + + private Class prevBlock = null; + private Class prevTile = null; + + public ItemStack identifyBlockHighlight(World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor) { + Block block = accessor.getBlock(); + int blockID = accessor.getBlockID(); + + if (IWailaBlock.class.isInstance(block)){ + try{ + return ((IWailaBlock)block).getWailaStack(accessor, ConfigHandler.instance()); + }catch (Throwable e){ + WailaExceptionHandler.handleErr(e, block.getClass().toString(), null); + } + } + + if(ModuleRegistrar.instance().hasStackProviders(block)){ + for (IWailaDataProvider dataProvider : ModuleRegistrar.instance().getStackProviders(block)){ + try{ + ItemStack retval = dataProvider.getWailaStack(accessor, ConfigHandler.instance()); + if (retval != null) + return retval; + }catch (Throwable e){ + WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), null); + } + } + } + return null; + } + + public List handleBlockTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorBlock accessor, List currenttip, Layout layout) { + Block block = accessor.getBlock(); + + if (accessor.getTileEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){ + accessor.resetTimer(); + HashSet keys = new HashSet(); + + if (ModuleRegistrar.instance().hasSyncedNBTKeys(block)) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(block)); + + if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getTileEntity())) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getTileEntity())); + + if (keys.size() != 0) + WailaPacketHandler.INSTANCE.sendToServer(new Message0x01TERequest(accessor.getTileEntity(), keys)); + } else if (accessor.getTileEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { + + try{ + NBTTagCompound tag = new NBTTagCompound(); + accessor.getTileEntity().writeToNBT(tag); + accessor.remoteNbt = tag; + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + } + } + + /* Interface IWailaBlock */ + if (IWailaBlock.class.isInstance(block)){ + TileEntity entity = world.getTileEntity(mop.blockX, mop.blockY, mop.blockZ); + if (layout == Layout.HEADER) + try{ + return ((IWailaBlock)block).getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + else if (layout == Layout.BODY) + try{ + return ((IWailaBlock)block).getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + else if (layout == Layout.FOOTER) + try{ + return ((IWailaBlock)block).getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + return WailaExceptionHandler.handleErr(e, block.getClass().toString(), currenttip); + } + } + + headBlockProviders.clear(); + bodyBlockProviders.clear(); + tailBlockProviders.clear(); + + /* Lookup by class (for blocks)*/ + if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(block)) + headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(block)); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(block)) + bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(block)); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(block)) + tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(block)); + + + /* Lookup by class (for tileentities)*/ + if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadProviders(accessor.getTileEntity())) + headBlockProviders.addAll(ModuleRegistrar.instance().getHeadProviders(accessor.getTileEntity())); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyProviders(accessor.getTileEntity())) + bodyBlockProviders.addAll(ModuleRegistrar.instance().getBodyProviders(accessor.getTileEntity())); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailProviders(accessor.getTileEntity())) + tailBlockProviders.addAll(ModuleRegistrar.instance().getTailProviders(accessor.getTileEntity())); + + /* Apply all collected providers */ + if (layout == Layout.HEADER) + for (IWailaDataProvider dataProvider : headBlockProviders) + try{ + currenttip = dataProvider.getWailaHead(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + if (layout == Layout.BODY) + for (IWailaDataProvider dataProvider : bodyBlockProviders) + try{ + currenttip = dataProvider.getWailaBody(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + if (layout == Layout.FOOTER) + for (IWailaDataProvider dataProvider : tailBlockProviders) + try{ + currenttip = dataProvider.getWailaTail(itemStack, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + return currenttip; + } + + public List handleEntityTextData(Entity entity, World world, EntityPlayer player, MovingObjectPosition mop, DataAccessorEntity accessor, List currenttip, Layout layout) { + + if (accessor.getEntity() != null && Waila.instance.serverPresent && accessor.isTimeElapsed(250)){ + accessor.resetTimer(); + HashSet keys = new HashSet(); + + if (ModuleRegistrar.instance().hasSyncedNBTKeys(accessor.getEntity())) + keys.addAll(ModuleRegistrar.instance().getSyncedNBTKeys(accessor.getEntity())); + + if (keys.size() != 0) + WailaPacketHandler.INSTANCE.sendToServer(new Message0x03EntRequest(accessor.getEntity(), keys)); + + } else if (accessor.getEntity() != null && !Waila.instance.serverPresent && accessor.isTimeElapsed(250)) { + + try{ + NBTTagCompound tag = new NBTTagCompound(); + accessor.getEntity().writeToNBT(tag); + accessor.remoteNbt = tag; + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().getName(), null); + } + } + + headEntityProviders.clear(); + bodyEntityProviders.clear(); + tailEntityProviders.clear(); + + /* Lookup by class (for entities)*/ + if (layout == Layout.HEADER && ModuleRegistrar.instance().hasHeadEntityProviders(entity)) + headEntityProviders.addAll(ModuleRegistrar.instance().getHeadEntityProviders(entity)); + + else if (layout == Layout.BODY && ModuleRegistrar.instance().hasBodyEntityProviders(entity)) + bodyEntityProviders.addAll(ModuleRegistrar.instance().getBodyEntityProviders(entity)); + + else if (layout == Layout.FOOTER && ModuleRegistrar.instance().hasTailEntityProviders(entity)) + tailEntityProviders.addAll(ModuleRegistrar.instance().getTailEntityProviders(entity)); + + /* Apply all collected providers */ + if (layout == Layout.HEADER) + for (IWailaEntityProvider dataProvider : headEntityProviders) + try{ + currenttip = dataProvider.getWailaHead(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + if (layout == Layout.BODY) + for (IWailaEntityProvider dataProvider : bodyEntityProviders) + try{ + currenttip = dataProvider.getWailaBody(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + if (layout == Layout.FOOTER) + for (IWailaEntityProvider dataProvider : tailEntityProviders) + try{ + currenttip = dataProvider.getWailaTail(entity, currenttip, accessor, ConfigHandler.instance()); + } catch (Throwable e){ + currenttip = WailaExceptionHandler.handleErr(e, dataProvider.getClass().toString(), currenttip); + } + + return currenttip; + } +} diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java new file mode 100644 index 0000000..3993952 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -0,0 +1,455 @@ +package mcp.mobius.waila.api.impl; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; + +import au.com.bytecode.opencsv.CSVReader; +import net.minecraft.block.Block; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaBlockDecorator; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.api.IWailaFMPDecorator; +import mcp.mobius.waila.api.IWailaFMPProvider; +import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.IWailaSummaryProvider; +import mcp.mobius.waila.cbcore.LangUtil; + +public class ModuleRegistrar implements IWailaRegistrar { + + private static ModuleRegistrar instance = null; + + public LinkedHashMap> headBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> tailBlockProviders = new LinkedHashMap>(); + public LinkedHashMap> stackBlockProviders = new LinkedHashMap>(); + + public LinkedHashMap> blockClassDecorators = new LinkedHashMap>(); + + public LinkedHashMap> headEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> tailEntityProviders = new LinkedHashMap>(); + public LinkedHashMap> overrideEntityProviders = new LinkedHashMap>(); + + public LinkedHashMap> headFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> bodyFMPProviders = new LinkedHashMap>(); + public LinkedHashMap> tailFMPProviders = new LinkedHashMap>(); + + public LinkedHashMap> FMPClassDecorators = new LinkedHashMap>(); + + public LinkedHashMap> syncedNBTKeys = new LinkedHashMap>(); + + public LinkedHashMap>> wikiDescriptions = new LinkedHashMap>>(); + public LinkedHashMap> summaryProviders = new LinkedHashMap>(); + + private ModuleRegistrar() { + instance = this; + } + + public static ModuleRegistrar instance(){ + if (ModuleRegistrar.instance == null) + ModuleRegistrar.instance = new ModuleRegistrar(); + return ModuleRegistrar.instance; + } + + /* CONFIG HANDLING */ + @Override + public void addConfig(String modname, String key, String configname) { + ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG(configname)); + } + + @Override + public void addConfigRemote(String modname, String key, String configname) { + ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG(configname)); + } + + @Override + public void addConfig(String modname, String key) { + ConfigHandler.instance().addConfig(modname, key, LangUtil.translateG("option." + key)); + } + + @Override + public void addConfigRemote(String modname, String key) { + ConfigHandler.instance().addConfigServer(modname, key, LangUtil.translateG("option." + key)); + } + + + /* REGISTRATION METHODS */ + @Override + public void registerHeadProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.headBlockProviders); + } + + @Override + public void registerBodyProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.bodyBlockProviders); + } + + @Override + public void registerTailProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.tailBlockProviders); + } + + @Override + public void registerStackProvider(IWailaDataProvider dataProvider, Class block) { + this.registerProvider(dataProvider, block, this.stackBlockProviders); + } + + @Override + public void registerHeadProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.headEntityProviders); + } + + @Override + public void registerBodyProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.bodyEntityProviders); + } + + @Override + public void registerTailProvider(IWailaEntityProvider dataProvider, Class entity) { + this.registerProvider(dataProvider, entity, this.tailEntityProviders); + } + + @Override + public void registerHeadProvider(IWailaFMPProvider dataProvider, String name) { + this.registerProvider(dataProvider, name, this.headFMPProviders); + } + + @Override + public void registerBodyProvider(IWailaFMPProvider dataProvider, String name) { + this.registerProvider(dataProvider, name, this.bodyFMPProviders); + } + + @Override + public void registerTailProvider(IWailaFMPProvider dataProvider, String name) { + this.registerProvider(dataProvider, name, this.tailFMPProviders); + } + + @Override + public void registerOverrideEntityProvider (IWailaEntityProvider dataProvider, Class entity){ + this.registerProvider(dataProvider, entity, this.overrideEntityProviders); + } + + @Override + public void registerShortDataProvider(IWailaSummaryProvider dataProvider, Class item) { + this.registerProvider(dataProvider, item, this.summaryProviders); + } + + @Override + public void registerDecorator(IWailaBlockDecorator decorator, Class block) { + this.registerProvider(decorator, block, this.blockClassDecorators); + } + + @Override + public void registerDecorator(IWailaFMPDecorator decorator, String name) { + this.registerProvider(decorator, name, this.FMPClassDecorators); + } + + private void registerProvider(T dataProvider, V clazz, LinkedHashMap> target) { + if (!target.containsKey(clazz)) + target.put(clazz, new ArrayList()); + + ArrayList providers =target.get(clazz); + if (providers.contains(dataProvider)) return; + + target.get(clazz).add(dataProvider); + } + + @Override + public void registerSyncedNBTKey(String key, Class target){ + if (!this.syncedNBTKeys.containsKey(target)) + this.syncedNBTKeys.put(target, new HashSet()); + + this.syncedNBTKeys.get(target).add(key); + } + + + + /* PROVIDER GETTERS */ + + public ArrayList getHeadProviders(Object block) { + return getProviders(block, this.headBlockProviders); + } + + public ArrayList getBodyProviders(Object block) { + return getProviders(block, this.bodyBlockProviders); + } + + public ArrayList getTailProviders(Object block) { + return getProviders(block, this.tailBlockProviders); + } + + public ArrayList getStackProviders(Object block) { + return getProviders(block, this.stackBlockProviders); + } + + public ArrayList getHeadEntityProviders(Object entity) { + return getProviders(entity, this.headEntityProviders); + } + + public ArrayList getBodyEntityProviders(Object entity) { + return getProviders(entity, this.bodyEntityProviders); + } + + public ArrayList getTailEntityProviders(Object entity) { + return getProviders(entity, this.tailEntityProviders); + } + + public ArrayList getOverrideEntityProviders(Object entity) { + return getProviders(entity, this.overrideEntityProviders); + } + + public ArrayList getHeadFMPProviders(String name) { + return getProviders(name, this.headFMPProviders); + } + + public ArrayList getBodyFMPProviders(String name) { + return getProviders(name, this.bodyFMPProviders); + } + + public ArrayList getTailFMPProviders(String name) { + return getProviders(name, this.tailFMPProviders); + } + + public ArrayList getSummaryProvider(Object item){ + return getProviders(item, this.summaryProviders); + } + + public ArrayList getBlockDecorators(Object block){ + return getProviders(block, this.blockClassDecorators); + } + + public ArrayList getFMPDecorators(String name){ + return getProviders(name, this.FMPClassDecorators); + } + + private ArrayList getProviders(Object obj, LinkedHashMap> target){ + ArrayList returnList = new ArrayList(); + for (Class clazz : target.keySet()) + if (clazz.isInstance(obj)) + returnList.addAll(target.get(clazz)); + + return returnList; + } + + private ArrayList getProviders(String name, LinkedHashMap> target){ + return target.get(name); + } + + public HashSet getSyncedNBTKeys(Object target){ + HashSet returnList = new HashSet(); + for (Class clazz : this.syncedNBTKeys.keySet()) + if (clazz.isInstance(target)) + returnList.addAll(this.syncedNBTKeys.get(clazz)); + + return returnList; + } + + /* HAS METHODS */ + + public boolean hasStackProviders(Object block){ + return hasProviders(block, this.stackBlockProviders); + } + + public boolean hasHeadProviders(Object block){ + return hasProviders(block, this.headBlockProviders); + } + + public boolean hasBodyProviders(Object block){ + return hasProviders(block, this.bodyBlockProviders); + } + + public boolean hasTailProviders(Object block){ + return hasProviders(block, this.tailBlockProviders); + } + + public boolean hasHeadEntityProviders(Object entity){ + return hasProviders(entity, this.headEntityProviders); + } + + public boolean hasBodyEntityProviders(Object entity){ + return hasProviders(entity, this.bodyEntityProviders); + } + + public boolean hasTailEntityProviders(Object entity){ + return hasProviders(entity, this.tailEntityProviders); + } + + public boolean hasOverrideEntityProviders(Object entity){ + return hasProviders(entity, this.overrideEntityProviders); + } + + public boolean hasHeadFMPProviders(String name){ + return hasProviders(name, this.headFMPProviders); + } + + public boolean hasBodyFMPProviders(String name){ + return hasProviders(name, this.bodyFMPProviders); + } + + public boolean hasTailFMPProviders(String name){ + return hasProviders(name, this.tailFMPProviders); + } + + public boolean hasBlockDecorator(Object block){ + return hasProviders(block, this.blockClassDecorators); + } + + public boolean hasFMPDecorator(String name){ + return hasProviders(name, this.FMPClassDecorators); + } + + private boolean hasProviders(Object obj, LinkedHashMap> target){ + for (Class clazz : target.keySet()) + if (clazz.isInstance(obj)) + return true; + return false; + } + + private boolean hasProviders(String name, LinkedHashMap> target){ + return target.containsKey(name); + } + + public boolean hasSummaryProvider(Class item){ + return this.summaryProviders.containsKey(item); + } + + public boolean hasSyncedNBTKeys(Object target){ + for (Class clazz : this.syncedNBTKeys.keySet()) + if (clazz.isInstance(target)) + return true; + return false; + } + + /* ----------------- */ + @Override + public void registerDocTextFile(String filename) { + List docData = null; + int nentries = 0; + + + try{ + docData = this.readFileAsString(filename); + } catch (IOException e){ + Waila.log.log(Level.WARNING, String.format("Error while accessing file %s : %s", filename, e)); + return; + } + + for (String[] ss : docData){ + String modid = ss[0]; + String name = ss[1]; + String meta = ss[2]; + String desc = ss[5].replace('$', '\n'); + if (!(desc.trim().equals(""))){ + if (!this.wikiDescriptions.containsKey(modid)) + this.wikiDescriptions.put(modid, new LinkedHashMap >()); + if (!this.wikiDescriptions.get(modid).containsKey(name)) + this.wikiDescriptions.get(modid).put(name, new LinkedHashMap()); + + this.wikiDescriptions.get(modid).get(name).put(meta, desc); + System.out.printf("Registered %s %s %s\n", modid, name, meta); + nentries += 1; + } + } + + /* + String[] sections = docData.split(">>>>"); + for (String s : sections){ + s.trim(); + if (!s.equals("")){ + try{ + String name = s.split("\r?\n",2)[0].trim(); + String desc = s.split("\r?\n",2)[1].trim(); + if (!this.wikiDescriptions.containsKey(modid)) + this.wikiDescriptions.put(modid, new LinkedHashMap ()); + this.wikiDescriptions.get(modid).put(name, desc); + nentries += 1; + }catch (Exception e){ + System.out.printf("%s\n", e); + } + } + } + */ + Waila.log.log(Level.INFO, String.format("Registered %s entries from %s", nentries, filename)); + } + + public boolean hasDocTextModID(String modid){ + return this.wikiDescriptions.containsKey(modid); + } + + public boolean hasDocTextItem(String modid, String item){ + if (this.hasDocTextModID(modid)) + return this.wikiDescriptions.get(modid).containsKey(item); + return false; + } + + public boolean hasDocTextMeta(String modid, String item, String meta){ + if (this.hasDocTextItem(modid, item)) + return this.wikiDescriptions.get(modid).get(item).containsKey(meta); + return false; + } + + public LinkedHashMap getDocText(String modid, String name){ + return this.wikiDescriptions.get(modid).get(name); + } + + public String getDocText(String modid, String name, String meta){ + return this.wikiDescriptions.get(modid).get(name).get(meta); + } + + public boolean hasDocTextSpecificMeta(String modid, String name, String meta){ + for (String s : this.getDocText(modid, name).keySet()) + if (s.equals(meta)) + return true; + return false; + } + + public String getDoxTextWildcardMatch(String modid, String name){ + Set keys = this.wikiDescriptions.get(modid).keySet(); + for (String s : keys){ + String regexed = s; + regexed = regexed.replace(".", "\\."); + regexed = regexed.replace("*", ".*"); + + if (name.matches(s)) + return s; + } + return null; + } + + private List readFileAsString(String filePath) throws IOException { +// URL fileURL = this.getClass().getResource(filePath); +// File filedata = new File(fileURL); +// Reader paramReader = new InputStreamReader(this.getClass().getResourceAsStream(filePath)); + + InputStream in = getClass().getResourceAsStream(filePath); + BufferedReader input = new BufferedReader(new InputStreamReader(in)); + CSVReader reader = new CSVReader(input); + + List myEntries = reader.readAll(); + reader.close(); + + return myEntries; + /* + StringBuffer fileData = new StringBuffer(); + //BufferedReader reader = new BufferedReader(paramReader); + + char[] buf = new char[1024]; + int numRead=0; + while((numRead=input.read(buf)) != -1){ + String readData = String.valueOf(buf, 0, numRead); + fileData.append(readData); + } + input.close(); + return fileData.toString(); + */ + } +} diff --git a/src/main/java/mcp/mobius/waila/api/package-info.java b/src/main/java/mcp/mobius/waila/api/package-info.java new file mode 100644 index 0000000..9b5e663 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/api/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.0",owner="Waila",provides="WailaAPI") +package mcp.mobius.waila.api; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java new file mode 100644 index 0000000..b9d02f0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java @@ -0,0 +1,110 @@ +package mcp.mobius.waila.cbcore; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.SortedSet; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.Language; +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * Easy localisation access. + */ +public class LangUtil +{ + public static LangUtil instance = new LangUtil(null); + + public String prefix; + + public LangUtil(String prefix) + { + this.prefix = prefix; + } + + public static String translateG(String s, Object... format) + { + return instance.translate(s, format); + } + + public String translate(String s, Object... format) + { + if(prefix != null && !s.startsWith(prefix+".")) + s = prefix+"."+s; + String ret = LanguageRegistry.instance().getStringLocalization(s); + if(ret.length() == 0) + ret = LanguageRegistry.instance().getStringLocalization(s, "en_US"); + if(ret.length() == 0) + ret = StatCollector.translateToLocal(s); + if(ret.length() == 0) + return s; + if(format.length > 0) + ret = String.format(ret, format); + return ret; + } + + public void addLangFile(InputStream resource, String lang) throws IOException + { + LanguageRegistry reg = LanguageRegistry.instance(); + BufferedReader reader = new BufferedReader(new InputStreamReader(resource, "UTF-8")); + while(true) + { + String read = reader.readLine(); + if(read == null) + break; + + int equalIndex = read.indexOf('='); + if(equalIndex == -1) + continue; + String key = read.substring(0, equalIndex); + String value = read.substring(equalIndex+1); + if(prefix != null) + key = prefix+"."+key; + reg.addStringLocalization(key, lang, value); + } + } + + @SideOnly(Side.CLIENT) + public static LangUtil loadLangDir(String domain) + { + return new LangUtil(domain).addLangDir(new ResourceLocation(domain, "lang")); + } + + @SideOnly(Side.CLIENT) + public LangUtil addLangDir(ResourceLocation dir) + { + IResourceManager resManager = Minecraft.getMinecraft().getResourceManager(); + for(Language lang : (SortedSet)Minecraft.getMinecraft().getLanguageManager().getLanguages()) + { + String langID = lang.getLanguageCode(); + IResource langRes; + try + { + langRes = resManager.getResource(new ResourceLocation(dir.getResourceDomain(), dir.getResourcePath()+'/'+langID+".lang")); + } + catch(Exception e) + { + continue; + } + try + { + addLangFile(langRes.getInputStream(), langID); + } + catch(IOException e) + { + System.err.println("Failed to load lang resource. domain="+prefix+", resource="+langRes); + e.printStackTrace(); + } + } + + return this; + } +} diff --git a/src/main/java/mcp/mobius/waila/client/KeyEvent.java b/src/main/java/mcp/mobius/waila/client/KeyEvent.java new file mode 100644 index 0000000..28e4ceb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/client/KeyEvent.java @@ -0,0 +1,132 @@ +package mcp.mobius.waila.client; + +import java.util.List; + +import org.lwjgl.input.Keyboard; + +import codechicken.nei.api.API; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.gui.screens.config.ScreenConfig; +import mcp.mobius.waila.handlers.nei.HandlerEnchants; +import mcp.mobius.waila.overlay.RayTracing; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.MovingObjectPosition; +import net.minecraftforge.common.config.Configuration; + +public class KeyEvent { + public static KeyBinding key_cfg; + public static KeyBinding key_show; + public static KeyBinding key_liquid; + public static KeyBinding key_recipe; + public static KeyBinding key_usage; + static boolean firstInventory = true; + + @SubscribeEvent + public void onKeyEvent(KeyInputEvent event){ + int key = Keyboard.getEventKey(); + Minecraft mc = Minecraft.getMinecraft(); + + if (Keyboard.getEventKeyState()){ + if (key == key_cfg.getKeyCode()){ + if(mc.currentScreen == null) + mc.displayGuiScreen(new ScreenConfig(mc.currentScreen)); + } + + else if (key == key_show.getKeyCode() && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){ + boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, !status); + } + + else if (key == key_show.getKeyCode() && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){ + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); + } + + else if (key == key_liquid.getKeyCode()){ + boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true); + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status); + } + + else if (key == key_recipe.getKeyCode()){ + this.openRecipeGUI(true); + } + + else if (key == key_usage.getKeyCode()){ + this.openRecipeGUI(false); + } + } + } + + public KeyEvent(){ + KeyEvent.key_cfg = new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila"); + KeyEvent.key_show = new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila"); + KeyEvent.key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila"); + KeyEvent.key_recipe = new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3, "Waila"); + KeyEvent.key_usage = new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4, "Waila"); + + ClientRegistry.registerKeyBinding(KeyEvent.key_cfg); + ClientRegistry.registerKeyBinding(KeyEvent.key_show); + ClientRegistry.registerKeyBinding(KeyEvent.key_liquid); + ClientRegistry.registerKeyBinding(KeyEvent.key_recipe); + ClientRegistry.registerKeyBinding(KeyEvent.key_usage); + GuiContainerManager.addInputHandler(new HandlerEnchants()); + API.addKeyBind(Constants.BIND_SCREEN_ENCH, Keyboard.KEY_I); + + /* + Minecraft.getMinecraft().gameSettings.keyBindings = (KeyBinding[])ArrayUtils.addAll( + new KeyBinding[] {KeyHandler.key_cfg, KeyHandler.key_show, KeyHandler.key_liquid}, + Minecraft.getMinecraft().gameSettings.keyBindings); + */ + } + + public void openRecipeGUI(boolean recipe){ + Minecraft mc = Minecraft.getMinecraft(); + boolean uiResult; + String msg; + + if ((RayTracing.instance().getTarget() != null) && (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)){ + List stacks = RayTracing.instance().getIdentifierItems(); + if (stacks.size() > 0){ + mc.displayGuiScreen(new GuiInventory(mc.thePlayer)); + if (firstInventory){ + try {Thread.sleep(1000);} catch (Exception e){}; + firstInventory = false; + } + + if(recipe) + if(!GuiCraftingRecipe.openRecipeGui("item", stacks.get(0).copy())){ + ItemStack target = stacks.get(0).copy(); + target.setItemDamage(0); + if(!GuiCraftingRecipe.openRecipeGui("item", target)){ + mc.thePlayer.addChatMessage(new ChatComponentTranslation("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.norecipe"))); + mc.displayGuiScreen((GuiScreen)null); + mc.setIngameFocus(); + } + } + + if(!recipe) + if(!GuiUsageRecipe.openRecipeGui("item", stacks.get(0).copy())){ + ItemStack target = stacks.get(0).copy(); + target.setItemDamage(0); + if(!GuiUsageRecipe.openRecipeGui("item", target)){ + mc.thePlayer.addChatMessage(new ChatComponentTranslation("\u00a7f\u00a7o" + LangUtil.translateG("client.msg.nousage"))); + mc.displayGuiScreen((GuiScreen)null); + mc.setIngameFocus(); + } + } + } + } + } +} diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java new file mode 100644 index 0000000..df42c83 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -0,0 +1,181 @@ +package mcp.mobius.waila.client; + +import mcp.mobius.waila.addons.agriculture.AgricultureModule; +import mcp.mobius.waila.addons.appeng.AppEngModule; +import mcp.mobius.waila.addons.buildcraft.BCModule; +import mcp.mobius.waila.addons.buildcraft.BCPowerAPIModule; +import mcp.mobius.waila.addons.carpenters.CarpentersModule; +import mcp.mobius.waila.addons.enderio.EnderIOModule; +import mcp.mobius.waila.addons.enderstorage.EnderStorageModule; +import mcp.mobius.waila.addons.etb.ETBModule; +import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule; +import mcp.mobius.waila.addons.gravestone.GravestoneModule; +import mcp.mobius.waila.addons.harvestcraft.HarvestcraftModule; +import mcp.mobius.waila.addons.ic2.IC2Module; +import mcp.mobius.waila.addons.magicalcrops.MagicalCropsModule; +import mcp.mobius.waila.addons.openblocks.OpenBlocksModule; +import mcp.mobius.waila.addons.projectred.ProjectRedModule; +import mcp.mobius.waila.addons.railcraft.RailcraftModule; +import mcp.mobius.waila.addons.secretrooms.SecretRoomsModule; +import mcp.mobius.waila.addons.statues.StatuesModule; +import mcp.mobius.waila.addons.stevescarts.StevesCartsModule; +import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; +import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; +import mcp.mobius.waila.addons.twilightforest.TwilightForestModule; +import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.gui.truetyper.FontLoader; +import mcp.mobius.waila.gui.truetyper.TrueTypeFont; +import mcp.mobius.waila.handlers.DecoratorFMP; +import mcp.mobius.waila.handlers.HUDHandlerBlocks; +import mcp.mobius.waila.handlers.HUDHandlerEntities; +import mcp.mobius.waila.handlers.HUDHandlerFMP; +//import mcp.mobius.waila.handlers.SummaryProviderDefault; +import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila; +import mcp.mobius.waila.overlay.WailaTickHandler; +import mcp.mobius.waila.server.ProxyServer; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; + +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import mcp.mobius.waila.cbcore.LangUtil; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; + +public class ProxyClient extends ProxyServer { + + TrueTypeFont minecraftiaFont; + + //public static LangUtil lang = LangUtil.loadLangDir("waila"); + + public ProxyClient() {} + + + @Override + public void registerHandlers(){ + + LangUtil.loadLangDir("waila"); + + minecraftiaFont = FontLoader.createFont(new ResourceLocation("waila", "fonts/Minecraftia.ttf"), 14, true); + + //TickRegistry.registerTickHandler(WailaTickHandler.instance(), Side.CLIENT); + + //GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); + GuiContainerManager.addTooltipHandler(new TooltipHandlerWaila()); + + //KeyBindingRegistry.registerKeyBinding(new ConfigKeyHandler()); + + // We mute the default keybind for displaying the tooltip + NEIClientConfig.getSetting(Constants.BIND_NEI_SHOW).setIntValue(Keyboard.KEY_NONE); + NEIClientConfig.getSetting(Constants.CFG_NEI_SHOW).setBooleanValue(false); + + //API.addKeyBind(Constants.BIND_WIKI, "Display wiki", Keyboard.KEY_RSHIFT); + //API.addKeyBind(Constants.BIND_TECH, "Display techtree", Keyboard.KEY_RSHIFT); + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBlocks(), Block.class); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerBlocks(), Block.class); + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerEntities(), Entity.class); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEntities(), Entity.class); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerEntities(), Entity.class); + + //ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class); + + ModuleRegistrar.instance().addConfig("General", "general.showhp"); + ModuleRegistrar.instance().addConfig("General", "general.showcrop"); + } + + @Override + public void registerMods(){ + + HUDHandlerVanilla.register(); + + /*BETTER BARRELS*/ + //BetterBarrelsModule.register(); + + /* BUILDCRAFT */ + BCModule.register(); + + /* INDUSTRIALCRAFT2 */ + IC2Module.register(); + + /*Thaumcraft*/ + ThaumcraftModule.register(); + + /*EnderStorage*/ + EnderStorageModule.register(); + + /*Gravestone*/ + GravestoneModule.register(); + + /*Twilight forest*/ + TwilightForestModule.register(); + + /* Applied Energetics */ + //AppEngModule.register(); + + /* Thermal Expansion */ + ThermalExpansionModule.register(); + + /* ETB */ + ETBModule.register(); + + /* EnderIO */ + EnderIOModule.register(); + + /* Buildcraft Power API */ + BCPowerAPIModule.register(); + + /* ProjectRed API */ + ProjectRedModule.register(); + + /* ExtraUtilities */ + ExtraUtilitiesModule.register(); + + /* OpenBlocks */ + OpenBlocksModule.register(); + + /* Railcraft */ + RailcraftModule.register(); + + /* Steve's Carts */ + StevesCartsModule.register(); + + /* Secret Rooms */ + //SecretRoomsModule.register(); + + /* Carpenter's Blocks */ + CarpentersModule.register(); + + /* Pam's HarvestCraft */ + HarvestcraftModule.register(); + + /* Magical crops */ + MagicalCropsModule.register(); + + /* Statues */ + StatuesModule.register(); + + /* Agriculture */ + AgricultureModule.register(); + + if(Loader.isModLoaded("ForgeMultipart")){ + HUDHandlerFMP.register(); + DecoratorFMP.register(); + } + + //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), Block.class); + //ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBlocks(), TileEntity.class); + } + + @Override + public Object getFont(){return this.minecraftiaFont;} +} diff --git a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java new file mode 100644 index 0000000..2aee08f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java @@ -0,0 +1,101 @@ +package mcp.mobius.waila.gui.events; + +import net.minecraft.client.Minecraft; + +import org.lwjgl.input.Mouse; + +import mcp.mobius.waila.gui.interfaces.IWidget; + +public class MouseEvent { + + public enum EventType {NONE, MOVE, CLICK, RELEASED, DRAG, WHEEL, ENTER, LEAVE}; + + public long timestamp; + public Minecraft mc; + public IWidget srcwidget; + public IWidget trgwidget; + public double x,y; + public int z; + public static int buttonCount = Mouse.getButtonCount(); + public boolean[] buttonState = new boolean[buttonCount]; + public EventType type; + public int button = -1; + + + public MouseEvent(IWidget widget){ + this.srcwidget = widget; + this.timestamp = System.nanoTime(); + + this.mc = Minecraft.getMinecraft(); + + this.x = (double)Mouse.getEventX() * (double)this.srcwidget.getSize().getX() / (double)this.mc.displayWidth; + this.y = (double)this.srcwidget.getSize().getY() - (double)Mouse.getEventY() * (double)this.srcwidget.getSize().getY() / (double)this.mc.displayHeight - 1.0; + + //this.x = Mouse.getEventX(); + //this.y = Mouse.getEventY(); + + //System.out.printf("%s %s\n", this.x, this.y); + + //this.z = Mouse.getEventDWheel(); + this.z = Mouse.getDWheel(); + + for (int i = 0; i < buttonCount; i++) + buttonState[i] = Mouse.isButtonDown(i); + + this.trgwidget = this.srcwidget.getWidgetAtCoordinates(this.x, this.y); + } + + public String toString(){ + String retstring = String.format("MOUSE %s : [%s] [ %.2f %.2f %d ] [", this.type, this.timestamp, this.x, this.y, this.z); + if (this.buttonCount < 5) + for (int i = 0; i < this.buttonCount; i++) + retstring += String.format(" %s ", this.buttonState[i]); + else + for (int i = 0; i < 5; i++) + retstring += String.format(" %s ", this.buttonState[i]); + retstring += "]"; + + if (this.button != -1) + retstring += String.format(" Button %s", this.button); + + return retstring; + } + + // Returns the event type based on the previous mouse event. + public EventType getEventType(MouseEvent me){ + + this.type = EventType.NONE; + + if (this.trgwidget != me.trgwidget){ + this.type = EventType.ENTER; + return this.type; + } + + if (this.z != 0){ + this.type = EventType.WHEEL; + return this.type; + } + + for (int i = 0; i < this.buttonCount; i++){ + if (this.buttonState[i] != me.buttonState[i]){ + if (this.buttonState[i] == true) + this.type = EventType.CLICK; + else + this.type = EventType.RELEASED; + this.button = i; + return this.type; + } + } + + //MOVE & DRAG EVENTS (we moved the mouse and button 0 was clicked or not) + if ((this.x != me.x) || (this.y != me.y)){ + if (this.buttonState[0] == true) + this.type = EventType.DRAG; + else + this.type = EventType.MOVE; + return this.type; + } + + return this.type; + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java new file mode 100644 index 0000000..b648120 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java @@ -0,0 +1,37 @@ +package mcp.mobius.waila.gui.helpers; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +import com.google.common.collect.Lists; + +public class ReverseIterator implements Iterable { + + private ListIterator listIterator; + + public ReverseIterator(Collection wrappedList) { + List list = Lists.newArrayList(wrappedList); + this.listIterator = list.listIterator(wrappedList.size()); + } + + public Iterator iterator() { + return new Iterator() { + + public boolean hasNext() { + return listIterator.hasPrevious(); + } + + public T next() { + return listIterator.previous(); + } + + public void remove() { + listIterator.remove(); + } + + }; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java new file mode 100644 index 0000000..80c10bb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java @@ -0,0 +1,7 @@ +package mcp.mobius.waila.gui.helpers; + +public class UIException extends RuntimeException { + public UIException(String message) { + super(message); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java new file mode 100644 index 0000000..7feeea4 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java @@ -0,0 +1,192 @@ +package mcp.mobius.waila.gui.helpers; + +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.EntityLivingBase; +import net.minecraft.util.Vec3; + +public class UIHelper { + + public static void drawTexture(int posX, int posY, int sizeX, int sizeY) + { + UIHelper.drawTexture(posX, posY, sizeX, sizeY, 0, 0, 256, 256); + } + + public static void drawTexture(int posX, int posY, int sizeX, int sizeY, int texU, int texV, int texSizeU, int texSizeV) + { + float zLevel = 0.0F; + float f = 0.00390625F; + + Tessellator tess = Tessellator.instance; + tess.startDrawingQuads(); + tess.addVertexWithUV((double)(posX + 0), (double)(posY + sizeY), (double)zLevel, texU*f, (texV + texSizeV)*f); + tess.addVertexWithUV((double)(posX + sizeX), (double)(posY + sizeY), (double)zLevel, (texU + texSizeU)*f, (texV + texSizeV)*f); + tess.addVertexWithUV((double)(posX + sizeX), (double)(posY + 0), (double)zLevel, (texU + texSizeU)*f, texV*f); + tess.addVertexWithUV((double)(posX + 0), (double)(posY + 0), (double)zLevel, texU*f, texV*f); + tess.draw(); + } + + public static void drawGradientRect(int minx, int miny, int maxx, int maxy, int zlevel, int color1, int color2) + { + float alpha1 = (float)(color1 >> 24 & 255) / 255.0F; + float red1 = (float)(color1 >> 16 & 255) / 255.0F; + float green1 = (float)(color1 >> 8 & 255) / 255.0F; + float blue1 = (float)(color1 & 255) / 255.0F; + float alpha2 = (float)(color2 >> 24 & 255) / 255.0F; + float red2 = (float)(color2 >> 16 & 255) / 255.0F; + float green2 = (float)(color2 >> 8 & 255) / 255.0F; + float blue2 = (float)(color2 & 255) / 255.0F; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glShadeModel(GL11.GL_SMOOTH); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorRGBA_F(red1, green1, blue1, alpha1); + tessellator.addVertex((double)maxx, (double)miny, (double)zlevel); + tessellator.addVertex((double)minx, (double)miny, (double)zlevel); + tessellator.setColorRGBA_F(red2, green2, blue2, alpha2); + tessellator.addVertex((double)minx, (double)maxy, (double)zlevel); + tessellator.addVertex((double)maxx, (double)maxy, (double)zlevel); + tessellator.draw(); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + public static void drawBillboard(Vec3 pos, float offX, float offY, float offZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a, double partialFrame){ + UIHelper.drawBillboard((float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, x1, y1, x2, y2, r, g, b, a, partialFrame); + } + + public static void drawBillboard(float posX, float posY, float posZ, float offX, float offY, float offZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a, double partialFrame){ + EntityLivingBase player = Minecraft.getMinecraft().renderViewEntity; + float playerViewY = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * (float)partialFrame; + float playerViewX = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * (float)partialFrame; + + UIHelper.drawBillboard(posX, posY, posZ, offX, offY, offZ, playerViewX, playerViewY * -1.0F, 0.0F, x1, y1, x2, y2, r, g, b, a); + } + + public static void drawBillboard(float posX, float posY, float posZ, float offX, float offY, float offZ, float rotX, float rotY, float rotZ, double x1, double y1, double x2, double y2, int r, int g, int b, int a){ + float f = 1.6F; + float f1 = 0.016666668F * f; + GL11.glPushMatrix(); + + GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ); + + GL11.glNormal3f(0.0F, 1.0F, 0.0F); + GL11.glRotatef(rotY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(rotX, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F); + + //GL11.glScalef(-f1, -f1, f1); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + //GL11.glDisable(GL11.GL_TEXTURE_2D); + drawRectangle(x1, y1, 0, x2, y2, 0, r, g, b, a); + + GL11.glPopMatrix(); + } + + + + public static void drawBillboardText(String text, Vec3 pos, float offX, float offY, float offZ, double partialFrame){ + UIHelper.drawBillboardText(text, (float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, partialFrame); + } + + public static void drawBillboardText(String text, float posX, float posY, float posZ, float offX, float offY, float offZ, double partialFrame){ + EntityLivingBase player = Minecraft.getMinecraft().renderViewEntity; + float playerViewY = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * (float)partialFrame; + float playerViewX = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * (float)partialFrame; + + UIHelper.drawFloatingText(text, posX, posY, posZ, offX, offY, offZ, playerViewX, playerViewY * -1.0F, 0.0F); + } + + public static void drawFloatingText(String text, Vec3 pos, float offX, float offY, float offZ, float rotX, float rotY, float rotZ){ + UIHelper.drawFloatingText(text, (float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord, offX, offY, offZ, rotX, rotY, rotZ); + } + + public static void drawFloatingText(String text, float posX, float posY, float posZ, float offX, float offY, float offZ, float rotX, float rotY, float rotZ){ + + if (text.isEmpty()) return; + + FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; + + float f = 1.6F; + float f1 = 0.016666668F * f; + GL11.glPushMatrix(); + + + //GL11.glTranslatef((float)accessor.getPosition().blockX + 0.0F, (float)accessor.getPosition().blockY + 0.5F, (float)accessor.getPosition().blockZ); + GL11.glTranslatef(posX + offX, posY + offY, posZ + offZ); + + //GL11.glTranslatef(posX, posY, posZ); + GL11.glNormal3f(0.0F, 1.0F, 0.0F); + GL11.glRotatef(rotY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(rotX, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(rotZ, 0.0F, 0.0F, 1.0F); + //GL11.glTranslatef(offX, offY, offZ); + + GL11.glScalef(-f1, -f1, f1); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDepthMask(false); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + byte b0 = 0; + + GL11.glDisable(GL11.GL_TEXTURE_2D); + int j = fontrenderer.getStringWidth(text) / 2; + drawRectangle((double)(-j - 1), (double)(8 + b0), 0.0, (double)(j + 1), (double)(-1 + b0), 0.0, 0, 0, 0, 64); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, 553648127); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(true); + fontrenderer.drawString(text, -fontrenderer.getStringWidth(text) / 2, b0, -1); + //GL11.glEnable(GL11.GL_LIGHTING); + //GL11.glDisable(GL11.GL_BLEND); + //GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glPopMatrix(); + + } + + public static void drawRectangle(double x1, double y1, double z1, double x2, double y2, double z2, int r, int g, int b, int a){ + Tessellator tessellator = Tessellator.instance; + + tessellator.startDrawingQuads(); + tessellator.setColorRGBA(r, g, b, a); + + tessellator.addVertex(x1, y2, z1); + tessellator.addVertex(x1, y1, z2); + tessellator.addVertex(x2, y1, z2); + tessellator.addVertex(x2, y2, z1); + + tessellator.draw(); + + } + + public static void drawRectangleEW(double x1, double y1, double z1, double x2, double y2, double z2, int r, int g, int b, int a){ + Tessellator tessellator = Tessellator.instance; + + tessellator.startDrawingQuads(); + tessellator.setColorRGBA(r, g, b, a); + + tessellator.addVertex(x1, y1, z1); + tessellator.addVertex(x1, y1, z2); + tessellator.addVertex(x2, y2, z2); + tessellator.addVertex(x2, y2, z1); + + tessellator.draw(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java new file mode 100644 index 0000000..4f5a929 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java @@ -0,0 +1,8 @@ +package mcp.mobius.waila.gui.interfaces; + +public enum CType { +REL_X, +REL_Y, +RELXY, +ABSXY; +} diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java new file mode 100644 index 0000000..9c2183d --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java @@ -0,0 +1,64 @@ +package mcp.mobius.waila.gui.interfaces; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; + +import org.lwjgl.util.Point; + +public interface IWidget { + // Should all the coordinates, sizes, etc be % or absolute values ? + // Should we allow 2 methods for an absolute referencing (screen pos) and relative one (parent pos) ? + + IWidget getParent(); + void setParent(IWidget parent); + + IWidget setGeometry(WidgetGeometry geom); + WidgetGeometry getGeometry(); + + IWidget setPos(double x, double y); + IWidget setPos(double x, double y, boolean fracX, boolean fracY); + IWidget setSize(double sx, double sy); + IWidget setSize(double sx, double sy, boolean fracX, boolean fracY); + IWidget adjustSize(); + + Point getPos(); + Point getSize(); + int getRight(); + int getLeft(); + int getTop(); + int getBottom(); + + void draw(); + void draw(Point pos); + void show(); + void hide(); + void setAlpha(float alpha); + float getAlpha(); + boolean shouldRender(); + + IWidget addWidget(String name, IWidget widget); + IWidget addWidget(String name, IWidget widget, RenderPriority priority); + IWidget getWidget(String name); + IWidget delWidget(String name); + IWidget getWidgetAtCoordinates(double posX, double posY); + + boolean isWidgetAtCoordinates(double posx, double posy); + + void handleMouseInput(); + + void onMouseClick(MouseEvent event); + void onMouseDrag(MouseEvent event); + void onMouseMove(MouseEvent event); + void onMouseRelease(MouseEvent event); + void onMouseWheel(MouseEvent event); + void onMouseEnter(MouseEvent event); + void onMouseLeave(MouseEvent event); + + void emit(Signal signal, Object... params); + void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params); + + //boolean onMouseEnter(); + //boolean onMouseMoved(); + //boolean onMouseLeave(); + +} diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java new file mode 100644 index 0000000..d41d9b0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java @@ -0,0 +1,7 @@ +package mcp.mobius.waila.gui.interfaces; + +public enum RenderPriority { + LOW, + MEDIUM, + HIGH; +} diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java new file mode 100644 index 0000000..beb87e7 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java @@ -0,0 +1,8 @@ +package mcp.mobius.waila.gui.interfaces; + +public enum Signal { + DRAGGED, + CLICKED, + VALUE_CHANGED, + GEOM_CHANGED; +} diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java new file mode 100644 index 0000000..d5e11f6 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java @@ -0,0 +1,5 @@ +package mcp.mobius.waila.gui.interfaces; + +public enum WAlign { +LEFT,CENTER,RIGHT,TOP,BOTTOM; +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java new file mode 100644 index 0000000..8384a13 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java @@ -0,0 +1,90 @@ +package mcp.mobius.waila.gui.screens; + +import java.util.HashMap; + +import org.lwjgl.input.Mouse; + +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.widgets.LayoutCanvas; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; + +public abstract class ScreenBase extends GuiScreen{ + protected GuiScreen parent; // Return screen if available. + protected Minecraft mc; // Minecraft instance + protected HashMap widgets; // List of widgets on this ui + + public ScreenBase(GuiScreen parent) { + this.parent = parent; + this.mc = Minecraft.getMinecraft(); + this.widgets = new HashMap(); + + this.addWidget("canvas", new LayoutCanvas()); + + Mouse.getDWheel(); // We init the DWheel method (getDWheel returns the value since the last call, so we have to call it once on ui creation) + } + + ///////////////////// + // WIDGET HANDLING // + ///////////////////// + + public IWidget addWidget(String name, IWidget widget){ + this.widgets.put(name, widget); + return this.getWidget(name); + } + + public IWidget getWidget(String name){ + return this.widgets.get(name); + } + + public IWidget delWidget(String name){ + IWidget widget = this.getWidget(name); + this.widgets.remove(widget); + return widget; + } + + public IWidget getRoot(){ + return this.getWidget("canvas"); + } + + ///////////////////// + // DRAWING METHODS // + ///////////////////// + + @Override + public void drawScreen(int i, int j, float f) { + this.drawDefaultBackground(); //The dark background common to most of the UIs + super.drawScreen(i, j, f); + + for (IWidget widget: this.widgets.values()) + widget.draw(); + } + + // Used to easily display a UI without having to mess with mc handle. + public void display(){ + this.mc.displayGuiScreen(this); + } + + ///////////////////// + // INPUT METHODS // + ///////////////////// + + //Keyboard handling. Basic one is just returning to the previous UI when Esc is pressed + @Override + public void keyTyped(char keyChar, int keyID) + { + if (keyID == 1) + if (this.parent == null){ + this.mc.displayGuiScreen((GuiScreen)null); + this.mc.setIngameFocus(); + } else + this.mc.displayGuiScreen(this.parent); + } + + @Override + public void handleMouseInput() + { + this.getRoot().handleMouseInput(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java new file mode 100644 index 0000000..3c85cf3 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java @@ -0,0 +1,32 @@ +package mcp.mobius.waila.gui.screens.config; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.client.gui.GuiScreen; + +public class ScreenConfig extends ScreenBase { + public ScreenConfig(GuiScreen parent){ + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(50.0, 50.0, 50.0, 30.0, CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); + + ButtonContainer buttonContainer = ((ButtonContainer)this.getRoot().getWidget("ButtonContainer")); + + buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), "screen.button.waila", new ScreenWailaConfig(this))); + buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), "screen.button.modules", new ScreenModuleChoice(this))); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java new file mode 100644 index 0000000..710d53c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java @@ -0,0 +1,256 @@ +package mcp.mobius.waila.gui.screens.config; + +import org.lwjgl.util.Point; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.RenderPriority; +import mcp.mobius.waila.gui.interfaces.Signal; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.LayoutMargin; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC; +import mcp.mobius.waila.overlay.OverlayConfig; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.Configuration; + +public class ScreenHUDConfig extends ScreenBase { + + private class EventCanvas extends LayoutBase{ + IWidget draggedWidget = null; + + float scale; + + public EventCanvas(IWidget parent, GuiScreen prevScreen){ + super(parent); + this.setGeometry(new WidgetGeometry(0.0,0.0,100.0,100.0,CType.RELXY, CType.RELXY)); + + /* + IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); + layoutX.setGeometry(new WidgetGeometry(40.0,50.0,20,60, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutX.addWidget("ButtonXSub", new ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.BOTTOM)); + layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + */ + + /* + IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); + layoutY.setGeometry(new WidgetGeometry(50.0,50.0,20,60,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")).setGeometry(new WidgetGeometry(0.0, 0.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutY.addWidget("ButtonYSub", new ButtonLabel(null, "-")).setGeometry(new WidgetGeometry(0.0,100.0,20,20, CType.RELXY, CType.ABSXY, WAlign.LEFT, WAlign.BOTTOM)); + layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, "0")).setGeometry(new WidgetGeometry(50.0,50.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + */ + + double picX = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,0) / 100.0; + double picY = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,0) / 100.0; + float picAlpha = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0) / 100.0f; + scale = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,0) / 100.0f; + + int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); + this.addWidget("Layout", new LayoutMargin(null), RenderPriority.HIGH); + ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); + this.getWidget("Layout").addWidget("Picture", new PictureMovableRC(null, "waila:textures/config_template.png")).setGeometry(new WidgetGeometry(picX, picY, picSX, picSY,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.addWidget("TextTuto1", new LabelFixedFont(null, "screen.label.dragtuto")).setGeometry(new WidgetGeometry(50.0, 30.0,20,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER));; + + IWidget layoutX = this.addWidget("LayoutX", new LayoutBase(this)); + layoutX.setGeometry(new WidgetGeometry(35.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutX.addWidget("LabelX", new LabelFixedFont(null, "X")) .setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutX.addWidget("ButtonXAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutX.addWidget("ValueDisplayX", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutX.addWidget("ButtonXSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutY = this.addWidget("LayoutY", new LayoutBase(this)); + layoutY.setGeometry(new WidgetGeometry(45.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutY.addWidget("LabelY", new LabelFixedFont(null, "Y")) .setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutY.addWidget("ButtonYAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutY.addWidget("ValueDisplayY", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutY.addWidget("ButtonYSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutAlpha = this.addWidget("LayoutAlpha", new LayoutBase(this)); + layoutAlpha.setGeometry(new WidgetGeometry(55.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutAlpha.addWidget("LabelAlpha", new LabelFixedFont(null, "Alpha")).setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutAlpha.addWidget("ButtonAlphaAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutAlpha.addWidget("ValueDisplayAlpha", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutAlpha.addWidget("ButtonAlphaSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + IWidget layoutScale = this.addWidget("LayoutScale", new LayoutBase(this)); + layoutScale.setGeometry(new WidgetGeometry(65.0,50.0,20,80,CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + layoutScale.addWidget("LabelScale", new LabelFixedFont(null, "screen.label.scale")).setGeometry(new WidgetGeometry(50.0, 0.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutScale.addWidget("ButtonScaleAdd", new ButtonLabel(null, "+")) .setGeometry(new WidgetGeometry(0.0, 10.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + layoutScale.addWidget("ValueDisplayScale", new LabelFixedFont(null, "0")) .setGeometry(new WidgetGeometry(50.0, 40.0,20,20, CType.REL_X, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + layoutScale.addWidget("ButtonScaleSub", new ButtonLabel(null, "-")) .setGeometry(new WidgetGeometry(0.0, 60.0,20,20, CType.REL_X, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + + this.addWidget("ButtonCancel", new ButtonScreenChange(null, "screen.button.cancel", prevScreen)).setGeometry(new WidgetGeometry(70.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); + this.addWidget("ButtonOk", new ButtonScreenChange(null, "screen.button.ok", prevScreen)).setGeometry(new WidgetGeometry(30.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); + this.addWidget("ButtonDefault",new ButtonLabel(null, "screen.button.default")).setGeometry(new WidgetGeometry(50.0,97.0,75,20, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.BOTTOM)); + + + + ((LabelFixedFont)this.getWidget("LayoutX").getWidget("ValueDisplayX")).setText(String.format("%.2f", picX)); + ((LabelFixedFont)this.getWidget("LayoutY").getWidget("ValueDisplayY")).setText(String.format("%.2f", picY)); + ((LabelFixedFont)this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")).setText(String.format("%.2f", picAlpha)); + ((LabelFixedFont)this.getWidget("LayoutScale").getWidget("ValueDisplayScale")).setText(String.format("%.2f", scale)); + + this.getWidget("Layout").getWidget("Picture").setAlpha(picAlpha); + + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY){ + if (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(posX, posY)) + return this.getWidget("Layout").getWidget("Picture"); + else + return super.getWidgetAtCoordinates(posX, posY); + } + + @Override + public void onMouseClick(MouseEvent event){ + //System.out.println(this.getWidgetAtCoordinates(event.x, event.y)); + + if ((event.button == 0) && (this.getWidget("Layout").getWidget("Picture").isWidgetAtCoordinates(event.x, event.y))){ + this.getWidget("Layout").getWidget("Picture").onMouseClick(event); + this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); + } + else + super.onMouseClick(event); + } + + @Override + public void onMouseDrag(MouseEvent event){ + + //if ((this.getWidgetAtCoordinates(event.x, event.y) == this) && (this.draggedWidget != null)){ + if (this.draggedWidget != null){ + this.draggedWidget.onMouseDrag(event); + } else { + super.onMouseDrag(event); + } + } + + @Override + public void onMouseRelease(MouseEvent event){ + if (event.button == 0) + this.draggedWidget = null; + super.onMouseRelease(event); + } + + + private void updateData(){ + ((LabelFixedFont)this.getWidget("LayoutX").getWidget("ValueDisplayX")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX())); + ((LabelFixedFont)this.getWidget("LayoutY").getWidget("ValueDisplayY")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY())); + ((LabelFixedFont)this.getWidget("LayoutAlpha").getWidget("ValueDisplayAlpha")).setText(String.format("%.2f", this.getWidget("Layout").getWidget("Picture").getAlpha())); + ((LabelFixedFont)this.getWidget("LayoutScale").getWidget("ValueDisplayScale")).setText(String.format("%.2f", scale)); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ + + if (this.getWidget("Layout") == null) return; + + if (srcwidget.equals(this.getWidget("Layout").getWidget("Picture")) && signal == Signal.DRAGGED){ + this.draggedWidget = this.getWidget("Layout").getWidget("Picture"); + this.updateData(); + } + + if (signal == Signal.CLICKED){ + + IWidget picture = this.getWidget("Layout").getWidget("Picture"); + double pictureX = picture.getGeometry().getRawPos().getX(); + double pictureY = picture.getGeometry().getRawPos().getY(); + double pixelToPercentX = 100.0D / picture.getParent().getSize().getX(); + double pixelToPercentY = 100.0D / picture.getParent().getSize().getY(); + + if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXAdd"))){ + double newPos = Math.min(pictureX + pixelToPercentX, 100.0); + picture.setPos(newPos, pictureY); + } + + if (srcwidget.equals(this.getWidget("LayoutX").getWidget("ButtonXSub"))){ + double newPos = Math.max(pictureX - pixelToPercentX, 0.0); + picture.setPos(newPos, pictureY); + } + + if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYAdd"))){ + double newPos = Math.min(pictureY + pixelToPercentY, 100.0); + picture.setPos(pictureX, newPos); + } + + if (srcwidget.equals(this.getWidget("LayoutY").getWidget("ButtonYSub"))){ + double newPos = Math.max(pictureY - pixelToPercentY, 0.0); + picture.setPos(pictureX, newPos); + } + + if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaAdd"))) + picture.setAlpha(Math.min(picture.getAlpha() + 0.05f, 1.0f)); + + if (srcwidget.equals(this.getWidget("LayoutAlpha").getWidget("ButtonAlphaSub"))) + picture.setAlpha(Math.max(picture.getAlpha() - 0.05f, 0.0f)); + + if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleAdd"))){ + scale += 0.05f; + scale = Math.max(0.10f, scale); + scale = Math.min(2.00f, scale); + + int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); + picture.setSize(picSX, picSY); + ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); + } + + if (srcwidget.equals(this.getWidget("LayoutScale").getWidget("ButtonScaleSub"))){ + scale -= 0.05f; + scale = Math.max(0.10f, scale); + scale = Math.min(2.00f, scale); + + int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); + picture.setSize(picSX, picSY); + ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); + } + + //picture.emit(Signal.DRAGGED, picture.getPos()); + this.updateData(); + + } + if (srcwidget.equals(this.getWidget("ButtonOk")) && signal == Signal.CLICKED){ + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getX() * 100.0)); + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, (int)(this.getWidget("Layout").getWidget("Picture").getGeometry().getRawPos().getY() * 100.0)); + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, (int)(this.getWidget("Layout").getWidget("Picture").getAlpha() * 100.0)); + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE, (int)(scale * 100.0)); + + OverlayConfig.alpha = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0); + OverlayConfig.posX = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 0); + OverlayConfig.posY = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 0); + OverlayConfig.scale = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SCALE,0) / 100.0f; + + OverlayConfig.updateColors(); + } + + if (srcwidget.equals(this.getWidget("ButtonDefault")) && signal == Signal.CLICKED){ + this.getWidget("Layout").getWidget("Picture").setPos(50.0, 1.0); + this.getWidget("Layout").getWidget("Picture").setAlpha(0.8f); + this.scale = 1.0f; + int picSX = (int)(180 / this.rez.getScaleFactor() * scale), picSY = (int)(62 / this.rez.getScaleFactor() * scale); + this.getWidget("Layout").getWidget("Picture").setSize(picSX, picSY); + ((LayoutMargin)this.getWidget("Layout")).setMargins(picSX/2, picSX/2, picSY/2, picSY/2); + + this.updateData(); + } + } + } + + public ScreenHUDConfig(GuiScreen parent){ + super(parent); + + this.getRoot().addWidget("EventCanvas", new EventCanvas(this.getRoot(), parent)); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java new file mode 100644 index 0000000..2815ec0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java @@ -0,0 +1,31 @@ +package mcp.mobius.waila.gui.screens.config; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import net.minecraft.client.gui.GuiScreen; + +public class ScreenModuleChoice extends ScreenBase { + + public ScreenModuleChoice(GuiScreen parent){ + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainer(this.getRoot(), 3, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(50.0, 20.0, 400.0, 60.0, CType.RELXY, CType.REL_Y, WAlign.CENTER, WAlign.TOP)); + + ButtonContainer buttonContainer = ((ButtonContainer)this.getRoot().getWidget("ButtonContainer")); + + for (String key : ConfigHandler.instance().getModuleNames()) + buttonContainer.addButton( new ButtonScreenChange(this.getRoot(), key, new ScreenModuleConfig(this, key))); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "Back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java new file mode 100644 index 0000000..20b758c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java @@ -0,0 +1,48 @@ +package mcp.mobius.waila.gui.screens.config; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig; +import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfigRemote; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.client.gui.GuiScreen; + +public class ScreenModuleConfig extends ScreenBase { + + private String modName; + + public ScreenModuleConfig(GuiScreen parent, String modname){ + super(parent); + + this.modName = modname; + + this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(0.0, 20.0, 100.0, 60.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + + ButtonContainerLabel buttonContainer = ((ButtonContainerLabel)this.getRoot().getWidget("ButtonContainer")); + + for (String key:ConfigHandler.instance().getConfigKeys(this.modName).keySet()){ + if (ConfigHandler.instance().isServerRequired(key)) + buttonContainer.addButton(new ButtonBooleanConfigRemote(this.getRoot(), Constants.CATEGORY_MODULES, key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key)); + else + buttonContainer.addButton(new ButtonBooleanConfig(this.getRoot(), Constants.CATEGORY_MODULES, key, "screen.button.no", "screen.button.yes"), ConfigHandler.instance().getConfigKeys(this.modName).get(key)); + //buttonContainer.addButton(new ButtonConfigRemote(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key )); + //else + //buttonContainer.addButton(new ButtonConfigOption(-1, "No", "Yes", ConfigHandler.instance().getConfigKeys(this.modName).get(key), key )); + } + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(this.getRoot().getWidget("LayoutBack"), "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + + +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java new file mode 100644 index 0000000..0be8fc8 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java @@ -0,0 +1,43 @@ +package mcp.mobius.waila.gui.screens.config; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonBooleanConfig; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import mcp.mobius.waila.utils.Constants; + +public class ScreenWailaConfig extends ScreenBase { + public ScreenWailaConfig(GuiScreen parent){ + super(parent); + + this.getRoot().addWidget("ButtonContainer", new ButtonContainerLabel(this.getRoot(), 2, 100, 25.0)); + this.getRoot().getWidget("ButtonContainer").setGeometry(new WidgetGeometry(0.0, 10.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); + + ButtonContainerLabel buttonContainer = ((ButtonContainerLabel)this.getRoot().getWidget("ButtonContainer")); + + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true, true, "screen.button.hidden", "screen.button.visible"), "choice.showhidewaila"); + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, true, true, "screen.button.maintained", "screen.button.toggled"), "choice.toggledmaintained"); + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showhideidmeta"); + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true, false,"screen.button.hidden", "screen.button.visible"), "choice.showliquids"); + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, true, false,"screen.button.no", "screen.button.yes"), "choice.shifttoggledblock"); + buttonContainer.addButton( new ButtonBooleanConfig(this.getRoot(), Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, true, false,"screen.button.no", "screen.button.yes"), "choice.shifttoggledents"); + + + this.getRoot().addWidget("LayoutConfigPos", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutConfigPos").setGeometry(new WidgetGeometry(0.0, 50.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutConfigPos").addWidget("ButtonConfigPos", new ButtonScreenChange(null, "screen.button.configureaspect", new ScreenHUDConfig(this))); + this.getRoot().getWidget("LayoutConfigPos").getWidget("ButtonConfigPos").setGeometry(new WidgetGeometry(50.0, 50.0, 150.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.getRoot().addWidget("LayoutBack", new LayoutBase(this.getRoot())); + this.getRoot().getWidget("LayoutBack").setGeometry(new WidgetGeometry(0.0, 80.0, 100.0, 20.0, CType.RELXY, CType.RELXY)); + this.getRoot().getWidget("LayoutBack").addWidget("ButtonBack", new ButtonScreenChange(null, "screen.button.back", this.parent)); + this.getRoot().getWidget("LayoutBack").getWidget("ButtonBack").setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java new file mode 100644 index 0000000..43945b5 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java @@ -0,0 +1,79 @@ +package mcp.mobius.waila.gui.screens.info; + +import mcp.mobius.waila.cbcore.LangUtil; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.ItemStackDisplay; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.ViewTable; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; + +public class ScreenEnchants extends ScreenBase { + + public ScreenEnchants(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("Layout_Title", new LayoutBase(null)) + .setGeometry(new WidgetGeometry(50.0, 10.0, 50.0, 32.0, CType.REL_X, CType.REL_X, WAlign.CENTER, WAlign.TOP)); + + this.getRoot().getWidget("Layout_Title").addWidget("ItemStack", new ItemStackDisplay(null)) + .setGeometry(new WidgetGeometry(0.0, 0.0, 32.0, 32.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + this.getRoot().getWidget("Layout_Title").addWidget("LabelName", new LabelFixedFont(null, "None")) + .setGeometry(new WidgetGeometry(40.0, 4.0, 16.0, 16.0, CType.ABSXY, CType.ABSXY, WAlign.LEFT, WAlign.TOP)); + + this.getRoot().getWidget("Layout_Title").addWidget("LabelEnchantability", new LabelFixedFont(null, "None")) + .setGeometry(new WidgetGeometry(40.0, 22.0, 16.0, 16.0, CType.ABSXY, CType.REL_X, WAlign.LEFT, WAlign.BOTTOM)); + + this.getRoot().addWidget("Table", new ViewTable(null)) + .setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 80.0, CType.REL_X, CType.RELXY, WAlign.CENTER, WAlign.TOP)); + + String columnName = "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.name"); + String columnMinLvl= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.minlvl");; + String columnMaxLvl= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.maxlvl");; + String columnWeight= "\u00a7a\u00a7o" + LangUtil.translateG("enchant.title.weight");; + + ((ViewTable)this.getRoot().getWidget("Table")) + .setColumnsTitle(columnName, columnMinLvl, columnMaxLvl, columnWeight, "\u00a7a\u00a7oMod") + .setColumnsWidth(35.0, 10.0, 10.0, 10.0, 35.0) + .setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER, WAlign.CENTER, WAlign.LEFT); + } + + public ViewTable getTable(){ + return (ViewTable)this.getRoot().getWidget("Table"); + } + + public ScreenEnchants addRow(String...strings ){ + this.getTable().addRow(strings); + return this; + } + + public ScreenEnchants setStack(ItemStack stack){ + ((ItemStackDisplay)this.getRoot().getWidget("Layout_Title").getWidget("ItemStack")).setStack(stack); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + public ScreenEnchants setName(String name){ + ((LabelFixedFont)this.getRoot().getWidget("Layout_Title").getWidget("LabelName")).setText(name); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + public ScreenEnchants setEnchantability(String value){ + ((LabelFixedFont)this.getRoot().getWidget("Layout_Title").getWidget("LabelEnchantability")).setText(String.format("%s : %s", LangUtil.translateG("enchant.label.enchantability"), value)); + this.getRoot().getWidget("Layout_Title").adjustSize(); + return this; + } + + /* + public ScreenEnchants setStack(ItemStack stack){ + ((ItemStackDisplay)this.getRoot().getWidget("ItemStack")).setStack(stack); + return this; + } + */ +} diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java new file mode 100644 index 0000000..8dfd438 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java @@ -0,0 +1,70 @@ +package mcp.mobius.waila.gui.testing; + +import org.lwjgl.util.Point; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIException; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.ItemStackDisplay; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.LayoutCropping; +import mcp.mobius.waila.gui.widgets.PictureDisplay; +import mcp.mobius.waila.gui.widgets.PictureSwitch; +import mcp.mobius.waila.gui.widgets.ViewTable; +import mcp.mobius.waila.gui.widgets.ViewportScrollable; +import mcp.mobius.waila.gui.widgets.WidgetBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonBoolean; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonInteger; +import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig; +import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; +import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC; +import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + +public class ScreenTest extends ScreenBase { + + public ScreenTest(GuiScreen parent) { + super(parent); + + this.getRoot().addWidget("Test", new ViewTable(null)) + .setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + ((ViewTable)this.getRoot().getWidget("Test")) + .setColumnsTitle("Column1","Column2","Column3") + .setColumnsWidth(30.0,30.0,30.0) + .setColumnsAlign(WAlign.CENTER, WAlign.CENTER, WAlign.CENTER) + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3") + .addRow("test1", "test2", "test3"); + + + /* + this.getRoot().addWidget("Test", new Row(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 20.0, CType.RELXY, CType.REL_X, WAlign.CENTER, WAlign.CENTER)); + ((Row)this.getRoot().getWidget("Test")).setColumnsText("aabbbbbbbbbbbbbbbbbbbbbbbbb","bb","cc"); + ((Row)this.getRoot().getWidget("Test")).setColumnsWidth(30.0,30.0,30.0); + ((Row)this.getRoot().getWidget("Test")).setColumnsAlign(WAlign.LEFT, WAlign.CENTER, WAlign.CENTER); + */ + + + //this.getRoot().addWidget("TestLayout", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 90.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + //((LayoutBase)this.getRoot().getWidget("TestLayout")).setBackgroundColors(0xff505050, 0xff505050); + + //this.getRoot().addWidget("Layout", new ViewportScrollable(null)).setGeometry(new WidgetGeometry(50.0,50.0,75.0,75.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + //((ViewportScrollable)this.getRoot().getWidget("Layout")).attachWidget(new PictureSwitch(this.getRoot(), "waila:textures/test.png", "waila:textures/test_solar.png")).setSize(900, 900); + + + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java new file mode 100644 index 0000000..a5844ad --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java @@ -0,0 +1,29 @@ +package mcp.mobius.waila.gui.testing; + +import net.minecraft.client.gui.GuiScreen; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; +import mcp.mobius.waila.gui.widgets.buttons.ButtonIntegerConfig; + +public class ScreenTest2 extends ScreenBase { + + public ScreenTest2(GuiScreen parent) { + super(parent); + //this.getRoot().addWidget("Picture", new PictureSwitch(this.getRoot(), "waila:textures/test.png", "waila:textures/test_solar.png")); + //this.getRoot().addWidget("Button", new ButtonInteger(this.getRoot(), "Val0", "Val1", "Val2")); + //this.getRoot().getWidget("Button").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, true, false, WidgetAlign.CENTER, WidgetAlign.CENTER)); + + this.getRoot().addWidget("Buttons", new ButtonContainerLabel(this.getRoot(), 2, 100, 30.0)); + this.getRoot().getWidget("Buttons").setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 50.0, CType.RELXY, CType.RELXY)); + + //((ButtonContainer)this.getRoot().getWidget("Buttons")).addButton(new ButtonIntegerConfig(this.getRoot(), "testconfig", true, 0, "Val0", "Val1", "Val2")); + + this.getRoot().addWidget("Text", new LabelFixedFont(this.getRoot(), "waila:textures/test.png")); + this.getRoot().getWidget("Text").setGeometry(new WidgetGeometry(50.0D, 10.0D, 50.0D, 50.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.TOP)); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java new file mode 100644 index 0000000..6bb8078 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java @@ -0,0 +1,118 @@ +package mcp.mobius.waila.gui.truetyper; + +/** +* TrueTyper: Open Source TTF implementation for Minecraft. +* Copyright (C) 2013 - Mr_okushama +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +import java.nio.FloatBuffer; + +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.vector.Matrix4f; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraftforge.client.GuiIngameForge; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.common.MinecraftForge; + +public class FontHelper { + + private static String formatEscape = "\u00A7"; + + + public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float... rgba){ + drawString(s,x,y,font,scaleX,scaleY,0,rgba); + + } + + public static void drawString(String s, float x, float y, TrueTypeFont font, float scaleX, float scaleY, float rotationZ, float... rgba){ + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + if(mc.gameSettings.hideGUI){ + return; + } + int amt = 1; + if(sr.getScaleFactor() == 1){ + amt = 2; + } + + FloatBuffer matrixData = BufferUtils.createFloatBuffer(16); + GL11.glGetFloat(GL11.GL_MODELVIEW_MATRIX, matrixData); + FontHelper.set2DMode(matrixData); + GL11.glPushMatrix(); + y = mc.displayHeight-(y*sr.getScaleFactor())-(((font.getLineHeight()/amt))); + float tx = (x*sr.getScaleFactor())+(font.getWidth(s)/2); + float tranx = tx+2; + float trany = y+(font.getLineHeight()/2); + GL11.glTranslatef(tranx,trany,0); + GL11.glRotatef(rotationZ, 0f, 0f, 1f); + GL11.glTranslatef(-tranx,-trany,0); + + + GL11.glEnable(GL11.GL_BLEND); + if(s.contains(formatEscape)){ + String[] pars = s.split(formatEscape); + float totalOffset = 0; + for(int i = 0; i < pars.length; i++){ + String par = pars[i]; + float[] c = rgba; + if(i > 0){ + c = Formatter.getFormatted(par.charAt(0)); + par = par.substring(1, par.length()); + } + font.drawString((x*sr.getScaleFactor()+totalOffset), y, par, scaleX/amt, scaleY/amt, c); + totalOffset += font.getWidth(par); + } + }else{ + font.drawString((x*sr.getScaleFactor()), y, s, scaleX/amt, scaleY/amt, rgba); + } + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_BLEND); + FontHelper.set3DMode(); + } + + private static void set2DMode(FloatBuffer matrixData) { + Minecraft mc = Minecraft.getMinecraft(); + ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + mc.entityRenderer.setupOverlayRendering(); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glPushMatrix(); + //GL11.glLoadMatrix(matrixData); + + GL11.glLoadIdentity(); + GL11.glOrtho(0, mc.displayWidth, 0, mc.displayHeight, -1, 1); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glPushMatrix(); + GL11.glLoadIdentity(); + + Matrix4f matrix = new Matrix4f(); + matrix.load(matrixData); + GL11.glTranslatef(matrix.m30*sr.getScaleFactor(),-matrix.m31*sr.getScaleFactor(), 0f); + + } + + private static void set3DMode() { + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glPopMatrix(); + Minecraft mc = Minecraft.getMinecraft(); + mc.entityRenderer.setupOverlayRendering(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java new file mode 100644 index 0000000..232bb83 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java @@ -0,0 +1,69 @@ +package mcp.mobius.waila.gui.truetyper; + +/** +* TrueTyper: Open Source TTF implementation for Minecraft. +* Copyright (C) 2013 - Mr_okushama +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +import java.awt.Font; +import java.awt.FontFormatException; +import java.awt.geom.AffineTransform; +import java.io.IOException; +import java.util.ArrayList; + + + +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +public class FontLoader{ + + public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias){ + return loadSystemFont(name, defSize, antialias, Font.TRUETYPE_FONT); + + } + + public static TrueTypeFont loadSystemFont(String name, float defSize, boolean antialias, int type){ + Font font; + TrueTypeFont out = null; + try { + font = new Font(name, type, (int)defSize); + font = font.deriveFont(defSize); + out = new TrueTypeFont(font, antialias); + } catch (Exception e) { + e.printStackTrace(); + } + return out; + } + + public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias){ + return createFont(res, defSize, antialias, Font.TRUETYPE_FONT); + } + + public static TrueTypeFont createFont(ResourceLocation res, float defSize, boolean antialias, int type){ + Font font; + TrueTypeFont out = null; + try { + font = Font.createFont(type, Minecraft.getMinecraft().getResourceManager().getResource(res).getInputStream()); + font = font.deriveFont(defSize); + out = new TrueTypeFont(font, antialias); + } catch (Exception e) { + e.printStackTrace(); + } + return out; + } + +} \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java new file mode 100644 index 0000000..2c20a42 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java @@ -0,0 +1,86 @@ +package mcp.mobius.waila.gui.truetyper; + +/** +* TrueTyper: Open Source TTF implementation for Minecraft. +* Copyright (C) 2013 - Mr_okushama +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +public class Formatter { + + public static float[] getFormatted(char c){ + int[] outrgba = null; + float[] outfloat; + switch(c){ + case '0': + outrgba = new int[]{0,0,0,0,255}; + break; + case '1': + outrgba = new int[]{0,0,170,255}; + break; + case '2': + outrgba = new int[]{0,170,0,255}; + break; + case '3': + outrgba = new int[]{0,170,170,255}; + break; + case '4': + outrgba = new int[]{170,0,0,255}; + break; + case '5': + outrgba = new int[]{170,0,170,255}; + break; + case '6': + outrgba = new int[]{255,170,0,255}; + break; + case '7': + outrgba = new int[]{170,170,170,255}; + break; + case '8': + outrgba = new int[]{85,85,85,255}; + break; + case '9': + outrgba = new int[]{85,85,255,255}; + break; + case 'a': + outrgba = new int[]{85,255,85,255}; + break; + case 'b': + outrgba = new int[]{85,255,255,255}; + break; + case 'c': + outrgba = new int[]{255,85,85,255}; + break; + case 'd': + outrgba = new int[]{85,255,255,255}; + break; + case 'e': + outrgba = new int[]{255,255,85,255}; + break; + case 'f': + outrgba = new int[]{255,255,255,255}; + break; + default: + outrgba = new int[]{255,255,255,255}; + break; + } + outfloat = new float[outrgba.length]; + for(int i = 0; i < outrgba.length ; i++){ + outfloat[i] = outrgba[i] > 0 ? outrgba[i]/255 : 0; + } + return outfloat; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java new file mode 100644 index 0000000..dbb3b17 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java @@ -0,0 +1,71 @@ +package mcp.mobius.waila.gui.truetyper; + +/** +* TrueTyper: Open Source TTF implementation for Minecraft. +* Copyright (C) 2013 - Mr_okushama +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ + +import java.awt.Font; +import java.awt.GraphicsEnvironment; +import java.util.ArrayList; + +import net.minecraft.util.EnumChatFormatting; + +public class Test { + + public static ArrayList testFonts = new ArrayList(); + public static float[] white = {1f,1f,1f,1f}; + public static boolean init = false; + public static void initTest(){ + return; + /* + GraphicsEnvironment e = GraphicsEnvironment.getLocalGraphicsEnvironment(); + Font[] fonts = e.getAllFonts(); + { + int max = 9; + for(Font f : fonts){ + boolean pass = true; + for(TrueTypeFont ttf : testFonts){ + if(ttf.font.getFontName().startsWith(f.getFontName().substring(0, 1))){ + pass = false; + continue; + } + } + if(pass){ + max--; + if(max == 0){ + break; + } + testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, false)); + testFonts.add(FontLoader.loadSystemFont(f.getFontName(), 24f, true)); + } + } + } + init = true; + + } + + public static void doTest(){ + if(!init){ + initTest(); + } + for(int i =0; i < testFonts.size(); i++){ + int y = 10+i*12; + int x = 10; + FontHelper.drawString("He"+EnumChatFormatting.GOLD+"llo "+EnumChatFormatting.GREEN+"wor"+EnumChatFormatting.YELLOW+"ld", x, y, testFonts.get(i), 1f, 1f); + }*/ + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java new file mode 100644 index 0000000..14ebe83 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java @@ -0,0 +1,507 @@ +package mcp.mobius.waila.gui.truetyper; + +import java.awt.Color; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferInt; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.IntBuffer; +import java.util.HashMap; +import java.util.Map; +import java.awt.GraphicsEnvironment; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.settings.GameSettings; + +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; +import org.lwjgl.opengl.GL30; +import org.lwjgl.util.glu.GLU; + + +/** +* TrueTyper: Open Source TTF implementation for Minecraft. +* Modified from Slick2D - under BSD Licensing - http://slick.ninjacave.com/license/ +* +* Copyright (c) 2013 - Slick2D +* +* All rights reserved. +*/ + +public class TrueTypeFont { + public final static int + ALIGN_LEFT = 0, + ALIGN_RIGHT = 1, + ALIGN_CENTER = 2; + /** Array that holds necessary information about the font characters */ + private FloatObject[] charArray = new FloatObject[256]; + + /** Map of user defined font characters (Character <-> IntObject) */ + private Map customChars = new HashMap(); + + /** Boolean flag on whether AntiAliasing is enabled or not */ + protected boolean antiAlias; + + /** Font's size */ + private float fontSize = 0; + + /** Font's height */ + private float fontHeight = 0; + + /** Texture used to cache the font 0-255 characters */ + private int fontTextureID; + + /** Default font texture width */ + private int textureWidth = 1024; + + /** Default font texture height */ + private int textureHeight = 1024; + + /** A reference to Java's AWT Font that we create our font texture from */ + protected Font font; + + /** The font metrics for our Java AWT font */ + private FontMetrics fontMetrics; + + + private int correctL = 9, correctR = 8; + + private class FloatObject { + /** Character's width */ + public float width; + + /** Character's height */ + public float height; + + /** Character's stored x position */ + public float storedX; + + /** Character's stored y position */ + public float storedY; + } + + + public TrueTypeFont(Font font, boolean antiAlias, char[] additionalChars) { + this.font = font; + this.fontSize = font.getSize()+3; + this.antiAlias = antiAlias; + + createSet( additionalChars ); + System.out.println("TrueTypeFont loaded: "+font+" - AntiAlias = "+antiAlias); + fontHeight -= 1; + if (fontHeight <= 0) fontHeight = 1; + } + + public TrueTypeFont(Font font, boolean antiAlias) { + this( font, antiAlias, null ); + } + public void setCorrection(boolean on) { + if (on) { + correctL = 2; + correctR = 1; + } else { + correctL = 0; + correctR = 0; + } + } + + private BufferedImage getFontImage(char ch) { + // Create a temporary image to extract the character's size + BufferedImage tempfontImage = new BufferedImage(1, 1, + BufferedImage.TYPE_INT_ARGB); + Graphics2D g = (Graphics2D) tempfontImage.getGraphics(); + if (antiAlias == true) { + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + } + g.setFont(font); + fontMetrics = g.getFontMetrics(); + float charwidth = fontMetrics.charWidth(ch)+8; + + if (charwidth <= 0) { + charwidth = 7; + } + float charheight = fontMetrics.getHeight()+3; + if (charheight <= 0) { + charheight = fontSize; + } + + // Create another image holding the character we are creating + BufferedImage fontImage; + fontImage = new BufferedImage((int)charwidth,(int)charheight, + BufferedImage.TYPE_INT_ARGB); + Graphics2D gt = (Graphics2D) fontImage.getGraphics(); + if (antiAlias == true) { + gt.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + } + gt.setFont(font); + + gt.setColor(Color.WHITE); + int charx = 3; + int chary = 1; + gt.drawString(String.valueOf(ch), (charx), (chary) + + fontMetrics.getAscent()); + + return fontImage; + + } + + private void createSet( char[] customCharsArray ) { + // If there are custom chars then I expand the font texture twice + if (customCharsArray != null && customCharsArray.length > 0) { + textureWidth *= 2; + } + + // In any case this should be done in other way. Texture with size 512x512 + // can maintain only 256 characters with resolution of 32x32. The texture + // size should be calculated dynamicaly by looking at character sizes. + + try { + + BufferedImage imgTemp = new BufferedImage(textureWidth, textureHeight, BufferedImage.TYPE_INT_ARGB); + Graphics2D g = (Graphics2D) imgTemp.getGraphics(); + + g.setColor(new Color(0,0,0,1)); + g.fillRect(0,0,textureWidth,textureHeight); + + float rowHeight = 0; + float positionX = 0; + float positionY = 0; + + int customCharsLength = ( customCharsArray != null ) ? customCharsArray.length : 0; + + for (int i = 0; i < 256 + customCharsLength; i++) { + + // get 0-255 characters and then custom characters + char ch = ( i < 256 ) ? (char) i : customCharsArray[i-256]; + + BufferedImage fontImage = getFontImage(ch); + + FloatObject newIntObject = new FloatObject(); + + newIntObject.width = fontImage.getWidth(); + newIntObject.height = fontImage.getHeight(); + + if (positionX + newIntObject.width >= textureWidth) { + positionX = 0; + positionY += rowHeight; + rowHeight = 0; + } + + newIntObject.storedX = positionX; + newIntObject.storedY = positionY; + + if (newIntObject.height > fontHeight) { + fontHeight = newIntObject.height; + } + + if (newIntObject.height > rowHeight) { + rowHeight = newIntObject.height; + } + + // Draw it here + g.drawImage(fontImage, (int)positionX, (int)positionY, null); + + positionX += newIntObject.width; + + if( i < 256 ) { // standard characters + charArray[i] = newIntObject; + } else { // custom characters + customChars.put( new Character( ch ), newIntObject ); + } + + fontImage = null; + } + + fontTextureID = loadImage(imgTemp); + + + + //.getTexture(font.toString(), imgTemp); + + } catch (Exception e) { + System.err.println("Failed to create font."); + e.printStackTrace(); + } + } + + private void drawQuad(float drawX, float drawY, float drawX2, float drawY2, + float srcX, float srcY, float srcX2, float srcY2) { + float DrawWidth = drawX2 - drawX; + float DrawHeight = drawY2 - drawY; + float TextureSrcX= srcX / textureWidth; + float TextureSrcY = srcY / textureHeight; + float SrcWidth = srcX2 - srcX; + float SrcHeight = srcY2 - srcY; + float RenderWidth = (SrcWidth / textureWidth); + float RenderHeight = (SrcHeight / textureHeight); + Tessellator t = Tessellator.instance; + + //t.setColorRGBA_F(0f, 0f, 0f, 1f); + + t.addVertexWithUV(drawX, drawY, 0, TextureSrcX, TextureSrcY); + //GL11.glTexCoord2f(TextureSrcX, TextureSrcY); + //GL11.glVertex2f(drawX, drawY); + + t.addVertexWithUV(drawX, drawY + DrawHeight, 0, TextureSrcX, TextureSrcY + RenderHeight); + //GL11.glTexCoord2f(TextureSrcX, TextureSrcY + RenderHeight); + //GL11.glVertex2f(drawX, drawY + DrawHeight); + + t.addVertexWithUV(drawX + DrawWidth, drawY + DrawHeight, 0, TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); + //GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY + RenderHeight); + //GL11.glVertex2f(drawX + DrawWidth, drawY + DrawHeight); + + t.addVertexWithUV(drawX + DrawWidth, drawY, 0, TextureSrcX + RenderWidth, TextureSrcY); + //GL11.glTexCoord2f(TextureSrcX + RenderWidth, TextureSrcY); + //GL11.glVertex2f(drawX + DrawWidth, drawY); + } + + public float getWidth(String whatchars) { + float totalwidth = 0; + FloatObject floatObject = null; + int currentChar = 0; + float lastWidth = -10f; + for (int i = 0; i < whatchars.length(); i++) { + currentChar = whatchars.charAt(i); + if (currentChar < 256) { + floatObject = charArray[currentChar]; + } else { + floatObject = (FloatObject)customChars.get( new Character( (char) currentChar ) ); + } + + if( floatObject != null ){ + totalwidth += floatObject.width/2; + lastWidth = floatObject.width; + } + } + //System.out.println("Size: "+totalwidth); + return this.fontMetrics.stringWidth(whatchars); + //return (totalwidth); + } + + public float getHeight() { + return fontHeight; + } + + + public float getHeight(String HeightString) { + return fontHeight; + } + + public float getLineHeight() { + return fontHeight; + } + + public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, float... rgba) { + if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; + drawString(x,y,whatchars, 0, whatchars.length()-1, scaleX, scaleY, ALIGN_LEFT, rgba); + } + public void drawString(float x, float y, String whatchars, float scaleX, float scaleY, int format, float... rgba) { + if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; + + drawString(x,y,whatchars, 0, whatchars.length()-1, scaleX, scaleY, format, rgba); + } + + + public void drawString(float x, float y, String whatchars, int startIndex, int endIndex, float scaleX, float scaleY, int format, float... rgba) { + if(rgba.length == 0) rgba = new float[]{1f,1f,1f,1f}; + GL11.glPushMatrix(); + GL11.glScalef (scaleX, scaleY, 1.0f); + + FloatObject floatObject = null; + int charCurrent; + + + float totalwidth = 0; + int i = startIndex, d, c; + float startY = 0; + + + + switch (format) { + case ALIGN_RIGHT: { + d = -1; + c = correctR; + + while (i < endIndex) { + if (whatchars.charAt(i) == '\n') startY -= fontHeight; + i++; + } + break; + } + case ALIGN_CENTER: { + for (int l = startIndex; l <= endIndex; l++) { + charCurrent = whatchars.charAt(l); + if (charCurrent == '\n') break; + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); + } + totalwidth += floatObject.width-correctL; + } + totalwidth /= -2; + } + case ALIGN_LEFT: + default: { + d = 1; + c = correctL; + break; + } + + } + GL11.glBindTexture(GL11.GL_TEXTURE_2D, fontTextureID); + Tessellator t = Tessellator.instance; + t.startDrawingQuads(); + // GL11.glBegin(GL11.GL_QUADS); + if(rgba.length == 4) + t.setColorRGBA_F(rgba[0], rgba[1], rgba[2], rgba[3]); + while (i >= startIndex && i <= endIndex) { + + charCurrent = whatchars.charAt(i); + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); + } + + if( floatObject != null ) { + if (d < 0) totalwidth += (floatObject.width-c) * d; + if (charCurrent == '\n') { + startY -= fontHeight * d; + totalwidth = 0; + if (format == ALIGN_CENTER) { + for (int l = i+1; l <= endIndex; l++) { + charCurrent = whatchars.charAt(l); + if (charCurrent == '\n') break; + if (charCurrent < 256) { + floatObject = charArray[charCurrent]; + } else { + floatObject = (FloatObject)customChars.get( new Character( (char) charCurrent ) ); + } + totalwidth += floatObject.width-correctL; + } + totalwidth /= -2; + } + //if center get next lines total width/2; + } + else { + drawQuad((totalwidth + floatObject.width) + x/scaleX, + startY + y/scaleY, + totalwidth + x/scaleX, + (startY + floatObject.height) + y/scaleY, + floatObject.storedX + floatObject.width, + floatObject.storedY + floatObject.height, + floatObject.storedX, + floatObject.storedY); + if (d > 0) totalwidth += (floatObject.width-c) * d ; + } + i += d; + + } + } + t.draw(); + // GL11.glEnd(); + + GL11.glPopMatrix(); + } + public static int loadImage(BufferedImage bufferedImage) { + try { + short width = (short)bufferedImage.getWidth(); + short height = (short)bufferedImage.getHeight(); + //textureLoader.bpp = bufferedImage.getColorModel().hasAlpha() ? (byte)32 : (byte)24; + int bpp = (byte)bufferedImage.getColorModel().getPixelSize(); + ByteBuffer byteBuffer; + DataBuffer db = bufferedImage.getData().getDataBuffer(); + if (db instanceof DataBufferInt) { + int intI[] = ((DataBufferInt)(bufferedImage.getData().getDataBuffer())).getData(); + byte newI[] = new byte[intI.length * 4]; + for (int i = 0; i < intI.length; i++) { + byte b[] = intToByteArray(intI[i]); + int newIndex = i*4; + + newI[newIndex] = b[1]; + newI[newIndex+1] = b[2]; + newI[newIndex+2] = b[3]; + newI[newIndex+3] = b[0]; + } + + byteBuffer = ByteBuffer.allocateDirect( + width*height*(bpp/8)) + .order(ByteOrder.nativeOrder()) + .put(newI); + } else { + byteBuffer = ByteBuffer.allocateDirect( + width*height*(bpp/8)) + .order(ByteOrder.nativeOrder()) + .put(((DataBufferByte)(bufferedImage.getData().getDataBuffer())).getData()); + } + byteBuffer.flip(); + + + int internalFormat = GL11.GL_RGBA8, + format = GL11.GL_RGBA; + IntBuffer textureId = BufferUtils.createIntBuffer(1);; + GL11.glGenTextures(textureId); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureId.get(0)); + + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_CLAMP); + + + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST); + //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); + //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_NEAREST); + + //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR_MIPMAP_LINEAR); + //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_LINEAR); + //GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST_MIPMAP_NEAREST); + + GL11.glTexEnvf(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL11.GL_MODULATE); + + GLU.gluBuild2DMipmaps(GL11.GL_TEXTURE_2D, internalFormat, width, height, format, GL11.GL_UNSIGNED_BYTE, byteBuffer); + return textureId.get(0); + + } catch (Exception e) { + e.printStackTrace(); + System.exit(-1); + } + + return -1; + } + public static boolean isSupported(String fontname) { + Font font[] = getFonts(); + for (int i = font.length-1; i >= 0; i--) { + if (font[i].getName().equalsIgnoreCase(fontname)) + return true; + } + return false; + } + public static Font[] getFonts() { + return GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts(); + } + public static byte[] intToByteArray(int value) { + return new byte[] { + (byte)(value >>> 24), + (byte)(value >>> 16), + (byte)(value >>> 8), + (byte)value}; + } + + public void destroy() { + IntBuffer scratch = BufferUtils.createIntBuffer(1); + scratch.put(0, fontTextureID); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0); + GL11.glDeleteTextures(scratch); + } +} \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java new file mode 100644 index 0000000..a06b323 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java @@ -0,0 +1,49 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.interfaces.IWidget; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +import codechicken.nei.guihook.GuiContainerManager; + +public class ItemStackDisplay extends WidgetBase { + + ItemStack stack = null; + + public ItemStackDisplay(IWidget parent){ + this(parent, null); + } + + public ItemStackDisplay(IWidget parent, ItemStack stack){ + super(parent); + this.stack = stack; + this.setSize(16, 16); + } + + public void setStack(ItemStack stack){ + this.stack = stack; + } + + public ItemStack getStack(){ + return this.stack; + } + + @Override + public void draw(Point pos) { + if (this.stack == null) return; + + float scaleX = this.getSize().getX()/16.0f; + float scaleY = this.getSize().getY()/16.0f; + + GL11.glPushMatrix(); + GL11.glScalef(scaleX, scaleY, 1.0f); + + RenderHelper.enableGUIStandardItemLighting(); + GuiContainerManager.drawItem((int)(pos.getX()/scaleX), (int)(pos.getY()/scaleX), this.stack); + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java new file mode 100644 index 0000000..42bd3d7 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java @@ -0,0 +1,60 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.Signal; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.util.Point; + +import mcp.mobius.waila.cbcore.LangUtil; + +public class LabelFixedFont extends WidgetBase { + + protected String text = ""; + protected int color; + + public LabelFixedFont(IWidget parent, String text){ + super(parent); + this.setText(text); + this.color = 0xFFFFFF; + } + + public LabelFixedFont(IWidget parent, String text, int color){ + super(parent); + this.setText(text); + this.color = color; + } + + @Override + public IWidget setGeometry(WidgetGeometry geom){ + this.geom = geom; + this.updateGeometry(); + return this; + } + + public void setText(String text){ + this.text = LangUtil.translateG(text); + this.updateGeometry(); + } + + public void setColor(int color){ + this.color = color; + } + + private void updateGeometry(){ + if (this.geom == null) + this.geom = new WidgetGeometry(0,0,50,50, CType.ABSXY, CType.ABSXY); + + this.geom = new WidgetGeometry(this.geom.x, this.geom.y, this.mc.fontRenderer.getStringWidth(this.text), 8, this.geom.posType, CType.ABSXY, this.geom.alignX, this.geom.alignY); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); + //this.mc.fontRenderer.drawString(this.text, pos.getX(), pos.getY(), this.color); + this.loadGLState(); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java new file mode 100644 index 0000000..1573cc0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java @@ -0,0 +1,47 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; + +import org.lwjgl.util.Point; + +public class LayoutBase extends WidgetBase { + + protected int bgcolor1 = 0x00000000; + protected int bgcolor2 = 0x00000000; + protected boolean renderBG; + + public LayoutBase(IWidget parent){ + super(parent); + } + + @Override + public void draw(Point pos) { + if (this.renderBG) + UIHelper.drawGradientRect(this.getLeft(), this.getTop(), this.getRight(), this.getBottom(), 0, this.bgcolor1, this.bgcolor2); + } + + public void setBackgroundColors(int bg1, int bg2){ + this.bgcolor1 = bg1; + this.bgcolor2 = bg2; + this.renderBG = true; + } + + /* + @Override + public void onMouseEnter(MouseEvent event) { + IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + if (widget != null && widget != this) + widget.onMouseEnter(event); + } + + @Override + public void onMouseLeave(MouseEvent event) { + IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + if (widget != null && widget != this) + widget.onMouseLeave(event); + } + */ + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java new file mode 100644 index 0000000..ce0c023 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java @@ -0,0 +1,122 @@ +package mcp.mobius.waila.gui.widgets; + +import net.minecraft.client.gui.ScaledResolution; + +import org.lwjgl.input.Mouse; +import org.lwjgl.util.Point; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.events.MouseEvent.EventType; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.Signal; + +public class LayoutCanvas extends LayoutBase{ + + private MouseEvent lastMouseEvent; + private IWidget draggedWidget = null; + + public LayoutCanvas(){ + super(null); + this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); + Mouse.getDWheel(); // This is to "calibrate" the DWheel + this.lastMouseEvent = new MouseEvent(this); + } + + @Override + public void draw(){ + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY); + + /* + this.draw(this.getPos()); + + for (IWidget widget: this.widgets.values()) + if (widget.shouldRender()) + widget.draw(); + */ + + super.draw(); + + this.handleMouseInput(); + } + + @Override + public void draw(Point pos) { super.draw(pos); } + + @Override + public void handleMouseInput(){ + // Here we are going to generate the require mouse events we will pass down to all the other widgets + // This is more or less where the magic happens. If you want mouse support for a widget, it should be + // attached to a canvas like this one, or any inheriting one. + + MouseEvent event = new MouseEvent(this); + EventType type = event.getEventType(this.lastMouseEvent); + IWidget targetWidget = this.getWidgetAtCoordinates(event.x, event.y); + + switch (type){ + case CLICK: + if (targetWidget != null) + targetWidget.onMouseClick(event); + //this.onMouseClick(event); + break; + case DRAG: + if (targetWidget != null) + targetWidget.onMouseDrag(event); + //this.onMouseDrag(event); + break; + case MOVE: + if (targetWidget != null) + targetWidget.onMouseMove(event); + //this.onMouseMove(event); + break; + case RELEASED: + if (targetWidget != null) + targetWidget.onMouseRelease(event); + //this.onMouseRelease(event); + break; + case WHEEL: + if (targetWidget != null) + targetWidget.onMouseWheel(event); + //this.onMouseWheel(event); + break; + case ENTER: + if (event.trgwidget != null) + event.trgwidget.onMouseEnter(event); + if (this.lastMouseEvent.trgwidget != null){ + event.type = EventType.LEAVE; + this.lastMouseEvent.trgwidget.onMouseLeave(event); + } + break; + case NONE: + break; + default: + break; + } + + this.lastMouseEvent = event; + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ + if (signal == Signal.DRAGGED) + this.draggedWidget = srcwidget; + else + super.onWidgetEvent(srcwidget, signal, params); + } + + @Override + public void onMouseRelease(MouseEvent event){ + if(event.button == 0) + this.draggedWidget = null; + super.onMouseRelease(event); + } + + @Override + public void onMouseDrag(MouseEvent event){ + if (this.draggedWidget != null) + this.draggedWidget.onMouseDrag(event); + else + super.onMouseDrag(event); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java new file mode 100644 index 0000000..f4464f5 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java @@ -0,0 +1,68 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.interfaces.IWidget; +import net.minecraft.client.gui.ScaledResolution; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +public class LayoutCropping extends LayoutBase { + + int xOffset = 0; + int yOffset = 0; + + public LayoutCropping(IWidget parent){ + super(parent); + } + + public void setOffsets(int xoffset, int yoffset){ + this.xOffset = xoffset; + this.yOffset = yoffset; + } + + @Override + public void draw(){ + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.saveGLState(); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); + + this.draw(this.getPos()); + + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), (this.rez.getScaledHeight() - (this.getPos().getY() + this.getSize().getY())) * this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), this.getSize().getY()*this.rez.getScaleFactor()); + //GL11.glScissor(this.getPos().getX()*this.rez.getScaleFactor(), this.getPos().getY()*this.rez.getScaleFactor(), this.getSize().getX()*this.rez.getScaleFactor(), this.getSize().getY()*this.rez.getScaleFactor()); + + GL11.glTranslatef(xOffset, yOffset, 0.0f); + + /* + for (IWidget widget: this.widgets.values()) + if (widget.shouldRender()) + widget.draw(); + */ + + + for (IWidget widget: this.renderQueue_LOW.values()) + if (widget.shouldRender()) + widget.draw(); + + for (IWidget widget: this.renderQueue_MEDIUM.values()) + if (widget.shouldRender()) + widget.draw(); + + for (IWidget widget: this.renderQueue_HIGH.values()) + if (widget.shouldRender()) + widget.draw(); + + + GL11.glDisable(GL11.GL_SCISSOR_TEST); + + this.loadGLState(); + } + + @Override + public void draw(Point pos) { super.draw(pos); } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java new file mode 100644 index 0000000..1f93e7f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java @@ -0,0 +1,43 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; + +import org.lwjgl.util.Point; + +public class LayoutMargin extends LayoutBase { + + int left = 0; + int right = 0; + int top = 0; + int bottom = 0; + + public LayoutMargin(IWidget parent){ + super (parent); + this.setGeometry(new WidgetGeometry(0,0,0,0,CType.ABSXY,CType.ABSXY,WAlign.CENTER,WAlign.CENTER)); + } + + public void setMargins(int left, int right, int top, int bottom){ + this.left = left; + this.right = right; + this.top = top; + this.bottom = bottom; + } + + @Override + public Point getSize(){ + Point parentSize = this.parent.getSize(); + return new Point(parentSize.getX() - left - right, parentSize.getY() - top - bottom); + } + + @Override + public Point getPos(){ + Point parentPos = this.parent.getPos(); + return new Point(parentPos.getX() + left, parentPos.getY() + top); + } + + @Override + public void draw(Point pos) { super.draw(pos); } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java new file mode 100644 index 0000000..9faccc7 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java @@ -0,0 +1,31 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +public class PictureDisplay extends WidgetBase { + + protected ResourceLocation texture; + + public PictureDisplay(IWidget parent, String uri){ + super(parent); + this.texture = new ResourceLocation(uri); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java new file mode 100644 index 0000000..a8b87f5 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java @@ -0,0 +1,49 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +public class PictureSwitch extends WidgetBase { + + private ResourceLocation texture1; + private ResourceLocation texture2; + private boolean mouseOver = false; + + public PictureSwitch(IWidget parent, String uri1, String uri2){ + super(parent); + this.texture1 = new ResourceLocation(uri1); + this.texture2 = new ResourceLocation(uri2); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + ResourceLocation texture = mouseOver ? this.texture2 : this.texture1; + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } + + @Override + public void onMouseEnter(MouseEvent event){ + //System.out.printf("%s %s\n", this, event); + mouseOver = true; + } + + @Override + public void onMouseLeave(MouseEvent event){ + //System.out.printf("%s %s\n", this, event); + mouseOver = false; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java new file mode 100644 index 0000000..9ac387a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java @@ -0,0 +1,201 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.helpers.UIException; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; + +import org.lwjgl.util.Point; + +public class ViewTable extends WidgetBase{ + + public class Cell extends WidgetBase{ + public Cell(IWidget parent, String text, WAlign align){ + super(parent); + + //this.addWidget("Crop", new LayoutCropping(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 90.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + + switch(align){ + case CENTER: + //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)) + .setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + break; + case LEFT: + //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)) + .setGeometry(new WidgetGeometry(5.0, 50.0, 95.0, 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.CENTER)); + break; + case RIGHT: + //this.getWidget("Crop").addWidget("Text", new LabelFixedFont(null, text)) + this.addWidget("Text", new LabelFixedFont(null, text)) + .setGeometry(new WidgetGeometry(5.0, 50.0, 95.0, 100.0, CType.RELXY, CType.RELXY, WAlign.RIGHT, WAlign.CENTER)); + break; + default: + throw new UIException(String.format("Unexpected align value : %s", align)); + } + } + + @Override + public void draw(Point pos){} + } + + public class Row extends WidgetBase{ + int ncolumns = -1; + double[] widths; + String[] texts; + WAlign[] aligns; + boolean init = false; + int bgcolor1 = 0x50505050; + int bgcolor2 = 0x50505050; + + + public Row(IWidget parent){ + super(parent); + + this.addWidget("Background", new LayoutBase(null)).setGeometry(new WidgetGeometry(50.0, 50.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + ((LayoutBase)this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); + + } + + public Row setColumnsWidth(double... widths){ + if (this.ncolumns == -1) + this.ncolumns = widths.length; + else if(this.ncolumns != widths.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, widths.length)); + } + + this.widths = widths; + + return this; + } + + public Row setColumnsText(String...strings ){ + if (this.ncolumns == -1) + this.ncolumns = strings.length; + else if(this.ncolumns != strings.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, strings.length)); + } + + this.texts = strings; + + return this; + } + + public Row setColumnsAlign(WAlign... aligns ){ + if (this.ncolumns == -1) + this.ncolumns = aligns.length; + else if(this.ncolumns != aligns.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, aligns.length)); + } + + this.aligns = aligns; + + return this; + } + + public Row setColors(int bg1, int bg2){ + this.bgcolor1 = bg1; + this.bgcolor2 = bg2; + ((LayoutBase)this.getWidget("Background")).setBackgroundColors(this.bgcolor1, this.bgcolor2); + return this; + } + + @Override + public void draw(){ + if (!init) + { + double currentOffset = 0.0; + for (int i = 0; i < this.ncolumns; i++){ + if (!this.widgets.containsKey(String.format("Cell_%02d", i))){ + Cell cell = (Cell)(this.addWidget(String.format("Cell_%02d", i), new Cell(null, this.texts[i], this.aligns[i]))); + cell.setGeometry(new WidgetGeometry(currentOffset, 50.0, this.widths[i], 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.CENTER)); + currentOffset += this.widths[i]; + } + } + init = true; + } + + super.draw(); + } + + @Override + public void draw(Point pos){} + } + + int ncolumns = -1; + int nrows = 0; + double[] widths; + String[] texts; + WAlign[] aligns; + boolean init = false; + + public ViewTable(IWidget parent){ + super(parent); + this.addWidget("Titles", new Row(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 16.0, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + ((Row)this.getWidget("Titles")).setColors(0x00000000, 0x00000000); + this.addWidget("Viewport", new ViewportScrollable(null)).setGeometry(new WidgetGeometry(0.0, 16.0, 100.0, 90.0, CType.REL_X, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + ((ViewportScrollable)(this.getWidget("Viewport"))).attachWidget(new LayoutBase(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 0.0, CType.RELXY, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + + } + + @Override + public void draw(Point pos){} + + public ViewTable setColumnsWidth(double... widths){ + if (this.ncolumns == -1) + this.ncolumns = widths.length; + else if(this.ncolumns != widths.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, widths.length)); + } + + this.widths = widths; + ((Row)this.getWidget("Titles")).setColumnsWidth(widths); + return this; + } + + public ViewTable setColumnsTitle(String...strings ){ + if (this.ncolumns == -1) + this.ncolumns = strings.length; + else if(this.ncolumns != strings.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, strings.length)); + } + + this.texts = strings; + ((Row)this.getWidget("Titles")).setColumnsText(strings); + + return this; + } + + public ViewTable setColumnsAlign(WAlign... aligns ){ + if (this.ncolumns == -1) + this.ncolumns = aligns.length; + else if(this.ncolumns != aligns.length){ + throw new UIException(String.format("Number of columns mismatch. Expecting %d, got %d", this.ncolumns, aligns.length)); + } + + this.aligns = aligns; + ((Row)this.getWidget("Titles")).setColumnsAlign(aligns); + + return this; + } + + public ViewTable addRow(String...strings ){ + IWidget tableLayout = ((ViewportScrollable)(this.getWidget("Viewport"))).getAttachedWidget(); + tableLayout.setSize(100.0, (this.nrows + 1) * 16); + + Row newRow = (Row)new Row(null); + newRow.setColumnsWidth(this.widths); + newRow.setColumnsText(strings); + newRow.setColumnsAlign(this.aligns); + if(this.nrows % 2 == 1) + newRow.setColors(0x50808080, 0x50808080); + newRow.setGeometry(new WidgetGeometry(0.0, 16*this.nrows, 100.0, 16, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + + tableLayout.addWidget(String.format("Row_%03d", this.nrows), newRow); + + this.nrows += 1; + + return this; + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java new file mode 100644 index 0000000..247c3e7 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java @@ -0,0 +1,179 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.Signal; +import mcp.mobius.waila.gui.interfaces.WAlign; + +import org.lwjgl.opengl.Display; +import org.lwjgl.util.Point; + +public class ViewportScrollable extends WidgetBase { + + public class Escalator extends WidgetBase{ + int yOffset = 0; + int sizeCursor = 8; + int maxValue = 0; + int step = 0; + boolean drag = false; + + public Escalator(IWidget parent, int step){ + this.parent = parent; + this.step = step; + } + + public void setOffset(int yoffset){ + this.yOffset = yoffset; + } + + public void setMaxValue(int value){ + this.maxValue = value; + } + + public void setStep(int step){ + this.step = step; + } + + @Override + public void draw(Point pos) { + UIHelper.drawGradientRect(this.getLeft(), this.getTop(), this.getRight(), this.getBottom(), 1, 0xff999999, 0xff999999); + int offsetScaled = (int)(((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue * (yOffset)); + UIHelper.drawGradientRect(this.getLeft(), this.getTop() + offsetScaled, this.getRight(), this.getTop() + offsetScaled + sizeCursor, 1, 0xffffffff, 0xffffffff); + } + + @Override + public void onMouseClick(MouseEvent event){ + if (event.button == 0){ + int offsetScaled = this.getTop() + (int)(((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue * (yOffset)); + + this.drag = false; + + if (event.y < offsetScaled) + this.yOffset += this.step; + else if (event.y > offsetScaled + sizeCursor) + this.yOffset -= this.step; + else + this.drag = true; + + this.emit(Signal.VALUE_CHANGED, this.yOffset); + + } else { + super.onMouseClick(event); + } + } + + @Override + public void onMouseRelease(MouseEvent event){ + if (event.button == 0) + this.drag = false; + super.onMouseRelease(event); + } + + @Override + public void onMouseDrag(MouseEvent event){ + if (this.drag){ + int relativeY = (int)event.y - this.getTop(); + double factor = ((double)this.getSize().getY() - (double)sizeCursor + 1) / (double)this.maxValue; + this.yOffset = (int)(relativeY / factor); + this.yOffset = Math.max(this.yOffset, this.maxValue); + this.yOffset = Math.min(this.yOffset, 0); + this.emit(Signal.VALUE_CHANGED, this.yOffset); + this.emit(Signal.DRAGGED, this); + } + else + super.onMouseDrag(event); + } + + } + + IWidget attachedWidget = null; + int yOffset = 0; + int step = 5; + + public ViewportScrollable( IWidget parent){ + super(parent); + this.addWidget("Cropping", new LayoutCropping(null)).setGeometry(new WidgetGeometry(0.0, 0.0, 100.0, 100.0, CType.RELXY, CType.RELXY, WAlign.LEFT, WAlign.TOP)); + this.addWidget("Escalator", new Escalator(null, this.step * 5)).setGeometry(new WidgetGeometry(100.0, 0, 8, 100.0, CType.RELXY, CType.REL_Y, WAlign.RIGHT, WAlign.TOP)).hide(); + } + + public IWidget attachWidget(IWidget widget){ + this.attachedWidget = this.getWidget("Cropping").addWidget("Cropped", widget); + return this.attachedWidget; + } + + public IWidget getAttachedWidget(){ + return this.attachedWidget; + } + + public IWidget setStep(int step){ + this.step = step; + ((Escalator)this.getWidget("Escalator")).setStep(this.step * 5); + return this; + } + + @Override + public void draw(Point pos) {} + + @Override + public void draw(){ + //if (Display.wasResized()) + + if ((this.attachedWidget != null) && (this.attachedWidget.getSize().getY() > this.getSize().getY())) + this.getWidget("Escalator").show(); + else + this.getWidget("Escalator").hide(); + + super.draw(); + } + + @Override + public void onMouseWheel(MouseEvent event){ + this.yOffset += event.z / 120.0 * this.step; + + this.yOffset = Math.max(this.yOffset, this.getSize().getY() - this.attachedWidget.getSize().getY()); + this.yOffset = Math.min(this.yOffset, 0); + + ((LayoutCropping)this.getWidget("Cropping")).setOffsets(0, this.yOffset); + ((Escalator)this.getWidget("Escalator")).setOffset(this.yOffset); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params){ + if (srcwidget.equals(this.attachedWidget) && signal == Signal.GEOM_CHANGED){ + ((Escalator)this.getWidget("Escalator")).setMaxValue(this.getSize().getY() - srcwidget.getSize().getY()); + } + + else if (srcwidget.equals(this.getWidget("Escalator")) && signal == Signal.VALUE_CHANGED){ + this.yOffset = (Integer)params[0]; + ((LayoutCropping)this.getWidget("Cropping")).setOffsets(0, this.yOffset); + } + else + super.onWidgetEvent(srcwidget, signal, params); + + } + + @Override + public void onMouseDrag(MouseEvent event){ + if (this.getWidget("Escalator").shouldRender() && ((Escalator)this.getWidget("Escalator")).drag) + this.getWidget("Escalator").onMouseDrag(event); + else + super.onMouseDrag(event); + } + + @Override + public void onMouseClick(MouseEvent event){ + if (event.button == 0){ + if (!this.getWidget("Escalator").isWidgetAtCoordinates(event.x, event.y)){ + ((Escalator)this.getWidget("Escalator")).drag = false; + super.onMouseClick(event); + } + else + this.getWidget("Escalator").onMouseClick(event); + } + else + super.onMouseClick(event); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java new file mode 100644 index 0000000..6ce5619 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java @@ -0,0 +1,362 @@ +package mcp.mobius.waila.gui.widgets; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.texture.TextureManager; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.ReverseIterator; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.RenderPriority; +import mcp.mobius.waila.gui.interfaces.Signal; + +public abstract class WidgetBase implements IWidget { + + protected IWidget parent; + protected WidgetGeometry geom; + protected LinkedHashMap widgets = new LinkedHashMap(); + protected LinkedHashMap renderQueue_HIGH = new LinkedHashMap(); + protected LinkedHashMap renderQueue_MEDIUM = new LinkedHashMap(); + protected LinkedHashMap renderQueue_LOW = new LinkedHashMap(); + protected Minecraft mc; + protected TextureManager texManager; + protected ScaledResolution rez; + + protected boolean hasBlending; + protected boolean hasLight; + protected int boundTexIndex; + + protected boolean isRendering = true; + + protected float alpha = 1.0f; + + public WidgetBase(){ + this.setParent(null); + this.mc = Minecraft.getMinecraft(); + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.texManager = this.mc.renderEngine; + this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); + } + + public WidgetBase(IWidget parent){ + this.setParent(parent); + this.mc = Minecraft.getMinecraft(); + this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + this.texManager = this.mc.renderEngine; + this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY)); + } + + ///////////////////// + // WIDGET HANDLING // + ///////////////////// + + @Override + public IWidget addWidget(String name, IWidget widget){ + return this.addWidget(name, widget, RenderPriority.MEDIUM); + } + + @Override + public IWidget addWidget(String name, IWidget widget, RenderPriority priority){ + widget.setParent(this); + this.widgets.put(name, widget); + + switch(priority){ + case LOW: + this.renderQueue_LOW.put(name, widget); + break; + case HIGH: + this.renderQueue_HIGH.put(name, widget); + break; + case MEDIUM: + this.renderQueue_MEDIUM.put(name, widget); + break; + } + + + return this.getWidget(name); + } + + + @Override + public IWidget getWidget(String name){ + return this.widgets.get(name); + } + + @Override + public IWidget delWidget(String name){ + IWidget widget = this.getWidget(name); + this.widgets.remove(widget); + return widget; + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY){ + for (IWidget widget : new ReverseIterator(this.widgets.values())) + if ((posX >= widget.getPos().getX()) && + (posX <= widget.getPos().getX() + widget.getSize().getX()) && + (posY >= widget.getPos().getY()) && + (posY <= widget.getPos().getY() + widget.getSize().getY())) + return widget.getWidgetAtCoordinates(posX, posY); + + if ((posX >= this.getPos().getX()) && + (posX <= this.getPos().getX() + this.getSize().getX()) && + (posY >= this.getPos().getY()) && + (posY <= this.getPos().getY() + this.getSize().getY())) + return this; + + return null; + } + + @Override + public boolean isWidgetAtCoordinates(double posx, double posy){ + if (this.getLeft() > posx) return false; + if (this.getRight() < posx) return false; + if (this.getTop() > posy) return false; + if (this.getBottom() < posy) return false; + return true; + } + + /////////////////////// + // IWIDGET INTERFACE // + /////////////////////// + + @Override + public IWidget getParent() { return this.parent; } + @Override + public void setParent(IWidget parent) { this.parent = parent; } + + @Override + public void draw(){ + this.saveGLState(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1.0f, 1.0f, 1.0f, this.alpha); + + this.draw(this.getPos()); + + /* + for (IWidget widget: this.widgets.values()) + if (widget.shouldRender()) + widget.draw(); + */ + + for (IWidget widget: this.renderQueue_LOW.values()) + if (widget.shouldRender()) + widget.draw(); + + for (IWidget widget: this.renderQueue_MEDIUM.values()) + if (widget.shouldRender()) + widget.draw(); + + for (IWidget widget: this.renderQueue_HIGH.values()) + if (widget.shouldRender()) + widget.draw(); + + this.loadGLState(); + } + + @Override + public abstract void draw(Point pos); + + @Override + public IWidget setGeometry(WidgetGeometry geom) { + this.geom = geom; + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + public IWidget setGeometry(double x, double y, double sx, double sy, CType fp, CType fs){ + this.setGeometry(new WidgetGeometry (x, y, sx, sy, fp, fs)); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + @Override + public WidgetGeometry getGeometry() { return this.geom; } + @Override + public Point getPos() { return this.geom.getPos(this.parent); } + @Override + public Point getSize() { return this.geom.getSize(this.parent); } + @Override + public int getLeft() { return this.getPos().getX(); } + @Override + public int getRight() { return this.getPos().getX() + this.getSize().getX(); } + @Override + public int getTop() { return this.getPos().getY(); } + @Override + public int getBottom() { return this.getPos().getY() + this.getSize().getY(); } + + @Override + public IWidget setPos(double x, double y){ + return this.setPos(x, y, this.geom.fracPosX, this.geom.fracPosY); + } + + @Override + public IWidget setPos(double x, double y, boolean fracX, boolean fracY){ + this.geom.setPos(x, y, fracX, fracY); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + }; + + @Override + public IWidget setSize(double sx, double sy){ + return this.setSize(sx, sy, this.geom.fracSizeX, this.geom.fracSizeY); + } + + @Override + public IWidget setSize(double sx, double sy, boolean fracX, boolean fracY){ + this.geom.setSize(sx, sy, fracX, fracY); + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + }; + + @Override + public IWidget adjustSize(){ + int minleft = 9999; + int maxright = 0; + int mintop = 9999; + int maxbottom = 0; + + for (IWidget widget : this.widgets.values()){ + minleft = Math.min(minleft, widget.getLeft()); + maxright = Math.max(maxright, widget.getRight()); + + mintop = Math.min(mintop, widget.getTop()); + maxbottom = Math.max(maxbottom, widget.getBottom()); + } + + this.setSize(maxright - minleft, maxbottom - mintop, false, false); + + this.emit(Signal.GEOM_CHANGED, this.geom); + return this; + } + + //////////////////////////// + // SOME RENDERING HELPERS // + //////////////////////////// + + protected void saveGLState(){ + hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); + hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); + boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); + GL11.glPushAttrib(GL11.GL_CURRENT_BIT); + GL11.glPushMatrix(); + } + + protected void loadGLState(){ + if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND); + if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); + GL11.glPopMatrix(); + GL11.glPopAttrib(); + //GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + @Override + public void setAlpha(float alpha){this.alpha = alpha;}; + + @Override + public float getAlpha(){return this.alpha;}; + + @Override + public void show(){this.isRendering = true;}; + @Override + public void hide(){this.isRendering = false;}; + @Override + public boolean shouldRender(){return this.isRendering;}; + + //////////////////// + // INPUT HANDLING // + //////////////////// + + @Override + public void handleMouseInput(){} + + @Override + public void onMouseClick(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseClick(event); + + //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + //if (widget != null && widget != this) + // widget.onMouseClick(event); + } + + @Override + public void onMouseDrag(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseDrag(event); + + //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + //if (widget != null && widget != this) + // widget.onMouseDrag(event); + } + + @Override + public void onMouseMove(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseMove(event); + + + //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + //if (widget != null && widget != this) + // widget.onMouseMove(event); + } + + @Override + public void onMouseRelease(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseRelease(event); + + //IWidget widget = this.getWidgetAtCoordinates(event.x, event.y); + //if (widget != null && widget != this) + // widget.onMouseRelease(event); + } + + @Override + public void onMouseWheel(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseWheel(event); + } + + @Override + public void onMouseEnter(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseEnter(event); + } + + @Override + public void onMouseLeave(MouseEvent event) { + //System.out.printf("%s %s\n", this, event); + if (this.parent != null) + this.parent.onMouseLeave(event); + } + + @Override + public void emit(Signal signal, Object... params) { + if(this.parent != null) + this.parent.onWidgetEvent(this, signal, params); + } + + @Override + public void onWidgetEvent(IWidget srcwidget, Signal signal, Object... params) { + if (this.parent != null) + this.parent.onWidgetEvent(srcwidget, signal, params); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java new file mode 100644 index 0000000..032c2ed --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java @@ -0,0 +1,186 @@ +package mcp.mobius.waila.gui.widgets; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import net.minecraft.util.MathHelper; + +import org.lwjgl.util.Point; + + + +//public class WidgetGeometry implements Cloneable{ +public class WidgetGeometry{ + + //public enum Align {LEFT, CENTER, RIGHT, TOP, BOTTOM}; + + + double x = -1; + double y = -1; + double sx = -1; + double sy = -1; + + CType posType; + CType sizeType; + + boolean fracPosX = false; + boolean fracPosY = false; + boolean fracSizeX = false; + boolean fracSizeY = false; + + WAlign alignX; + WAlign alignY; + + public class PointDouble{ + double x; double y; + public PointDouble(double x, double y){ this.x = x; this.y = y;}; + public double getX(){return this.x;} + public double getY(){return this.y;} + public String toString(){return String.format("PointDouble : %.5f %.5f", this.x, this.y);} + } + + public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize){ + this(x, y, sx, sy, fracPos, fracSize, WAlign.LEFT, WAlign.TOP); + } + + public WidgetGeometry(double x, double y, double sx, double sy, CType fracPos, CType fracSize, WAlign alignX, WAlign alignY){ + this.x = x; + this.y = y; + this.sx = sx; + this.sy = sy; + this.posType = fracPos; + this.sizeType = fracSize; + + switch(fracPos){ + case REL_X: + this.fracPosX = true; + break; + case RELXY: + this.fracPosX = true; + this.fracPosY = true; + break; + case REL_Y: + this.fracPosY = true; + break; + default: + break; + + } + + switch(fracSize){ + case REL_X: + this.fracSizeX = true; + break; + case RELXY: + this.fracSizeX = true; + this.fracSizeY = true; + break; + case REL_Y: + this.fracSizeY = true; + break; + default: + break; + + } + + this.alignX = alignX; + this.alignY = alignY; + } + + public void setPos(double x, double y, boolean fracX, boolean fracY){ + this.x = x; + this.y = y; + this.fracPosX = fracX; + this.fracPosY = fracY; + } + + public void setSize(double sx, double sy, boolean fracSizeX, boolean fracSizeY){ + this.sx = sx; + this.sy = sy; + this.fracSizeX = fracSizeX; + this.fracSizeY = fracSizeY; + } + + public PointDouble getRawPos(){ + return new PointDouble(this.x, this.y); + } + + public Point getUnalignedPos(IWidget parent){ + int x = -1; + if (this.fracPosX) + x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); + if (!this.fracPosX && parent != null) + x = parent.getPos().getX() + (int)this.x; + if (!this.fracPosX && parent == null) + x = (int)this.x; + + int y = -1; + if (this.fracPosY) + y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); + if (!this.fracPosY && parent != null) + y = parent.getPos().getY() + (int)this.y; + if (!this.fracPosY && parent == null) + y = (int)this.y; + + return new Point(x,y); + } + + public Point getPos(IWidget parent){ + + int x = -1; + if (this.fracPosX) + x = MathHelper.ceiling_double_int(parent.getPos().getX() + parent.getSize().getX() * this.x / 100D); + if (!this.fracPosX && parent != null) + x = parent.getPos().getX() + (int)this.x; + if (!this.fracPosX && parent == null) + x = (int)this.x; + + int y = -1; + if (this.fracPosY) + y = MathHelper.ceiling_double_int(parent.getPos().getY() + parent.getSize().getY() * this.y / 100D); + if (!this.fracPosY && parent != null) + y = parent.getPos().getY() + (int)this.y; + if (!this.fracPosY && parent == null) + y = (int)this.y; + + + if (this.alignX == WAlign.CENTER) + x -= this.getSize(parent).getX() / 2; + + if (this.alignY == WAlign.CENTER) + y -= this.getSize(parent).getY() / 2; + + if (this.alignX == WAlign.RIGHT) + x -= this.getSize(parent).getX() - 1; + + if (this.alignY == WAlign.BOTTOM) + y -= this.getSize(parent).getY() - 1; + + return new Point(x,y); + } + + public Point getSize(IWidget parent){ + int sx = -1; + if (this.fracSizeX) + sx = MathHelper.ceiling_double_int(parent.getSize().getX() * this.sx / 100D); + if (!this.fracSizeX) + sx = (int)this.sx; + + int sy = -1; + if (this.fracSizeY) + sy = MathHelper.ceiling_double_int(parent.getSize().getY() * this.sy / 100D); + if (!this.fracSizeY) + sy = (int)this.sy; + + return new Point(sx,sy); + } + + public String toString(){ + return String.format("Geometry : [%s %s] [%s %s] [%s %s] [%s %s]", this.x, this.y, this.sx, this.sy, this.posType, this.sizeType, this.alignX, this.alignY); + } + + //@Override + //public WidgetGeometry clone() throws CloneNotSupportedException{ + // return (WidgetGeometry)super.clone(); + //} +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java new file mode 100644 index 0000000..a3bcbe9 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java @@ -0,0 +1,74 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.Signal; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetBase; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +public abstract class ButtonBase extends WidgetBase { + + protected boolean mouseOver = false; + protected static ResourceLocation widgetsTexture = new ResourceLocation("textures/gui/widgets.png"); + + public ButtonBase(IWidget parent){ + super(parent); + } + + @Override + public void draw() { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + for (IWidget widget : this.widgets.values()) + if (widget instanceof LabelFixedFont) + if (this.mouseOver) + ((LabelFixedFont)widget).setColor(0xffffa0); + else + ((LabelFixedFont)widget).setColor(0xffffff); + + super.draw(); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + int texOffset = 0; + + if (this.mouseOver) + texOffset = 1; + + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); + + this.loadGLState(); + } + + @Override + public void onMouseEnter(MouseEvent event){ + mouseOver = true; + } + + @Override + public void onMouseLeave(MouseEvent event){ + mouseOver = false; + } + + @Override + public IWidget getWidgetAtCoordinates(double posX, double posY){ + return this; + } + + @Override + public void onMouseClick(MouseEvent event){ + if (event.button == 0) + this.mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + + this.emit(Signal.CLICKED, event.button); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java new file mode 100644 index 0000000..f89c3bc --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java @@ -0,0 +1,43 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.util.Point; + +public class ButtonBoolean extends ButtonBase { + + protected boolean state = false; + + public ButtonBoolean(IWidget parent, String textFalse, String textTrue){ + super(parent); + + this.addWidget("LabelFalse", new LabelFixedFont(this, textFalse)); + this.getWidget("LabelFalse").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + this.addWidget("LabelTrue", new LabelFixedFont(this, textTrue)); + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelTrue").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event){ + super.onMouseClick(event); + + if (event.button == 0) + this.state = !this.state; + + if (this.state){ + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java new file mode 100644 index 0000000..68fa5cd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java @@ -0,0 +1,62 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import org.lwjgl.util.Point; + +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; + +public class ButtonBooleanConfig extends ButtonBoolean { + + protected String category; + protected String configKey; + protected boolean instant; + + public ButtonBooleanConfig(IWidget parent, String category, String configKey, String textFalse, String textTrue){ + this(parent, category, configKey, true, true, textFalse, textTrue); + } + + public ButtonBooleanConfig(IWidget parent, String category, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){ + super(parent, textFalse, textTrue); + this.category = category; + this.configKey = configKey; + this.instant = instant; + + this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); + + if (this.state){ + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } + + @Override + public void onMouseClick(MouseEvent event){ + if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.onMouseClick(event); + + if (this.instant) + ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); + } + + @Override + public void draw(Point pos) { + if (!ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.draw(pos); + else{ + this.saveGLState(); + int texOffset = -1; + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); + this.loadGLState(); + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java new file mode 100644 index 0000000..af57221 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java @@ -0,0 +1,52 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; + +public class ButtonBooleanConfigRemote extends ButtonBooleanConfig { + + public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, String textFalse, String textTrue){ + this(parent, category, configKey, true, true, textFalse, textTrue); + } + + public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, boolean instant, boolean state_, String textFalse, String textTrue){ + super(parent, category, configKey, instant, state_, textFalse, textTrue); + if (!Waila.instance.serverPresent) + this.state = false; + + if (this.state){ + this.getWidget("LabelTrue").show(); + this.getWidget("LabelFalse").hide(); + } else { + this.getWidget("LabelTrue").hide(); + this.getWidget("LabelFalse").show(); + } + } + + @Override + public void onMouseClick(MouseEvent event){ + if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.onMouseClick(event); + } + + @Override + public void draw(Point pos) { + if ((Waila.instance.serverPresent) && !ConfigHandler.instance().forcedConfigs.containsKey(this.configKey)) + super.draw(pos); + else{ + this.saveGLState(); + int texOffset = -1; + this.mc.getTextureManager().bindTexture(widgetsTexture); + UIHelper.drawTexture(this.getPos().getX(), this.getPos().getY(), this.getSize().getX(), this.getSize().getY(), 0, 66 + texOffset*20, 200, 20); + this.loadGLState(); + } + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java new file mode 100644 index 0000000..7b02b89 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java @@ -0,0 +1,50 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import org.lwjgl.util.Point; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; + +public class ButtonContainer extends WidgetBase { + + private int nButtons = 0; + private int columns; + private int buttonSize; + private double spacing; + + public ButtonContainer(IWidget parent, int columns, int buttonSize, double spacing){ + super (parent); + this.columns = columns; + this.spacing = spacing; + this.buttonSize = buttonSize; + } + + public void addButton(ButtonBase button){ + String buttonName = String.format("Button_%d", nButtons); + String layoutName = String.format("Layout_%d", nButtons); + String layoutLabelName = String.format("LayoutLabel_%d", nButtons); + String labelName = String.format("Label_%d", nButtons); + + this.addWidget(layoutName, new LayoutBase(this)); + this.addWidget(layoutLabelName, new LayoutBase(this)); + + int column = this.nButtons % this.columns; + int row = this.nButtons / this.columns; + double sizeColumn = 100.0 / this.columns; + + this.getWidget(layoutName).setGeometry(new WidgetGeometry(sizeColumn * column, spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + this.getWidget(layoutName).addWidget(buttonName, button); + this.getWidget(layoutName).getWidget(buttonName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.nButtons += 1; + } + + @Override + public void draw(Point pos) {} + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java new file mode 100644 index 0000000..c7d7b6f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java @@ -0,0 +1,55 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.LayoutBase; +import mcp.mobius.waila.gui.widgets.WidgetBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; + +import org.lwjgl.util.Point; + +//TODO : THIS CLASS IS WIP AND CAN'T WORK RIGHT NOW + +public class ButtonContainerLabel extends WidgetBase { + + private int nButtons = 0; + private int columns; + private int buttonSize; + private double spacing; + + public ButtonContainerLabel(IWidget parent, int columns, int buttonSize, double spacing){ + super (parent); + this.columns = columns; + this.spacing = spacing; + this.buttonSize = buttonSize; + } + + public void addButton(ButtonBase button, String label){ + String buttonName = String.format("Button_%d", nButtons); + String layoutName = String.format("Layout_%d", nButtons); + String layoutLabelName = String.format("LayoutLabel_%d", nButtons); + String labelName = String.format("Label_%d", nButtons); + + this.addWidget(layoutName, new LayoutBase(this)); + this.addWidget(layoutLabelName, new LayoutBase(this)); + + int column = (this.nButtons % this.columns) * 2; + int row = this.nButtons / this.columns; + double sizeColumn = 100.0 / (this.columns * 2); + + this.getWidget(layoutName).setGeometry(new WidgetGeometry(sizeColumn * (column + 1), spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + this.getWidget(layoutName).addWidget(buttonName, button); + this.getWidget(layoutName).getWidget(buttonName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.getWidget(layoutLabelName).setGeometry(new WidgetGeometry(sizeColumn * column, spacing * row, sizeColumn, spacing, CType.REL_X, CType.REL_X, WAlign.LEFT, WAlign.TOP)); + this.getWidget(layoutLabelName).addWidget(labelName, new LabelFixedFont(this, label)); + this.getWidget(layoutLabelName).getWidget(labelName).setGeometry(new WidgetGeometry(50.0, 50.0, buttonSize, 20.0, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + + this.nButtons += 1; + } + + @Override + public void draw(Point pos) {} +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java new file mode 100644 index 0000000..e322cbb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java @@ -0,0 +1,49 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.util.Point; + +public class ButtonInteger extends ButtonBase { + + protected int state = 0; + protected int nStates; + + public ButtonInteger(IWidget parent, String... texts){ + super(parent); + + this.nStates = texts.length; + + for (int i = 0; i < texts.length; i++){ + String labelName = String.format("Label_%d", i); + this.addWidget(labelName, new LabelFixedFont(this, texts[i])); + this.getWidget(labelName).hide(); + this.getWidget(labelName).setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + this.getWidget("Label_0").show(); + } + + @Override + public void onMouseClick(MouseEvent event){ + super.onMouseClick(event); + + if (event.button == 0) + this.state += 1; + + if (this.state >= this.nStates) + this.state = 0; + + for (int i = 0; i < this.nStates; i++) + this.getWidget(String.format("Label_%d", i)).hide(); + + this.getWidget(String.format("Label_%d", state)).show(); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java new file mode 100644 index 0000000..db10661 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java @@ -0,0 +1,45 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import net.minecraftforge.common.config.Configuration; + +import org.lwjgl.util.Point; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.widgets.WidgetBase; + +public class ButtonIntegerConfig extends ButtonInteger { + + private String category; + private String configKey; + private boolean instant; + + public ButtonIntegerConfig(IWidget parent, String category, String configKey, String... texts){ + this(parent, category, configKey, true, 0, texts); + } + + public ButtonIntegerConfig(IWidget parent, String category, String configKey, boolean instant, int state_, String... texts){ + super(parent, texts); + this.category = category; + this.configKey = configKey; + this.instant = instant; + + this.state = ConfigHandler.instance().getConfig(this.category, this.configKey, state_); + + for (int i = 0; i < this.nStates; i++) + this.getWidget(String.format("Label_%d", i)).hide(); + + this.getWidget(String.format("Label_%d", state)).show(); + } + + @Override + public void onMouseClick(MouseEvent event){ + super.onMouseClick(event); + + if (this.instant) + ConfigHandler.instance().setConfig(this.category, this.configKey, this.state); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java new file mode 100644 index 0000000..9bef571 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java @@ -0,0 +1,24 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import net.minecraft.client.gui.GuiScreen; + +public class ButtonLabel extends ButtonBase { + + public ButtonLabel(IWidget parent, String text){ + super(parent); + + this.addWidget("Label", new LabelFixedFont(this, text)); + this.getWidget("Label").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event){ + super.onMouseClick(event); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java new file mode 100644 index 0000000..8665fb2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java @@ -0,0 +1,31 @@ +package mcp.mobius.waila.gui.widgets.buttons; + +import net.minecraft.client.gui.GuiScreen; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.screens.ScreenBase; +import mcp.mobius.waila.gui.widgets.LabelFixedFont; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; + +public class ButtonScreenChange extends ButtonBase { + + GuiScreen linkedScreen; + + public ButtonScreenChange(IWidget parent, String text, GuiScreen linkedscreen){ + super(parent); + this.linkedScreen = linkedscreen; + + this.addWidget("Label", new LabelFixedFont(this, text)); + this.getWidget("Label").setGeometry(new WidgetGeometry(50.0D, 50.0D, 100.0D, 20.0D, CType.RELXY, CType.ABSXY, WAlign.CENTER, WAlign.CENTER)); + } + + @Override + public void onMouseClick(MouseEvent event){ + super.onMouseClick(event); + + if (event.button == 0) + this.mc.displayGuiScreen(this.linkedScreen); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java new file mode 100644 index 0000000..ce3fdc4 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java @@ -0,0 +1,68 @@ +package mcp.mobius.waila.gui.widgets.movable; + +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.Signal; +import mcp.mobius.waila.gui.interfaces.WAlign; +import mcp.mobius.waila.gui.widgets.WidgetBase; +import mcp.mobius.waila.gui.widgets.WidgetGeometry; +import mcp.mobius.waila.gui.widgets.WidgetGeometry.PointDouble; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + + +// A movable picture setup especially for centered relative positions. + +public class PictureMovableRC extends WidgetBase { + + private double offsetX, offsetY; + protected ResourceLocation texture; + + public PictureMovableRC(IWidget parent, String uri) { + super(parent); + this.texture = new ResourceLocation(uri); + } + + @Override + public void onMouseClick(MouseEvent event){ + this.offsetX = event.x - this.geom.getUnalignedPos(this.parent).getX(); + this.offsetY = event.y - this.geom.getUnalignedPos(this.parent).getY(); + //System.out.printf("%s %s\n", this.offsetX, this.offsetY); + } + + @Override + public void onMouseDrag(MouseEvent event){ + double newX = event.x - this.offsetX ; + double newY = event.y - this.offsetY ; + + newX = Math.max(newX, this.parent.getLeft()); + newY = Math.max(newY, this.parent.getTop()); + + newX = Math.min(newX, this.parent.getRight()); + newY = Math.min(newY, this.parent.getBottom()); + + this.setPos(((newX - this.parent.getLeft()) / this.parent.getSize().getX()) * 100.0, ((newY - this.parent.getTop())/ this.parent.getSize().getY()) * 100.0); + + //System.out.printf("%s\n", this.parent.getGeometry()); + //System.out.printf("%s %s\n", this.parent.getPos(), this.parent.getSize()); + + this.emit(Signal.DRAGGED, this.getPos()); + } + + @Override + public void draw(Point pos) { + this.saveGLState(); + + GL11.glPushMatrix(); + this.texManager.bindTexture(texture); + UIHelper.drawTexture(pos.getX(), pos.getY(), this.getSize().getX(), this.getSize().getY()); + GL11.glPopMatrix(); + + this.loadGLState(); + } +} + diff --git a/src/main/java/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak b/src/main/java/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak new file mode 100644 index 0000000..971734b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak @@ -0,0 +1,235 @@ +package mcp.mobius.waila.gui_old; + +import java.util.Collection; +import java.util.HashMap; + +import org.lwjgl.input.Mouse; + +import mcp.mobius.waila.gui_old.widget.IWidget; +import mcp.mobius.waila.gui_old.widget_old.Button2States; +import mcp.mobius.waila.gui_old.widget_old.ButtonChangeScreen; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; + +public class BaseWailaScreen extends GuiScreen{ + + protected GuiScreen parentGui; // GUI we will return to in the case we are call from a GUI + public ScaledResolution res; + protected HashMap widgets = new HashMap(); + + /* Custom mouse handling */ + private int lastMouseButton = -1; + private long lastMouseEvent = -1; + private int lastMousePosX = -1; + private int lastMousePosY = -1; + private static int buttonCount = Mouse.getButtonCount(); + private boolean[] lastButtonStates = new boolean[buttonCount]; + private IWidget[] focusWidget = new IWidget[buttonCount]; + private IWidget mainFocusWidget = null; + + + + public BaseWailaScreen(GuiScreen _parentGui) { + this.parentGui = _parentGui; + res = new ScaledResolution(Minecraft.getMinecraft().gameSettings, + Minecraft.getMinecraft().displayWidth, + Minecraft.getMinecraft().displayHeight); + Mouse.getDWheel(); + } + + @Override + /* Here we draw anything special, and super takes care of the buttons for us */ + public void drawScreen(int i, int j, float f) + { + drawDefaultBackground(); + super.drawScreen(i, j, f); + } + + @Override + /* Here we handle key presses. Super will just close the gui on ESC, and we like it like that */ + public void keyTyped(char keyChar, int keyID) + { + if (keyID == 1) + { + if (this.parentGui == null){ + this.mc.displayGuiScreen((GuiScreen)null); + this.mc.setIngameFocus(); + } else { + this.mc.displayGuiScreen(this.parentGui); + } + } + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + if (guibutton instanceof ButtonChangeScreen) + ((ButtonChangeScreen)guibutton).pressButton(); + + else if (guibutton instanceof Button2States) + ((Button2States)guibutton).pressButton(); + } + + protected int getXCentered(int width){ + return (this.res.getScaledWidth() - width)/ 2; + } + + public void addWidget(String name, IWidget widget){ + this.widgets.put(name, widget); + } + + public Collection getWidgets(){ + return this.widgets.values(); + } + + public IWidget getWidget(String name){ + return this.widgets.get(name); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int buttonID) + { + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null && widget.mouseClicked(mouseX, mouseY, buttonID)){ + if (buttonID == 0) + this.mainFocusWidget = widget; + this.focusWidget[buttonID] = widget; + } + else + super.mouseClicked(mouseX, mouseY, buttonID); + } + + @Override + public void mouseMovedOrUp(int mouseX, int mouseY, int buttonID) + { + if (buttonID == 0) + this.mainFocusWidget = null; + + if (this.focusWidget[buttonID] != null){ + this.focusWidget[buttonID].mouseReleased(mouseX, mouseY, buttonID); + this.focusWidget[buttonID] = null; + } else { + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget == null || !widget.mouseReleased(mouseX, mouseY, buttonID)) + super.mouseMovedOrUp(mouseX, mouseY, buttonID); + } + } + + public void mouseWheel(int mouseX, int mouseY, int mouseZ){ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + widget.mouseWheel(mouseX, mouseY, mouseZ); + + } + + public void mouseMoved(int mouseX, int mouseY){ + if (this.mainFocusWidget != null) + this.mainFocusWidget.mouseMoved(mouseX, mouseY); + else{ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + widget.mouseMoved(mouseX, mouseY); + } + } + + /* + public void mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime){ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + widget.mouseDragged(mouseX, mouseY, buttonID, deltaTime); + } + */ + + @Override + public void handleMouseInput() + { + int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth; + int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; + int mouseZ = Mouse.getEventDWheel(); + boolean[] buttonChanged = new boolean[buttonCount]; + + if (mouseZ != 0) + this.mouseWheel(mouseX, mouseY, mouseZ); + + int changedButton = -1; + boolean hasStateChanged = false; + if (Mouse.getEventButtonState()){ + hasStateChanged = true; + changedButton = Mouse.getEventButton(); + } + for (int i = 0; i < buttonCount; i++){ + buttonChanged[i] = Mouse.isButtonDown(i) != this.lastButtonStates[i]; + this.lastButtonStates[i] = Mouse.isButtonDown(i); + + if (buttonChanged[i] && Mouse.isButtonDown(i)) + this.mouseClicked(mouseX, mouseY, i); + else if (buttonChanged[i] && !Mouse.isButtonDown(i)) + this.mouseMovedOrUp(mouseX, mouseY, i); + } + + if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){ + this.mouseMoved(mouseX, mouseY); + this.lastMousePosX = mouseX; + this.lastMousePosY = mouseY; + } + + /* + if (changedButton != -1){ + if (Mouse.isButtonDown(changedButton)){ + this.mouseClicked(mouseX, mouseY, changedButton); + this.lastMouseButton = changedButton; + } + else if (!Mouse.isButtonDown(changedButton)){ + this.mouseMovedOrUp(mouseX, mouseY, changedButton); + this.lastMouseButton = -1; + } + } + + if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){ + this.mouseMoved(mouseX, mouseY); + this.lastMousePosX = mouseX; + this.lastMousePosY = mouseY; + } + */ + + /* + if (hasStateChanged) + { + this.lastMouseButton = changedButton; + this.lastMouseEvent = Minecraft.getSystemTime(); + this.mouseClicked(mouseX, mouseY, this.lastMouseButton); + } + else if (changedButton != -1) + { + this.lastMouseButton = -1; + this.mouseMovedOrUp(mouseX, mouseY, changedButton); + } + */ + /* + else if (this.lastMouseButton != -1 && this.lastMouseEvent > 0L) + { + long deltaTime = Minecraft.getSystemTime() - this.lastMouseEvent; + this.mouseDragged(mouseX, mouseY, this.lastMouseButton, deltaTime); + } + */ + /* + else if ((mouseX != this.lastMousePosX) || (mouseY != this.lastMousePosY)){ + this.mouseMoved(mouseX, mouseY); + this.lastMousePosX = mouseX; + this.lastMousePosY = mouseY; + } + */ + } + + private IWidget getWidgetAtCoordinates(int posX, int posY){ + for (IWidget widget : this.getWidgets()) + if ((posX >= widget.getPosX()) && + (posX <= widget.getPosX() + widget.getWidth()) && + (posY >= widget.getPosY()) && + (posY <= widget.getPosY() + widget.getHeight())) + return widget; + return null; + } +} \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak b/src/main/java/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak new file mode 100644 index 0000000..1b03b3c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak @@ -0,0 +1,62 @@ +package mcp.mobius.waila.gui_old; + +import mcp.mobius.waila.gui_old.widget.ContainerTable; +import mcp.mobius.waila.gui_old.widget.Label; +import mcp.mobius.waila.gui_old.widget.StackDisplay; +import mcp.mobius.waila.gui_old.widget.WikiReader; +import net.minecraft.client.gui.GuiScreen; + +public class GuiIngameWiki extends BaseWailaScreen { + + public WikiReader widReader = null; + public StackDisplay widStack = null; + public ContainerTable widTable = null; + public Label widItemName = null; + + public GuiIngameWiki(GuiScreen _parentGui) { + super(_parentGui); + + this.widReader = new WikiReader(this); + this.widStack = new StackDisplay(this); + this.widTable = new ContainerTable(this); + this.widItemName = new Label(""); + + this.widReader.setWidth(this.res.getScaledWidth()-this.res.getScaledWidth()/3 - 16); + this.widReader.setHeight(this.res.getScaledHeight() - 24); + this.widReader.setBackgroundColor(0x66888888); + + this.widStack.setScale(4.0f); + + this.widTable.setAutosize(false); + this.widTable.setWidth(this.res.getScaledWidth()/3 - 8); + this.widTable.setHeight(this.res.getScaledHeight() - 16 - this.widStack.getHeight()); + this.widTable.setColumns(8, "\u00a7a\u00a7oEntry", "\u00a7a\u00a7oValue"); + + this.addWidget("wikireader", this.widReader); + this.addWidget("stackdisplay", this.widStack); + this.addWidget("datatable", this.widTable); + } + + @Override + public void drawScreen(int i, int j, float f) + { + super.drawScreen(i, j, f); + widTable.draw(4, this.widStack.getHeight() + 16, 1000); + widItemName.draw(this.res.getScaledWidth()/6-widItemName.getWidth()/2, this.widStack.getHeight(), 0); + widReader.draw(this.res.getScaledWidth()/3 + 8, 8, 0); + widStack.draw(this.res.getScaledWidth()/6-widStack.getWidth()/2, 0, 0); + } + + @Override + public void initGui() + { + } + + @Override + public void drawDefaultBackground() + { + this.drawGradientRect(0, 0, this.width, this.height, 0xdd000000, 0xdd000000); + } + +} + \ No newline at end of file diff --git a/src/main/java/mcp/mobius/waila/gui_old/GuiTechTree.java.bak b/src/main/java/mcp/mobius/waila/gui_old/GuiTechTree.java.bak new file mode 100644 index 0000000..1c0ef6e --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/GuiTechTree.java.bak @@ -0,0 +1,41 @@ +package mcp.mobius.waila.gui_old; + +import mcp.mobius.waila.gui_old.widget.DraggableViewport; +import net.minecraft.client.gui.GuiScreen; + +public class GuiTechTree extends BaseWailaScreen { + + public DraggableViewport widViewport = null; + public int topOffset = 16; + + public GuiTechTree(GuiScreen _parentGui) { + super(_parentGui); + + this.widViewport = new DraggableViewport(this); + this.widViewport.setWidth(this.res.getScaledWidth() - 32); + this.widViewport.setHeight(this.res.getScaledHeight() - 32); + this.widViewport.setBackgroundColor(0x66888888); + + this.addWidget("viewport", this.widViewport); + + } + + @Override + public void drawScreen(int i, int j, float f) + { + super.drawScreen(i, j, f); + this.widViewport.draw(16,topOffset,0); + } + + @Override + public void initGui() + { + } + + @Override + public void drawDefaultBackground() + { + this.drawGradientRect(0, 0, this.width, this.height, 0xdd000000, 0xdd000000); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak new file mode 100644 index 0000000..49ab093 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak @@ -0,0 +1,168 @@ +package mcp.mobius.waila.gui_old.NEI; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import codechicken.core.ReflectionManager; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.FuelRecipeHandler; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.ICraftingHandler; +import codechicken.nei.recipe.TemplateRecipeHandler; +import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class CraftingTreeNode { + + CraftingTreeNode topNode = null; + LinkedHashMap> bottomNodes = new LinkedHashMap>(); + + //Item stacks we have in the node. + public ArrayList elements = new ArrayList(); + //Item stacks we are filtering the recipes with. (Previous stacks in the tree) + ArrayList excRecipes = new ArrayList(); + //List of recipes available for a given stack + HashMap> recipesMap = new HashMap>(); + //Components sorted by recipes for a given item stack + HashMap>> componentsMap = new HashMap>>(); + + int layer; + LinkedHashMap> layers; + + public CraftingTreeNode(CraftingTreeNode topNode, ArrayList elements, int layer, LinkedHashMap> layers) { + this.topNode = topNode; + this.layer = layer; + this.layers = layers; + this.addSelfToLayers(); + this.setElements(elements); + System.out.printf("%s\n", this.toString()); + } + + public CraftingTreeNode(CraftingTreeNode topNode, ArrayList elements, ArrayList excluded, int layer, LinkedHashMap> layers) { + this.topNode = topNode; + this.layer = layer; + this.layers = layers; + this.addSelfToLayers(); + this.excRecipes = excluded; + this.setElements(elements); + System.out.printf("%s\n", this.toString()); + } + + public CraftingTreeNode(CraftingTreeNode topNode, ItemStack stack, int layer, LinkedHashMap> layers) { + this.topNode = topNode; + this.layer = layer; + this.layers = layers; + this.addSelfToLayers(); + this.addElement(stack); + System.out.printf("%s\n", this.toString()); + } + + public void addSelfToLayers(){ + if (!(this.layers.containsKey(layer))) + this.layers.put(this.layer, new ArrayList()); + this.layers.get(this.layer).add(this); + } + + public void addElement(ItemStack stack){ + this.elements.add(stack); + this.recipesMap.put(stack, this.getRecipes(stack, this.excRecipes)); + this.componentsMap.put(stack, new ArrayList>()); + for (CachedRecipe recipe: this.recipesMap.get(stack)){ + this.excRecipes.add(recipe); + ArrayList subComposants = new ArrayList(); + for (PositionedStack substack : recipe.getIngredients()) + subComposants.add(substack.item); + + if (subComposants.size() > 0){ + if (!this.bottomNodes.containsKey(stack)) + this.bottomNodes.put(stack, new ArrayList()); + this.bottomNodes.get(stack).add(new CraftingTreeNode(this, this.cleanupRecipe(subComposants), this.excRecipes, this.layer+1, this.layers)); + } + } + } + + public void setElements(ArrayList elements){ + for (ItemStack is : elements) + this.addElement(is); + } + + public ArrayList getRecipes(ItemStack stack, ArrayList excluded){ + ArrayList craftinghandlers = ReflectionManager.getField(GuiCraftingRecipe.class, ArrayList.class, null, "craftinghandlers"); + ArrayList cachedRecipes = new ArrayList(); + + for (ICraftingHandler handler : craftinghandlers) + if (handler instanceof TemplateRecipeHandler && !(handler instanceof FuelRecipeHandler)){ + ((TemplateRecipeHandler) handler).arecipes = new ArrayList(); + ((TemplateRecipeHandler) handler).loadCraftingRecipes(stack); + for (CachedRecipe recipe : ((TemplateRecipeHandler)handler).arecipes){ + boolean found = false; + for (CachedRecipe exc : excluded) + if (this.areRecipesIdentical(recipe, exc)) + found = true; + if (found) + continue; + + cachedRecipes.add(recipe); + } + } + return cachedRecipes; + } + + public boolean areRecipesIdentical(CachedRecipe recipe1, CachedRecipe recipe2){ + if (recipe1.getResult().items.length != recipe2.getResult().items.length) + return false; + if (recipe1.getIngredients().size() != recipe1.getIngredients().size()) + return false; + for (int i = 0; i < recipe1.getResult().items.length; i++) + if (!recipe1.getResult().items[i].isItemEqual(recipe2.getResult().items[i])) + return false; + for (int i = 0; i < recipe1.getIngredients().size(); i++) + for (int j = 0; j < recipe1.getIngredients().get(i).items.length; j++) + if (!recipe1.getIngredients().get(i).items[j].isItemEqual(recipe2.getIngredients().get(i).items[j])) + return false; + return true; + + } + + public ArrayList cleanupRecipe(ArrayList stacks){ + ArrayList curratedStacks = new ArrayList(); + for (ItemStack is : stacks){ + boolean found = false; + for (ItemStack isc : curratedStacks){ + //if (OreDictionary.itemMatches(is, isc, false)){ + if ((isc.isItemEqual(is)) || + ((OreDictionary.getOreID(isc) != -1) && + (OreDictionary.getOreID(is) != -1) && + (OreDictionary.getOreID(isc) == OreDictionary.getOreID(is)) + )){ + found = true; + break; + } + } + if (!found){ + ItemStack isc = is.copy(); + isc.stackSize = 0; + curratedStacks.add(isc); + } + } + + for (ItemStack is : stacks) + for (ItemStack isc : curratedStacks) + if ((isc.isItemEqual(is)) || + ((OreDictionary.getOreID(isc) != -1) && + (OreDictionary.getOreID(is) != -1) && + (OreDictionary.getOreID(isc) == OreDictionary.getOreID(is)) + )) + //if (isc.isItemEqual(is) || OreDictionary.getOreID(isc) == OreDictionary.getOreID(is)) + isc.stackSize += is.stackSize; + + return curratedStacks; + } + + @Override + public String toString(){ + return this.elements.toString(); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak new file mode 100644 index 0000000..7ea44bd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak @@ -0,0 +1,141 @@ +package mcp.mobius.waila.gui_old.NEI; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import mcp.mobius.waila.Constants; +import mcp.mobius.waila.gui_old.GuiTechTree; +import mcp.mobius.waila.gui_old.widget.ComponentDisplay; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.forge.IContainerInputHandler; + +public class HandlerTechTree implements IContainerInputHandler { + + public HandlerTechTree() { + // TODO Auto-generated constructor stub + } + + @Override + public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) { + // TODO Auto-generated method stub + + } + + + @Override + public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { + ItemStack stackover = gui.manager.getStackMouseOver(); + if(stackover == null) + return false; + + if(keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_TECH)){ + Minecraft mc = Minecraft.getMinecraft(); + GuiTechTree techScreen = new GuiTechTree(mc.currentScreen); + + LinkedHashMap> layers = new LinkedHashMap> (); + CraftingTreeNode tree = new CraftingTreeNode(null, stackover, 0, layers); + + /* + LinkedHashMap> curratedLayers = new LinkedHashMap> (); + + for (int layer : layers.keySet()) + curratedLayers.put(layer, new ArrayList()); + + for (int i = 0; i < (layers.size() - 1) ; i++) + for (CraftingTreeNode node : layers.get(i)){ + if (node.bottomNodes.size() != 0){ + curratedLayers.get(i).add(node); + + } + else{ + node.layer += 1; + layers.get(i+1).add(node); + } + } + + for (CraftingTreeNode node : layers.get(layers.keySet().size()-1)) + curratedLayers.get(layers.keySet().size()-1).add(node); + + System.out.printf("%s\n", curratedLayers); + */ + + /* + for (int layer = curratedLayers.keySet().size() - 1; layer >= 0; layer--){ + int offsetX = 0; + for (int icompo = 0; icompo < curratedLayers.get(layer).size(); icompo++){ + ComponentDisplay componentDisplay = new ComponentDisplay(techScreen, curratedLayers.get(layer).get(icompo)); + componentDisplay.setBackgroundColor(0xddeeeed1); + techScreen.widViewport.addWidget(componentDisplay, offsetX, layer*32, 0); + offsetX += componentDisplay.getWidth() + 8; + } + } + */ + + for (int layer = layers.keySet().size() - 1; layer >= 0; layer--){ + int offsetX = 0; + for (int icompo = 0; icompo < layers.get(layer).size(); icompo++){ + ComponentDisplay componentDisplay = new ComponentDisplay(techScreen, layers.get(layer).get(icompo)); + componentDisplay.setBackgroundColor(0xddeeeed1); + if (layer != 0) + componentDisplay.setDrawOverlay(true); + + techScreen.widViewport.addWidget(componentDisplay, offsetX, layer*32, 0); + offsetX += componentDisplay.getWidth() + 8; + } + } + + mc.displayGuiScreen(techScreen); + } + return false; + } + + @Override + public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, + int button) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onMouseClicked(GuiContainer gui, int mousex, int mousey, + int button) { + // TODO Auto-generated method stub + + } + + @Override + public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { + // TODO Auto-generated method stub + + } + + @Override + public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, + int scrolled) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, + int scrolled) { + // TODO Auto-generated method stub + + } + + @Override + public void onMouseDragged(GuiContainer gui, int mousex, int mousey, + int button, long heldTime) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak new file mode 100644 index 0000000..72d52be --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak @@ -0,0 +1,138 @@ +package mcp.mobius.waila.gui_old.NEI; + +import java.util.LinkedHashMap; + +import mcp.mobius.waila.Constants; +import mcp.mobius.waila.mod_Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.gui_old.GuiIngameWiki; +import mcp.mobius.waila.gui_old.widget.Label; +import mcp.mobius.waila.handlers.SummaryProvider; +import mcp.mobius.waila.tools.ModIdentification; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.forge.IContainerInputHandler; + +public class HandlerWiki implements IContainerInputHandler { + + public String getDescriptionString(String modid, String name, String meta){ + if (ModuleRegistrar.instance().hasDocTextModID(modid)){ + //Do we have an direct entry for this item ? + if (ModuleRegistrar.instance().hasDocTextItem(modid, name)){ + //We check if we have an exact match, a wildcard match and finally, an meta 0 match + if (ModuleRegistrar.instance().hasDocTextMeta(modid, name, meta)){ + return ModuleRegistrar.instance().getDocText(modid, name, meta); + } else if (ModuleRegistrar.instance().hasDocTextSpecificMeta(modid, name, "*")){ + return ModuleRegistrar.instance().getDocText(modid, name, "*"); + } else if (ModuleRegistrar.instance().hasDocTextSpecificMeta(modid, name, "0")){ + return ModuleRegistrar.instance().getDocText(modid, name, "0"); + } + + } else if (ModuleRegistrar.instance().getDoxTextWildcardMatch(modid, name) != null) { + String key = ModuleRegistrar.instance().getDoxTextWildcardMatch(modid, name); + if (ModuleRegistrar.instance().hasDocTextMeta(modid, key, meta)){ + return ModuleRegistrar.instance().getDocText(modid, key, meta); + } else if (ModuleRegistrar.instance().hasDocTextSpecificMeta(modid, key, "*")){ + return ModuleRegistrar.instance().getDocText(modid, key, "*"); + } else if (ModuleRegistrar.instance().hasDocTextSpecificMeta(modid, key, "0")){ + return ModuleRegistrar.instance().getDocText(modid, key, "0"); + } + } + + } + return String.format("No description for %s$$%s",modid, name); + } + + + + @Override + public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { + ItemStack stackover = gui.manager.getStackMouseOver(); + if(stackover == null) + return false; + + if(keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_WIKI)){ + Minecraft mc = Minecraft.getMinecraft(); + GuiIngameWiki wikiScreen = new GuiIngameWiki(mc.currentScreen); + + wikiScreen.widReader.setText(this.getDescriptionString(ModIdentification.idFromStack(stackover), stackover.getItemName(), String.valueOf(stackover.getItemDamage()))); + wikiScreen.widStack.setStack(stackover); + wikiScreen.widItemName.setLabel(stackover.getDisplayName()); + + LinkedHashMap entries = SummaryProvider.instance().getSummary(stackover, (ConfigHandler.instance())); + int nvalidentries = 0; + for (String s : entries.keySet()) + if (entries.get(s) != null) + nvalidentries += 1; + + if (nvalidentries == 0) + for (int i = 0; i < 6; i++) + wikiScreen.widTable.addRow(new Label(""), new Label(entries.get(""))); + else + for (String s : entries.keySet()) + if (entries.get(s) != null) + wikiScreen.widTable.addRow(new Label(s), new Label(entries.get(s))); + + mc.displayGuiScreen(wikiScreen); + + } + return false; + } + + @Override + public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) { + // TODO Auto-generated method stub + + } + + @Override + public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, + int button) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onMouseClicked(GuiContainer gui, int mousex, int mousey, + int button) { + // TODO Auto-generated method stub + + } + + @Override + public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { + // TODO Auto-generated method stub + + } + + @Override + public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, + int scrolled) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, + int scrolled) { + // TODO Auto-generated method stub + + } + + @Override + public void onMouseDragged(GuiContainer gui, int mousex, int mousey, + int button, long heldTime) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak new file mode 100644 index 0000000..a5fecfe --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak @@ -0,0 +1,215 @@ +package mcp.mobius.waila.gui_old.widget; + +import java.util.Collection; +import java.util.HashMap; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureManager; + +public abstract class BaseWidget implements IWidget { + + protected int width, height; + protected String label; + protected int posX, posY, posZ; + protected GuiScreen parent; + protected FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;; + protected TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; + protected HashMap widgets = new HashMap(); + protected IWidget[] focusWidget = new IWidget[Mouse.getButtonCount()]; + protected IWidget mainFocusWidget = null; + protected int backgroundColor = 0; + + public BaseWidget(){} + + @Override + public abstract int getWidth(); + @Override + public abstract int getHeight(); + @Override + public void setWidth(int width) { this.width = width; } + @Override + public void setHeight(int height) { this.height = height; } + + @Override + public void setPos (int posX, int posY, int posZ){ + this.posX = posX; + this.posY = posY; + this.posZ = posZ; + } + @Override + public int getPosX(){return this.posX;} + @Override + public int getPosY(){return this.posY;} + + @Override + public String getLabel(){ return this.label;} + @Override + public void setLabel(String label){ this.label = label; } + + @Override + public abstract void draw(); + @Override + public void draw(int x, int y, int z){ + this.posX = x; + this.posY = y; + this.posZ = z; + GL11.glPushMatrix(); + GL11.glTranslatef(0.0f,0.0f, this.posZ); + this.draw(); + GL11.glPopMatrix(); + } + @Override + public void draw(float scale){ + int oldX = this.posX; + int oldY = this.posY; + this.posX /= scale; + this.posY /= scale; + GL11.glPushMatrix(); + GL11.glTranslatef(0.0f,0.0f, this.posZ); + this.draw(); + GL11.glPopMatrix(); + this.posX = oldX; + this.posY = oldY; + } + + + @Override + public boolean mouseClicked(int mouseX, int mouseY, int buttonID){ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null){ + if (buttonID == 0) + this.mainFocusWidget = widget; + this.focusWidget[buttonID] = widget; + return widget.mouseClicked(mouseX, mouseY, buttonID); + } else + return false; + } + @Override + public boolean mouseReleased(int mouseX, int mouseY, int buttonID){ + if (buttonID == 0) + this.mainFocusWidget = null; + + if (this.focusWidget[buttonID] != null){ + boolean retval = this.focusWidget[buttonID].mouseReleased(mouseX, mouseY, buttonID); + this.focusWidget[buttonID] = null; + return retval; + } + this.focusWidget[buttonID] = null; + return false; + } + @Override + public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + return widget.mouseWheel(mouseX, mouseY, mouseZ); + return false; + } + @Override + public boolean mouseMoved(int mouseX, int mouseY){ + if (this.mainFocusWidget != null) + return this.mainFocusWidget.mouseMoved(mouseX, mouseY); + + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + return widget.mouseMoved(mouseX, mouseY); + return false; + } + + /* + @Override + public boolean mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime){ + IWidget widget = this.getWidgetAtCoordinates(mouseX, mouseY); + if (widget != null) + return widget.mouseDragged(mouseX, mouseY, buttonID, deltaTime); + return false; + } + */ + + public void startScissorFilter(int posX, int posY, int width, int height){ + ScaledResolution res = new ScaledResolution(Minecraft.getMinecraft().gameSettings, + Minecraft.getMinecraft().displayWidth, + Minecraft.getMinecraft().displayHeight); + int scaleFactor = res.getScaleFactor(); + + int glLeft = posX * scaleFactor; + int glBottom = (res.getScaledHeight() - (posY + height)) * scaleFactor; + + GL11.glScissor(posX*scaleFactor, glBottom, width*scaleFactor, height*scaleFactor); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + } + + public void stopScissorFilter(){ + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } + + @Override + public IWidget getWidgetAtCoordinates(int posX, int posY){ + for (IWidget widget : this.getWidgets()) + if ((posX >= widget.getPosX()) && + (posX <= widget.getPosX() + widget.getWidth()) && + (posY >= widget.getPosY()) && + (posY <= widget.getPosY() + widget.getHeight())) + return widget; + return null; + } + @Override + public void addWidget(String name, IWidget widget){ + this.widgets.put(name, widget); + } + @Override + public Collection getWidgets(){ + return this.widgets.values(); + } + @Override + public IWidget getWidget(String name){ + return this.widgets.get(name); + } + + @Override + public void setBackgroundColor(int color){ + this.backgroundColor = color; + } + + @Override + public void drawBackground(){ + if (this.backgroundColor != 0) + this.drawGradientRect(this.posX, this.posY, this.posX+this.getWidth(), this.posY+this.getHeight(), 0.0, this.backgroundColor, this.backgroundColor); + } + + public void drawGradientRect(int left, int top, int right, int bottom, double zlevel, int colorStart, int colorStop) + { + float f = (colorStart >> 24 & 255) / 255.0F; + float f1 = (colorStart >> 16 & 255) / 255.0F; + float f2 = (colorStart >> 8 & 255) / 255.0F; + float f3 = (colorStart & 255) / 255.0F; + float f4 = (colorStop >> 24 & 255) / 255.0F; + float f5 = (colorStop >> 16 & 255) / 255.0F; + float f6 = (colorStop >> 8 & 255) / 255.0F; + float f7 = (colorStop & 255) / 255.0F; + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glShadeModel(GL11.GL_SMOOTH); + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorRGBA_F(f1, f2, f3, f); + tessellator.addVertex(right, top, zlevel); + tessellator.addVertex(left, top, zlevel); + tessellator.setColorRGBA_F(f5, f6, f7, f4); + tessellator.addVertex(left, bottom, zlevel); + tessellator.addVertex(right, bottom, zlevel); + tessellator.draw(); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak new file mode 100644 index 0000000..a1b9d78 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak @@ -0,0 +1,75 @@ +package mcp.mobius.waila.gui_old.widget; + +import java.util.ArrayList; + +import mcp.mobius.waila.gui_old.NEI.CraftingTreeNode; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + +public class ComponentDisplay extends BaseWidget { + + ArrayList components = null; + CraftingTreeNode node = null; + int spacingX = 4; + int spacingY = 4; + int stackDisplayWidth = 0; + boolean drawOverlay = false; + + public ComponentDisplay(GuiScreen parent){ + this.parent = parent; + this.components = new ArrayList(); + }; + + public ComponentDisplay(GuiScreen parent, CraftingTreeNode node){ + this.parent = parent; + this.node = node; + this.setComponents(node.elements); + }; + + public void setDrawOverlay(boolean value){ + for(IWidget widget : this.getWidgets()) + if(widget instanceof StackDisplay) + ((StackDisplay)widget).setDrawOverlay(value); + } + + public void setComponents(ArrayList components){ + this.components = components; + this.stackDisplayWidth = 0; + + for (ItemStack component : components) + this.addWidget(String.format("widget_%03d", this.getWidgets().size()), new StackDisplay(this.parent, component)); + + for (IWidget widget:this.getWidgets()) + this.stackDisplayWidth = Math.max(this.stackDisplayWidth, widget.getWidth()); + } + + @Override + public int getWidth() { + int width = 0; + for (IWidget widget:this.getWidgets()) + width += widget.getWidth(); + width += (this.getWidgets().size() + 1) * this.spacingX; + return width; + } + + @Override + public int getHeight() { + int height = 0; + for (IWidget widget:this.getWidgets()) + height = Math.max(widget.getHeight(), height); + height += this.spacingY * 2; + return height; + } + + @Override + public void draw() { + //this.drawBackground(); + int index = 0; + for (IWidget widget: this.getWidgets()){ + widget.setPos(this.posX + (this.spacingX * (index + 1)) + ( index * this.stackDisplayWidth ), this.posY + this.spacingY, 0); + widget.draw(); + index += 1; + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak new file mode 100644 index 0000000..15feb02 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak @@ -0,0 +1,191 @@ +package mcp.mobius.waila.gui_old.widget; + +import java.util.ArrayList; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiScreen; + +public class ContainerTable extends BaseWidget{ + int rowHeight; + int ncolumns; + //int viewportYPos = 0; + int tableHeight = 0; + int tableWidth = 0; + int scrollWidth = 8; + int scrollButtonHeight = 16; + boolean isScrollActive = false; + FontRenderer fontRender; + int[] columnPos; + int[] columnWidth; + ArrayList table = new ArrayList(); + VerticalScrollBar scrollbar = new VerticalScrollBar(); + Label[] columnnames; + boolean autosize = true; + + public ContainerTable(GuiScreen parent){ + this.parent = parent; + this.addWidget("VScrollBar", this.scrollbar); + }; + + public ContainerTable( GuiScreen parent, int height, int ncolumns, String[] columnnames) { + this.parent = parent; + this.height = height; + this.rowHeight = 8; + this.fontRender = Minecraft.getMinecraft().fontRenderer; + this.ncolumns = ncolumns; + this.columnPos = new int[this.ncolumns]; + this.columnWidth = new int[this.ncolumns]; + this.columnnames = new Label[this.ncolumns]; + + for (int i = 0; i < this.ncolumns; i++){ + Label labelHeader = new Label(columnnames[i]); + this.columnnames[i] = labelHeader; + this.addWidget(String.format("header_%s", i), labelHeader); + } + this.addWidget("VScrollBar", this.scrollbar); + } + + public void setAutosize(boolean value){ + this.autosize = value; + } + + public void setColumns(int rowHeight, String... header){ + this.rowHeight = rowHeight; + this.ncolumns = header.length; + this.columnPos = new int[this.ncolumns]; + this.columnWidth = new int[this.ncolumns]; + this.columnnames = new Label[this.ncolumns]; + + for (int i = 0; i < this.ncolumns; i++){ + Label labelHeader = new Label(header[i]); + this.columnnames[i] = labelHeader; + this.addWidget(String.format("header_%s", i), labelHeader); + + this.columnWidth[i] = Math.max(labelHeader.getWidth() + 8, this.columnWidth[i]); + this.columnWidth[i] = Math.max(this.columnnames[i].getWidth() + 8, this.columnWidth[i]); + } + this.columnPos[0] = 0; + for (int i = 1; i < this.ncolumns; i++) + this.columnPos[i] = this.columnPos[i-1] + this.columnWidth[i-1]; + } + + public int getSize() { + return this.table.size(); + } + + public void addRow(IWidget... data){ + this.table.add(data); + for (int i = 0; i < data.length; i++) + this.addWidget(String.format("row_%s_%s", this.table.size(), i), data[i]); + + for (int i = 0; i < ncolumns; i++){ + this.columnWidth[i] = Math.max(data[i].getWidth() + 8, this.columnWidth[i]); + this.columnWidth[i] = Math.max(this.columnnames[i].getWidth() + 8, this.columnWidth[i]); + } + + this.columnPos[0] = 0; + for (int i = 1; i < this.ncolumns; i++) + this.columnPos[i] = this.columnPos[i-1] + this.columnWidth[i-1]; + + this.isScrollActive = (this.getViewportHeight() < this.getTableHeight()); + } + + @Override + public void draw() { + GL11.glPushMatrix(); + GL11.glTranslatef(1.0f, 1.0f, this.posZ); + this.drawBackground(); + this.drawTitle(this.posX, this.posY); + + GL11.glPushMatrix(); + GL11.glTranslatef(0, this.scrollbar.getCurrentValue() * -1.0F, 0); + this.startScissorFilter(this.posX, this.posY + this.rowHeight, this.getWidth(), this.getViewportHeight()); + + for (int i = 0; i < this.table.size(); i++) + this.drawRow(i, this.posX, this.posY+(i+1)*this.rowHeight); + + this.stopScissorFilter(); + GL11.glPopMatrix(); + + if (this.isScrollActive){ + this.updateScrollBar(); + this.scrollbar.draw(); + } + GL11.glPopMatrix(); + } + + public void updateScrollBar(){ + int scrollbarX = this.posX + this.getWidth() - this.scrollWidth; + int scrollbarY = this.posY + this.rowHeight; + int scrollbarW = this.scrollWidth; + int scrollbarH = this.getViewportHeight(); + int maxvalue = this.getTableHeight() - this.getViewportHeight(); + + this.scrollbar.setup(this.parent, scrollbarX, scrollbarY, scrollbarW, scrollbarH, this.scrollButtonHeight, maxvalue); + } + + @Override + public int getWidth(){ + if (!autosize) + return this.width; + + int width = 0; + for (int i: this.columnWidth) + width += i; + + if (this.isScrollActive) + width += this.scrollWidth; + return width; + } + + public int getTableHeight(){ + return this.rowHeight * this.getSize(); + } + + public int getViewportHeight(){ + return this.getHeight() - this.rowHeight; + } + + @Override + public int getHeight(){ + return this.height; + } + + @Override + public void setHeight(int height){ + this.height = height; + this.isScrollActive = (this.getViewportHeight() < this.getTableHeight()); + } + + public void drawTitle(int rowleft, int rowtop) + { + for (int j = 0; j < this.ncolumns; j++){ + this.columnnames[j].setWidth(this.columnWidth[j]); + this.columnnames[j].draw(rowleft + this.columnPos[j], rowtop, 0); + } + } + + public void drawRow(int index, int rowleft, int rowtop) + { + if (index%2 == 0) + this.parent.drawGradientRect(rowleft, rowtop, rowleft+this.getWidth(), rowtop+this.rowHeight, 0xff333333, 0xff333333); + else + this.parent.drawGradientRect(rowleft, rowtop, rowleft+this.getWidth(), rowtop+this.rowHeight, 0xff000000, 0xff000000); + + IWidget[] data = this.table.get(index); + for (int j = 0; j < this.ncolumns; j++){ + data[j].setWidth(this.columnWidth[j]); + data[j].draw(rowleft + this.columnPos[j], rowtop, 0); + } + + } + + @Override + public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){ + this.scrollbar.addCurrentValue((mouseZ / -120) * this.scrollbar.getStep()); + return true; + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak new file mode 100644 index 0000000..fc0e9d0 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak @@ -0,0 +1,110 @@ +package mcp.mobius.waila.gui_old.widget; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.gui.GuiScreen; + +public class DraggableViewport extends BaseWidget { + + //public StackDisplay widStack = null;; + private int offsetX = 0; + private int offsetY = 0; + private int prevMouseX = 0; + private int prevMouseY = 0; + private float scale = 1.0f; + private boolean dragging = false; + + + public DraggableViewport(GuiScreen parent){ + this.parent = parent; + /* + widStack = new StackDisplay(parent); + widStack.setStack(new ItemStack(Item.axeDiamond)); + widStack.setPos(80, 80, 0); + + this.addWidget("stackdisplay", this.widStack); + */ + } + + public void addWidget(IWidget widget, int posX, int posY, int posZ){ + this.addWidget(String.format("widget_%s", this.widgets.size()), widget); + widget.setPos(posX, posY, posZ); + } + + @Override + public int getWidth() { + return this.width; + } + + @Override + public int getHeight() { + return this.height; + } + + @Override + public void draw() { + this.drawBackground(); + + this.drawBackground(); + GL11.glPushMatrix(); + GL11.glTranslatef(offsetX, offsetY, 0); + GL11.glScalef(this.scale, this.scale, 1.0f); + this.startScissorFilter(this.posX, this.posY, this.getWidth(), this.getHeight()); + + for (IWidget widget : this.getWidgets()) + widget.drawBackground(); + + for (IWidget widget : this.getWidgets()) + //widget.draw(this.scale); + widget.draw(); + + + this.stopScissorFilter(); + GL11.glPopMatrix(); + } + + @Override + public boolean mouseClicked(int mouseX, int mouseY, int buttonID){ + if (buttonID == 0){ + this.dragging = true; + this.prevMouseX = mouseX; + this.prevMouseY = mouseY; + return true; + } + else + return false; + } + + @Override + public boolean mouseReleased(int mouseX, int mouseY, int buttonID){ + if (buttonID == 0) + this.dragging = false; + else + return false; + return true; + } + + + @Override + public boolean mouseMoved(int mouseX, int mouseY){ + if (this.dragging){ + this.offsetX -= (this.prevMouseX - mouseX); + this.offsetY -= (this.prevMouseY - mouseY); + this.prevMouseX = mouseX; + this.prevMouseY = mouseY; + + return true; + } + return false; + } + + @Override + public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){ + if (mouseZ > 0) + this.scale *= Math.abs((mouseZ / -120)*2); + else + this.scale /= Math.abs((mouseZ / -120)*2); + return true; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/IWidget.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/IWidget.java.bak new file mode 100644 index 0000000..3826f18 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/IWidget.java.bak @@ -0,0 +1,34 @@ +package mcp.mobius.waila.gui_old.widget; + +import java.util.Collection; + +public interface IWidget { + int getWidth(); + int getHeight(); + String getLabel(); + int getPosX(); + int getPosY(); + + void setWidth(int width); + void setHeight(int height); + void setLabel(String label); + void setPos(int posX, int posY, int posZ); + + boolean mouseClicked(int mouseX, int mouseY, int buttonID); + boolean mouseReleased(int mouseX, int mouseY, int buttonID); + boolean mouseWheel(int mouseX, int mouseY, int mouseZ); + boolean mouseMoved(int mouseX, int mouseY); + //boolean mouseDragged(int mouseX, int mouseY, int buttonID, long deltaTime); + + void draw(); + void draw(int x, int y, int z); + void draw(float scale); + + IWidget getWidgetAtCoordinates(int posX, int posY); + public void addWidget(String name, IWidget widget); + public Collection getWidgets(); + public IWidget getWidget(String name); + + void drawBackground(); + void setBackgroundColor(int color); +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/Label.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/Label.java.bak new file mode 100644 index 0000000..664feed --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/Label.java.bak @@ -0,0 +1,67 @@ +package mcp.mobius.waila.gui_old.widget; + +import net.minecraft.client.gui.GuiScreen; + +public class Label extends BaseWidget { + + public Label(GuiScreen parent){ + this.parent = parent; + } + + public Label(GuiScreen parent, String label){ + this.parent = parent; + this.setLabel(label); + } + + public Label(String label){ + this.parent = null; + this.setLabel(label); + } + + public Label(int label){ + this.parent = null; + this.setLabel(String.valueOf(label)); + } + + public Label(float label){ + this.parent = null; + this.setLabel(String.valueOf(label)); + } + + public int getCharWidth(){ + return this.fontRenderer.getCharWidth((char)32); + } + + @Override + public void draw() { + this.drawBackground(); + this.renderString(this.posX, this.posY, 0, 0xffffffff); + } + + public String getTrimLabel(){ + int maxchars = this.width / this.getCharWidth(); + return this.label.substring(0, Math.min(this.label.length(), maxchars)); + } + + @Override + public int getWidth(){ + return this.fontRenderer.getStringWidth(this.label); + } + + @Override + public void setLabel(String label){ + this.label = label; + this.width = this.fontRenderer.getStringWidth(this.label); + } + + public void renderString(int x, int y, int z, int color){ + //this.fontrender.drawString(this.getTrimLabel(), x, y, color); + this.fontRenderer.drawString(this.getLabel(), x, y, color); + } + + @Override + public int getHeight() { + return 8; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak new file mode 100644 index 0000000..7dbbcf6 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak @@ -0,0 +1,71 @@ +package mcp.mobius.waila.gui_old.widget; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; + +public class StackDisplay extends BaseWidget { + + protected static RenderItem drawItems = new RenderItem(); + protected ItemStack stack; + protected Icon icon; + protected float scale = 1.0F; + protected boolean drawOverlay = false; + + public StackDisplay(GuiScreen parent){ + this.parent = parent; + StackDisplay.drawItems.zLevel = 500.0f; + }; + + public StackDisplay(GuiScreen parent, ItemStack stack){ + this.parent = parent; + this.setStack(stack); + }; + + public void setDrawOverlay(boolean value){ + this.drawOverlay = value; + } + + public void setStack(ItemStack stack){ + this.stack = stack; + this.icon = stack.getIconIndex(); + } + + @Override + public void draw() { + this.drawBackground(); + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, 1.0f); + + RenderHelper.disableStandardItemLighting(); + drawItems.renderItemAndEffectIntoGUI(this.fontRenderer, this.renderEngine, this.stack, (int)(this.posX/scale), (int)(this.posY/scale)); + if (this.drawOverlay) + drawItems.renderItemOverlayIntoGUI(this.fontRenderer, this.renderEngine, this.stack, (int)(this.posX/scale), (int)(this.posY/scale), String.valueOf(stack.stackSize)); + RenderHelper.enableStandardItemLighting(); + GL11.glPopMatrix(); + + } + + + @Override + public int getWidth(){ + return (int)(16 * this.scale); + } + + @Override + public int getHeight(){ + return (int)(16 * this.scale); + } + + public void setScale(float scale_){ + this.scale = scale_; + } + + public float getScale(){ + return this.scale; + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak new file mode 100644 index 0000000..8d72d73 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak @@ -0,0 +1,109 @@ +package mcp.mobius.waila.gui_old.widget; + +import net.minecraft.client.gui.GuiScreen; + +public class VerticalScrollBar extends BaseWidget { + + private int maxvalue; + private int currvalue = 0; + private int buttonH; + private int buttonTop; + private int step = 6; + public boolean dragging = false; + + public VerticalScrollBar(){}; + + public void setup(GuiScreen parent, int posX, int posY, int width, int height, int buttonH, int maxvalue) { + this.parent = parent; + this.posX = posX; + this.posY = posY; + this.width = width; + this.height = height; + this.maxvalue = maxvalue; + this.buttonH = buttonH; + } + + @Override + public int getWidth() { + return this.width; + } + + @Override + public int getHeight() { + return this.height; + } + + @Override + public void draw() { + this.drawBackground(); + this.parent.drawGradientRect(this.posX, + this.posY, + this.posX + this.getWidth(), + this.posY + this.getHeight(), + 0xff999999, 0xff999999); + + float currentRatio = (float)(this.currvalue) / (float)(this.maxvalue); + this.buttonTop = (int)((this.getHeight() - this.buttonH) * currentRatio) + this.posY; + + this.parent.drawGradientRect(this.posX, + buttonTop, + this.posX + this.getWidth(), + buttonTop + this.buttonH, + 0xffffffff, 0xffffffff); + + } + + public void setCurrentValue(int currvalue){ + this.currvalue = currvalue; + this.currvalue = Math.max(0, this.currvalue); + this.currvalue = Math.min(this.maxvalue, this.currvalue); + } + + public void addCurrentValue(int value){ + this.currvalue += value; + this.currvalue = Math.max(0, this.currvalue); + this.currvalue = Math.min(this.maxvalue, this.currvalue); + } + + public int getCurrentValue(){ + return this.currvalue; + } + + public int getStep(){ + return this.step; + } + + @Override + public boolean mouseClicked(int mouseX, int mouseY, int buttonID){ + if(mouseY < this.buttonTop) + this.addCurrentValue(-1 * this.step); + else if (mouseY > this.buttonTop + this.buttonH) + this.addCurrentValue(this.step); + else if (buttonID == 0) + this.dragging = true; + else + return false; + return true; + } + + @Override + public boolean mouseReleased(int mouseX, int mouseY, int buttonID){ + if (buttonID == 0) + this.dragging = false; + else + return false; + return true; + } + + + @Override + public boolean mouseMoved(int mouseX, int mouseY){ + if (this.dragging){ + int value = (int)((float)((mouseY - this.buttonH/2) - this.posY)/(float)(this.getHeight()-this.buttonH)*this.maxvalue); + this.setCurrentValue(value); + return true; + } + return false; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak new file mode 100644 index 0000000..618af95 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak @@ -0,0 +1,127 @@ +package mcp.mobius.waila.gui_old.widget; + +import java.util.ArrayList; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.gui.GuiScreen; + +public class WikiReader extends BaseWidget { + + private VerticalScrollBar scrollbar = new VerticalScrollBar(); + private String text = ""; + int textHeight = 0; + int lineHeight = 8; + int scrollWidth = 8; + int scrollButtonHeight = 16; + boolean isScrollActive = false; + + + public WikiReader(GuiScreen parent){ + this.parent = parent; + this.addWidget("VScrollBar", this.scrollbar); + } + + @Override + public int getWidth() { + if (!this.isScrollActive) + return this.width; + else + return this.width - this.scrollWidth; + } + + @Override + public int getHeight() { + return this.height; + } + + @Override + public void draw() { + this.drawBackground(); + GL11.glPushMatrix(); + GL11.glTranslatef(0, this.scrollbar.getCurrentValue() * -1.0F, 0); + this.startScissorFilter(this.posX, this.posY, this.getWidth(), this.getViewportHeight()); + + int offset = this.posY; + + for (String s : this.getTailoredText()){ + this.fontRenderer.drawString(s, this.posX, offset, 0xFFFFFFFF); + offset += this.lineHeight; + } + + this.stopScissorFilter(); + GL11.glPopMatrix(); + + if (this.isScrollActive){ + this.updateScrollBar(); + this.scrollbar.draw(); + } + } + + public void setText(String text){ + this.text = text; + this.textHeight = this.getTailoredText().size() * this.lineHeight; + if (this.textHeight > this.getHeight()){ + this.isScrollActive = true; + //this.setWidth(this.getWidth() - this.scrollWidth); + this.textHeight = this.getTailoredText().size() * this.lineHeight; + } + } + + public int getTextHeight(){ + return this.getTailoredText().size() * this.lineHeight; + } + + public String getText(){ + return this.text; + } + + public ArrayList getTailoredText(){ + String[] splittedText = this.text.split("\r?\n"); + ArrayList lines = new ArrayList(); + for (String s : splittedText){ + ArrayList whiteSpaces = this.getWhiteSpaces(s); + int lastCutIndex = 0; + for (int i = 0; i < whiteSpaces.size(); i++){ + String substring = s.substring(lastCutIndex, whiteSpaces.get(i)); + if (this.fontRenderer.getStringWidth(substring) > this.getWidth()){ + lines.add(s.substring(lastCutIndex, whiteSpaces.get(i-1))); + lastCutIndex = whiteSpaces.get(i-1) + 1; + } + } + lines.add(s.substring(lastCutIndex)); + } + return lines; + } + + private ArrayList getWhiteSpaces(String input){ + ArrayList indexes = new ArrayList(); + int index = 0; + while (index != -1){ + index = input.indexOf(" ", index + 1); + if (index != -1) + indexes.add(index); + } + return indexes; + } + + @Override + public boolean mouseWheel(int mouseX, int mouseY, int mouseZ){ + this.scrollbar.addCurrentValue((mouseZ / -120) * this.scrollbar.getStep()); + return true; + } + + public int getViewportHeight(){ + return this.getHeight(); + } + + public void updateScrollBar(){ + int scrollbarX = this.posX + this.getWidth(); + int scrollbarY = this.posY; + int scrollbarW = this.scrollWidth; + int scrollbarH = this.getViewportHeight(); + int maxvalue = this.getTextHeight() - this.getViewportHeight(); + + this.scrollbar.setup(this.parent, scrollbarX, scrollbarY, scrollbarW, scrollbarH, this.scrollButtonHeight, maxvalue); + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak new file mode 100644 index 0000000..c90e46b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak @@ -0,0 +1,117 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.ResourceLocation; + +public class Button2States extends GuiButton { + + boolean state; + String label; + int labelSize; + String stateFalse; + String stateTrue; + + public Button2States(int par1, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { + super(par1, 0, 0, 80, 20, _stateFalse); + state = _state; + label = _label; + stateFalse = _stateFalse; + stateTrue = _stateTrue; + labelSize = _labelSize; + this.displayString = state ? stateTrue:stateFalse; + } + + public Button2States(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { + super(par1, par2, par3, _stateFalse); + state = _state; + label = _label; + stateFalse = _stateFalse; + stateTrue = _stateTrue; + labelSize = _labelSize; + this.displayString = state ? stateTrue:stateFalse; + } + + public Button2States(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state) { + super(par1, par2, par3, par4, par5, _stateFalse); + state = _state; + label = _label; + stateFalse = _stateFalse; + stateTrue = _stateTrue; + labelSize = _labelSize; + this.displayString = state ? stateTrue:stateFalse; + } + + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) + { + if (this.drawButton) + { + FontRenderer fontrenderer = par1Minecraft.fontRenderer; + + //DONE : Changed from v1.5.2 to 1.6.2 resource handling + //par1Minecraft.renderEngine.bindTexture("/gui/gui.png"); + ResourceLocation guipng = new ResourceLocation("textures/gui/widgets.png"); + par1Minecraft.renderEngine.func_110577_a(guipng); + + if (this.labelSize == -1) + labelSize = fontrenderer.getStringWidth(this.label) + 5; + + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.field_82253_i = par2 >= this.xPosition + this.labelSize && par3 >= this.yPosition && par2 < this.xPosition + this.width + this.labelSize && par3 < this.yPosition + this.height; + int k = this.getHoverState(this.field_82253_i); + this.drawTexturedModalRect(this.xPosition + this.labelSize, this.yPosition, 0, 46 + k * 20, this.width / 2, this.height); + this.drawTexturedModalRect(this.xPosition + this.labelSize + this.width / 2, this.yPosition, 200 - this.width / 2, 46 + k * 20, this.width / 2, this.height); + this.mouseDragged(par1Minecraft, par2, par3); + int l = 14737632; + + if (!this.enabled) + { + l = -6250336; + } + else if (this.field_82253_i) + { + l = 16777120; + } + + this.drawCenteredString(fontrenderer, this.displayString, this.xPosition + this.labelSize + this.width / 2, this.yPosition + (this.height - 8) / 2, l); + this.drawCenteredString(fontrenderer, this.label, this.xPosition + this.labelSize/2, this.yPosition + (this.height - 8) / 2, 14737632); + } + } + + public void pressButton(){ + state = state?false:true; + this.displayString = state ? stateTrue:stateFalse; + } + + public boolean getState(){ + return state; + } + + @Override + public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) + { + return this.enabled && this.drawButton && par2 >= this.xPosition + this.labelSize && par3 >= this.yPosition && par2 < this.xPosition + this.labelSize + this.width && par3 < this.yPosition + this.height; + } + + public int getHeight(){ + return this.height; + } + + public int getWidth(){ + return this.width + this.labelSize; + } + + public void setHeight(int value){ + this.height = value; + } + + public void setWidth(int value){ + this.width = value; + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak new file mode 100644 index 0000000..a1895ba --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak @@ -0,0 +1,46 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; + +public class ButtonChangeScreen extends GuiButton { + + GuiScreen linkedScreen; + + public ButtonChangeScreen(int par1, String par4Str, GuiScreen _linkedScreen) { + super(par1, 0, 0, 80, 20, par4Str); + this.linkedScreen = _linkedScreen; + } + + public ButtonChangeScreen(int par1, int par2, int par3, String par4Str, GuiScreen _linkedScreen) { + super(par1, par2, par3, par4Str); + this.linkedScreen = _linkedScreen; + } + + public ButtonChangeScreen(int par1, int par2, int par3, int par4, int par5, String par6Str, GuiScreen _linkedScreen) { + super(par1, par2, par3, par4, par5, par6Str); + this.linkedScreen = _linkedScreen; + } + + public void pressButton(){ + Minecraft mc = Minecraft.getMinecraft(); + mc.displayGuiScreen(this.linkedScreen); + } + + public int getHeight(){ + return this.height; + } + + public int getWidth(){ + return this.width; + } + + public void setHeight(int value){ + this.height = value; + } + + public void setWidth(int value){ + this.width = value; + } +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak new file mode 100644 index 0000000..daa040c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak @@ -0,0 +1,39 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import codechicken.nei.NEIClientConfig; + +public class ButtonConfigNEI extends ButtonConfigOption { + + public ButtonConfigNEI(int par1, String _stateFalse, String _stateTrue, + String _label, String _configKey) { + super(par1, _stateFalse, _stateTrue, _label, _configKey); + } + + public ButtonConfigNEI(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, + String _configKey) { + super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, + _state, _configKey); + } + + public ButtonConfigNEI(int par1, int par2, int par3, int par4, int par5, + String _stateFalse, String _stateTrue, String _label, + int _labelSize, boolean _state, String _configKey) { + super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, + _labelSize, _state, _configKey); + } + + @Override + public void setupInitialState(String _configKey, boolean _state){ + this.configKey = _configKey; + this.state = NEIClientConfig.getSetting(this.configKey).getBooleanValue(); + this.displayString = state ? stateTrue:stateFalse; + } + + @Override + public void pressButton(){ + super.pressButton(); + this.state = !NEIClientConfig.getSetting(this.configKey).getBooleanValue(); + NEIClientConfig.getSetting(this.configKey).setBooleanValue(this.state); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak new file mode 100644 index 0000000..73c2000 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak @@ -0,0 +1,54 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import mcp.mobius.waila.mod_Waila; +import net.minecraftforge.common.Configuration; +import net.minecraftforge.common.Property; + +public class ButtonConfigOption extends Button2States { + + String configKey; + + public ButtonConfigOption(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey) { + super(par1, 0, 0, 80, 20, _stateFalse, _stateTrue, _label, -1, false); + this.setupInitialState(_configKey, true); + } + + public ButtonConfigOption(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey, boolean _state) { + super(par1, 0, 0, 80, 20, _stateFalse, _stateTrue, _label, -1, _state); + this.setupInitialState(_configKey, _state); + } + + public ButtonConfigOption(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { + super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, _state); + this.setupInitialState(_configKey, true); + } + + public ButtonConfigOption(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { + super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, _labelSize, _state); + this.setupInitialState(_configKey, true); + } + + public void setupInitialState(String _configKey, boolean _state){ + this.configKey = _configKey; + this.state = this.readConfigKey(this.configKey, _state); + this.displayString = state ? stateTrue:stateFalse; + } + + @Override + public void pressButton(){ + super.pressButton(); + this.writeConfigKey(this.configKey, this.state); + } + + protected void writeConfigKey(String keyname, boolean value){ + mod_Waila.instance.config.getCategory(Configuration.CATEGORY_GENERAL).put(keyname, new Property(keyname,String.valueOf(value),Property.Type.BOOLEAN)); + mod_Waila.instance.config.save(); + } + + protected boolean readConfigKey(String keyname, boolean _state){ + mod_Waila.instance.config.load(); + Property prop = mod_Waila.instance.config.get(Configuration.CATEGORY_GENERAL, keyname, _state); + return prop.getBoolean(_state); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak new file mode 100644 index 0000000..784dfcb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak @@ -0,0 +1,43 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import mcp.mobius.waila.mod_Waila; +import net.minecraft.client.Minecraft; + +public class ButtonConfigRemote extends ButtonConfigOption { + + public ButtonConfigRemote(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey) { + super(par1, _stateFalse, _stateTrue, _label, _configKey); + } + public ButtonConfigRemote(int par1, String _stateFalse, String _stateTrue, String _label, String _configKey, boolean _state) { + super(par1, _stateFalse, _stateTrue, _label, _configKey, _state); + } + public ButtonConfigRemote(int par1, int par2, int par3, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { + super(par1, par2, par3, _stateFalse, _stateTrue, _label, _labelSize, _state, _configKey); + } + + public ButtonConfigRemote(int par1, int par2, int par3, int par4, int par5, String _stateFalse, String _stateTrue, String _label, int _labelSize, boolean _state, String _configKey) { + super(par1, par2, par3, par4, par5, _stateFalse, _stateTrue, _label, _labelSize, _state, _configKey); + } + + @Override + public void drawButton(Minecraft par1Minecraft, int par2, int par3) + { + this.enabled = mod_Waila.instance.serverPresent; + super.drawButton(par1Minecraft, par2, par3); + } + + @Override + public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) + { + this.enabled = mod_Waila.instance.serverPresent; + return super.mousePressed(par1Minecraft, par2, par3); + } + + @Override + protected int getHoverState(boolean par1) + { + this.enabled = mod_Waila.instance.serverPresent; + return super.getHoverState(par1); + } + +} diff --git a/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak new file mode 100644 index 0000000..81cea8b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak @@ -0,0 +1,68 @@ +package mcp.mobius.waila.gui_old.widget_old; + +import java.util.ArrayList; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; + +public class ContainerButtons { + + GuiScreen parentScreen; + int posX, posY, width, height; + int maxLabelSize = 0; + int maxColumnWidth = 0; + + ArrayList buttons = new ArrayList(); + + public ContainerButtons(GuiScreen _parentScreen, int _posX, int _posY, int _width, int _height) { + this.parentScreen = _parentScreen; + this.posX = _posX; this.posY = _posY; + this.width = _width; this.height = _height; + this.maxColumnWidth = this.width/2; + } + + public void addButton(GuiButton button){ + + this.buttons.add(button); + + /* + FontRenderer fontrenderer = Minecraft.getMinecraft().fontRenderer; + if (button instanceof Button2States){ + maxLabelSize = Math.max(maxLabelSize, fontrenderer.getStringWidth(((Button2States)button).label) + 5); + ((Button2States)button).labelSize = maxLabelSize; + maxColumnWidth = Math.max(maxColumnWidth, ((Button2States)button).getWidth()); + } + */ + + /* + for (GuiButton other : this.buttons){ + if (other instanceof Button2States) + ((Button2States) other).labelSize = this.maxLabelSize; + + if (other instanceof ButtonChangeScreen) + ((ButtonChangeScreen) other).setWidth(maxColumnWidth); + } + */ + + if (button instanceof Button2States){ + ((Button2States) button).setWidth(80); + ((Button2States) button).labelSize = this.width/2 - 80; + button.xPosition = (this.buttons.size() - 1)%2 * this.width / 2 + this.posX; + button.yPosition = (this.buttons.size() - 1)/2 * 20 + this.posY; + } + + if (button instanceof ButtonChangeScreen){ + //((ButtonChangeScreen) button).setWidth(this.width/2); + ((ButtonChangeScreen) button).setWidth(120); + button.xPosition = (this.buttons.size() - 1)%2 * this.width / 2 + this.posX + (this.width / 2 - ((ButtonChangeScreen) button).getWidth())/2; + button.yPosition = (this.buttons.size() - 1)/2 * 20 + this.posY; + } + + + + + this.parentScreen.buttonList.add(button); + + } + +} diff --git a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java new file mode 100644 index 0000000..62c99f8 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java @@ -0,0 +1,50 @@ +package mcp.mobius.waila.handlers; + +import java.util.logging.Level; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.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.api.impl.DataAccessorFMP; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class DecoratorFMP implements IWailaBlockDecorator { + + @Override + public void decorateBlock(ItemStack itemStack, IWailaDataAccessor accessor, IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", 10); + for (int i = 0; i < list.tagCount(); i++){ + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); + + if (ModuleRegistrar.instance().hasFMPDecorator(id)){ + DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id, accessor.getRenderingPosition(), accessor.getPartialFrame()); + + for (IWailaFMPDecorator provider : ModuleRegistrar.instance().getFMPDecorators(id)) + provider.decorateBlock(itemStack, DataAccessorFMP.instance, config); + } + } + } + + public static void register(){ + Class BlockMultipart = null; + try{ + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[FMP] Class not found. " + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[FMP] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().registerDecorator(new DecoratorFMP(), BlockMultipart); + } + +} diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java new file mode 100644 index 0000000..8871d95 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -0,0 +1,84 @@ +package mcp.mobius.waila.handlers; + +import java.util.List; + +import codechicken.nei.guihook.GuiContainerManager; +import static mcp.mobius.waila.api.SpecialChars.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; + +public class HUDHandlerBlocks implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + String name = null; + try + { + String s = GuiContainerManager.itemDisplayNameShort(itemStack); + if(s != null && !s.endsWith("Unnamed")) + name = s; + + if(name != null) + currenttip.add(name); + } + catch(Exception e) + { + } + + if(itemStack.getItem() == Items.redstone) + { + int md = accessor.getMetadata(); + String s = ""+md; + if(s.length() < 2) + s=" "+s; + currenttip.set(currenttip.size()-1, name+" "+s); + } + + if (currenttip.size() == 0) + currenttip.add("< Unnamed >"); + else{ + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, true)){ + name = currenttip.get(0); + //currenttip.set(0, name + String.format(" %s:%s", accessor.getBlockID(), accessor.getMetadata())); + //currenttip.set(0, name + String.format(" %s:%s", itemStack.itemID, itemStack.getItemDamage())); + } + } + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + /* + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) && currenttip.size() > 0 && !accessor.getPlayer().isSneaking()){ + currenttip.clear(); + currenttip.add(ITALIC + "Press shift for more data"); + return currenttip; + } + */ + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + String modName = ModIdentification.nameFromStack(itemStack); + if (modName != null && !modName.equals("")){ + currenttip.add(BLUE + ITALIC + modName ); + } + + return currenttip; + } +} diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java new file mode 100644 index 0000000..673b165 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -0,0 +1,109 @@ +package mcp.mobius.waila.handlers; + +import java.util.List; + +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.MathHelper; +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class HUDHandlerEntities implements IWailaEntityProvider { + + public static int nhearts = 20; + public static float maxhpfortext = 40.0f; + + @Override + public Entity getWailaOverride(IWailaEntityAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + try{ + currenttip.add(WHITE + entity.getCommandSenderName()); + } catch (Exception e){ + currenttip.add(WHITE + "Unknown"); + } + return currenttip; + } + + @Override + public List getWailaBody(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("general.showhp")) return currenttip; + + if (entity instanceof EntityLivingBase){ + String hptip = ""; + + nhearts = nhearts <= 0 ? 20 : nhearts; + + float health = ((EntityLivingBase)entity).getHealth() / 2.0f; + float maxhp = ((EntityLivingBase)entity).getMaxHealth() / 2.0f; + + if (((EntityLivingBase)entity).getHealth() > maxhpfortext) + currenttip.add(String.format("HP : " + WHITE + "%.0f" + GRAY + " / " + WHITE + "%.0f", ((EntityLivingBase)entity).getHealth(), ((EntityLivingBase)entity).getMaxHealth())); + + else{ + for (int i = 0; i < MathHelper.floor_float(health); i++){ + hptip += HEART; + if(hptip.length() % (nhearts * HEART.length()) == 0){ + currenttip.add(hptip); + hptip = ""; + } + } + + if (((EntityLivingBase)entity).getHealth() > MathHelper.floor_float(health) * 2.0f){ + hptip += HHEART; + if(hptip.length() % (nhearts * HEART.length()) == 0){ + currenttip.add(hptip); + hptip = ""; + } + } + + for (int i = 0; i < MathHelper.floor_float(maxhp - health); i++){ + hptip += EHEART; + if(hptip.length() % (nhearts * HEART.length()) == 0){ + currenttip.add(hptip); + hptip = ""; + } + } + + if (!hptip.equals("")) + currenttip.add(hptip); + } + } + + return currenttip; + } + + @Override + public List getWailaTail(Entity entity, List currenttip, IWailaEntityAccessor accessor, IWailaConfigHandler config) { + try{ + currenttip.add(BLUE + ITALIC + getEntityMod(entity)); + } catch (Exception e){ + currenttip.add(BLUE + ITALIC + "Unknown"); + } + return currenttip; + } + + private static String getEntityMod(Entity entity){ + String modName = ""; + try{ + EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), true); + ModContainer modC = er.getContainer(); + modName = modC.getName(); + } catch (NullPointerException e){ + modName = "Minecraft"; + } + return modName; + } + +} diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java new file mode 100644 index 0000000..e16a2da --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -0,0 +1,99 @@ +package mcp.mobius.waila.handlers; + +import java.util.List; +import java.util.logging.Level; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.Constants; +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.IWailaFMPProvider; +import mcp.mobius.waila.api.impl.DataAccessorFMP; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class HUDHandlerFMP implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++){ + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); + + if (ModuleRegistrar.instance().hasHeadFMPProviders(id)){ + DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); + + for (IWailaFMPProvider provider : ModuleRegistrar.instance().getHeadFMPProviders(id)) + currenttip = provider.getWailaHead(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++){ + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); + + if (ModuleRegistrar.instance().hasBodyFMPProviders(id)){ + DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); + + for (IWailaFMPProvider provider : ModuleRegistrar.instance().getBodyFMPProviders(id)) + currenttip = provider.getWailaBody(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + NBTTagList list = accessor.getNBTData().getTagList("parts", Constants.NBT.TAG_COMPOUND); + for (int i = 0; i < list.tagCount(); i++){ + NBTTagCompound subtag = list.getCompoundTagAt(i); + String id = subtag.getString("id"); + + if (ModuleRegistrar.instance().hasTailFMPProviders(id)){ + DataAccessorFMP.instance.set(accessor.getWorld(), accessor.getPlayer(), accessor.getPosition(), subtag, id); + + for (IWailaFMPProvider provider : ModuleRegistrar.instance().getTailFMPProviders(id)) + currenttip = provider.getWailaTail(itemStack, currenttip, DataAccessorFMP.instance, config); + } + } + + return currenttip; + } + + public static void register(){ + Class BlockMultipart = null; + try{ + BlockMultipart = Class.forName("codechicken.multipart.BlockMultipart"); + } catch (ClassNotFoundException e){ + Waila.log.log(Level.WARNING, "[FMP] Class not found. " + e); + return; + } catch (Exception e){ + Waila.log.log(Level.WARNING, "[FMP] Unhandled exception." + e); + return; + } + + ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerTailProvider(new HUDHandlerFMP(), BlockMultipart); + ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart); + + Waila.log.log(Level.INFO, "Forge Multipart found and dedicated handler registered"); + + } +} diff --git a/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak new file mode 100644 index 0000000..3a4e2c3 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak @@ -0,0 +1,32 @@ +package mcp.mobius.waila.handlers; + +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaSummaryProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + +public class SummaryProvider { + + private static SummaryProvider instance = null; + + private SummaryProvider() { + instance = this; + } + + public static SummaryProvider instance(){ + if (SummaryProvider.instance == null) + SummaryProvider.instance = new SummaryProvider(); + return SummaryProvider.instance; + } + + public LinkedHashMap getSummary(ItemStack stack, IWailaConfigHandler config) { + LinkedHashMap currentSummary = new LinkedHashMap(); + + for (IWailaSummaryProvider provider : ModuleRegistrar.instance().getSummaryProvider(stack.getItem())){ + currentSummary = provider.getSummary(stack, currentSummary, config); + } + return currentSummary; + } +} diff --git a/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak new file mode 100644 index 0000000..34bd92b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak @@ -0,0 +1,213 @@ +package mcp.mobius.waila.handlers; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.IShearable; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaSummaryProvider; + +public class SummaryProviderDefault implements IWailaSummaryProvider { + + public SummaryProviderDefault() { + // TODO Auto-generated constructor stub + } + + @Override + public LinkedHashMap getSummary(ItemStack stack, LinkedHashMap currentSummary, IWailaConfigHandler config) { + + if (!(stack.getItem() instanceof ItemBlock)){ + //For now, we have either a basic item or a tool/weapon/armor + if (this.getToolMaterialName(stack) != null){ + currentSummary.put("Material", this.getToolMaterialName(stack)); + currentSummary.put("Tier", this.getHarvestLevel(stack) != null?String.valueOf(this.getHarvestLevel(stack)):null); + currentSummary.put("Durability", this.getItemDurability(stack) != null?String.valueOf(this.getItemDurability(stack)):null); + + currentSummary.put("Harvest", this.getEffectiveBlock(stack)); + if (this.getEffectiveBlock(stack) != null) + currentSummary.put("Efficiency", this.getEfficiencyOnProperMaterial(stack) != null?String.valueOf(this.getEfficiencyOnProperMaterial(stack)):null); + + currentSummary.put("Enchant", this.getToolEnchantability(stack) != null?String.valueOf(this.getToolEnchantability(stack)):null); + currentSummary.put("Damage", this.getDamageVsEntity(stack) != null?String.valueOf(this.getDamageVsEntity(stack)):null); + } + else if (this.getArmorMaterialName(stack) != null){ + currentSummary.put("Material", this.getArmorMaterialName(stack)); + currentSummary.put("Durability", this.getItemDurability(stack) != null?String.valueOf(this.getItemDurability(stack)):null); + currentSummary.put("Armor Value", this.getDamageReduction(stack) != null?String.valueOf(this.getDamageReduction(stack)):null); + currentSummary.put("Enchant", this.getArmorEnchantability(stack) != null?String.valueOf(this.getArmorEnchantability(stack)):null); + } + } else { + //We have an ItemBlock + ItemBlock itemBlock = (ItemBlock)stack.getItem(); + Block block = Block.blocksList[itemBlock.getBlockID()]; + try{currentSummary.put("Hardness", String.valueOf(block.getBlockHardness(Minecraft.getMinecraft().theWorld, 0, 0, 0)));} catch (Exception e){}; + try{currentSummary.put("Resistance", String.valueOf(block.getExplosionResistance(null)));} catch (Exception e){}; + + try{ + ArrayList droppedStacks = block.getBlockDropped(Minecraft.getMinecraft().theWorld, 0, 0, 0, stack.getItemDamage(), 3); + if (droppedStacks.size() == 1) + currentSummary.put("Drop", droppedStacks.get(0).getDisplayName()); + else + for (int i=0; i < droppedStacks.size(); i++) + currentSummary.put(String.format("Drop %s", i), droppedStacks.get(i).getDisplayName()); + }catch (Exception e){System.out.printf("%s\n",e);}; + + try{ + if (block instanceof IShearable){ + IShearable shearable = (IShearable)block; + ArrayList droppedStacks = shearable.onSheared(null, Minecraft.getMinecraft().theWorld, 0, 0, 0, 3); + if (droppedStacks.size() == 1) + currentSummary.put("Sheared", droppedStacks.get(0).getDisplayName()); + else + for (int i=0; i < droppedStacks.size(); i++) + currentSummary.put(String.format("Sheared %s", i), droppedStacks.get(i).getDisplayName()); + } + }catch (Exception e){System.out.printf("%s\n",e);}; + } + + + + return currentSummary; + } + + public EnumToolMaterial getToolMaterial(ItemStack stack){ + Class itemClass = stack.getItem().getClass(); + EnumToolMaterial material = null; + try{ + Field getMaterial = this.findField(itemClass, "toolMaterial"); + if (getMaterial != null){ + getMaterial.setAccessible(true); + material = (EnumToolMaterial)(getMaterial.get(stack.getItem())); + } + } catch (Exception e){} + return material; + } + + public EnumArmorMaterial getArmorMaterial(ItemStack stack){ + Class itemClass = stack.getItem().getClass(); + EnumArmorMaterial material = null; + try{ + Field getMaterial = this.findField(itemClass, "material"); + if (getMaterial != null){ + getMaterial.setAccessible(true); + material = (EnumArmorMaterial)(getMaterial.get(stack.getItem())); + } + } catch (Exception e){} + return material; + } + + public String getToolMaterialName(ItemStack stack){ + EnumToolMaterial material = this.getToolMaterial(stack); + if (material == null) + return null; + + HashMap matName = new HashMap(); + matName.put("WOOD", "Wood"); + matName.put("STONE", "Stone"); + matName.put("IRON", "Iron"); + matName.put("EMERALD", "Diamond"); + matName.put("GOLD", "Gold"); + String materialName = material.toString(); + materialName = matName.containsKey(materialName)?matName.get(materialName):materialName; + return materialName; + } + + public String getArmorMaterialName(ItemStack stack){ + EnumArmorMaterial material = this.getArmorMaterial(stack); + if (material == null) + return null; + + HashMap matName = new HashMap(); + matName.put("CLOTH", "Cloth"); + matName.put("CHAIN", "Chain"); + matName.put("IRON", "Iron"); + matName.put("DIAMOND", "Diamond"); + matName.put("GOLD", "Gold"); + String materialName = material.toString(); + materialName = matName.containsKey(materialName)?matName.get(materialName):materialName; + return materialName; + } + + public String getEffectiveBlock(ItemStack stack){ + Class itemClass = stack.getItem().getClass(); + try{ + Field blocksEffectiveField = itemClass.getField("blocksEffectiveAgainst"); + Block[] effectiveBlocksArray = (Block[])(blocksEffectiveField.get(stack.getItem())); + ArrayList effectiveBlocks = new ArrayList(); + Collections.addAll(effectiveBlocks, effectiveBlocksArray); + String effectiveAgainst = ""; + + if (effectiveBlocks.contains(Block.obsidian)) + effectiveAgainst = Block.obsidian.getLocalizedName(); + else if (effectiveBlocks.contains(Block.stone)) + effectiveAgainst = Block.stone.getLocalizedName(); + else if (effectiveBlocks.contains(Block.dirt)) + effectiveAgainst = Block.dirt.getLocalizedName(); + else if (effectiveBlocks.contains(Block.wood)) + effectiveAgainst = Block.wood.getLocalizedName(); + + return effectiveAgainst.equals("")?null:effectiveAgainst; + }catch (Exception e){} + return null; + } + + public Integer getHarvestLevel(ItemStack stack){ + EnumToolMaterial material = this.getToolMaterial(stack); + return material!=null?material.getHarvestLevel():null; + } + + public Float getEfficiencyOnProperMaterial(ItemStack stack){ + EnumToolMaterial material = this.getToolMaterial(stack); + return material!=null?material.getEfficiencyOnProperMaterial():null; + } + + public Integer getToolEnchantability(ItemStack stack){ + EnumToolMaterial material = this.getToolMaterial(stack); + return material!=null?material.getEnchantability():null; + } + + public Float getDamageVsEntity(ItemStack stack){ + EnumToolMaterial material = this.getToolMaterial(stack); + return material!=null?material.getDamageVsEntity():null; + } + + public Integer getItemDurability(ItemStack stack){ + return stack.getMaxDamage() > 0?stack.getMaxDamage():null; + } + + public Integer getDamageReduction(ItemStack stack){ + if (stack.getItem() instanceof ItemArmor){ + ItemArmor armor = (ItemArmor)stack.getItem(); + return armor.damageReduceAmount; + } + return null; + } + + public Integer getArmorEnchantability(ItemStack stack){ + EnumArmorMaterial material = this.getArmorMaterial(stack); + return material!=null?material.getEnchantability():null; + } + + public Field findField(Class lookup, String name){ + Field retField = null; + try{ + retField = lookup.getDeclaredField(name); + } catch (Exception e){ + if (lookup.getSuperclass() == null) + retField = null; + else + retField = findField(lookup.getSuperclass(), name); + } + return retField; + } +} diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java new file mode 100644 index 0000000..98fab24 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -0,0 +1,142 @@ +package mcp.mobius.waila.handlers.nei; + +import java.util.Map; + +import mcp.mobius.waila.gui.screens.info.ScreenEnchants; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; + +public class HandlerEnchants implements IContainerInputHandler { + + @Override + public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { return false; } + + @Override + public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) { } + + @Override + public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { + ItemStack stackover = GuiContainerManager.getManager().getStackMouseOver(gui); + if(stackover == null) + return false; + + if(keyID == NEIClientConfig.getKeyBinding(Constants.BIND_SCREEN_ENCH)){ + //try{ + int itemEnchantability = stackover.getItem().getItemEnchantability(); + if (itemEnchantability == 0){return false;} + + Minecraft mc = Minecraft.getMinecraft(); + ScreenEnchants screen = new ScreenEnchants(mc.currentScreen); + screen.setStack(stackover); + screen.setName(stackover.getDisplayName()); + screen.setEnchantability(String.valueOf(itemEnchantability)); + + Enchantment[] enchants = null; + if (stackover.getItem() == Items.book) + enchants = Enchantment.enchantmentsBookList; + else + enchants = Enchantment.enchantmentsList; + + for(Enchantment enchant : enchants){ + boolean isCompatible = true; + int level = 0; + boolean isApplied = false; + + if (enchant == null){continue;} + if (enchant.canApplyAtEnchantingTable(stackover) || stackover.getItem() == Items.book){ + + if (stackover.isItemEnchanted()){ + Map stackenchants = EnchantmentHelper.getEnchantments(stackover); + for (Object id : stackenchants.keySet()){ + if (!enchant.canApplyTogether(Enchantment.enchantmentsList[(Integer)id])) + isCompatible = false; + if ((Integer)id == enchant.effectId){ + isApplied = true; + level = (Integer)stackenchants.get(id); + } + } + } + + for (int lvl = enchant.getMinLevel(); lvl <= enchant.getMaxLevel(); lvl++){ + int minEnchantEnchantability = enchant.getMinEnchantability(lvl); + int maxEnchantEnchantability = enchant.getMaxEnchantability(lvl); + + int minItemEnchantability = 1; + int meanItemEnchantability = 1 + itemEnchantability/4; + int maxItemEnchantability = 1 + itemEnchantability/2; + + int minModifiedEnchantability = (int)(0.85*minItemEnchantability + 0.5); + int meanModifiedEnchantability = (int)(1.00*meanItemEnchantability + 0.5); + int maxModifiedEnchantability = (int)(1.15*maxItemEnchantability + 0.5); + + int minLevel = (int) ((minEnchantEnchantability - minModifiedEnchantability)/1.15); + int maxLevel = (int) ((maxEnchantEnchantability - maxModifiedEnchantability)/0.85); + + int meanMinLevel = (int) ((minEnchantEnchantability - meanModifiedEnchantability)/1.0); + int meanMaxLevel = (int) ((maxEnchantEnchantability - meanModifiedEnchantability)/1.0); + + String colorcode = isCompatible ? "\u00a7f" : "\u00a7c"; + + if (isApplied && lvl == level) + colorcode = "\u00a7e"; + + screen.addRow(colorcode + enchant.getTranslatedName(lvl), + colorcode + String.valueOf(minLevel), + colorcode + String.valueOf(maxLevel), + colorcode + String.valueOf(enchant.getWeight()), + "\u00a79\u00a7o"+ ModIdentification.nameFromObject(enchant)); + } + } + } + mc.displayGuiScreen(screen); + } + + return false; + } + + /* + public String getEnchantModName(Enchantment enchant){ + String enchantPath = enchant.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + + //mod_Waila.log.log(Level.INFO, enchantPath); + + String enchantModName = ""; + for (String s: mod_Waila.instance.modSourceList.keySet()) + if (enchantPath.contains(s)) + enchantModName = mod_Waila.instance.modSourceList.get(s); + + if (enchantModName.equals("Minecraft Coder Pack")) + enchantModName = "Minecraft"; + return enchantModName; + } + */ + + @Override + public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) { return false; } + + @Override + public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) { } + + @Override + public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) { } + + @Override + public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; } + + @Override + public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { } + + @Override + public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) { } + +} diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java new file mode 100644 index 0000000..81f0ddb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -0,0 +1,30 @@ +package mcp.mobius.waila.handlers.nei; + +import java.util.List; + +import codechicken.nei.guihook.IContainerTooltipHandler; +import mcp.mobius.waila.utils.ModIdentification; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +public class TooltipHandlerWaila implements IContainerTooltipHandler { + + @Override + public List handleItemDisplayName(GuiContainer arg0, ItemStack itemstack, List currenttip) { + return currenttip; + } + + @Override + public List handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, List currenttip) { + String canonicalName = ModIdentification.nameFromStack(itemstack); + if (canonicalName != null && !canonicalName.equals("")) + currenttip.add("\u00a79\u00a7o" + canonicalName); + return currenttip; + } + + @Override + public List handleTooltip(GuiContainer arg0, int arg1, int arg2, List currenttip) { + return currenttip; + } + +} diff --git a/src/main/java/mcp/mobius/waila/network/IWailaMessage.java b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java new file mode 100644 index 0000000..fa94900 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java @@ -0,0 +1,9 @@ +package mcp.mobius.waila.network; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + +public interface IWailaMessage { + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception; + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg); +} diff --git a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java new file mode 100644 index 0000000..ef24a7a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java @@ -0,0 +1,63 @@ +package mcp.mobius.waila.network; + +import java.util.HashMap; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.config.ConfigCategory; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class Message0x00ServerPing extends SimpleChannelInboundHandler implements IWailaMessage { + + HashMap forcedKeys = new HashMap(); + + public Message0x00ServerPing(){ + ConfigCategory serverForcingCfg = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); + + for (String key : serverForcingCfg.keySet()){ + if (serverForcingCfg.get(key).getBoolean(false)){ + forcedKeys.put(key, ConfigHandler.instance().getConfig(key)); + } + } + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeShort(this.forcedKeys.keySet().size()); + for (String key : forcedKeys.keySet()){ + WailaPacketHandler.INSTANCE.writeString(target, key); + target.writeBoolean(this.forcedKeys.get(key)); + } + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try{ + Message0x00ServerPing msg = (Message0x00ServerPing)rawmsg; + int nkeys = dat.readShort(); + for (int i = 0; i < nkeys; i++){ + this.forcedKeys.put(WailaPacketHandler.INSTANCE.readString(dat), dat.readBoolean()); + } + }catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x00ServerPing msg) throws Exception { + Waila.log.info("Received server authentication msg. Remote sync will be activated"); + Waila.instance.serverPresent = true; + + for (String key : msg.forcedKeys.keySet()) + Waila.log.info(String.format("Received forced key config %s : %s", key, msg.forcedKeys.get(key))); + + ConfigHandler.instance().forcedConfigs = msg.forcedKeys; + } +} + diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java new file mode 100644 index 0000000..8990f6c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -0,0 +1,83 @@ +package mcp.mobius.waila.network; + +import java.util.HashSet; + +import cpw.mods.fml.common.FMLCommonHandler; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.DimensionManager; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class Message0x01TERequest extends SimpleChannelInboundHandler implements IWailaMessage { + + public int dim; + public int posX; + public int posY; + public int posZ; + public HashSet keys = new HashSet (); + + public Message0x01TERequest(){} + + public Message0x01TERequest(TileEntity ent, HashSet keys){ + this.dim = ent.getWorldObj().provider.dimensionId; + this.posX = ent.xCoord; + this.posY = ent.yCoord; + this.posZ = ent.zCoord; + this.keys = keys; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeInt(dim); + target.writeInt(posX); + target.writeInt(posY); + target.writeInt(posZ); + target.writeInt(this.keys.size()); + + for (String key : keys) + WailaPacketHandler.INSTANCE.writeString(target, key); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try{ + Message0x01TERequest msg = (Message0x01TERequest)rawmsg; + msg.dim = dat.readInt(); + msg.posX = dat.readInt(); + msg.posY = dat.readInt(); + msg.posZ = dat.readInt(); + + int nkeys = dat.readInt(); + + for (int i = 0; i < nkeys; i++) + this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); + + }catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x01TERequest msg) throws Exception { + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + TileEntity entity = DimensionManager.getWorld(msg.dim).getTileEntity(msg.posX, msg.posY, msg.posZ); + if (entity != null){ + try{ + NBTTagCompound tag = new NBTTagCompound(); + entity.writeToNBT(tag); + ctx.writeAndFlush(new Message0x02TENBTData(NBTUtil.createTag(tag, msg.keys))).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + }catch(Throwable e){ + WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); + } + } + + + } +} + diff --git a/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java new file mode 100644 index 0000000..088ed6a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java @@ -0,0 +1,40 @@ +package mcp.mobius.waila.network; + +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + + +public class Message0x02TENBTData extends SimpleChannelInboundHandler implements IWailaMessage { + + NBTTagCompound tag; + + public Message0x02TENBTData(){} + + public Message0x02TENBTData(NBTTagCompound tag){ + this.tag = tag; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + WailaPacketHandler.INSTANCE.writeNBT(target, tag); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { + try{ + this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x02TENBTData msg) throws Exception { + DataAccessorBlock.instance.remoteNbt = msg.tag; + } +} + diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java new file mode 100644 index 0000000..9c64ac6 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -0,0 +1,75 @@ +package mcp.mobius.waila.network; + +import java.util.HashSet; + +import cpw.mods.fml.common.FMLCommonHandler; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.DimensionManager; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class Message0x03EntRequest extends SimpleChannelInboundHandler implements IWailaMessage { + + public int dim; + public int id; + public HashSet keys = new HashSet (); + + public Message0x03EntRequest(){} + + public Message0x03EntRequest(Entity ent, HashSet keys){ + this.dim = ent.worldObj.provider.dimensionId; + this.id = ent.getEntityId(); + this.keys = keys; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + target.writeInt(dim); + target.writeInt(id); + target.writeInt(this.keys.size()); + + for (String key : keys) + WailaPacketHandler.INSTANCE.writeString(target, key); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) { + try{ + Message0x03EntRequest msg = (Message0x03EntRequest)rawmsg; + msg.dim = dat.readInt(); + msg.id = dat.readInt(); + + + int nkeys = dat.readInt(); + + for (int i = 0; i < nkeys; i++) + this.keys.add(WailaPacketHandler.INSTANCE.readString(dat)); + + }catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x03EntRequest msg) throws Exception { + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + Entity entity = DimensionManager.getWorld(msg.dim).getEntityByID(msg.id); + if (entity != null){ + try{ + NBTTagCompound tag = new NBTTagCompound(); + entity.writeToNBT(tag); + ctx.writeAndFlush(new Message0x04EntNBTData(NBTUtil.createTag(tag, msg.keys))).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + }catch(Throwable e){ + WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); + } + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java new file mode 100644 index 0000000..c916e6a --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java @@ -0,0 +1,40 @@ +package mcp.mobius.waila.network; + +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.DataAccessorEntity; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; + +public class Message0x04EntNBTData extends SimpleChannelInboundHandler implements IWailaMessage { + + NBTTagCompound tag; + + public Message0x04EntNBTData(){} + + public Message0x04EntNBTData(NBTTagCompound tag){ + this.tag = tag; + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception { + WailaPacketHandler.INSTANCE.writeNBT(target, tag); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) { + try{ + this.tag = WailaPacketHandler.INSTANCE.readNBT(dat); + } catch (Exception e){ + WailaExceptionHandler.handleErr(e, this.getClass().toString(), null); + } + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Message0x04EntNBTData msg) throws Exception { + DataAccessorEntity.instance.remoteNbt = msg.tag; + } + +} diff --git a/src/main/java/mcp/mobius/waila/network/NetworkHandler.java b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java new file mode 100644 index 0000000..2fdc628 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java @@ -0,0 +1,12 @@ +package mcp.mobius.waila.network; + +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; + +public class NetworkHandler { + @SubscribeEvent + public void onPlayerLoggedIn(PlayerLoggedInEvent event){ + WailaPacketHandler.INSTANCE.sendTo(new Message0x00ServerPing(), (EntityPlayerMP)event.player); + } +} diff --git a/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java b/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java new file mode 100644 index 0000000..fcbbec2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java @@ -0,0 +1,127 @@ +package mcp.mobius.waila.network; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; + +import java.io.IOException; +import java.util.EnumMap; + +import com.google.common.base.Charsets; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTSizeTracker; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; + +public enum WailaPacketHandler { + INSTANCE; + + public EnumMap channels; + + private WailaPacketHandler(){ + this.channels = NetworkRegistry.INSTANCE.newChannel("Waila", new WailaCodec()); + if (FMLCommonHandler.instance().getSide() == Side.CLIENT){ + addClientHandlers(); + addServerHandlers(); + }else{ + addServerHandlers(); + } + + } + + private void addClientHandlers(){ + FMLEmbeddedChannel channel = this.channels.get(Side.CLIENT); + String codec = channel.findChannelHandlerNameForType(WailaCodec.class); + + channel.pipeline().addAfter(codec, "ServerPing", new Message0x00ServerPing()); + channel.pipeline().addAfter("ServerPing", "TENBTData", new Message0x02TENBTData()); + channel.pipeline().addAfter("TENBTData", "EntNBTData", new Message0x04EntNBTData()); + } + + private void addServerHandlers(){ + FMLEmbeddedChannel channel = this.channels.get(Side.SERVER); + String codec = channel.findChannelHandlerNameForType(WailaCodec.class); + + channel.pipeline().addAfter(codec, "TERequest", new Message0x01TERequest()); + channel.pipeline().addAfter("TERequest", "EntRequest", new Message0x03EntRequest()); + } + + private class WailaCodec extends FMLIndexedMessageToMessageCodec + { + public WailaCodec() + { + addDiscriminator(0, Message0x00ServerPing.class); + addDiscriminator(1, Message0x01TERequest.class); + addDiscriminator(2, Message0x02TENBTData.class); + addDiscriminator(3, Message0x03EntRequest.class); + addDiscriminator(4, Message0x04EntNBTData.class); + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, IWailaMessage msg, ByteBuf target) throws Exception + { + msg.encodeInto(ctx, msg, target); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage msg) + { + msg.decodeInto(ctx, dat, msg); + } + } + + public void sendTo(IWailaMessage message, EntityPlayerMP player){ + channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); + channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); + channels.get(Side.SERVER).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + } + + public void sendToServer(IWailaMessage message){ + channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER); + channels.get(Side.CLIENT).writeAndFlush(message).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); + } + + public void writeNBT(ByteBuf target, NBTTagCompound tag) throws IOException{ + if (tag == null) + target.writeShort(-1); + else{ + byte[] abyte = CompressedStreamTools.compress(tag); + target.writeShort((short)abyte.length); + target.writeBytes(abyte); + } + } + + public NBTTagCompound readNBT(ByteBuf dat) throws IOException + { + short short1 = dat.readShort(); + + if (short1 < 0) + return null; + else{ + byte[] abyte = new byte[short1]; + dat.readBytes(abyte); + return CompressedStreamTools.func_152457_a(abyte, NBTSizeTracker.field_152451_a); + } + } + + public void writeString(ByteBuf buffer, String data) throws IOException + { + byte[] abyte = data.getBytes(Charsets.UTF_8); + buffer.writeShort(abyte.length); + buffer.writeBytes(abyte); + } + + public String readString(ByteBuf buffer) throws IOException + { + int j = buffer.readShort(); + String s = new String(buffer.readBytes(j).array(), Charsets.UTF_8); + return s; + } +} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak new file mode 100644 index 0000000..da393d4 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak @@ -0,0 +1,76 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.HashMap; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraftforge.common.config.ConfigCategory; + +public class Packet0x00ServerPing { + + public byte header; + public HashMap forcedKeys = new HashMap(); + + public Packet0x00ServerPing(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + this.header = inputStream.readByte(); + + forcedKeys.clear(); + while (true){ + String key = Packet.readString(inputStream, 255); + if (key.equals("END OF LIST")) break; + boolean value = inputStream.readBoolean(); + forcedKeys.put(key, value); + } + + } catch (IOException e){} + } + + public static Packet250CustomPayload create(){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(0x00); + + ConfigCategory serverForcing = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_SERVER); + + /* + ConfigCategory serverModules = ConfigHandler.instance().config.getCategory(Constants.CATEGORY_MODULES); + + HashMap keys = new HashMap(); + + for (String key : serverModules.keySet()){ + keys.put(key, serverModules.get(key).getBoolean(true)); + } + */ + + for (String key : serverForcing.keySet()){ + if (serverForcing.get(key).getBoolean(false)){ + Packet.writeString(key, outputStream); + outputStream.writeBoolean(ConfigHandler.instance().getConfig(key)); + } + } + + Packet.writeString("END OF LIST", outputStream); + + }catch(IOException e){} + + packet.channel = "Waila"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + + +} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak new file mode 100644 index 0000000..210ec7b --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak @@ -0,0 +1,67 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.HashSet; + +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class Packet0x01TERequest { + + public byte header; + public int worldID; + public int posX; + public int posY; + public int posZ; + public HashSet keys = new HashSet (); + + public Packet0x01TERequest(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + keys.clear(); + try{ + this.header = inputStream.readByte(); + this.worldID = inputStream.readInt(); + this.posX = inputStream.readInt(); + this.posY = inputStream.readInt(); + this.posZ = inputStream.readInt(); + + int nkeys = inputStream.readInt(); + for (int i = 0; i < nkeys; i++) + keys.add(Packet.readString(inputStream, 250)); + + } catch (IOException e){} + } + + public static Packet250CustomPayload create(World world, MovingObjectPosition mop, HashSet keys){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); + DataOutputStream outputStream = new DataOutputStream(bos); + + keys.add("x"); keys.add("y"); keys.add("z"); + + try{ + outputStream.writeByte(0x01); + outputStream.writeInt(world.provider.dimensionId); + outputStream.writeInt(mop.blockX); + outputStream.writeInt(mop.blockY); + outputStream.writeInt(mop.blockZ); + outputStream.writeInt(keys.size()); + + for (String key : keys) + Packet.writeString(key, outputStream); + + }catch(IOException e){} + + packet.channel = "Waila"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } +} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak new file mode 100644 index 0000000..ed790f5 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak @@ -0,0 +1,42 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import mcp.mobius.waila.utils.NBTUtil; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet0x02TENBTData { + public byte header; + public NBTTagCompound tag; + + public Packet0x02TENBTData(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + this.header = inputStream.readByte(); + this.tag = NBTUtil.readNBTTagCompound(inputStream); + } catch (IOException e){} + } + + public static Packet250CustomPayload create(NBTTagCompound tag){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(0x02); + NBTUtil.writeNBTTagCompound(tag, outputStream); + }catch(IOException e){} + + packet.channel = "Waila"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } +} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak new file mode 100644 index 0000000..d7e800d --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak @@ -0,0 +1,60 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.HashSet; + +import net.minecraft.entity.Entity; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.world.World; + +public class Packet0x03EntRequest { + + public byte header; + public int worldID; + public int id; + public HashSet keys = new HashSet (); + + public Packet0x03EntRequest(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + keys.clear(); + try{ + this.header = inputStream.readByte(); + this.worldID = inputStream.readInt(); + this.id = inputStream.readInt(); + + int nkeys = inputStream.readInt(); + for (int i = 0; i < nkeys; i++) + keys.add(Packet.readString(inputStream, 250)); + + } catch (IOException e){} + } + + public static Packet250CustomPayload create(World world, Entity ent, HashSet keys){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(0x03); + outputStream.writeInt(world.provider.dimensionId); + outputStream.writeInt(ent.entityId); + outputStream.writeInt(keys.size()); + + for (String key : keys) + Packet.writeString(key, outputStream); + + }catch(IOException e){} + + packet.channel = "Waila"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + +} diff --git a/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak new file mode 100644 index 0000000..5071ccf --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak @@ -0,0 +1,45 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import mcp.mobius.waila.utils.NBTUtil; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet0x04EntNBTData { + public byte header; + public NBTTagCompound tag; + + public Packet0x04EntNBTData(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + this.header = inputStream.readByte(); + this.tag = NBTUtil.readNBTTagCompound(inputStream); + } catch (IOException e){} + } + + public static Packet250CustomPayload create(NBTTagCompound tag){ + Packet250CustomPayload packet = new Packet250CustomPayload(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1 + 4 + 4 + 4 + 4); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(0x04); + NBTUtil.writeNBTTagCompound(tag, outputStream); + }catch(IOException e){} + + packet.channel = "Waila"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + + + +} diff --git a/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak new file mode 100644 index 0000000..76e35c3 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak @@ -0,0 +1,40 @@ +package mcp.mobius.waila.network; + +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetLoginHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet1Login; +import net.minecraft.server.MinecraftServer; +import cpw.mods.fml.common.network.IConnectionHandler; +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; + +public class WailaConnectionHandler implements IConnectionHandler { + + @Override + public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { + PacketDispatcher.sendPacketToPlayer(Packet0x00ServerPing.create(), player); + } + + @Override + public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) { + return null; + } + + @Override + public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { + } + + @Override + public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) { + } + + @Override + public void connectionClosed(INetworkManager manager) { + } + + @Override + public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { + } + +} diff --git a/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak new file mode 100644 index 0000000..f09956c --- /dev/null +++ b/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak @@ -0,0 +1,99 @@ +package mcp.mobius.waila.network; + +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; + +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.DataAccessorEntity; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.server.MinecraftServer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.DimensionManager; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IPacketHandler; +import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; + +public class WailaPacketHandler implements IPacketHandler { + + @Override + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player){ + try{ + if (packet.channel.equals("Waila")) { + + byte header = this.getHeader(packet); + if (header == 0x00){ + Packet0x00ServerPing castedPacket = new Packet0x00ServerPing(packet); + Waila.log.info("Received server authentication msg. Remote sync will be activated"); + Waila.instance.serverPresent = true; + + for (String key : castedPacket.forcedKeys.keySet()) + Waila.log.info(String.format("Received forced key config %s : %s", key, castedPacket.forcedKeys.get(key))); + + ConfigHandler.instance().forcedConfigs = castedPacket.forcedKeys; + } + + else if (header == 0x01){ + Packet0x01TERequest castedPacket = new Packet0x01TERequest(packet); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + TileEntity entity = DimensionManager.getWorld(castedPacket.worldID).getBlockTileEntity(castedPacket.posX, castedPacket.posY, castedPacket.posZ); + if (entity != null){ + try{ + NBTTagCompound tag = new NBTTagCompound(); + entity.writeToNBT(tag); + PacketDispatcher.sendPacketToPlayer(Packet0x02TENBTData.create(NBTUtil.createTag(tag, castedPacket.keys)), player); + }catch(Throwable e){ + WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); + } + } + } + else if (header == 0x02){ + Packet0x02TENBTData castedPacket = new Packet0x02TENBTData(packet); + DataAccessorBlock.instance.remoteNbt = castedPacket.tag; + } + + else if (header == 0x03){ + Packet0x03EntRequest castedPacket = new Packet0x03EntRequest(packet); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); + Entity entity = DimensionManager.getWorld(castedPacket.worldID).getEntityByID(castedPacket.id); + if (entity != null){ + try{ + NBTTagCompound tag = new NBTTagCompound(); + entity.writeToNBT(tag); + PacketDispatcher.sendPacketToPlayer(Packet0x04EntNBTData.create(NBTUtil.createTag(tag, castedPacket.keys)), player); + }catch(Throwable e){ + WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null); + } + } + } + + else if (header == 0x04){ + Packet0x04EntNBTData castedPacket = new Packet0x04EntNBTData(packet); + DataAccessorEntity.instance.remoteNbt = castedPacket.tag; + } + } + } + catch (Exception e){ + return; + } + } + + public byte getHeader(Packet250CustomPayload packet){ + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + try{ + return inputStream.readByte(); + } catch (IOException e){ + return -1; + } + } + + +} diff --git a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java new file mode 100644 index 0000000..61119af --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java @@ -0,0 +1,64 @@ +package mcp.mobius.waila.overlay; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.waila.api.IWailaBlockDecorator; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.WailaExceptionHandler; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; + +public class DecoratorRenderer { + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onRenderWorldLast(RenderWorldLastEvent event) { + if (RayTracing.instance().getTarget() == null || RayTracing.instance().getTargetStack() == null) return; + + double partialTicks = event.partialTicks; + + DataAccessorBlock accessor = DataAccessorBlock.instance; + World world = Minecraft.getMinecraft().theWorld; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityLivingBase viewEntity = Minecraft.getMinecraft().renderViewEntity; + + if (world == null || player == null || viewEntity == null) return; + + accessor.set(world, player, RayTracing.instance().getTarget(), viewEntity, partialTicks); + + Block block = accessor.getBlock(); + + if (!ModuleRegistrar.instance().hasBlockDecorator(block)) return; + + GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDepthMask(false); + + if (ModuleRegistrar.instance().hasBlockDecorator(block)){ + for (IWailaBlockDecorator decorator : ModuleRegistrar.instance().getBlockDecorators(block)) + try{ + GL11.glPushMatrix(); + decorator.decorateBlock(RayTracing.instance().getTargetStack(), accessor, ConfigHandler.instance()); + GL11.glPopMatrix(); + } catch (Throwable e){ + GL11.glPopMatrix(); + WailaExceptionHandler.handleErr(e, decorator.getClass().toString(), null); + } + } + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glPopAttrib(); + + } +} diff --git a/src/main/java/mcp/mobius/waila/overlay/IconUI.java b/src/main/java/mcp/mobius/waila/overlay/IconUI.java new file mode 100644 index 0000000..7f84384 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/IconUI.java @@ -0,0 +1,42 @@ +package mcp.mobius.waila.overlay; +import static mcp.mobius.waila.api.SpecialChars.*; + +import java.util.HashMap; + +public enum IconUI { +HEART (52, 0, 9, 9, 52, 9, 9, 9, "a"), +HHEART(61, 0, 9, 9, 52, 9, 9, 9, "b"), +EHEART(52, 9, 9, 9, "c"); + + private final static HashMap lk = new HashMap(); + static { + for (IconUI icon : IconUI.values()){ + lk.put(icon.symbol, icon); + } + } + + public final int u, v, su, sv; + public final int bu, bv, bsu, bsv; + public final String symbol; + + private IconUI(int u, int v, int su, int sv, String symbol){ + this(u,v,su,sv,-1,-1,-1,-1,symbol); + } + + private IconUI(int u, int v, int su, int sv, int bu, int bv, int bsu, int bsv, String symbol){ + this.u = u; + this.v = v; + this.su = su; + this.sv = sv; + this.bu = bu; + this.bv = bv; + this.bsu = bsu; + this.bsv = bsv; + this.symbol = WailaStyle + WailaIcon + symbol; + } + + public static IconUI bySymbol(String s){ + return lk.get(s); + } + +} diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java new file mode 100644 index 0000000..fe878fd --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java @@ -0,0 +1,24 @@ +package mcp.mobius.waila.overlay; + +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; + +public class OverlayConfig { + public static int posX; + public static int posY; + public static int alpha; + public static int bgcolor; + public static int gradient1; + public static int gradient2; + public static int fontcolor; + public static float scale; + + public static void updateColors(){ + OverlayConfig.alpha = (int)(ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA,0) / 100.0f * 256) << 24; + OverlayConfig.bgcolor = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR,0); + OverlayConfig.gradient1 = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1,0); + OverlayConfig.gradient2 = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2,0); + OverlayConfig.fontcolor = OverlayConfig.alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FONTCOLOR,0); + } +} diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java new file mode 100644 index 0000000..0af5c03 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -0,0 +1,152 @@ +package mcp.mobius.waila.overlay; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.guihook.GuiContainerManager; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraftforge.common.config.Configuration; +import net.minecraft.util.MovingObjectPosition; + +public class OverlayRenderer { + + protected static boolean hasBlending; + protected static boolean hasLight; + protected static boolean hasDepthTest; + protected static boolean hasLight0; + protected static boolean hasLight1; + protected static boolean hasRescaleNormal; + protected static boolean hasColorMaterial; + protected static int boundTexIndex; + protected static RenderItem renderItem = new RenderItem(); + + public static void renderOverlay() + { + Minecraft mc = Minecraft.getMinecraft(); + if(!(mc.currentScreen == null && + mc.theWorld != null && + Minecraft.isGuiEnabled() && + !mc.gameSettings.keyBindPlayerList.getIsKeyPressed() && + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true) && + RayTracing.instance().getTarget() != null)) + return; + + if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && RayTracing.instance().getTargetStack() != null) + { + renderOverlay(WailaTickHandler.instance().tooltip); + } + + if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) + { + renderOverlay(WailaTickHandler.instance().tooltip); + } + } + + public static void renderOverlay(Tooltip tooltip) + { + //TrueTypeFont font = (TrueTypeFont)mod_Waila.proxy.getFont(); + + GL11.glPushMatrix(); + saveGLState(); + + GL11.glScalef(OverlayConfig.scale, OverlayConfig.scale, 1.0f); + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + + drawTooltipBox(tooltip.x, tooltip.y, tooltip.w, tooltip.h, OverlayConfig.bgcolor, OverlayConfig.gradient1, OverlayConfig.gradient2); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA,GL11.GL_ONE_MINUS_SRC_ALPHA); + tooltip.drawStrings(); + GL11.glDisable(GL11.GL_BLEND); + + tooltip.drawIcons(); + + if (tooltip.hasIcon) + RenderHelper.enableGUIStandardItemLighting(); + + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + if (tooltip.hasIcon && tooltip.stack != null && tooltip.stack.getItem() != null) + GuiContainerManager.drawItem(tooltip.x+5, tooltip.y+tooltip.h/2-8, tooltip.stack); + + loadGLState(); + GL11.glPopMatrix(); + + + } + + public static void saveGLState(){ + hasBlending = GL11.glGetBoolean(GL11.GL_BLEND); + hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING); + //hasLight0 = GL11.glGetBoolean(GL11.GL_LIGHT0); + //hasLight1 = GL11.glGetBoolean(GL11.GL_LIGHT1); + hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST); + //hasRescaleNormal = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL); + //hasColorMaterial = GL11.glGetBoolean(GL11.GL_COLOR_MATERIAL); + boundTexIndex = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D); + GL11.glPushAttrib(GL11.GL_CURRENT_BIT); + } + + public static void loadGLState(){ + if (hasBlending) GL11.glEnable(GL11.GL_BLEND); else GL11.glDisable(GL11.GL_BLEND); + //if (hasLight) GL11.glEnable(GL11.GL_LIGHTING); else GL11.glDisable(GL11.GL_LIGHTING); + //if (hasLight0) GL11.glEnable(GL11.GL_LIGHT0); else GL11.glDisable(GL11.GL_LIGHT0); + if (hasLight1) GL11.glEnable(GL11.GL_LIGHT1); else GL11.glDisable(GL11.GL_LIGHT1); + if (hasDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST); else GL11.glDisable(GL11.GL_DEPTH_TEST); + //if (hasRescaleNormal) GL11.glEnable(GL12.GL_RESCALE_NORMAL); else GL11.glDisable(GL12.GL_RESCALE_NORMAL); + //if (hasColorMaterial) GL11.glEnable(GL11.GL_COLOR_MATERIAL); else GL11.glDisable(GL11.GL_COLOR_MATERIAL); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, boundTexIndex); + GL11.glPopAttrib(); + //GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } + + public static void drawTooltipBox(int x, int y, int w, int h, int bg, int grad1, int grad2) + { + //int bg = 0xf0100010; + GuiDraw.drawGradientRect(x + 1, y, w - 1, 1, bg, bg); + GuiDraw.drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg); + GuiDraw.drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg);//center + GuiDraw.drawGradientRect(x, y + 1, 1, h - 1, bg, bg); + GuiDraw.drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg); + //int grad1 = 0x505000ff; + //int grad2 = 0x5028007F; + GuiDraw.drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2); + GuiDraw.drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2); + + GuiDraw.drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1); + GuiDraw.drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2); + } + + public static void drawTexturedModalRect(int x, int y, int u, int v, int w, int h, int tw, int th) + { + float f = 0.00390625F; + float f1 = 0.00390625F; + float zLevel = 0.0F; + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorOpaque_F(1, 1, 1); + tessellator.addVertexWithUV(x + 0, y + h, zLevel, (u + 0) * f, (v + th) * f1); + tessellator.addVertexWithUV(x + w, y + h, zLevel, (u + tw) * f, (v + th) * f1); + tessellator.addVertexWithUV(x + w, y + 0, zLevel, (u + tw) * f, (v + 0) * f1); + tessellator.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * f, (v + 0) * f1); + tessellator.draw(); + } + + public static void renderIcon(int x, int y, int sx, int sy, IconUI icon){ + Minecraft.getMinecraft().getTextureManager().bindTexture(Gui.icons); + if (icon.bu != -1) + drawTexturedModalRect(x, y, icon.bu, icon.bv, sx, sy, icon.bsu, icon.bsv); + drawTexturedModalRect(x, y, icon.u, icon.v, sx, sy, icon.su, icon.sv); + } +} diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java new file mode 100644 index 0000000..f963957 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -0,0 +1,208 @@ +package mcp.mobius.waila.overlay; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.DataAccessorEntity; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.IShearable; +import net.minecraftforge.common.config.Configuration; + +public class RayTracing { + + private static RayTracing _instance; + private RayTracing(){} + public static RayTracing instance(){ + if(_instance == null) + _instance = new RayTracing(); + return _instance; + } + + private MovingObjectPosition target = null; + private ItemStack targetStack = null; + private Entity targetEntity= null; + private Minecraft mc = Minecraft.getMinecraft(); + + public void fire(){ + if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY){ + this.target = mc.objectMouseOver; + this.targetStack = null; + return; + } + + EntityLivingBase viewpoint = mc.renderViewEntity; + if (viewpoint == null) return; + + this.target = this.rayTrace(viewpoint, 4.0, 0); + + if (this.target == null) return; + } + + public MovingObjectPosition getTarget(){ + return this.target; + } + + public ItemStack getTargetStack(){ + if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + this.targetStack = this.getIdentifierStack(); + else + this.targetStack = null; + + return this.targetStack; + } + + public Entity getTargetEntity(){ + if (this.target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) + this.targetEntity = this.getIdentifierEntity(); + else + this.targetEntity = null; + + return this.targetEntity; + } + + public MovingObjectPosition rayTrace(EntityLivingBase entity, double par1, float par3) + { + Vec3 vec3 = entity.getPosition(par3); + if (entity.getEyeHeight() != 0.12F) + vec3.yCoord += entity.getEyeHeight(); + + Vec3 vec31 = entity.getLook(par3); + Vec3 vec32 = vec3.addVector(vec31.xCoord * par1, vec31.yCoord * par1, vec31.zCoord * par1); + + //if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true)) + return entity.worldObj.rayTraceBlocks(vec3, vec32, true); + else + return entity.worldObj.rayTraceBlocks(vec3, vec32, false); + } + + public ItemStack getIdentifierStack(){ + World world = mc.theWorld; + ArrayList items = this.getIdentifierItems(); + if (items.isEmpty()) + return null; + + Collections.sort(items, new Comparator() + { + @Override + public int compare(ItemStack stack0, ItemStack stack1) + { + return stack1.getItemDamage() - stack0.getItemDamage(); + } + }); + + return items.get(0); + } + + public Entity getIdentifierEntity(){ + ArrayList ents = new ArrayList(); + + if (this.target == null) + return null; + + if (ModuleRegistrar.instance().hasOverrideEntityProviders(this.target.entityHit)) + ents.add(ModuleRegistrar.instance().getOverrideEntityProviders(this.target.entityHit).get(0).getWailaOverride(DataAccessorEntity.instance, ConfigHandler.instance())); + + if(ents.size() > 0) + return ents.get(0); + else + return this.target.entityHit; + } + + public ArrayList getIdentifierItems() + { + ArrayList items = new ArrayList(); + + if (this.target == null) + return items; + + EntityPlayer player = mc.thePlayer; + World world = mc.theWorld; + + int x = this.target.blockX; + int y = this.target.blockY; + int z = this.target.blockZ; + //int blockID = world.getBlockId(x, y, z); + //Block mouseoverBlock = Block.blocksList[blockID]; + Block mouseoverBlock = world.getBlock(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (mouseoverBlock == null) return items; + + if (ModuleRegistrar.instance().hasStackProviders(mouseoverBlock)){ + ItemStack providerStack = ModuleRegistrar.instance().getStackProviders(mouseoverBlock).get(0).getWailaStack(DataAccessorBlock.instance, ConfigHandler.instance()); + if (providerStack != null) + items.add(providerStack); + } + + if (tileEntity != null && ModuleRegistrar.instance().hasStackProviders(tileEntity)){ + ItemStack providerStack = ModuleRegistrar.instance().getStackProviders(tileEntity).get(0).getWailaStack(DataAccessorBlock.instance, ConfigHandler.instance()); + if (providerStack != null) + items.add(providerStack); + } + + if(items.size() > 0) + return items; + + if (world.getTileEntity(x, y, z) == null){ + try{ + ItemStack block = new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)); + items.add(block); + } catch(Exception e){ + } + } + + if(items.size() > 0) + return items; + + try{ + ItemStack pick = mouseoverBlock.getPickBlock(this.target, world, x, y, z); + if(pick != null) + items.add(pick); + }catch(Exception e){} + + if(items.size() > 0) + return items; + + /* + try + { + items.addAll(mouseoverBlock.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0)); + } + catch(Exception e){} + + if(items.size() > 0) + return items; + */ + + if(mouseoverBlock instanceof IShearable) + { + IShearable shearable = (IShearable)mouseoverBlock; + if(shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) + { + items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0)); + } + } + + if(items.size() == 0) + items.add(0, new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z))); + + return items; + } + +} diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java new file mode 100644 index 0000000..aef1be8 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -0,0 +1,173 @@ +package mcp.mobius.waila.overlay; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.awt.Dimension; +import java.awt.Point; + +import codechicken.lib.gui.GuiDraw; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class Tooltip { + public static int TabSpacing = 8; + public static int IconSize = 8; + + ArrayList lines = new ArrayList(); + int w,h,x,y,ty; + int offsetX; + int maxStringW; + Point pos; + boolean hasIcon = false; + ItemStack stack; + + int[] columnsWidth; + int columnsWidthMono; + int[] columnsPos; + int ncolumns = 0; + + private class Line{ + String[] columnsRaw; + ArrayList> columns = new ArrayList>(); + int ncolumns; + int[] columnsWidth; + int lineWidth; + + public Line(String text){ + columnsRaw = text.split(TAB); + ncolumns = columnsRaw.length; + columnsWidth = new int[ncolumns]; + lineWidth = 0; + + for (String s : columnsRaw) + columns.add(parseString(s)); + + for (int i = 0; i < ncolumns; i++){ + for (String s : columns.get(i)){ + if (s.startsWith(WailaStyle + WailaIcon)) + columnsWidth[i] += IconSize; + else if (s.startsWith(WailaStyle + WailaStyle)) + columnsWidth[i] += 0; + else + columnsWidth[i] += GuiDraw.getStringWidth(s); + } + lineWidth += columnsWidth[i]; + } + } + + ArrayList parseString(String s){ + ArrayList retList = new ArrayList(); + Pattern pattern = Pattern.compile(WailaStyle + ".."); + Matcher matcher = pattern.matcher(s); + + int prevIndex = 0; + while (matcher.find()){ + String substring = s.substring(prevIndex, matcher.start()); + if (!substring.equals("")) + retList.add(substring); + retList.add(s.substring(matcher.start(), matcher.end())); + prevIndex = matcher.end(); + } + retList.add(s.substring(prevIndex)); + return retList; + } + } + + public Tooltip(List textData, ItemStack stack){ + this(textData, true); + this.stack = stack; + } + + public Tooltip(List textData, boolean hasIcon){ + for (String s : textData) + lines.add(new Line(s)); + + for (Line l : lines) + ncolumns = Math.max(ncolumns, l.ncolumns); + + columnsWidth = new int[ncolumns]; + columnsPos = new int[ncolumns]; + + for (Line l : lines){ + for (int i = 0; i < l.ncolumns; i++){ + if (l.ncolumns > 1 && ncolumns != 1) + columnsWidth[i] = Math.max(columnsWidth[i], l.columnsWidth[i]); + } + + columnsWidthMono = Math.max(columnsWidthMono, l.columnsWidth[0]); + + } + + maxStringW = 0; + for (int i = 0; i < ncolumns; i++) + maxStringW += columnsWidth[i]; + maxStringW += ncolumns * TabSpacing; + + maxStringW = Math.max(maxStringW, columnsWidthMono); + + for (int i = 0; i < ncolumns - 1; i++) + columnsPos[i + 1] = columnsWidth[i] + columnsPos[i]; + + this.pos = new Point(ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX,0), + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY,0)); + this.hasIcon = hasIcon; + + int paddingW = hasIcon ? 29 : 13; + int paddingH = hasIcon ? 24 : 0; + offsetX = hasIcon ? 24 : 6; + + w = maxStringW + paddingW; + + h = Math.max(paddingH, 10 + 10*lines.size()); + + Dimension size = GuiDraw.displaySize(); + x = ((int)(size.width / OverlayConfig.scale)-w-1)*pos.x/10000; + y = ((int)(size.height / OverlayConfig.scale)-h-1)*pos.y/10000; + + ty = (h-10*lines.size())/2; + } + + public void drawStrings(){ + for (int i = 0; i < lines.size(); i++){ + for (int c = 0; c < lines.get(i).ncolumns; c++){ + int offX = 0; + + for (int is = 0; is < lines.get(i).columns.get(c).size(); is++){ + String s = lines.get(i).columns.get(c).get(is); + if (s.startsWith(WailaStyle + WailaIcon)) + offX += IconSize; + + else if (s.startsWith(ALIGNRIGHT)) + offX += columnsWidth[c] - GuiDraw.getStringWidth(lines.get(i).columns.get(c).get(is + 1)); + + else{ + GuiDraw.drawString(s, x + offsetX + columnsPos[c] + c*TabSpacing + offX, y + ty + 10*i, OverlayConfig.fontcolor, true); + offX += GuiDraw.getStringWidth(s); + } + } + + } + } + } + + public void drawIcons(){ + for (int i = 0; i < lines.size(); i++){ + for (int c = 0; c < lines.get(i).ncolumns; c++){ + int offX = 0; + for (String s : lines.get(i).columns.get(c)){ + if (s.startsWith(WailaStyle + WailaIcon)){ + OverlayRenderer.renderIcon(x + offsetX + columnsPos[c] + c*TabSpacing + offX, y + ty + 10*i, IconSize, IconSize, IconUI.bySymbol(s)); + offX += IconSize; + }else{ + offX += GuiDraw.getStringWidth(s); + } + } + } + } + } +} diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java new file mode 100644 index 0000000..5bd5a39 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -0,0 +1,135 @@ +package mcp.mobius.waila.overlay; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import org.lwjgl.input.Keyboard; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorBlock; +import mcp.mobius.waila.api.impl.DataAccessorEntity; +import mcp.mobius.waila.api.impl.MetaDataProvider; +import mcp.mobius.waila.client.KeyEvent; +import mcp.mobius.waila.utils.Constants; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.config.Configuration; +import codechicken.nei.api.ItemInfo.Layout; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import static mcp.mobius.waila.api.SpecialChars.*; + +public class WailaTickHandler{ + + //public static LangUtil lang = LangUtil.loadLangDir("waila"); + + private int ticks = 0; + public ItemStack identifiedHighlight = new ItemStack(Blocks.dirt); + private List currenttip = new ArrayList(); + private List currenttipHead = new ArrayList(); + private List currenttipBody = new ArrayList(); + private List currenttipTail = new ArrayList(); + public Tooltip tooltip = null; + public MetaDataProvider handler = new MetaDataProvider(); + private Minecraft mc = Minecraft.getMinecraft(); + + private static WailaTickHandler _instance; + private WailaTickHandler(){} + + public static WailaTickHandler instance(){ + if(_instance == null) + _instance = new WailaTickHandler(); + return _instance; + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tickRender(TickEvent.RenderTickEvent event) { + OverlayRenderer.renderOverlay(); + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void tickClient(TickEvent.ClientTickEvent event) { + + if (!Keyboard.isKeyDown(KeyEvent.key_show.getKeyCode()) && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){ + ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, false); + } + + + World world = mc.theWorld; + EntityPlayer player = mc.thePlayer; + if (world != null && player != null){ + RayTracing.instance().fire(); + MovingObjectPosition target = RayTracing.instance().getTarget(); + + if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK){ + DataAccessorBlock accessor = DataAccessorBlock.instance; + accessor.set(world, player, target); + ItemStack targetStack = RayTracing.instance().getTargetStack(); // Here we get either the proper stack or the override + + if (targetStack != null){ + this.currenttip.clear(); + this.currenttipHead.clear(); + this.currenttipBody.clear(); + this.currenttipTail.clear(); + + + //this.identifiedHighlight = handler.identifyHighlight(world, player, target); + this.currenttipHead = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipHead, Layout.HEADER); + this.currenttipBody = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipBody, Layout.BODY); + this.currenttipTail = handler.handleBlockTextData(targetStack, world, player, target, accessor, currenttipTail, Layout.FOOTER); + + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTBLOCK, false) && currenttipBody.size() > 0 && !accessor.getPlayer().isSneaking()){ + currenttipBody.clear(); + currenttipBody.add(ITALIC + "Press shift for more data"); + } + + this.currenttip.addAll(this.currenttipHead); + this.currenttip.addAll(this.currenttipBody); + this.currenttip.addAll(this.currenttipTail); + + this.tooltip = new Tooltip(this.currenttip, targetStack); + } + } + else if (target != null && target.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY){ + DataAccessorEntity accessor = DataAccessorEntity.instance; + accessor.set(world, player, target); + + Entity targetEnt = RayTracing.instance().getTargetEntity(); // This need to be replaced by the override check. + + if (targetEnt != null){ + this.currenttip.clear(); + this.currenttipHead.clear(); + this.currenttipBody.clear(); + this.currenttipTail.clear(); + + this.currenttipHead = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipHead, Layout.HEADER); + this.currenttipBody = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipBody, Layout.BODY); + this.currenttipTail = handler.handleEntityTextData(targetEnt, world, player, target, accessor, currenttipTail, Layout.FOOTER); + + if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHIFTENTS, false) && currenttipBody.size() > 0 && !accessor.getPlayer().isSneaking()){ + currenttipBody.clear(); + currenttipBody.add(ITALIC + "Press shift for more data"); + } + + this.currenttip.addAll(this.currenttipHead); + this.currenttip.addAll(this.currenttipBody); + this.currenttip.addAll(this.currenttipTail); + + this.tooltip = new Tooltip(this.currenttip, false); + } + } + } + + } +} diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java new file mode 100644 index 0000000..d8d2566 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -0,0 +1,11 @@ +package mcp.mobius.waila.server; + +public class ProxyServer { + + public ProxyServer() {} + + public void registerHandlers(){} + public void registerMods(){} + + public Object getFont(){return null;} +} diff --git a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java new file mode 100644 index 0000000..44e0b55 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java @@ -0,0 +1,154 @@ +package mcp.mobius.waila.utils; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import mcp.mobius.waila.Waila; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; + +public class AccessHelper { + public static Field getDeclaredField(String classname, String fieldname){ + + try { + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); + //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_; + } + catch (NoSuchFieldException e) { + Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname)); + return null; + } + catch (SecurityException e) { + Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname)); + return null; + } + catch (ClassNotFoundException e) { + Waila.log.warning(String.format("== Class %s not found !\n", classname)); + return null; + } + } + + public static Object getField(String classname, String fieldname, Object instance){ + + try { + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); + + //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_.get(instance); + } + catch (NoSuchFieldException e) { + Waila.log.warning(String.format("== Field %s %s not found !\n", classname, fieldname)); + return null; + } + catch (SecurityException e) { + Waila.log.warning(String.format("== Field %s %s security exception !\n", classname, fieldname)); + return null; + } + catch (ClassNotFoundException e) { + Waila.log.warning(String.format("== Class %s not found !\n", classname)); + return null; + } catch (IllegalArgumentException e) { + Waila.log.warning(String.format("== %s\n", e)); + return null; + } catch (IllegalAccessException e) { + Waila.log.warning(String.format("== %s\n", e)); + return null; + } + } + + + public static Object getFieldExcept(String classname, String fieldname, Object instance) throws Exception{ + Class class_ = Class.forName(classname); + Field field_ = class_.getDeclaredField(fieldname); + field_.setAccessible(true); + + //mod_Waila.log.fine(String.format("++ Found field %s %s\n", classname, fieldname)); + return field_.get(instance); + } + + + public static Block getBlock(String classname, String fieldname){ + Field field_ = getDeclaredField(classname, fieldname); + try{ + return (Block)field_.get(Block.class); + } catch (Exception e) { + System.out.printf("%s\n", e); + Waila.log.warning(String.format("== ERROR GETTING BLOCK %s %s\n", classname, fieldname)); + return null; + } + } + + public static Item getItem(String classname, String fieldname){ + Field field_ = getDeclaredField(classname, fieldname); + try{ + return (Item)field_.get(Item.class); + } catch (Exception e) { + System.out.printf("%s\n", e); + Waila.log.warning(String.format("== ERROR GETTING ITEM %s %s\n", classname, fieldname)); + return null; + } + } + + public static ArrayList getCraftingRecipes(ItemStack stack){ + ArrayList recipes = new ArrayList(); + + for (IRecipe recipe : (ArrayList)CraftingManager.getInstance().getRecipeList()){ + if (recipe != null && recipe.getRecipeOutput() != null){ + if (recipe.getRecipeOutput().isItemEqual(stack)) + recipes.add(recipe); + } + } + + return recipes; + } + + public static void cleanCraftingRecipes(ItemStack stack){ + for (IRecipe recipe: getCraftingRecipes(stack)){ + CraftingManager.getInstance().getRecipeList().remove(recipe); + } + } + + /* + public static void cleanSmeltingRecipes(ItemStack stack){ + Map smeltingList = FurnaceRecipes.smelting().getSmeltingList(); + Map, ItemStack> smeltingListMeta = FurnaceRecipes.smelting().getMetaSmeltingList(); + + HashMap matchingRecipes = new HashMap(); + HashMap, ItemStack> matchingRecipesMeta = new HashMap, ItemStack>(); + + // We walk the none meta list to find all the recipes + for (Object id_ : smeltingList.keySet()){ + Integer id = (Integer)id_; + ItemStack result = (ItemStack)smeltingList.get(id_); + + if (stack.isItemEqual(result)) + matchingRecipes.put(id, result); + } + + for (List key : smeltingListMeta.keySet()){ + ItemStack result = smeltingListMeta.get(key); + + if (stack.isItemEqual(result)) + matchingRecipesMeta.put(key, result); + } + + for (Integer key : matchingRecipes.keySet()) + FurnaceRecipes.smelting().getSmeltingList().remove(key); + + for (List key : matchingRecipesMeta.keySet()) + FurnaceRecipes.smelting().getMetaSmeltingList().remove(key); + } + */ +} diff --git a/src/main/java/mcp/mobius/waila/utils/Constants.java b/src/main/java/mcp/mobius/waila/utils/Constants.java new file mode 100644 index 0000000..bfed957 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/Constants.java @@ -0,0 +1,42 @@ +package mcp.mobius.waila.utils; + +public final class Constants { + public static String BIND_SCREEN_WIKI = "showwiki"; + public static String BIND_SCREEN_TECH = "showtechtree"; + public static String BIND_SCREEN_ENCH = "showenchant"; + + public static String BIND_WAILA_CFG = "waila.keybind.wailaconfig"; + public static String BIND_WAILA_SHOW = "waila.keybind.wailadisplay"; + public static String BIND_WAILA_LIQUID = "waila.keybind.liquid"; + public static String BIND_WAILA_RECIPE = "waila.keybind.recipe"; + public static String BIND_WAILA_USAGE = "waila.keybind.usage"; + public static String BIND_WAILA_TESTING= "waila.keybind.testing"; + + public static String CFG_NEI_SHOW = "world.highlight_tips"; + public static String BIND_NEI_SHOW = "keys.world.highlight_tips"; + + public static String CFG_WAILA_SHOW = "waila.cfg.show"; + public static String CFG_WAILA_MODE = "waila.cfg.showmode"; + public static String CFG_WAILA_LIQUID = "waila.cfg.liquid"; + public static String CFG_WAILA_METADATA = "waila.cfg.metadata"; + public static String CFG_WAILA_KEYBIND = "waila.cfg.keybind"; + public static String CFG_WAILA_POSX = "waila.cfg.posx"; + public static String CFG_WAILA_POSY = "waila.cfg.posy"; + public static String CFG_WAILA_SCALE = "waila.cfg.scale"; + public static String CFG_WAILA_SHIFTBLOCK = "waila.cfg.shiftblock"; + public static String CFG_WAILA_SHIFTENTS = "waila.cfg.shiftents"; + public static String CFG_WAILA_NHEARTS = "waila.cfg.heartsperline"; + public static String CFG_WAILA_MAXHP = "waila.cfg.maxhpbeforetext"; + + public static String CFG_WAILA_ALPHA = "waila.cfg.alpha"; + public static String CFG_WAILA_BGCOLOR = "waila.cfg.bgcolor"; + public static String CFG_WAILA_GRADIENT1 = "waila.cfg.gradient1"; + public static String CFG_WAILA_GRADIENT2 = "waila.cfg.gradient2"; + public static String CFG_WAILA_FONTCOLOR = "waila.cfg.fontcolor"; + + public static String CATEGORY_MODULES = "modules"; + public static String CATEGORY_SERVER = "server_forcing"; + public static boolean SERVER_FREE = false; + public static boolean SERVER_FORCED = true; + +} diff --git a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java new file mode 100644 index 0000000..29f307d --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java @@ -0,0 +1,147 @@ +package mcp.mobius.waila.utils; + +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import codechicken.core.CommonUtils; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.registry.GameData; + +public class ModIdentification { + + public static HashMap modSource_Name = new HashMap(); + public static HashMap modSource_ID = new HashMap(); + public static HashMap itemMap = new HashMap(); + public static HashMap keyhandlerStrings = new HashMap(); + + public static void init(){ + + //TODO : Redo this for the new frameworkn (1.7.2) + /* + NBTTagList itemDataList = new NBTTagList(); + GameData.writeItemData(itemDataList); + + for(int i = 0; i < itemDataList.tagCount(); i++) + { + ItemData itemData = new ItemData((NBTTagCompound) itemDataList.tagAt(i)); + itemMap.put(itemData.getItemId(), itemData.getModId()); + } + */ + + for (ModContainer mod : Loader.instance().getModList()){ + modSource_Name.put(mod.getSource().getName(), mod.getName()); + modSource_ID.put(mod.getSource().getName(), mod.getModId()); + } + + //TODO : Update this to match new version (1.7.2) + modSource_Name.put("1.6.2.jar", "Minecraft"); + modSource_Name.put("1.6.3.jar", "Minecraft"); + modSource_Name.put("1.6.4.jar", "Minecraft"); + modSource_Name.put("1.7.2.jar", "Minecraft"); + modSource_Name.put("Forge", "Minecraft"); + modSource_ID.put("1.6.2.jar", "Minecraft"); + modSource_ID.put("1.6.3.jar", "Minecraft"); + modSource_ID.put("1.6.4.jar", "Minecraft"); + modSource_ID.put("1.7.2.jar", "Minecraft"); + modSource_ID.put("Forge", "Minecraft"); + + +// for (String s : this.modSourceList.keySet()) +// if (this.modSourceList.get(s) == "Minecraft Coder Pack") +// this.modSourceList.put(s, "Minecraft"); + + // Code to retrieve all the registered keybindings along with the mod adding them. + /* + Field keyHandlers_Field = AccessHelper.getDeclaredField("cpw.mods.fml.client.registry.KeyBindingRegistry", "keyHandlers"); + try { + Set keyHandlers = (Set)keyHandlers_Field.get(KeyBindingRegistry.instance()); + for (KeyHandler keyhandler : keyHandlers) + for (int i = 0; i < keyhandler.getKeyBindings().length; i++) + keyhandlerStrings.put(keyhandler.getKeyBindings()[i].keyDescription, idFromObject(keyhandler)); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + */ + + } + + public static String nameFromObject(Object obj){ + String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + + try { + objPath = URLDecoder.decode(objPath, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + String modName = ""; + for (String s: modSource_Name.keySet()) + if (objPath.contains(s)){ + modName = modSource_Name.get(s); + break; + } + + if (modName.equals("Minecraft Coder Pack")) + modName = "Minecraft"; + + return modName; + } + + /* + public static String idFromObject(Object obj){ + String objPath = obj.getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + + try { + objPath = URLDecoder.decode(objPath, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + + String modName = ""; + for (String s: modSource_ID.keySet()) + if (objPath.contains(s)){ + modName = modSource_ID.get(s); + break; + } + + if (modName.equals("Minecraft Coder Pack")) + modName = "Minecraft"; + + return modName; + } + */ + + public static String nameFromStack(ItemStack stack){ + try{ + //String modID = itemMap.get(itemstack.itemID); + //ModContainer mod = ModIdentification.findModContainer(modID); + ModContainer mod = GameData.findModOwner(GameData.itemRegistry.getNameForObject(stack.getItem())); + String modname = mod == null ? "Minecraft" : mod.getName(); + return modname; + } catch (NullPointerException e){ + //System.out.printf("NPE : %s\n",itemstack.toString()); + return ""; + } + } + + /* + public static ModContainer findModContainer(String modID) + { + for(ModContainer mc : Loader.instance().getModList()) + if(modID.equals(mc.getModId())) + return mc; + + return null; + } + */ +} diff --git a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java new file mode 100644 index 0000000..8d8b065 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java @@ -0,0 +1,121 @@ +package mcp.mobius.waila.utils; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.HashSet; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTSizeTracker; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; + +public class NBTUtil { + + public static NBTBase getTag(String key, NBTTagCompound tag){ + String[] path = key.split("\\."); + + NBTTagCompound deepTag = tag; + for (String i : path){ + if (deepTag.hasKey(i)){ + if (deepTag.getTag(i) instanceof NBTTagCompound) + deepTag = deepTag.getCompoundTag(i); + else{ + return deepTag.getTag(i); + } + } else { + Waila.log.log(Level.WARNING, "Leaf " + key + " not found."); + return null; + } + } + return deepTag; + } + + public static NBTTagCompound setTag(String key, NBTTagCompound targetTag, NBTBase addedTag){ + String[] path = key.split("\\."); + + NBTTagCompound deepTag = targetTag; + for (int i = 0; i < path.length - 1; i++){ + if (!deepTag.hasKey(path[i])) + //deepTag.setCompoundTag(path[i], new NBTTagCompound()); + deepTag.setTag(path[i], new NBTTagCompound()); + + deepTag = deepTag.getCompoundTag(path[i]); + } + + deepTag.setTag(path[path.length - 1], addedTag); + + return targetTag; + } + + public static NBTTagCompound createTag(NBTTagCompound inTag, HashSet keys){ + if (keys.contains("*")) return inTag; + + NBTTagCompound outTag = new NBTTagCompound(); + + for (String key : keys){ + NBTBase tagToAdd = getTag(key, inTag); + //System.out.printf("%s\n", tagToAdd); + if (tagToAdd != null) + outTag = setTag(key, outTag, tagToAdd); + } + + return outTag; + } + + public static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound, DataOutputStream par1DataOutputStream) throws IOException + { + if (par0NBTTagCompound == null) + { + par1DataOutputStream.writeShort(-1); + } + else + { + byte[] abyte = CompressedStreamTools.compress(par0NBTTagCompound); + + if (abyte.length > 32000) + par1DataOutputStream.writeShort(-1); + else{ + par1DataOutputStream.writeShort((short)abyte.length); + par1DataOutputStream.write(abyte); + } + } + } + + public static NBTTagCompound readNBTTagCompound(DataInputStream par0DataInputStream) throws IOException + { + short short1 = par0DataInputStream.readShort(); + + if (short1 < 0) + { + return null; + } + else + { + byte[] abyte = new byte[short1]; + par0DataInputStream.readFully(abyte); + return CompressedStreamTools.func_152457_a(abyte, NBTSizeTracker.field_152451_a); + } + } + + public static int getNBTInteger(NBTTagCompound tag, String keyname){ + NBTBase subtag = tag.getTag(keyname); + if (subtag instanceof NBTTagInt) + return tag.getInteger(keyname); + if (subtag instanceof NBTTagShort) + return tag.getShort(keyname); + if (subtag instanceof NBTTagByte) + return tag.getByte(keyname); + + return 0; + } + +} diff --git a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java new file mode 100644 index 0000000..538b3fb --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java @@ -0,0 +1,32 @@ +package mcp.mobius.waila.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; + +import mcp.mobius.waila.Waila; + +public class WailaExceptionHandler { + + public WailaExceptionHandler() {} + + private static ArrayList errs = new ArrayList(); + + public static List handleErr(Throwable e, String className, List currenttip){ + if (!errs.contains(className)){ + errs.add(className); + + for (StackTraceElement elem : e.getStackTrace()){ + Waila.log.log(Level.WARNING, String.format("%s.%s:%s",elem.getClassName(), elem.getMethodName(), elem.getLineNumber())); + if (elem.getClassName().contains("waila")) break; + } + + Waila.log.log(Level.WARNING, String.format("Catched unhandled exception : [%s] %s",className,e)); + } + if (currenttip != null) + currenttip.add(""); + + return currenttip; + } + +} diff --git a/src/main/ressources/assets/waila/fonts/Minecraftia.ttf b/src/main/ressources/assets/waila/fonts/Minecraftia.ttf new file mode 100644 index 0000000..2cf2af4 Binary files /dev/null and b/src/main/ressources/assets/waila/fonts/Minecraftia.ttf differ diff --git a/src/main/ressources/assets/waila/lang/de_DE.lang b/src/main/ressources/assets/waila/lang/de_DE.lang new file mode 100644 index 0000000..50bcb8c --- /dev/null +++ b/src/main/ressources/assets/waila/lang/de_DE.lang @@ -0,0 +1,148 @@ +screen.button.waila=Waila +screen.button.modules=Module +screen.label.scale=Maße +screen.label.dragtuto=Verschiebe das HUD, um seine Position zu ändern. + +screen.button.default=Standard +screen.button.cancel=Abbrechen +screen.button.ok=Ok +screen.button.yes=Ja +screen.button.no=Nein +screen.button.back=Zurück +screen.button.hidden=Versteckt +screen.button.visible=Sichtbar +screen.button.maintained=Gewartet +screen.button.toggled=Geschaltet + +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 +enchant.title.minlvl=Min lvl +enchant.title.maxlvl=Max lvl +enchant.title.weight=Gewicht +enchant.label.enchantability=Verzauberbarkeit + +waila.keybind.wailaconfig=[Waila] Config-Bildschirm +waila.keybind.wailadisplay=[Waila] Zeigen/Verstecken +waila.keybind.liquid=[Waila] Zeige Flüssigkeiten +waila.keybind.recipe=[Waila] Zeige Rezept +waila.keybind.usage=[Waila] Zeige Nutzung +waila.keybind.testing=[Waila] Testen + +client.msg.norecipe=Kein Rezept gefunden. +client.msg.nousage=Keine Nutzung gefunden. + +hud.msg.none= +hud.msg.empty= +hud.msg.output=Output +hud.msg.input=Input +hud.msg.out=Out +hud.msg.in=In +hud.msg.power=Energie +hud.msg.storage=Speicher +hud.msg.stored=Gespeichert +hud.msg.any=Jegliches +hud.msg.mode=Modus +hud.msg.maxpower=Max Energie +hud.msg.trigger=Trigger +hud.msg.maxio=Max IO + +hud.msg.send=Senden +hud.msg.recv=Empfangen +hud.msg.item=Item +hud.msg.fluid=Flüssigk. +hud.msg.energ=Energie +hud.msg.frequency=Frequenz + +hud.msg.owner=Besitzer +hud.msg.public=Öffentlich +hud.msg.restricted=Eingeschränkt +hud.msg.private=Privat + +hud.msg.white=Weiß +hud.msg.orange=Orange +hud.msg.magenta=Magenta +hud.msg.lblue=HBlau +hud.msg.yellow=Gelb +hud.msg.lime=HGrün +hud.msg.pink=Pink +hud.msg.gray=Grau +hud.msg.lgray=HGrau +hud.msg.cyan=Türkis +hud.msg.purple=Violett +hud.msg.blue=Blau +hud.msg.brown=Braun +hud.msg.green=Grün +hud.msg.red=Rot +hud.msg.black=Schwarz + +hud.msg.growth=Wachstum +hud.msg.mature=Erwachsen +hud.msg.off=Aus +hud.msg.on=An +hud.msg.state=Status +hud.msg.delay=Verzögerung +hud.msg.comparator=Komparator +hud.msg.substractor=Substraktor +hud.msg.record=Platte + +hud.msg.offers=Angebote +hud.msg.demands=Bedarf + +option.appeng.monitorcontent=Monitorinhalt +option.bb.content=Fassinhalt +option.bc.tankamount=Flüssigk.-Menge +option.bc.tanktype=Flüssigk.-Typ +option.enderstorage.colors=Farben +option.ic2.inputeumach=Max EU-Input [Maschinen] +option.ic2.inputeuother=Max EU-Input [Anderes] +option.ic2.inputeu=Max EU-Input +option.ic2.outputeu=Max EU-Output +option.ic2.storage=Energie gespeichert +option.ic2.consump=Zeige Verbrauch +option.ic2.tradeomat=Zeige Tauschautomaten-Forderung +option.thaumcraft.storedvis=Kondensatorspeicher +option.thermalexpansion.energyhandler=Zeige RO-Speicher +option.thermalexpansion.energycell=Zeige EZellen IN/OUT +option.thermalexpansion.fluidtype=Zeige Flüssigk.-Typ +option.thermalexpansion.fluidamount=Zeige Flüssigk.-Menge +option.thermalexpansion.tankmode=Zeige Tankmodus +option.thermalexpansion.tesssendrecv=Tesseraktmodus +option.thermalexpansion.tessfreq=Tesseraktfrequenz +option.thermalexpansion.owner=Zeige Besitzer +option.thermalexpansion.conditemmode=Zeige Itemduktmodus +option.vanilla.spawntype=Spawner-Typ +option.vanilla.growthvalue=Wachstumswert +option.vanilla.leverstate=Hebelstatus +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 +option.enderio.owner=Zeige Block-Besitzer +option.enderio.channel=Zeige Hypercube-Kanal +option.bcapi.storage=Zeige gespeicherte MJ +option.bcapi.consump=Zeige maximale Energie +option.bcapi.trigger=Zeige Startenergie +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 diff --git a/src/main/ressources/assets/waila/lang/en_US.lang b/src/main/ressources/assets/waila/lang/en_US.lang new file mode 100644 index 0000000..1318b9d --- /dev/null +++ b/src/main/ressources/assets/waila/lang/en_US.lang @@ -0,0 +1,148 @@ +screen.button.waila=Waila +screen.button.modules=Modules +screen.label.scale=Scale +screen.label.dragtuto=Drag the HUD to setup its position. + +screen.button.default=Default +screen.button.cancel=Cancel +screen.button.ok=Ok +screen.button.yes=Yes +screen.button.no=No +screen.button.back=Back +screen.button.hidden=Hidden +screen.button.visible=Visible +screen.button.maintained=Maintained +screen.button.toggled=Toggled + +choice.showhidewaila=Show/Hide Waila +choice.showhideidmeta=Show ID:Metadata +choice.toggledmaintained=Toggled/Maintained +choice.showliquids=Liquids +choice.shifttoggledblock=Sneak toggle blocks +choice.shifttoggledents=Sneak toggle entities +screen.button.configureaspect=Configure aspect... + +enchant.title.name=Name +enchant.title.minlvl=Min lvl +enchant.title.maxlvl=Max lvl +enchant.title.weight=Weight +enchant.label.enchantability=Enchantability + +waila.keybind.wailaconfig=[Waila] Config screen +waila.keybind.wailadisplay=[Waila] Show/Hide +waila.keybind.liquid=[Waila] Show liquids +waila.keybind.recipe=[Waila] Show recipe +waila.keybind.usage=[Waila] Show usage +waila.keybind.testing=[Waila] Testing + +client.msg.norecipe=No recipe found. +client.msg.nousage=No usage found. + +hud.msg.none= +hud.msg.empty= +hud.msg.output=Output +hud.msg.input=Input +hud.msg.out=Out +hud.msg.in=In +hud.msg.power=Power +hud.msg.storage=Storage +hud.msg.stored=Stored +hud.msg.any=Any +hud.msg.mode=Mode +hud.msg.maxpower=Max Power +hud.msg.trigger=Trigger +hud.msg.maxio=Max IO + +hud.msg.send=Send +hud.msg.recv=Recv +hud.msg.item=Item +hud.msg.fluid=Fluid +hud.msg.energ=Energy +hud.msg.frequency=Frequency + +hud.msg.owner=Owner +hud.msg.public=Public +hud.msg.restricted=Restricted +hud.msg.private=Private + +hud.msg.white=White +hud.msg.orange=Orange +hud.msg.magenta=Magenta +hud.msg.lblue=LBlue +hud.msg.yellow=Yellow +hud.msg.lime=Lime +hud.msg.pink=Pink +hud.msg.gray=Gray +hud.msg.lgray=LGray +hud.msg.cyan=Cyan +hud.msg.purple=Purple +hud.msg.blue=Blue +hud.msg.brown=Brown +hud.msg.green=Green +hud.msg.red=Red +hud.msg.black=Black + +hud.msg.growth=Growth +hud.msg.mature=Mature +hud.msg.off=Off +hud.msg.on=On +hud.msg.state=State +hud.msg.delay=Delay +hud.msg.comparator=Comparator +hud.msg.substractor=Substractor +hud.msg.record=Record + +hud.msg.offers=Offers +hud.msg.demands=Demands + +option.appeng.monitorcontent=Monitor's content +option.bb.content=Barrel's content +option.bc.tankamount=Liquid amount +option.bc.tanktype=Liquid type +option.enderstorage.colors=Colors +option.ic2.inputeumach=Max EU input [Machines] +option.ic2.inputeuother=Max EU input [Other] +option.ic2.inputeu=Max EU input +option.ic2.outputeu=Max EU output +option.ic2.storage=Energy stored +option.ic2.consump=Show consumption +option.ic2.tradeomat=Show Trade-O-Mat request +option.thaumcraft.storedvis=Capacitor storage +option.thermalexpansion.energyhandler=Show RF storage +option.thermalexpansion.energycell=Show ECell IN/OUT +option.thermalexpansion.fluidtype=Show fluid type +option.thermalexpansion.fluidamount=Show fluid amount +option.thermalexpansion.tankmode=Show tank mode +option.thermalexpansion.tesssendrecv=Tesseract mode +option.thermalexpansion.tessfreq=Tesseract frequency +option.thermalexpansion.owner=Show owner +option.thermalexpansion.conditemmode=Show Itemduct mode +option.vanilla.spawntype=Spawner type +option.vanilla.growthvalue=Growth value +option.vanilla.leverstate=Lever state +option.vanilla.repeater=Repeater delay +option.vanilla.comparator=Comparator mode +option.vanilla.redstone=Redstone power +option.vanilla.jukebox=Jukebox disk +option.vanilla.silverfish=Hide silverfish +option.etb.displaydata=Show socket data +option.enderio.inout=Show input/output +option.enderio.storage=Show stored MJ +option.enderio.owner=Show block owner +option.enderio.channel=Show hypercube channel +option.bcapi.storage=Show stored MJ +option.bcapi.consump=Show maximum power +option.bcapi.trigger=Show triggering energy +option.pr.showio=Show gates IO +option.pr.showdata=Show gates data +option.extrautilities.fluidamount=Show fluid amount +option.openblocks.fluidamount=Show fluid amount +option.railcraft.fluidamount=Show fluid amount +option.secretrooms.hide=Hide camo blocks +option.carpenters.hide=Hide camo blocks +option.stevescarts.showall=Show data +option.stevescarts.colorblind=Colorblind mode +option.stevescarts.shifttoggle=Shift toggle +option.general.showhp=Show entities health +option.general.showcrop=Show crop growth +option.thaumcraft.aspects=Show aspects \ No newline at end of file diff --git a/src/main/ressources/assets/waila/lang/et_EE b/src/main/ressources/assets/waila/lang/et_EE new file mode 100644 index 0000000..db52211 --- /dev/null +++ b/src/main/ressources/assets/waila/lang/et_EE @@ -0,0 +1,148 @@ +screen.button.waila=Waila +screen.button.modules=Moodulid +screen.label.scale=Skaala +screen.label.dragtuto=Lohista HUDi, et seade üles selle positsioon. + +screen.button.default=Vaikimisi +screen.button.cancel=Tühista +screen.button.ok=Ok +screen.button.yes=Jah +screen.button.no=Ei +screen.button.back=Tagasi +screen.button.hidden=Peidetud +screen.button.visible=Nähtav +screen.button.maintained=Hooldatud +screen.button.toggled=Lülitatud + +choice.showhidewaila=Näita/Peida Waila +choice.showhideidmeta=Näita ID:Metaandmed +choice.toggledmaintained=Lülitatud/Hooldatud +choice.showliquids=Vedelikud +choice.shifttoggledblock=Hiilimis lülita blokid +choice.shifttoggledents=Hiilimis lülita entiteedid +screen.button.configureaspect=Konfigureeri aspekti... + +enchant.title.name=Nimi +enchant.title.minlvl=Min lvl +enchant.title.maxlvl=Max lvl +enchant.title.weight=Raskus +enchant.label.enchantability=Loitsitav + +waila.keybind.wailaconfig=[Waila] Konfiguratsiooni ekraan +waila.keybind.wailadisplay=[Waila] Näita/Peida +waila.keybind.liquid=[Waila] Näita vedelikke +waila.keybind.recipe=[Waila] Näita retsepti +waila.keybind.usage=[Waila] Näita kasutamist +waila.keybind.testing=[Waila] Testimine + +client.msg.norecipe=Ühtegi retsepti ei leitud. +client.msg.nousage=Ühtegi kasutust ei leitud. + +hud.msg.none= +hud.msg.empty= +hud.msg.output=Väljund +hud.msg.input=Sisend +hud.msg.out=Välja +hud.msg.in=Sisse +hud.msg.power=Võimsus +hud.msg.storage=Hoius +hud.msg.stored=Hoiustatud +hud.msg.any=Iga +hud.msg.mode=Mood +hud.msg.maxpower=Max Võimsus +hud.msg.trigger=Trigger +hud.msg.maxio=Max IO + +hud.msg.send=Saada +hud.msg.recv=Võtavastu +hud.msg.item=Ese +hud.msg.fluid=Vedelik +hud.msg.energ=Energia +hud.msg.frequency=Sagedus + +hud.msg.owner=Omanik +hud.msg.public=Avalik +hud.msg.restricted=Piiratud +hud.msg.private=Privaatne + +hud.msg.white=Valge +hud.msg.orange=Oranž +hud.msg.magenta=FuksiaP +hud.msg.lblue=HSinine +hud.msg.yellow=Kollane +hud.msg.lime=Laim +hud.msg.pink=Roosa +hud.msg.gray=Hall +hud.msg.lgray=HHall +hud.msg.cyan=TsüaanS +hud.msg.purple=Lilla +hud.msg.blue=Sinine +hud.msg.brown=Pruun +hud.msg.green=Roheline +hud.msg.red=Punane +hud.msg.black=Must + +hud.msg.growth=Kasv +hud.msg.mature=Küps +hud.msg.off=Väljas +hud.msg.on=Sees +hud.msg.state=Seis +hud.msg.delay=Viivitus +hud.msg.comparator=Võrdleja +hud.msg.substractor=Substractor +hud.msg.record=Heliplaat + +hud.msg.offers=Pakkumised +hud.msg.demands=Nõudmised + +option.appeng.monitorcontent=Monitori sisu +option.bb.content=Tünni sisu +option.bc.tankamount=Vedeliku kogus +option.bc.tanktype=Vedeliku tüüp +option.enderstorage.colors=Värvid +option.ic2.inputeumach=Max EU sisend [Masinad] +option.ic2.inputeuother=Max EU sisend [Muud] +option.ic2.inputeu=Max EU sisend +option.ic2.outputeu=Max EU väljund +option.ic2.storage=Energiat hoiustatud +option.ic2.consump=Näita tarbimist +option.ic2.tradeomat=Näita Trade-O-Mati nõudmist +option.thaumcraft.storedvis=Kondensaatori hoius +option.thermalexpansion.energyhandler=Näita RF hoiust +option.thermalexpansion.energycell=Näita ECelli SISSE/VÄLJA +option.thermalexpansion.fluidtype=Näita vedeliku tüüpi +option.thermalexpansion.fluidamount=Näita vedeliku kogust +option.thermalexpansion.tankmode=Näita paagi moodi +option.thermalexpansion.tesssendrecv=Tesserakti mood +option.thermalexpansion.tessfreq=Tesserakti sagedus +option.thermalexpansion.owner=Näita omanikku +option.thermalexpansion.conditemmode=Näita Itemducti moodi +option.vanilla.spawntype=Sünnikoha tüüp +option.vanilla.growthvalue=Kasvu väärtus +option.vanilla.leverstate=Hoova olek +option.vanilla.repeater=Võimendi viivitust +option.vanilla.comparator=Võrdleja mood +option.vanilla.redstone=Punakivi võimsus +option.vanilla.jukebox=Helikasti plaat +option.vanilla.silverfish=Peida majasoomukad +option.etb.displaydata=Näita pesa andmeid +option.enderio.inout=Näita sisendit/väljundit +option.enderio.storage=Näita hoiustatud MJ-le +option.enderio.owner=Näita bloki omanikku +option.enderio.channel=Näita hüperkuubi kanalit +option.bcapi.storage=Näita hoiustatud MJ-le +option.bcapi.consump=Näita maksimaalset võimsust +option.bcapi.trigger=Näita vallandavat energiat +option.pr.showio=Näita väravate IO-d +option.pr.showdata=Näita väravate andmeid +option.extrautilities.fluidamount=Näita vedeliku kogust +option.openblocks.fluidamount=Näita vedeliku kogust +option.railcraft.fluidamount=Näita vedeliku kogust +option.secretrooms.hide=Peida kamuflaaži blokid +option.carpenters.hide=Peida kamuflaaži blokid +option.stevescarts.showall=Näita andmeid +option.stevescarts.colorblind=Värvipimeda mood +option.stevescarts.shifttoggle=Shift lülitus +option.general.showhp=Näita entiteetide elusid +option.general.showcrop=Näita põllu kasvu +option.thaumcraft.aspects=Näita aspekte \ No newline at end of file diff --git a/src/main/ressources/assets/waila/lang/fr_FR.lang b/src/main/ressources/assets/waila/lang/fr_FR.lang new file mode 100644 index 0000000..d09a10c --- /dev/null +++ b/src/main/ressources/assets/waila/lang/fr_FR.lang @@ -0,0 +1,136 @@ +screen.button.waila=Waila +screen.button.modules=Modules +screen.label.scale=Echelle +screen.label.dragtuto=Faites glisser le HUD pour paramétrer la position. + +screen.button.default=Défaut +screen.button.cancel=Annuler +screen.button.ok=Ok +screen.button.yes=Oui +screen.button.no=Non +screen.button.back=Retour +screen.button.hidden=Masquer +screen.button.visible=Afficher +screen.button.maintained=Maintenu +screen.button.toggled=Switché + +choice.showhidewaila=Afficher/Masquer Waila +choice.showhideidmeta=Afficher ID:Metadata +choice.toggledmaintained= Switché/Maintenu +choice.showliquids=Liquides +screen.button.configureaspect=Configurer l'aspect… + +enchant.title.name=Nom +enchant.title.minlvl=Min lvl +enchant.title.maxlvl=Max lvl +enchant.title.weight=Poids +enchant.label.enchantability=Enchantabilitée + +waila.keybind.wailaconfig=[Waila] Ecran de config +waila.keybind.wailadisplay=[Waila] Afficher/Masquer +waila.keybind.liquid=[Waila] Afficher les liquides +waila.keybind.recipe=[Waila] Afficher les recettes +waila.keybind.usage=[Waila] Afficher l'utilisation +waila.keybind.testing=[Waila] Test + +client.msg.norecipe=Pas de recette trouvée. +client.msg.nousage=Pas d'utilisation trouvée. + +hud.msg.none= +hud.msg.empty= +hud.msg.output=Sortie +hud.msg.input=Entrée +hud.msg.out=Sortie +hud.msg.in=Entrée +hud.msg.power=Energie +hud.msg.storage=Stockage +hud.msg.stored=Stocké +hud.msg.any=Tout +hud.msg.mode=Mode +hud.msg.maxpower=Max Puissance +hud.msg.trigger=Déclencheur +hud.msg.maxio=Max Entrée/Sortie + +hud.msg.send=Envoyer +hud.msg.recv=Recevoir +hud.msg.item=Objet +hud.msg.fluid=Fluide +hud.msg.energ=Energie +hud.msg.frequency=Fréquence + +hud.msg.owner=Propriétaire +hud.msg.public=Publique +hud.msg.restricted=Limité +hud.msg.private=Privée + +hud.msg.white=Blanc +hud.msg.orange=Orange +hud.msg.magenta=Magenta +hud.msg.lblue=Bleu clair +hud.msg.yellow=Jaune +hud.msg.lime=Vert clair +hud.msg.pink=Rose +hud.msg.gray=Gris +hud.msg.lgray=Gris clair +hud.msg.cyan=Cyan +hud.msg.purple=Violet +hud.msg.blue=Bleu +hud.msg.brown=Marron +hud.msg.green=Vert +hud.msg.red=Rouge +hud.msg.black=Noir + +hud.msg.growth=Croissance +hud.msg.mature=Mature +hud.msg.off=Off +hud.msg.on=On +hud.msg.state=Etat +hud.msg.delay=Retard +hud.msg.comparator=Comparateur +hud.msg.substractor=Soustracteur +hud.msg.record=Disque + +hud.msg.offers=Offre +hud.msg.demands=Demande + +option.appeng.monitorcontent=Contenu des écrans +option.bb.content=Contenu des barils +option.bc.tankamount=Niveau de liquide +option.bc.tanktype=Sorte de liquide +option.enderstorage.colors=Couleurs +option.ic2.inputeumach=Max EU en entrée [Machines] +option.ic2.inputeuother=Max EU en entrée [Autres] +option.ic2.inputeu=Max EU en entrée +option.ic2.outputeu=Max EU en sortie +option.ic2.storage=Energie stockée +option.ic2.consump=Afficher consommation +option.thaumcraft.storedvis=Condensateur de stockage +option.thermalexpansion.energyhandler=Afficher stockage RF +option.thermalexpansion.energycell=Afficher ECell Entrée/Sortie +option.thermalexpansion.fluidtype=Afficher sorte fluides +option.thermalexpansion.fluidamount=Afficher niveau fluides +option.thermalexpansion.tankmode=Afficher mode Réservoir +option.thermalexpansion.tesssendrecv=Tesseract mode +option.thermalexpansion.tessfreq=Tesseract fréquence +option.thermalexpansion.owner=Afficher propriétaire +option.thermalexpansion.conditemmode=Afficher Itemduct mode +option.vanilla.spawntype=Spawner type +option.vanilla.growthvalue=Niveau de croissance +option.vanilla.leverstate=Etat Levier +option.vanilla.repeater=Répeteur retard +option.vanilla.comparator=Comparateur mode +option.vanilla.redstone=Redstone puissance +option.vanilla.jukebox=Jukebox disque +option.etb.displaydata=Afficher données socket +option.enderio.inout=Afficher Entrée/Sortie +option.enderio.storage=Afficher MJ stocké +option.enderio.owner=Afficher propriétaire du bloc +option.enderio.channel=Afficher hypercube canal +option.bcapi.storage=Afficher MJ stocké +option.bcapi.consump=Afficher puissance maximale +option.bcapi.trigger=Energie déclanchement +option.pr.showio=Afficher plaques IO +option.pr.showdata=Afficher plaques data +option.extrautilities.fluidamount=Afficher niveau fluides +option.openblocks.fluidamount=Afficher niveau fluides +option.railcraft.fluidamount=Afficher niveau fluides \ No newline at end of file diff --git a/src/main/ressources/assets/waila/lang/nl_NL.lang b/src/main/ressources/assets/waila/lang/nl_NL.lang new file mode 100644 index 0000000..f2f5e1c --- /dev/null +++ b/src/main/ressources/assets/waila/lang/nl_NL.lang @@ -0,0 +1,117 @@ +screen.button.waila=Waila +screen.button.modules=Modules +screen.label.scale=Schaal +screen.label.dragtuto=Sleep de HUD om zijn positie in te stellen. + +screen.button.default=Standaard +screen.button.cancel=Annuleren +screen.button.ok=Ok +screen.button.yes=Ja +screen.button.no=Nee +screen.button.back=Terug +screen.button.hidden=Verborgen +screen.button.visible=Zichtbaar +screen.button.maintained=Gehandhaafd +screen.button.toggled=Omgeschakeld + +choice.showhidewaila=Toon/Verberg Waila +choice.showhideidmeta=Toon ID:Metadata +choice.toggledmaintained=Omgeschakeld/Gehandhaafd +choice.showliquids=Vloeistoffen +screen.button.configureaspect=Configureer aspect... + +enchant.title.name=Naam +enchant.title.minlvl=Min lvl +enchant.title.maxlvl=Max lvl +enchant.title.weight=Gewicht +enchant.label.enchantability=Enchantbaarheid + +keybind.configscreen=[Waila] Configuratiescherm +keybind.showhide=[Waila] Toon/Verberg +keybind.showliquid=[Waila] Toon vloeistoffen +keybind.showrecipe=[Waila] Toon recepten +keybind.showusage=[Waila] Toon gebruik +keybind.testing=[Waila] Testen + +client.msg.norecipe=Geen recept gevonden. +client.msg.nousage=Geen gebruik gevonden. + +hud.msg.none= +hud.msg.empty= +hud.msg.output=Uitvoer +hud.msg.input=Invoer +hud.msg.out=Uit +hud.msg.in=In +hud.msg.power=Vermogen +hud.msg.storage=Opslag +hud.msg.any=Om het even welke +hud.msg.mode=Modus + +hud.msg.send=Zend +hud.msg.recv=Ontv +hud.msg.item=Item +hud.msg.fluid=Vloeistof +hud.msg.energ=Energie +hud.msg.frequency=Frequentie + +hud.msg.owner=Eigenaar +hud.msg.public=Publiek +hud.msg.restricted=Begrensd +hud.msg.private=Privé + +hud.msg.white=Wit +hud.msg.orange=Oranje +hud.msg.magenta=Magenta +hud.msg.lblue=LBlauw +hud.msg.yellow=Geel +hud.msg.lime=Limoen +hud.msg.pink=Roze +hud.msg.gray=Grijs +hud.msg.lgray=LGrijs +hud.msg.cyan=Cyaan +hud.msg.purple=Paars +hud.msg.blue=Blauw +hud.msg.brown=Bruin +hud.msg.green=Groen +hud.msg.red=Rood +hud.msg.black=Zwart + +hud.msg.growth=Groei +hud.msg.mature=Volwassen +hud.msg.off=Af +hud.msg.on=Aan +hud.msg.state=Status +hud.msg.delay=Vertraging +hud.msg.comparator=Vergelijker +hud.msg.substractor=Aftrekker +hud.msg.record=Neem op + +option.appeng.monitorcontent=Scherm inhoud +option.bb.content=Ton inhoud +option.bc.tankamount=Vloeistofhoeveelheid +option.bc.tanktype=Vloeistoftype +option.enderstorage.colors=Kleuren +option.ic2.inputeumach=Max EU invoer [Machines] +option.ic2.inputeuother=Max EU invoer [Andere] +option.ic2.inputeu=Max EU invoer +option.ic2.outputeu=Max EU uitvoer +option.ic2.storage=Opgeslagen energie +option.thaumcraft.storedvis=Condensator opslag +option.thermalexpansion.energyhandler=Toon RF opslag +option.thermalexpansion.energycell=Toon ECell IN/UIT +option.thermalexpansion.fluidtype=Toon vloeistoftype +option.thermalexpansion.fluidamount=Toon vloeistofhoeveelheid +option.thermalexpansion.tankmode=Toon tank modus +option.thermalexpansion.tesssendrecv=Tesseract modus +option.thermalexpansion.tessfreq=Tesseract frequentie +option.thermalexpansion.owner=Toon eigenaar +option.vanilla.spawntype=Spawner type +option.vanilla.growthvalue=Groei hoeveelheid +option.vanilla.leverstate=Hendel status +option.vanilla.repeater=Herhaler vertraging +option.vanilla.comparator=Vergelijker modus +option.vanilla.redstone=Redstone vermogen +option.vanilla.jukebox=Jukebox schijf +option.extrautilities.fluidamount=Toon vloeistofhoeveelheid +option.openblocks.fluidamount=Toon vloeistofhoeveelheid +option.railcraft.fluidamount=Toon vloeistofhoeveelheid \ No newline at end of file diff --git a/src/main/ressources/assets/waila/lang/ru_RU.lang b/src/main/ressources/assets/waila/lang/ru_RU.lang new file mode 100644 index 0000000..722edb1 --- /dev/null +++ b/src/main/ressources/assets/waila/lang/ru_RU.lang @@ -0,0 +1,131 @@ +screen.button.waila=Waila +screen.button.modules=Модули +screen.label.scale=Размер +screen.label.dragtuto=Перетащите интерфейс, чтобы изменить позицию. + +screen.button.default=По умолчанию +screen.button.cancel=Отмена +screen.button.ok=Ок +screen.button.yes=Да +screen.button.no=Нет +screen.button.back=Назад +screen.button.hidden=Скрывать +screen.button.visible=Показывать +screen.button.maintained=При нажатой клавише +screen.button.toggled=Вкл./Выкл. гор. клавишей + +choice.showhidewaila=Показать/Скрыть Waila +choice.showhideidmeta=Показать ID:Метаданные +choice.toggledmaintained=Переключ./Нажатая клав. +choice.showliquids=Жидкости +screen.button.configureaspect=Настроить индикатор... + +enchant.title.name=Название +enchant.title.minlvl=Мин. уровень +enchant.title.maxlvl=Макс. уровень +enchant.title.weight=Вес +enchant.label.enchantability=Зачарование + +waila.keybind.wailaconfig=[Waila] Меню настроек +waila.keybind.wailadisplay=[Waila] Показать/Скрыть +waila.keybind.liquid=[Waila] Показать жидкости +waila.keybind.recipe=[Waila] Показать рецепт +waila.keybind.usage=[Waila] Показать применение +waila.keybind.testing=[Waila] Тестировать + +client.msg.norecipe=Рецептов не найдено. +client.msg.nousage=Применений не найдено. + +hud.msg.none=<Ничего> +hud.msg.empty=<Пусто> +hud.msg.output=Вывод +hud.msg.input=Ввод +hud.msg.out=Из +hud.msg.in=В +hud.msg.power=Энергия +hud.msg.storage=Хранилище +hud.msg.any=Всё +hud.msg.mode=Режим +hud.msg.maxpower=Макс. энергия +hud.msg.trigger=Триггер +hud.msg.maxio=Макс. ввод/вывод + +hud.msg.send=Передача +hud.msg.recv=Приём +hud.msg.item=Предмет +hud.msg.fluid=Жидкость +hud.msg.energ=Энергия +hud.msg.frequency=Частота + +hud.msg.owner=Владелец +hud.msg.public=Публичный +hud.msg.restricted=Ограниченный +hud.msg.private=Приватный + +hud.msg.white=Белый +hud.msg.orange=Оранжевый +hud.msg.magenta=Сиреневый +hud.msg.lblue=Светло-синий +hud.msg.yellow=Жёлтый +hud.msg.lime=Светло-зелёный +hud.msg.pink=Розовый +hud.msg.gray=Серый +hud.msg.lgray=Светло-серый +hud.msg.cyan=Бирюзовый +hud.msg.purple=Фиолетовый +hud.msg.blue=Синий +hud.msg.brown=Коричневый +hud.msg.green=Зелёный +hud.msg.red=Красный +hud.msg.black=Чёрный + +hud.msg.growth=Рост +hud.msg.mature=Вырос +hud.msg.off=Выкл. +hud.msg.on=Вкл. +hud.msg.state=Статус +hud.msg.delay=Задержка +hud.msg.comparator=Компаратор +hud.msg.substractor=Вычитатель +hud.msg.record=Пластинка + +option.appeng.monitorcontent=Содержимое монитора +option.bb.content=Содержимое бочки +option.bc.tankamount=Кол-во жидкости +option.bc.tanktype=Тип жидкости +option.enderstorage.colors=Цвета +option.ic2.inputeumach=Макс. ввод еЭ [Машины] +option.ic2.inputeuother=Макс. ввод еЭ [Другое] +option.ic2.inputeu=Макс. ввод еЭ +option.ic2.outputeu=Макс. вывод еЭ +option.ic2.storage=Заряд энергии +option.thaumcraft.storedvis=Заряд конденсатора +option.thermalexpansion.energyhandler=Показывать заряд заряжателя +option.thermalexpansion.energycell=Показывать Ввод/Вывод Р.батареи +option.thermalexpansion.fluidtype=Показывать тип жидкости +option.thermalexpansion.fluidamount=Показывать кол-во жидкости +option.thermalexpansion.tankmode=Режим цистерны +option.thermalexpansion.tesssendrecv=Режим тессеракта +option.thermalexpansion.tessfreq=Частота тессеракта +option.thermalexpansion.owner=Показывать владельца +option.thermalexpansion.conditemmode=Показывать режим труб +option.vanilla.spawntype=Тип спаунера +option.vanilla.growthvalue=Стадия роста +option.vanilla.leverstate=Положение рычага +option.vanilla.repeater=Задержка повторителя +option.vanilla.comparator=Режим компаратора +option.vanilla.redstone=Сила красного камня +option.vanilla.jukebox=Пластинка в проигрывателе +option.etb.displaydata=Показывать инф. о сокетах +option.enderio.inout=Показывать ввод/вывод +option.enderio.storage=Показывать заряд MJ +option.enderio.owner=Показывать владельца блока +option.enderio.channel=Показывать канал гиперкуба +option.bcapi.storage=Показывать заряд MJ +option.bcapi.consump=Показывать макс. энергию +option.bcapi.trigger=Показывать энергию активации +option.pr.showio=Показывать ввод/вывод схем +option.pr.showdata=Показывать инф. о схемах +option.extrautilities.fluidamount=Показывать кол-во жидкости +option.openblocks.fluidamount=Показывать кол-во жидкости +option.railcraft.fluidamount=Показывать кол-во жидкости \ No newline at end of file diff --git a/src/main/ressources/assets/waila/textures/config_template.png b/src/main/ressources/assets/waila/textures/config_template.png new file mode 100644 index 0000000..61e0f4e Binary files /dev/null and b/src/main/ressources/assets/waila/textures/config_template.png differ diff --git a/src/main/ressources/assets/waila/textures/test.png b/src/main/ressources/assets/waila/textures/test.png new file mode 100644 index 0000000..1bb07cd Binary files /dev/null and b/src/main/ressources/assets/waila/textures/test.png differ diff --git a/src/main/ressources/assets/waila/textures/test_solar.png b/src/main/ressources/assets/waila/textures/test_solar.png new file mode 100644 index 0000000..25784b8 Binary files /dev/null and b/src/main/ressources/assets/waila/textures/test_solar.png differ diff --git a/src/main/ressources/mcmod.info b/src/main/ressources/mcmod.info new file mode 100644 index 0000000..7154872 --- /dev/null +++ b/src/main/ressources/mcmod.info @@ -0,0 +1,16 @@ +[ +{ + "modid": "waila", + "name": "Waila", + "description": "All your data are belong to us.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authors": ["ProfMobius"], + "credits": "The Forge and FML guys, for making this example", + "logoFile": "", + "screenshots": [], + "dependencies": [] +} +]