diff --git a/.gitignore b/.gitignore index 168124db..ad473ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ Thumbs.db #gradle stuff /.gradle /build/ +/run/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6e263951..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Mantle"] - path = Mantle - url = https://github.com/SlimeKnights/Mantle.git diff --git a/README.md b/README.md index 86c80089..cf2e9379 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,14 @@ #[Tinkers' Construct](http://www.minecraftforum.net/topic/1659892-tinkers-construct/) -#Version 1.5.x for Minecraft 1.6.x is now FINAL. - -Modify all the things, then do it again! +Modify all the things, then do it again! Melt down any metals you find. Turn everything into golems! ##Development -Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed to `forge/mcp/jars/mods/` from the Forge File Server: [ForgeMultipart](http://files.minecraftforge.net/ForgeMultipart/). [CClib](http://files.minecraftforge.net/CodeChickenLib/). The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Copy `TCore_dummy.jar` to `forge/mcp/jars/mods/` to enable the Preloader (optional -- only needed when working on the preloader itself) +Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed from the Forge File Server: [ForgeMultipart](http://files.minecraftforge.net/ForgeMultipart/). [CClib](http://files.minecraftforge.net/CodeChickenLib/). The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Copy `TCore_dummy.jar` to `forge/mcp/jars/mods/` to enable the Preloader (optional -- only needed when working on the preloader itself) ##Compile from Source -Run [Apache Ant](http://ant.apache.org/bindownload.cgi) in the repository root: `ant package` +Run gradlew in the repository root: `gradlew[.bat] setupdevworkspace build' ##Issue reporting Please include the following: diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..a793804a --- /dev/null +++ b/build.gradle @@ -0,0 +1,109 @@ +/* + * Tinkers Construct + * Master build file + * + * Authors: Sunstrike, ProgWML6 + * Help from AbrarSyed + */ + +buildscript { + repositories { + mavenCentral() + maven { + name = 'ForgeFS' + url = 'http://files.minecraftforge.net/maven' + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + } +} + +repositories { + ivy { + name 'Forge FS legacy' + artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" + } + ivy { + name 'CB FS' + artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" + } + maven { + name 'ForgeFS' + url 'http://files.minecraftforge.net/maven' + } + maven { + name 'MinecraftS3' + url 'http://s3.amazonaws.com/Minecraft.Download/libraries' + } +} + + +apply plugin: 'forge' + +dependencies { + compile name: 'ForgeMultipart', version: '1.6.4-1.0.0.211', ext: 'jar' + compile name: 'CodeChickenLib', version: '1.6.4-1.0.0.44', ext: 'jar' + compile name: 'NotEnoughItems', version: '1.6.1.5_d1', type: 'jar' + +} + +minecraft { + version = '1.6.4-9.11.1.964' + assetDir = 'run/assets' +} +// sets version to the slimeKnights version format +task buildInfo { + def cmd = "git rev-parse --short HEAD" + def proc = cmd.execute() + ext.revision = proc.text.trim() +} +version = "${minecraft.version}-${System.getenv().BUILD_NUMBER}.${project.buildInfo.revision}" + +sourceSets { + main { + resources { + srcDir 'resources' + } + } +} +processResources +{ + // replace stuff in text files, not binary ones. + from(sourceSets.main.resources.srcDirs) { + include '**/*.info' + // replace version and MCVersion + // forge version is also accessible via project.minecraftforgeVersion + // it contains the full minecraft version, including buildNumber + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not text + from(sourceSets.main.resources.srcDirs) { + exclude '**/*.info' + } +} + + +jar { + manifest { + attributes 'FMLCorePlugin': 'tconstruct.preloader.TConstructLoaderContainer' + attributes 'FMLCorePluginContainsFMLMod': 'true' + } +} +// because the normal output has been made to be obfuscated +task deobfJar(type: Jar) { + from sourceSets.main.output + classifier = 'deobf' +} +task libJar(type: Jar) { + from(sourceSets.main.java) { + include "tconstruct/library/*" + } + classifier = 'lib' +} +artifacts { + archives deobfJar + archives libJar +} + diff --git a/build.xml b/build.xml deleted file mode 100644 index 4b26bbc0..00000000 --- a/build.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..d5c591c9 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 00000000..0f589fd3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Nov 21 14:14:24 GMT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..91a7e269 --- /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 00000000..aec99730 --- /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/resources/TConstruct_AT.cfg b/resources/TConstruct_AT.cfg deleted file mode 100644 index bb075df1..00000000 --- a/resources/TConstruct_AT.cfg +++ /dev/null @@ -1,29 +0,0 @@ -# Tinkers Construct -- Access Transformer -# Required for Ant build system. -# Last update: Minecraft 1.6.4 - 2013 Sept 20 - -# EntityArrow - Grabbed 'em all, since so much is accessed -public uh.a -public uh.au -public uh.av -public uh.aw -public uh.b -public uh.c -public uh.d -public uh.e -public uh.f -public uh.g -public uh.h -public uh.i -public uh.j - -# GuiContainer -public awy.p #guiLeft -public awy.q #guiTop - -# GuiScreen -public awe.i #buttonList - -# ThreadDownloadImageData -public bic.g #field_110559_g -public bic.d #field_110560_d diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index 7cfb46c0..7edf11b6 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -998,13 +998,31 @@ Stackable: Yes -Electric -Adding a battery and a circuit to a tool gives it an electric field. The tool still functions properly when the battery has no charge. +Flux +Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. Effects: -- Allows the tool to be charged with electricity +- Allows the tool to be charged with Redstone Flux - Uses energy instead of durability while charged -- Available from IndustrialCraft 2 +- Available from Thermal Expansion 3 + +Type: Single-use +Stackable: No + + + +tool +fluxmod + + + +Flux +Adding a Hardened Flux Capacitor or Leadstone Energy Cell gives a tool energy. The tool still functions properly when the Cell/Capacitor has no charge. + +Effects: +- Allows the tool to be charged with Redstone Flux +- Uses energy instead of durability while charged +- Available from Thermal Expansion 3 Type: Single-use Stackable: No @@ -1013,7 +1031,7 @@ Note: this modifier will be removed in Minecraft 1.7 tool -electricmod +fluxmod2 diff --git a/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png b/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png deleted file mode 100644 index c69d1d68..00000000 Binary files a/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/axe/electric_axe_effect.png b/resources/assets/tinker/textures/items/axe/electric_axe_effect.png deleted file mode 100644 index 01d1caeb..00000000 Binary files a/resources/assets/tinker/textures/items/axe/electric_axe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png b/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png deleted file mode 100644 index 2a7854b2..00000000 Binary files a/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png b/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png deleted file mode 100644 index b7bb3e3e..00000000 Binary files a/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png b/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png deleted file mode 100644 index 189434d7..00000000 Binary files a/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png b/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png deleted file mode 100644 index 75738d43..00000000 Binary files a/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png b/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png deleted file mode 100644 index 3ac31578..00000000 Binary files a/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png b/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png deleted file mode 100644 index ee31bf4d..00000000 Binary files a/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png b/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png deleted file mode 100644 index 4bbeec8d..00000000 Binary files a/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png b/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png deleted file mode 100644 index 3500b50e..00000000 Binary files a/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png b/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png deleted file mode 100644 index bad24664..00000000 Binary files a/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png b/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png deleted file mode 100644 index 5a706d37..00000000 Binary files a/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png b/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png deleted file mode 100644 index 6b72e0a3..00000000 Binary files a/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png b/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png deleted file mode 100644 index 52c0f79a..00000000 Binary files a/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png b/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png b/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png b/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png b/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png deleted file mode 100644 index 45448b79..00000000 Binary files a/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png b/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png deleted file mode 100644 index f2199f51..00000000 Binary files a/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png deleted file mode 100644 index 41acfc3e..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png b/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png deleted file mode 100644 index 772f952c..00000000 Binary files a/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..c1ea7ff9 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,19 @@ +/* + * This settings file was auto generated by the Gradle buildInit task + * by 'sunstrike' at '21/11/13 14:14' with Gradle 1.9 + * + * The settings file is used to specify which projects to include in your build. + * In a single project build this file can be empty or even removed. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user guide at http://gradle.org/docs/1.9/userguide/multi_project_builds.html + */ + +/* +// To declare projects as part of a multi-project build use the 'include' method +include 'shared' +include 'api' +include 'services:webservice' +*/ + +rootProject.name = 'TinkersConstruct' diff --git a/src/cofh/api/energy/IEnergyContainerItem.java b/src/api/java/cofh/api/energy/IEnergyContainerItem.java similarity index 100% rename from src/cofh/api/energy/IEnergyContainerItem.java rename to src/api/java/cofh/api/energy/IEnergyContainerItem.java diff --git a/src/mcp/mobius/waila/api/IWailaBlock.java b/src/api/java/mcp/mobius/waila/api/IWailaBlock.java similarity index 100% rename from src/mcp/mobius/waila/api/IWailaBlock.java rename to src/api/java/mcp/mobius/waila/api/IWailaBlock.java diff --git a/src/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java similarity index 100% rename from src/mcp/mobius/waila/api/IWailaConfigHandler.java rename to src/api/java/mcp/mobius/waila/api/IWailaConfigHandler.java diff --git a/src/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java similarity index 100% rename from src/mcp/mobius/waila/api/IWailaDataAccessor.java rename to src/api/java/mcp/mobius/waila/api/IWailaDataAccessor.java diff --git a/src/mcp/mobius/waila/api/IWailaDataProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java similarity index 100% rename from src/mcp/mobius/waila/api/IWailaDataProvider.java rename to src/api/java/mcp/mobius/waila/api/IWailaDataProvider.java diff --git a/src/mcp/mobius/waila/api/IWailaRegistrar.java b/src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java similarity index 100% rename from src/mcp/mobius/waila/api/IWailaRegistrar.java rename to src/api/java/mcp/mobius/waila/api/IWailaRegistrar.java diff --git a/src/mods/battlegear2/api/IDyable.java b/src/api/java/mods/battlegear2/api/IDyable.java similarity index 100% rename from src/mods/battlegear2/api/IDyable.java rename to src/api/java/mods/battlegear2/api/IDyable.java diff --git a/src/mods/battlegear2/api/IShield.java b/src/api/java/mods/battlegear2/api/IShield.java similarity index 100% rename from src/mods/battlegear2/api/IShield.java rename to src/api/java/mods/battlegear2/api/IShield.java diff --git a/src/mods/battlegear2/api/PlayerEventChild.java b/src/api/java/mods/battlegear2/api/PlayerEventChild.java similarity index 100% rename from src/mods/battlegear2/api/PlayerEventChild.java rename to src/api/java/mods/battlegear2/api/PlayerEventChild.java diff --git a/src/mods/battlegear2/api/quiver/IArrowContainer2.java b/src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java similarity index 100% rename from src/mods/battlegear2/api/quiver/IArrowContainer2.java rename to src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java diff --git a/src/mods/battlegear2/api/quiver/QuiverArrowEvent.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java similarity index 100% rename from src/mods/battlegear2/api/quiver/QuiverArrowEvent.java rename to src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java diff --git a/src/mods/battlegear2/api/quiver/QuiverArrowRegistry.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java similarity index 100% rename from src/mods/battlegear2/api/quiver/QuiverArrowRegistry.java rename to src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java diff --git a/src/mods/battlegear2/api/weapons/IBackStabbable.java b/src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IBackStabbable.java rename to src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java diff --git a/src/mods/battlegear2/api/weapons/IBattlegearWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IBattlegearWeapon.java rename to src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java diff --git a/src/mods/battlegear2/api/weapons/IExtendedReachWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IExtendedReachWeapon.java rename to src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java diff --git a/src/mods/battlegear2/api/weapons/IHitTimeModifier.java b/src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IHitTimeModifier.java rename to src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java diff --git a/src/mods/battlegear2/api/weapons/IPenetrateWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IPenetrateWeapon.java rename to src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java diff --git a/src/mods/battlegear2/api/weapons/IPotionEffect.java b/src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java similarity index 100% rename from src/mods/battlegear2/api/weapons/IPotionEffect.java rename to src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java diff --git a/src/mods/battlegear2/api/weapons/ISpecialEffect.java b/src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java similarity index 100% rename from src/mods/battlegear2/api/weapons/ISpecialEffect.java rename to src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java diff --git a/src/mods/battlegear2/api/weapons/OffhandAttackEvent.java b/src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java similarity index 100% rename from src/mods/battlegear2/api/weapons/OffhandAttackEvent.java rename to src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java diff --git a/src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/FactoryRegistry.java rename to src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java new file mode 100644 index 00000000..b4f16603 --- /dev/null +++ b/src/api/java/powercrystals/minefactoryreloaded/api/FarmingRegistry.java @@ -0,0 +1,42 @@ +package powercrystals.minefactoryreloaded.api; + +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; + +import net.minecraft.item.ItemStack; +import powercrystals.minefactoryreloaded.api.rednet.IRedNetLogicCircuit; + +/** + * NO-OP + * @deprecated for FactoryRegistry + */ +@Deprecated +public class FarmingRegistry +{ + private static void alert() + { + FMLLog.severe("%s is using a removed API and may crash the game.", + Loader.instance().activeModContainer().getName()); + new Throwable().printStackTrace(); + } + public static void registerPlantable(IFactoryPlantable plantable) { alert(); } + public static void registerHarvestable(IFactoryHarvestable harvestable) { alert(); } + public static void registerFertilizable(IFactoryFertilizable fertilizable) { alert(); } + public static void registerFertilizer(IFactoryFertilizer fertilizer) { alert(); } + public static void registerRanchable(IFactoryRanchable ranchable) { alert(); } + public static void registerGrindable(IFactoryGrindable grindable) { alert(); } + public static void registerSludgeDrop(int weight, ItemStack drop) { alert(); } + public static void registerBreederFood(Class entityToBreed, ItemStack food) { alert(); } + public static void registerSafariNetHandler(ISafariNetHandler handler) { alert(); } + public static void registerMobEggHandler(IMobEggHandler handler) { alert(); } + public static void registerRubberTreeBiome(String biome) { alert(); } + public static void registerSafariNetBlacklist(Class blacklistedEntity) { alert(); } + public static void registerVillagerTradeMob(IRandomMobProvider mobProvider) { alert(); } + public static void registerLiquidDrinkHandler(int liquidId, ILiquidDrinkHandler liquidDrinkHandler) { alert(); } + public static void registerLaserOre(int weight, ItemStack drop) { alert(); } + public static void setLaserPreferredOre(int color, ItemStack ore) { alert(); } + public static void registerFruitLogBlockId(Integer fruitLogBlockId) { alert(); } + public static void registerFruit(IFactoryFruit fruit) { alert(); } + public static void registerAutoSpawnerBlacklist(String entityString) { alert(); } + public static void registerRedNetLogicCircuit(IRedNetLogicCircuit circuit) { alert(); } +} diff --git a/src/powercrystals/minefactoryreloaded/api/FertilizerType.java b/src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/FertilizerType.java rename to src/api/java/powercrystals/minefactoryreloaded/api/FertilizerType.java diff --git a/src/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/HarvestType.java rename to src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java diff --git a/src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFertilizer.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryFruit.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryFruit.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryPlantable.java diff --git a/src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IFactoryRanchable.java diff --git a/src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java rename to src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IMobEggHandler.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IMobEggHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java b/src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/INeedleAmmo.java rename to src/api/java/powercrystals/minefactoryreloaded/api/INeedleAmmo.java diff --git a/src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java b/src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IRandomMobProvider.java diff --git a/src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java rename to src/api/java/powercrystals/minefactoryreloaded/api/ISafariNetHandler.java diff --git a/src/powercrystals/minefactoryreloaded/api/ISyringe.java b/src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/ISyringe.java rename to src/api/java/powercrystals/minefactoryreloaded/api/ISyringe.java diff --git a/src/powercrystals/minefactoryreloaded/api/IToolHammer.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IToolHammer.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IToolHammer.java diff --git a/src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java b/src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java rename to src/api/java/powercrystals/minefactoryreloaded/api/IToolHammerAdvanced.java diff --git a/src/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/MobDrop.java rename to src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java diff --git a/src/powercrystals/minefactoryreloaded/api/RanchedItem.java b/src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/RanchedItem.java rename to src/api/java/powercrystals/minefactoryreloaded/api/RanchedItem.java diff --git a/src/powercrystals/minefactoryreloaded/api/RandomMob.java b/src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/RandomMob.java rename to src/api/java/powercrystals/minefactoryreloaded/api/RandomMob.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IConnectableRedNet.java diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java new file mode 100644 index 00000000..b670f403 --- /dev/null +++ b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetDecorative.java @@ -0,0 +1,6 @@ +package powercrystals.minefactoryreloaded.api.rednet; + +public interface IRedNetDecorative +{ + +} diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNoConnection.java diff --git a/src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java similarity index 100% rename from src/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java rename to src/api/java/powercrystals/minefactoryreloaded/api/rednet/RedNetConnectionType.java diff --git a/src/ic2/api/item/IBoxable.java b/src/ic2/api/item/IBoxable.java deleted file mode 100644 index 6214662c..00000000 --- a/src/ic2/api/item/IBoxable.java +++ /dev/null @@ -1,14 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -public interface IBoxable -{ - /** - * Determine whether an item can be stored in a toolbox or not. - * - * @param itemstack item to be stored - * @return Whether to store the item in the toolbox or not - */ - public abstract boolean canBeStoredInToolbox (ItemStack itemstack); -} diff --git a/src/ic2/api/item/ICustomElectricItem.java b/src/ic2/api/item/ICustomElectricItem.java deleted file mode 100644 index a65b4b29..00000000 --- a/src/ic2/api/item/ICustomElectricItem.java +++ /dev/null @@ -1,68 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * This interface is a special version of IElectricItem which delegates the implementation of - * charge(), discharge() and canUse() to the implementing Item. - * - * The default implementation (when not using ICustomElectricItem) does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator - * - * @note ICustomElectricItem must not call the ElectricItem methods charge, discharge or canUse - * - * @deprecated Use ISpecialElectricItem instead. - */ -@Deprecated -public interface ICustomElectricItem extends IElectricItem -{ - /** - * Charge an item with a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - public int charge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - public int discharge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - public boolean canUse (ItemStack itemStack, int amount); - - /** - * Determine whether to show the charge tool tip with NEI or other means. - * - * Return false if IC2's handler is incompatible, you want to implement your own or you don't - * want to display the charge at all. - * - * @return true to show the tool tip (x/y EU) - */ - public boolean canShowChargeToolTip (ItemStack itemStack); -} diff --git a/src/ic2/api/item/IElectricItem.java b/src/ic2/api/item/IElectricItem.java deleted file mode 100644 index 2b7fcce7..00000000 --- a/src/ic2/api/item/IElectricItem.java +++ /dev/null @@ -1,54 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * The item should have a maximum damage of 13. - */ -public interface IElectricItem -{ - /** - * Determine if the item can be used in a machine or as an armor part to supply energy. - * - * @return Whether the item can supply energy - */ - boolean canProvideEnergy (ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy greater than 0. - * - * @return Item ID to use - */ - int getChargedItemId (ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy of 0. - * - * @return Item ID to use - */ - int getEmptyItemId (ItemStack itemStack); - - /** - * Get the item's maximum charge energy in EU. - * - * @return Maximum charge energy - */ - int getMaxCharge (ItemStack itemStack); - - /** - * Get the item's tier, lower tiers can't send energy to higher ones. - * Batteries are Tier 1, Energy Crystals are Tier 2, Lapotron Crystals are Tier 3. - * - * @return Item's tier - */ - int getTier (ItemStack itemStack); - - /** - * Get the item's transfer limit in EU per transfer operation. - * - * @return Transfer limit - */ - int getTransferLimit (ItemStack itemStack); -} diff --git a/src/ic2/api/item/IElectricItemManager.java b/src/ic2/api/item/IElectricItemManager.java deleted file mode 100644 index cdfb49e5..00000000 --- a/src/ic2/api/item/IElectricItemManager.java +++ /dev/null @@ -1,93 +0,0 @@ -package ic2.api.item; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * This interface specifies a manager to handle the various tasks for electric items. - * - * The default implementation does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator - * - * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the - * default implementations through ElectricItem.rawManager. The default implementation is designed - * to minimize its dependency on its own constraints/structure and delegates most work back to the - * more atomic features in the gateway manager. - */ -public interface IElectricItemManager -{ - /** - * Charge an item with a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - int charge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - int discharge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Determine the charge level for the specified item - * - * @param itemStack ItemStack containing the electric item - * @return charge level in EU - */ - int getCharge (ItemStack itemStack); - - /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - boolean canUse (ItemStack itemStack, int amount); - - /** - * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param entity entity holding the item - * @return true if the operation succeeded - */ - boolean use (ItemStack itemStack, int amount, EntityLivingBase entity); - - /** - * Charge an item from the BatPack a player is wearing. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * use() already contains this functionality. - * - * @param itemStack electric item's stack - * @param entity entity holding the item - */ - void chargeFromArmor (ItemStack itemStack, EntityLivingBase entity); - - /** - * Get the tool tip to display for electric items. - * - * @param itemStack ItemStack to determine the tooltip for - * @return tool tip string or null for none - */ - String getToolTip (ItemStack itemStack); -} diff --git a/src/ic2/api/item/ISpecialElectricItem.java b/src/ic2/api/item/ISpecialElectricItem.java deleted file mode 100644 index 86916eef..00000000 --- a/src/ic2/api/item/ISpecialElectricItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -public interface ISpecialElectricItem extends IElectricItem -{ - /** - * Supply a custom IElectricItemManager. - * - * @param itemStack ItemStack to get the manager for - * @return IElectricItemManager instance - */ - IElectricItemManager getManager (ItemStack itemStack); -} diff --git a/src/ic2/api/item/Items.java b/src/ic2/api/item/Items.java deleted file mode 100644 index 1b7ed558..00000000 --- a/src/ic2/api/item/Items.java +++ /dev/null @@ -1,609 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides access to IC2 blocks and items. - * - * Some items can be acquired through the ore dictionary which is the recommended way. - * The items are initialized while IC2 is being loaded - try to use ModsLoaded() or load your mod after IC2. - * Some blocks/items can be disabled by a config setting, so it's recommended to check if they're null first. - * - * Getting the associated Block/Item for an ItemStack x: - * Blocks: Block.blocksList[x.itemID] - * Items: x.getItem() - */ -public final class Items -{ - /** - * Get an ItemStack for a specific item name, example: Items.getItem("resin") - * See the list below for item names. - * Make sure to copy() the ItemStack if you want to modify it. - * - * @param name item name - * @return The item or null if the item does not exist or an error occurred - */ - public static ItemStack getItem (String name) - { - try - { - if (Ic2Items == null) - Ic2Items = Class.forName(getPackage() + ".core.Ic2Items"); - - Object ret = Ic2Items.getField(name).get(null); - - if (ret instanceof ItemStack) - { - return (ItemStack) ret; - } - else - { - return null; - } - } - catch (Exception e) - { - System.out.println("IC2 API: Call getItem failed for " + name); - - return null; - } - } - - /* Possible values: - - // ores - copperOre; // Copper Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreCopper, null with enableWorldGenOreCopper=false - tinOre; // Tin Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreTin, null with enableWorldGenOreTin=false - uraniumOre; // Tin Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreUranium, null with enableWorldGenOreUranium=false - leadOre; // Lead Ore Block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreLead, null with enableWorldGenOreLead=false - - // rubber related - - Rubber wood block, meta reflects the state, meta in ItemStack set to 0, ore dictionary: woodRubber (with meta 0), null with enableWorldGenTreeRubber=false - dropped (as an item) -> metadata 0 - block, no resin spot -> metadata 0 or 1 - block, wet resin spot -> metadata 2-5 (according to the side) - block, dry resin spot -> metadata 8-11 (wet state + 6) - - rubberWood; - rubberLeaves; // Rubber Leaves block, currently not meta sensitive, meta in ItemStack set to 0, null with enableWorldGenTreeRubber=false - rubberSapling; // Rubber Sapling block, currently not meta sensitive, meta in ItemStack set to 0, null with enableWorldGenTreeRubber=false - resinSheet; // Resin Sheet block, currently not meta sensitive - rubberTrampoline; // Rubber Trampoline block, meta reflects internal state, meta in ItemStack set to 0 - - // building/storage - ironFence; // Iron Fence block, currently not meta sensitive - - reinforcedStone; // Reinforced Stone block, currently not meta sensitive - reinforcedGlass; // Reinforced Glass block, currently not meta sensitive - reinforcedDoorBlock; // Reinforced Door block, meta reflects the state (see vanilla doors), meta in ItemStack set to 0 - - constructionreinforcedFoam; // Construction Reinforced Foam block, currently not meta sensitive - constructionFoam; // Construction Foam block, currently not meta sensitive - constructionFoamWall; // Construction Foam Wall block, meta = color, implements IPaintableBlock - scaffold; // Scaffold block, meta reflects internal physical model data - ironScaffold; // Scaffold block, meta reflects internal physical model data - - bronzeBlock; // Bronze block, meta sensitive - copperBlock; // Copper block, meta sensitive - tinBlock; // Tin block, meta sensitive - uraniumBlock; // Uranium block, meta sensitive - leadBlock; // Uranium block, meta sensitive - - // cables (when placed as a block, inventory items are different; TE implements IEnergyConductor) - - copperCableBlock; // Copper Cable block, meta sensitive - insulatedCopperCableBlock; // Insulated Copper Cable block, meta sensitive - - goldCableBlock; // Gold Cable block, meta sensitive - insulatedGoldCableBlock; // Insulated Gold Cable block, meta sensitive - doubleInsulatedGoldCableBlock; // Double Insulated Gold Cable block, meta sensitive - - ironCableBlock; // Iron Cable block, meta sensitive - insulatedIronCableBlock; // Insulated Iron Cable block, meta sensitive - doubleInsulatedIronCableBlock; // Double Insulated Iron Cable block, meta sensitive - trippleInsulatedIronCableBlock; // Tripple Insulated Iron Cable block, meta sensitive - - glassFiberCableBlock; // Glass Fiber Cable block, meta sensitive - - tinCableBlock; // Tin Cable block, meta sensitive - insulatedtinCableBlock; // Insulated Tin Cable item, meta sensitive - detectorCableBlock; // Detector Cable block, meta sensitive - splitterCableBlock; // Splitter Cable block, meta sensitive - - // generators + related (TE implements IEnergySource ex. reactorChamber) - - generator; // Generator block, meta sensitive - geothermalGenerator; // Geothermal Generator block, meta sensitive - waterMill; // Water Mill block, meta sensitive - solarPanel; // Solar Panel block, meta sensitive - windMill; // Wind Mill block, meta sensitive - nuclearReactor; // Nuclear Reactor block, meta sensitive - reactorChamber; // Reactor Chamber block, currently not meta sensitive - RTGenerator; // Radioisotope Thermoelectric Generator block, meta sensitive - semifluidGenerator; // Semifluid Generator block, meta sensitive - - - // energy storages (TE implements IEnergySource and IEnergyConductor) - - batBox; // BatBox block, meta sensitive - cesuUnit; // CESU Unit block, meta sensitive - mfeUnit; // MFE Unit block, meta sensitive - mfsUnit; // MFS Unit block, meta sensitive - - // transformers (TE implements IEnergySource and IEnergyConductor) - - lvTransformer; // LV Transformer block, meta sensitive - mvTransformer; // MV Transformer block, meta sensitive - hvTransformer; // HV Transformer block, meta sensitive - evTransformer; // EV Transformer block, meta sensitive - - // machines + related (TE implements IEnergySink ex. machine, miningPipe, miningPipeTip) - - machine; // Machine block, meta sensitive - advancedMachine; // Advanced Machine block, meta sensitive - - ironFurnace; // Iron Furnace block, meta sensitive - electroFurnace; // Electro Furnace block, meta sensitive - macerator; // Macerator block, meta sensitive - extractor; // Extractor block, meta sensitive - compressor; // Compressor block, meta sensitive - canner; // Canner block, meta sensitive - miner; // Miner block, meta sensitive - pump; // Pump block, meta sensitive - magnetizer; // Magnetizer block, meta sensitive - electrolyzer; // Electrolyzer block, meta sensitive - recycler; // Recycler block, meta sensitive - inductionFurnace; // Induction Furnace block, meta sensitive - massFabricator; // Mass Fabricator block, meta sensitive - terraformer; // Terraformer block, meta sensitive - teleporter; // Teleporter block, meta sensitive - teslaCoil; // Tesla Coil block, meta sensitive - luminator; // Passive (dark) Luminator block, meta = facing - activeLuminator; // Active (bright) Luminator block, meta = facing - centrifuge; // Centrifuge block, meta sensitive - metalformer; // MetalFormer block ,meta sensitive - orewashingplant; // Ore Wasching Plant,Meta sensitive - patternstorage; // Pattern Storage,Meta sensitive - scanner; // Scanner,Meta sensitive - replicator; // Replicator,Meta sensitive - - miningPipe; // Mining Pipe block, currently not meta sensitive, meta in ItemStack set to 0 - miningPipeTip; // Mining Pipe Tip block, currently not meta sensitive, meta in ItemStack set to 0 - - - // personal blocks - - personalSafe; // Personal Safe block, meta sensitive - tradeOMat; // Trade-O-Mat block, meta sensitive - energyOMat; // Energy-O-Mat block, meta sensitive - - // explosives - - industrialTnt; // Industrial TNT block, currently not meta sensitive - nuke; // Nuke block, currently not meta sensitive - dynamiteStick; // Dynamite Stick block, meta = placement, meta in ItemStack set to 0 - dynamiteStickWithRemote; // Dynamite Stick with Remote block, meta = placement, meta in ItemStack set to 0 - - // Agriculture Stuff - - crop; // Crop Block, empty, not meta sensitive - cropmatron; // Cropmatron machien block, meta sensititve - - // ----- items ----- - - // rubber + related - resin; // Resin item, currently not meta sensitive - rubber; // Rubber item, currently not meta sensitive, ore dictionary: itemRubber - - FluidCell; - - // Lithium -> Tritium - - reactorLithiumCell; // LithiumCell use in Reaktor, , meta = damage value - TritiumCell; // Tritium, currently not meta sensitive - - // Nuclear Fuel - - UranFuel; // , currently not meta sensitive - MOXFuel; // , currently not meta sensitive - Plutonium; // , currently not meta sensitive - smallPlutonium; // , currently not meta sensitive - Uran235; // , currently not meta sensitive - smallUran235; // , currently not meta sensitive - Uran238; // , currently not meta sensitive - - reactorDepletedUraniumSimple; // Depleted Uranium Cell items, currently not meta sensitive - reactorDepletedUraniumDual; - reactorDepletedUraniumQuad; - reactorDepletedMOXSimple; // Depleted MOX Cell items, currently not meta sensitive - reactorDepletedMOXDual; - reactorDepletedMOXQuad; - reactorMOXSimple; // Depleted MOX Cell items, currently not meta sensitive - reactorMOXDual; - reactorMOXQuad; - RTGPellets; - - - // Recipe Parts - - coil; // Coil, meta sensitive - elemotor; // electric motor, meta sensitive - powerunit; // Item Power Unit, meta sensitive - powerunitsmall; // Item Power Unit, meta sensitive - - - // ItemCasing - - casingcopper; // Copper ItemCasing, meta sensitive - casingtin; // Tin ItemCasing, meta sensitive - casingbronze; // Bronze ItemCasing, meta sensitive - casinggold; // Gold ItemCasing, meta sensitive - casingiron; // Iron ItemCasing, meta sensitive - @Deprecated - casingadviron; // Refined Iron ItemCasing, meta sensitive - casinglead; // Lead ItemCasing, meta sensitive - - // Crushed Ore - crushedIronOre; // Crushed Iron Ore, meta sensitive - crushedCopperOre; // Crushed Copper Ore, meta sensitive - crushedGoldOre; // Crushed Gold Ore, meta sensitive - crushedTinOre; // Crushed Tin Ore, meta sensitive - crushedUraniumOre; // Crushed Uranium Ore, meta sensitive - crushedSilverOre; // Crushed Silver Ore, meta sensitive - crushedLeadOre; // Crushed Lead Ore, meta sensitive - - - //Purify Crushed Ore - purifiedCrushedIronOre; // Purify Crushed Iron Ore, meta sensitive - purifiedCrushedCopperOre; // Purify Crushed Copper Ore, meta sensitive - purifiedCrushedGoldOre; // Purify Crushed Gold Ore, meta sensitive - purifiedCrushedTinOre; // Purify Crushed Tin Ore, meta sensitive - purifiedCrushedUraniumOre; // Purify Crushed Uranium Ore, meta sensitive - purifiedCrushedSilverOre; // Purify Crushed Silver Ore, meta sensitive - purifiedCrushedLeadOre; // Purify Crushed Lead Ore, meta sensitive - - // dusts - stoneDust; - bronzeDust; // Bronze Dust item, meta sensitive, ore dictionary: dustBronze - clayDust; // Clay Dust item, meta sensitive, ore dictionary: dustClay - coalDust; // Coal Dust item, meta sensitive, ore dictionary: dustCoal - copperDust; // Copper Dust item, meta sensitive, ore dictionary: dustCopper - goldDust; // Gold Dust item, meta sensitive, ore dictionary: dustGold - ironDust; // Iron Dust item, meta sensitive, ore dictionary: dustIron - silverDust; // Silver Dust item, meta sensitive, ore dictionary: dustSilver - tinDust; // Tin Dust item, meta sensitive, ore dictionary: dustTin - hydratedCoalDust; // Hydrated Coal Dust item, meta sensitive - leadDust; // Lead Dust item, meta sensitive, ore dictionary: dustLead - obsidianDust; // Obsidian Dust item, meta sensitive, ore dictionary: dustObsidian - lapiDust; // Lapi Dust item, meta sensitive, ore dictionary: dustLapi - sulfurDust; // Sulfur Dust item, meta sensitive, ore dictionary: dustSulfur - lithiumDust; // Lithium dust, meta sensitive, ore dictionary: dustLithium - - // small dusts - - smallIronDust; // Small Iron Dust item, meta sensitive - smallCopperDust; // Small Copper Dust item, meta sensitive - smallGoldDust; // Small Gold Dust item, meta sensitive - smallTinDust; // Small Tin Dust item, meta sensitive - smallSilverDust; // Small Silver Dust item, meta sensitive - smallLeadDust; // Small Lead Dust item, meta sensitive - smallSulfurDust; // Small Sulfur Dust item, meta sensitive - smallLithiumDust; // Small Lithium Dust item, meta sensitive - - - // ingots - @Deprecated - refinedIronIngot; // Refined Iron Ingot item, currently not meta sensitive, ore dictionary: ingotRefinedIron - copperIngot; // Copper Ingot item, currently not meta sensitive, ore dictionary: ingotCopper - tinIngot; // Tin Ingot item, currently not meta sensitive, ore dictionary: ingotTin - bronzeIngot; // Bronze Ingot item, currently not meta sensitive, ore dictionary: ingotBronze - mixedMetalIngot; // Mixed Metal Ingot item, currently not meta sensitive - leadIngot; // Lead Ingot item, currently not meta sensitive - - - // tools/weapons (without electric tools) - treetap; // Treetap item, meta = damage value - wrench; // Wrench item, meta = damage value - cutter; // Insulation Cutter item, meta = damage value - constructionFoamSprayer; // Construction Foam Sprayer item, meta = charges (as of v1.45) - - bronzePickaxe; // Bronze Pickaxe item, meta = damage value - bronzeAxe; // Bronze Axe item, meta = damage value - bronzeSword; // Bronze Sword item, meta = damage value - bronzeShovel; // Bronze Shovel item, meta = damage value - bronzeHoe; // Bronze Hoe item, meta = damage value - - ForgeHammer; // Refine Iron Hammer item, meta = damage value - - // el. tools/devices/weapons - miningDrill; // Mining Drill item, meta = damage value for charge level - diamondDrill; // Diamond Tipped Mining Drill item, meta = damage value for charge level - chainsaw; // Chainsaw item, meta = damage value for charge level - electricWrench; // Electric Wrench item, meta = damage value for charge level - electricTreetap; // Electric Treetap item, meta = damage value for charge level - miningLaser; // Mining Laser item, meta = damage value for charge level - - ecMeter; // EC-Mater item, meta = itemdata db index (as of v1.45) - odScanner; // Ore Density Scanner item, meta = damage value for charge level - ovScanner; // Ore Value Scanner item, meta = damage value for charge level - obscurator; // Obscurator item, meta = damage value for charge level - - frequencyTransmitter; // Frequency Transmitter item, meta = itemdata db index (as of v1.45) - - nanoSaber; // Idle Nano Saber item, meta = damage value for charge level - enabledNanoSaber; // Enabled Nano Saber item, meta = damage value for charge level - - toolbox; // Open/Empty toolbox, meta = Open (0) / Closed (1) - - // armor/wearable - hazmatHelmet; // Hazmat Helmet item, meta = damage value - hazmatChestplate; // Hazmat Chestplate item, meta = damage value - hazmatLeggings; // Hazmat Leggings item, meta = damage value - hazmatBoots; // Hazmat Boots item, meta = damage value - - bronzeHelmet; // Bronze Helmet Armor item, meta = damage value - bronzeChestplate; // Bronze Chestplate Armor item, meta = damage value - bronzeLeggings; // Bronze Leggings Armor item, meta = damage value - bronzeBoots; // Bronze Boots Armor item, meta = damage value - - compositeArmor; // Composite Armor item, meta = damage value for charge level - - nanoHelmet; // Nano Helmet Armor item, meta = damage value for charge level - nanoBodyarmor; // Nano Bodyarmor item, meta = damage value for charge level - nanoLeggings; // Nano Leggings Armor item, meta = damage value for charge level - nanoBoots; // Nano Boots Armor item, meta = damage value for charge level - - quantumHelmet; // Quantum Helmet Armor item, meta = damage value for charge level - quantumBodyarmor; // Quantum Bodyarmor item, meta = damage value for charge level - quantumLeggings; // Quantum Leggings Armor item, meta = damage value for charge level - quantumBoots; // Quantum Boots Armor item, meta = damage value for charge level - - jetpack; // Jetpack item, meta = damage value for fuel level - electricJetpack; // Electric Jetpack item, meta = damage value for charge level - - batPack; // BatPack item, meta = damage value for charge level - advbatPack; // Adv.BatPack item, meta = damage value for charge level - lapPack; // LapPack item, meta = damage value for charge level - energyPack; // EnergyPack item, meta = damage value for charge level - - cfPack; // CF Pack item, meta = charges (as of v1.45) - solarHelmet; // Solar Helmet, currently not meta sensitive - staticBoots; // Static Boots, currently not meta sensitive - nightvisionGoggles; // Nightvision Goggles, meta = damage value for charge level - - // batteries - reBattery; // Empty RE Battery item, currently not meta sensitive - chargedReBattery; // RE Battery item, meta = damage value for charge level - advBattery; // Adv Batteryitem, meta = damage value for charge level - energyCrystal; // Energy Crystal item, meta = damage value for charge level - lapotronCrystal; // Lapotron Crystal item, meta = damage value for charge level - suBattery; // SU Battery item, meta = damage value for charge level - - // cables - copperCableItem; // Copper Cable item, meta sensitive - insulatedCopperCableItem; // Insulated Copper Cable item, meta sensitive - - goldCableItem; // Gold Cable item, meta sensitive - insulatedGoldCableItem; // Insulated Gold Cable item, meta sensitive - - @Deprecated - doubleInsulatedGoldCableItem; // Double Insulated Gold Cable item, meta sensitive - - ironCableItem; // Iron Cable item, meta sensitive - insulatedIronCableItem; // Insulated Iron Cable item, meta sensitive - - @Deprecated - doubleInsulatedIronCableItem; // Double Insulated Iron Cable item, meta sensitive - @Deprecated - trippleInsulatedIronCableItem; // Tripple Insulated Iron Cable item, meta sensitive - insulatedTinCableItem; - glassFiberCableItem; // Glass Fiber Cable item, meta sensitive - tinCableItem; // Tin Cable item, meta sensitive - - - detectorCableItem; // Detector Cable item, meta sensitive - splitterCableItem; // Splitter Cable item, meta sensitive - - // cells/containers (without reactor components) - - cell; // Empty Cell item, meta sensitive - lavaCell; // Lava Cell item, meta sensitive - waterCell; // Water Cell item, meta sensitive - UuMatterCell; // UUMatter Cell item, meta sensitive - CFCell; // constructionFoam Cell item, meta sensitive - - - fuelRod; // Empy Fuel Rod item, currently not meta sensitive - hydratedCoalCell; // Hydrated Coal Cell item, currently not meta sensitive - bioCell; // Bio Cell item, currently not meta sensitive - coalfuelCell; // Coalfuel Cell item, currently not meta sensitive - biofuelCell; // Biofuel Cell item, currently not meta sensitive - electrolyzedWaterCell; // Electrolyzed Water Cell item, currently not meta sensitive - airCell; // Compressed Air item, currently not meta sensitive - - fuelCan; // Empty Fuel Can item, currently not meta sensitive - filledFuelCan; // Fuel Can item, meta = fuel value (as of v1.45) - - tinCan; // Empty Tin Can item, currently not meta sensitive - filledTinCan; // Filled Tin Can item, currently not meta sensitive - - // reactor components - reactorUraniumSimple; // Uranium Cell items, meta = consumed uranium ticks - reactorUraniumDual; - reactorUraniumQuad; - - reactorCoolantSimple; - reactorCoolantTriple ; // Coolant Cell item, NBT for heat-storage, meta is 0-10000 for display - reactorCoolantSix; - - reactorPlating; // Integrated Reactor Plating item, currently not meta sensitive - reactorPlatingHeat; - reactorPlatingExplosive; - - reactorHeatSwitch; // Integrated Heat Disperser item, NBT for heat-storage, meta is 0-10000 for display - reactorHeatSwitchCore; - reactorHeatSwitchSpread; - reactorHeatSwitchDiamond; - - reactorVent; // Heat Venting component, NBT for heat-storage, meta is 0-10000 for display - reactorVentCore; - reactorVentGold; - reactorVentSpread;// Special: Does not store heat - reactorVentDiamond; - - reactorReflector; // Increase efficiency without additional ticks, NBT for heat-storage, meta is 0-10000 for display - reactorReflectorThick; // Increase efficiency without additional ticks, NBT for heat-storage, meta is 0-10000 for display - reactorCondensator; // Consumes redstone to absorb heat, NBT for storage, meta is 0-10000 for display - reactorCondensatorLap; // Consumes redstone/lapis to absorb heat, mNBT for storage, meta is 0-10000 for display - - // terraformer blueprints - terraformerBlueprint; // Empty Terraformer Blueprint item, currently not meta sensitive - cultivationTerraformerBlueprint; // Cultivation Terraformer Blueprint item, currently not meta sensitive - irrigationTerraformerBlueprint; // Irrigation Terraformer Blueprint item, currently not meta sensitive - chillingTerraformerBlueprint; // Chilling Terraformer Blueprint item, currently not meta sensitive - desertificationTerraformerBlueprint; // Desertification Terraformer Blueprint item, currently not meta sensitive - flatificatorTerraformerBlueprint; // Flatificator Terraformer Blueprint item, currently not meta sensitive - mushroomTerraformerBlueprint; // Mushroom Terraformer Blueprint item, currently not meta sensitive - - // diamond chain - coalBall; // Coal Ball item, currently not meta sensitive - compressedCoalBall; // Compressed Coal Ball item, currently not meta sensitive - coalChunk; // Coal Chunk item, currently not meta sensitive - industrialDiamond; // Industrial Diamond item, currently not meta sensitive, DEPRECATED - - // recycler chain - scrap; // Scrap item, currently not meta sensitive - scrapBox; // Scrap Box item, currently not meta sensitive - - // fuel production chain - hydratedCoalClump; // Hydrated Coal Clump item, currently not meta sensitive - plantBall; // Plant Ball item, currently not meta sensitive - compressedPlantBall; // Compressed Plant Ball item, currently not meta sensitive - - // painting - painter; // Painter item, currently not meta sensitive - - blackPainter; // Black Painter item, meta = damage value - redPainter; // Red Painter item, meta = damage value - greenPainter; // Green Painter item, meta = damage value - brownPainter; // Brown Painter item, meta = damage value - bluePainter; // Blue Painter item, meta = damage value - purplePainter; // Purple Painter item, meta = damage value - cyanPainter; // Cyan Painter item, meta = damage value - lightGreyPainter; // Light Grey Painter item, meta = damage value - darkGreyPainter; // Dark Grey Painter item, meta = damage value - pinkPainter; // Pink Painter item, meta = damage value - limePainter; // Lime Painter item, meta = damage value - yellowPainter; // Yellow Painter item, meta = damage value - cloudPainter; // Cloud Painter item, meta = damage value - magentaPainter; // Magenta Painter item, meta = damage value - orangePainter; // Orange Painter item, meta = damage value - whitePainter; // White Painter item, meta = damage value - - // explosives + related - dynamite; // Throwable Dynamite item, currently not meta sensitive - stickyDynamite; // Throwable Sticky Dynamite item, currently not meta sensitive - - remote; // Dynamite Remote item, currently not meta sensitive - - // misc intermediate recipe ingredients - electronicCircuit; // Electronic Circuit item, currently not meta sensitive - advancedCircuit; // Advanced Circuit item, currently not meta sensitive - - advancedAlloy; // Advanced Alloy item, currently not meta sensitive - - carbonFiber; // Raw Carbon Fiber item, currently not meta sensitive - carbonMesh; // Raw Carbon Mesh item, currently not meta sensitive - carbonPlate; // Carbon Plate item, currently not meta sensitive - - matter; // UUA item, currently not meta sensitive - iridiumOre; // Iridium Ore item, currently not meta sensitive - iridiumPlate; // Iridium Plate item, currently not meta sensitive - - - // Metal Plates - - platecopper; // Metal plate item, meta sensitive - platetin; // Metal plate item, meta sensitive - platebronze; // Metal plate item, meta sensitive - plategold; // Metal plate item, meta sensitive - plateiron; // Metal plate item, meta sensitive - platelead; // Metal plate item, meta sensitive - platelapi; // Metal plate item, meta sensitive - plateobsidian; // Metal plate item, meta sensitive - plateadviron; // Metal plate item, meta sensitive - - // Metal Dense Plates - denseplatecopper; // Metal dense plate item, meta sensitive - denseplatetin; // Metal dense plate item, meta sensitive - denseplatebronze; // Metal dense plate item, meta sensitive - denseplategold; // Metal dense plate item, meta sensitive - denseplateiron; // Metal dense plate item, meta sensitive - @Deprecated - denseplateadviron; // Metal dense plate item, meta sensitive - denseplatelead; // Metal dense plate item, meta sensitive - denseplatelapi; // Metal dense plate item, meta sensitive - denseplateobsidian; // Metal dense plate item, meta sensitive - - - - // upgrade modules - overclockerUpgrade; // overclocker upgrade item, meta sensitive - transformerUpgrade; // transformer upgrade item, meta sensitive - energyStorageUpgrade; // energy storage upgrade item, meta sensitive - ejectorUpgrade; // ejector upgrade item, meta sensitive - - // misc - coin; // Coin item, currently not meta sensitive - reinforcedDoor; // Reinforced Door item, currently not meta sensitive - constructionFoamPowder; // Construction Foam Powder item, currently not meta sensitive - grinPowder; // Poisonous ingrident, currently not meta sensitive - debug; // Debug item, currently not meta sensitive - boatCarbon; // Carbon Fiber Canoe item, meta sensitive - boatRubber; // Rubber Dinghy item, meta sensitive - boatRubberBroken; // Damaged Rubber Dinghy item, meta sensitive - boatElectric; // Electric Boat item, meta sensitive - - //Agriculture - cropSeed; // Crop seeds, stuff stored in NBT, don't use for crafting recipes! - cropnalyzer; // Cropnalyzer handheld device - fertilizer; // Basic IC2Item, used to provide nutrients toCropBlocks - hydratingCell; // Cell used to hydrate Crops, meta = Content, 0= Full, 9999 = Near empty - electricHoe; // Electric Hoe, Metadata indicates charge level - terraWart; // Mystic opposite of NEtherWart, cures StatusEffects, simply consumeable - weedEx; // Spraying can of WEED-EX, meta indicates usages left - - //Boozeception - mugEmpty; // Simple stone mug - coffeeBeans; // Harvested CoffeeBeans - coffeePowder; // Processed Coffee Beans, used to craft drinkable Coffee - mugCoffee; // Mug of Coffee, Meta indicates status 0 = cold, 1 = Normal, 2 = Sugar'd - hops; // Hops, harvested freshly from crop - barrel; // Carried Barrel, metadata encrypts the information about the liquid inside - blockBarrel; // Unobtainable "placed barrel", TileEntity controlling the Fermentation process - mugBooze; // Mug filled with booze, metadata encrypts the information about the liquid inside - - */ - - /** - * Get the base IC2 package name, used internally. - * - * @return IC2 package name, if unable to be determined defaults to ic2 - */ - private static String getPackage () - { - Package pkg = Items.class.getPackage(); - - if (pkg != null) - { - String packageName = pkg.getName(); - - return packageName.substring(0, packageName.length() - ".api.item".length()); - } - - return "ic2"; - } - - private static Class Ic2Items; -} diff --git a/src/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java similarity index 97% rename from src/tconstruct/TConstruct.java rename to src/main/java/tconstruct/TConstruct.java index 2bb9468f..4905cf40 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -32,7 +32,7 @@ import tconstruct.worldgen.village.*; * @author mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_2.0a", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) public class TConstruct { diff --git a/src/main/java/tconstruct/TConstruct.java.orig b/src/main/java/tconstruct/TConstruct.java.orig new file mode 100644 index 00000000..07a502c8 --- /dev/null +++ b/src/main/java/tconstruct/TConstruct.java.orig @@ -0,0 +1,198 @@ +package tconstruct; + +import tconstruct.achievements.TAchievements; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.Side; +import java.util.logging.Logger; +import net.minecraft.crash.CallableMinecraftVersion; +import net.minecraft.world.gen.structure.MapGenStructureIO; +import net.minecraftforge.common.MinecraftForge; +import tconstruct.client.event.EventCloakRender; +import tconstruct.common.*; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.*; +import tconstruct.library.util.TabTools; +import tconstruct.plugins.PluginController; +import tconstruct.util.*; +import tconstruct.util.config.*; +import tconstruct.util.landmine.behavior.Behavior; +import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; +import tconstruct.util.player.TPlayerHandler; +import tconstruct.worldgen.*; +import tconstruct.worldgen.village.*; + +/** TConstruct, the tool mod. + * Craft your tools with style, then modify until the original is gone! + * @author mDiyo + */ + +<<<<<<< HEAD:src/tconstruct/TConstruct.java +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") +======= +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_2.0a", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion") +>>>>>>> origin/gradle:src/main/java/tconstruct/TConstruct.java +@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class) +public class TConstruct +{ + /** The value of one ingot in millibuckets */ + public static final int ingotLiquidValue = 144; + public static final int oreLiquidValue = ingotLiquidValue * 2; + public static final int blockLiquidValue = ingotLiquidValue * 9; + public static final int chunkLiquidValue = ingotLiquidValue / 2; + public static final int nuggetLiquidValue = ingotLiquidValue / 9; + + public static final int liquidUpdateAmount = 6; + + // Shared mod logger + public static final Logger logger = Logger.getLogger("TConstruct"); + + /* Instance of this mod, used for grabbing prototype fields */ + @Instance("TConstruct") + public static TConstruct instance; + /* Proxies for sides, used for graphics processing */ + @SidedProxy(clientSide = "tconstruct.client.TProxyClient", serverSide = "tconstruct.common.TProxyCommon") + public static TProxyCommon proxy; + + public TConstruct() + { + logger.setParent(FMLCommonHandler.instance().getFMLLogger()); + if (Loader.isModLoaded("Natura")) + { + TConstruct.logger.info("[TConstruct] Natura, what are we going to do tomorrow night?"); + TConstruct.logger.info("[Natura] TConstruct, we're going to take over the world!"); + } + else + { + + TConstruct.logger.info("[TConstruct] Preparing to take over the world"); + } + + EnvironmentChecks.verifyEnvironmentSanity(); + + PluginController.getController().registerBuiltins(); + } + + @EventHandler + public void preInit (FMLPreInitializationEvent event) + { + + PHConstruct.initProps(event.getModConfigurationDirectory()); + TConstructRegistry.materialTab = new TabTools("TConstructMaterials"); + TConstructRegistry.toolTab = new TabTools("TConstructTools"); + TConstructRegistry.blockTab = new TabTools("TConstructBlocks"); + + tableCasting = new LiquidCasting(); + basinCasting = new LiquidCasting(); + chiselDetailing = new Detailing(); + + content = new TContent(); + + events = new TEventHandler(); + MinecraftForge.EVENT_BUS.register(events); + MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement()); + content.oreRegistry(); + + proxy.registerRenderer(); + proxy.addNames(); + proxy.readManuals(); + proxy.registerKeys(); + proxy.registerTickHandler(); + + GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); + MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler()); + GameRegistry.registerFuelHandler(content); + GameRegistry.registerCraftingHandler(new TCraftingHandler()); + NetworkRegistry.instance().registerGuiHandler(instance, proxy); + + if (PHConstruct.addToVillages) + { + // adds to the villager spawner egg + VillagerRegistry.instance().registerVillagerId(78943); + // moved down, not needed if 'addToVillages' is false + VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades()); + VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler()); + VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler()); + try + { + if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4")) + { + MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure"); + MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure"); + } + } + catch (Throwable e) + { + + } + } + + playerTracker = new TPlayerHandler(); + GameRegistry.registerPlayerTracker(playerTracker); + MinecraftForge.EVENT_BUS.register(playerTracker); + + PluginController.getController().preInit(); + } + + @EventHandler + public void init (FMLInitializationEvent event) + { + if (event.getSide() == Side.CLIENT) + { + MinecraftForge.EVENT_BUS.register(new EventCloakRender()); + } + + content.intermodCommunication(); + TwilightForestConfig.initProps(PHConstruct.cfglocation); + BOPConfig.initProps(PHConstruct.cfglocation); + DimensionBlacklist.getbaddimensions(); + GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); + + PluginController.getController().init(); + + if(PHConstruct.achievementsEnabled){ + TAchievements.init(); + } + } + + @EventHandler + public void postInit (FMLPostInitializationEvent evt) + { + proxy.postInit(); + Behavior.registerBuiltInBehaviors(); + SpecialStackHandler.registerBuiltInStackHandlers(); + content.modIntegration(); + content.addOreDictionarySmelteryRecipes(); + content.createEntities(); + content.modRecipes(); + + PluginController.getController().postInit(); + } + + public static LiquidCasting getTableCasting () + { + return tableCasting; + } + + public static LiquidCasting getBasinCasting () + { + return basinCasting; + } + + public static Detailing getChiselDetailing () + { + return chiselDetailing; + } + + public static TContent content; + public static TEventHandler events; + public static TPlayerHandler playerTracker; + public static LiquidCasting tableCasting; + public static LiquidCasting basinCasting; + public static Detailing chiselDetailing; +} diff --git a/src/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java similarity index 100% rename from src/tconstruct/achievements/TAchievements.java rename to src/main/java/tconstruct/achievements/TAchievements.java diff --git a/src/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java similarity index 100% rename from src/tconstruct/blocks/BlockLandmine.java rename to src/main/java/tconstruct/blocks/BlockLandmine.java diff --git a/src/main/java/tconstruct/blocks/BloodBlock.java b/src/main/java/tconstruct/blocks/BloodBlock.java new file mode 100644 index 00000000..038e003a --- /dev/null +++ b/src/main/java/tconstruct/blocks/BloodBlock.java @@ -0,0 +1,27 @@ +package tconstruct.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; + +public class BloodBlock extends TConstructFluid +{ + + public BloodBlock(int id, Fluid fluid, Material material, String texture) + { + super(id, fluid, material, texture); + } + + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + { + if (entity instanceof EntityLivingBase) + { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 20*15, 0)); + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.id, 20*5, 1)); + } + } +} diff --git a/src/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java similarity index 100% rename from src/tconstruct/blocks/CastingChannelBlock.java rename to src/main/java/tconstruct/blocks/CastingChannelBlock.java diff --git a/src/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java similarity index 100% rename from src/tconstruct/blocks/ConveyorBase.java rename to src/main/java/tconstruct/blocks/ConveyorBase.java diff --git a/src/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java similarity index 100% rename from src/tconstruct/blocks/CraftingSlab.java rename to src/main/java/tconstruct/blocks/CraftingSlab.java diff --git a/src/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java similarity index 100% rename from src/tconstruct/blocks/CraftingStationBlock.java rename to src/main/java/tconstruct/blocks/CraftingStationBlock.java diff --git a/src/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java similarity index 100% rename from src/tconstruct/blocks/DryingRack.java rename to src/main/java/tconstruct/blocks/DryingRack.java diff --git a/src/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java similarity index 100% rename from src/tconstruct/blocks/EquipBlock.java rename to src/main/java/tconstruct/blocks/EquipBlock.java diff --git a/src/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java similarity index 100% rename from src/tconstruct/blocks/FurnaceSlab.java rename to src/main/java/tconstruct/blocks/FurnaceSlab.java diff --git a/src/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java similarity index 100% rename from src/tconstruct/blocks/GlassBlock.java rename to src/main/java/tconstruct/blocks/GlassBlock.java diff --git a/src/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java similarity index 100% rename from src/tconstruct/blocks/GlassBlockConnected.java rename to src/main/java/tconstruct/blocks/GlassBlockConnected.java diff --git a/src/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java similarity index 100% rename from src/tconstruct/blocks/GlassBlockConnectedMeta.java rename to src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java diff --git a/src/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java similarity index 100% rename from src/tconstruct/blocks/GlassBlockStained.java rename to src/main/java/tconstruct/blocks/GlassBlockStained.java diff --git a/src/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java similarity index 100% rename from src/tconstruct/blocks/GlassPane.java rename to src/main/java/tconstruct/blocks/GlassPane.java diff --git a/src/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java similarity index 100% rename from src/tconstruct/blocks/GlassPaneConnected.java rename to src/main/java/tconstruct/blocks/GlassPaneConnected.java diff --git a/src/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java similarity index 100% rename from src/tconstruct/blocks/GlassPaneStained.java rename to src/main/java/tconstruct/blocks/GlassPaneStained.java diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java new file mode 100644 index 00000000..94b425f8 --- /dev/null +++ b/src/main/java/tconstruct/blocks/GlueBlock.java @@ -0,0 +1,48 @@ +package tconstruct.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; + +public class GlueBlock extends TConstructBlock { + + public GlueBlock(int id) + { + super(id, Material.ground, 4.0f, new String[]{"glue"}); + } + + @Override + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + { + entity.motionX *= 0.1; + entity.motionZ *= 0.1; + + if (entity instanceof EntityLivingBase) { + EntityLivingBase lvb = (EntityLivingBase)entity; + // Well you'd feel ill too standing on glue... + if (lvb.isPotionActive(Potion.hunger)) { + lvb.getActivePotionEffect(Potion.hunger).duration = 20; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); + } + + // Glue is sticky stuff + if (lvb.isPotionActive(Potion.moveSlowdown)) { + lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); + } + } + } + + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + { + return Block.slowSand.getCollisionBoundingBoxFromPool(world, x, y, z); + } + +} diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java new file mode 100644 index 00000000..f7ad3d8a --- /dev/null +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -0,0 +1,65 @@ +package tconstruct.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; + +public class GlueFluid extends BlockFluidFinite { + + Icon stillIcon; + Icon flowIcon; + + public GlueFluid(int id, Fluid fluid, Material material) + { + super(id, fluid, material); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); + flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + if (side == 0 || side == 1) + return stillIcon; + return flowIcon; + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + entity.motionX *= 0.1; + entity.motionZ *= 0.1; + + if (entity instanceof EntityLivingBase) { + EntityLivingBase lvb = (EntityLivingBase)entity; + // Well you'd feel ill too standing in glue... + if (lvb.isPotionActive(Potion.hunger)) { + lvb.getActivePotionEffect(Potion.hunger).duration = 20; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); + } + + // Glue is sticky stuff + if (lvb.isPotionActive(Potion.moveSlowdown)) { + lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); + } + } + } +} diff --git a/src/tconstruct/blocks/GolemCoreBlock.java b/src/main/java/tconstruct/blocks/GolemCoreBlock.java similarity index 100% rename from src/tconstruct/blocks/GolemCoreBlock.java rename to src/main/java/tconstruct/blocks/GolemCoreBlock.java diff --git a/src/tconstruct/blocks/GolemHeadBlock.java b/src/main/java/tconstruct/blocks/GolemHeadBlock.java similarity index 100% rename from src/tconstruct/blocks/GolemHeadBlock.java rename to src/main/java/tconstruct/blocks/GolemHeadBlock.java diff --git a/src/tconstruct/blocks/GolemPedestalBlock.java b/src/main/java/tconstruct/blocks/GolemPedestalBlock.java similarity index 100% rename from src/tconstruct/blocks/GolemPedestalBlock.java rename to src/main/java/tconstruct/blocks/GolemPedestalBlock.java diff --git a/src/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java similarity index 100% rename from src/tconstruct/blocks/GravelOre.java rename to src/main/java/tconstruct/blocks/GravelOre.java diff --git a/src/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java similarity index 100% rename from src/tconstruct/blocks/LavaTankBlock.java rename to src/main/java/tconstruct/blocks/LavaTankBlock.java diff --git a/src/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java similarity index 100% rename from src/tconstruct/blocks/LiquidMetalFinite.java rename to src/main/java/tconstruct/blocks/LiquidMetalFinite.java diff --git a/src/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java similarity index 100% rename from src/tconstruct/blocks/MeatBlock.java rename to src/main/java/tconstruct/blocks/MeatBlock.java diff --git a/src/tconstruct/blocks/MetalOre.java b/src/main/java/tconstruct/blocks/MetalOre.java similarity index 100% rename from src/tconstruct/blocks/MetalOre.java rename to src/main/java/tconstruct/blocks/MetalOre.java diff --git a/src/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java similarity index 100% rename from src/tconstruct/blocks/MultiBrick.java rename to src/main/java/tconstruct/blocks/MultiBrick.java diff --git a/src/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java similarity index 100% rename from src/tconstruct/blocks/MultiBrickFancy.java rename to src/main/java/tconstruct/blocks/MultiBrickFancy.java diff --git a/src/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java similarity index 100% rename from src/tconstruct/blocks/OreberryBush.java rename to src/main/java/tconstruct/blocks/OreberryBush.java diff --git a/src/tconstruct/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/blocks/OreberryBushEssence.java similarity index 100% rename from src/tconstruct/blocks/OreberryBushEssence.java rename to src/main/java/tconstruct/blocks/OreberryBushEssence.java diff --git a/src/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java similarity index 100% rename from src/tconstruct/blocks/PaneBase.java rename to src/main/java/tconstruct/blocks/PaneBase.java diff --git a/src/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java similarity index 100% rename from src/tconstruct/blocks/SearedBlock.java rename to src/main/java/tconstruct/blocks/SearedBlock.java diff --git a/src/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java similarity index 100% rename from src/tconstruct/blocks/SearedSlab.java rename to src/main/java/tconstruct/blocks/SearedSlab.java diff --git a/src/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java similarity index 100% rename from src/tconstruct/blocks/SlabBase.java rename to src/main/java/tconstruct/blocks/SlabBase.java diff --git a/src/tconstruct/blocks/SlimeExplosive.java b/src/main/java/tconstruct/blocks/SlimeExplosive.java similarity index 100% rename from src/tconstruct/blocks/SlimeExplosive.java rename to src/main/java/tconstruct/blocks/SlimeExplosive.java diff --git a/src/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java similarity index 100% rename from src/tconstruct/blocks/SlimePad.java rename to src/main/java/tconstruct/blocks/SlimePad.java diff --git a/src/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java similarity index 100% rename from src/tconstruct/blocks/SmelteryBlock.java rename to src/main/java/tconstruct/blocks/SmelteryBlock.java diff --git a/src/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/blocks/SoilBlock.java similarity index 100% rename from src/tconstruct/blocks/SoilBlock.java rename to src/main/java/tconstruct/blocks/SoilBlock.java diff --git a/src/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java similarity index 100% rename from src/tconstruct/blocks/SoilSlab.java rename to src/main/java/tconstruct/blocks/SoilSlab.java diff --git a/src/tconstruct/blocks/SpeedBlock.java b/src/main/java/tconstruct/blocks/SpeedBlock.java similarity index 100% rename from src/tconstruct/blocks/SpeedBlock.java rename to src/main/java/tconstruct/blocks/SpeedBlock.java diff --git a/src/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java similarity index 100% rename from src/tconstruct/blocks/SpeedSlab.java rename to src/main/java/tconstruct/blocks/SpeedSlab.java diff --git a/src/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java similarity index 100% rename from src/tconstruct/blocks/StoneLadder.java rename to src/main/java/tconstruct/blocks/StoneLadder.java diff --git a/src/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/blocks/StoneTorch.java similarity index 100% rename from src/tconstruct/blocks/StoneTorch.java rename to src/main/java/tconstruct/blocks/StoneTorch.java diff --git a/src/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java similarity index 100% rename from src/tconstruct/blocks/TConstructBlock.java rename to src/main/java/tconstruct/blocks/TConstructBlock.java diff --git a/src/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/blocks/TConstructFluid.java similarity index 100% rename from src/tconstruct/blocks/TConstructFluid.java rename to src/main/java/tconstruct/blocks/TConstructFluid.java diff --git a/src/tconstruct/blocks/TMetalBlock.java b/src/main/java/tconstruct/blocks/TMetalBlock.java similarity index 100% rename from src/tconstruct/blocks/TMetalBlock.java rename to src/main/java/tconstruct/blocks/TMetalBlock.java diff --git a/src/tconstruct/blocks/TankAirBlock.java b/src/main/java/tconstruct/blocks/TankAirBlock.java similarity index 100% rename from src/tconstruct/blocks/TankAirBlock.java rename to src/main/java/tconstruct/blocks/TankAirBlock.java diff --git a/src/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java similarity index 100% rename from src/tconstruct/blocks/ToolForgeBlock.java rename to src/main/java/tconstruct/blocks/ToolForgeBlock.java diff --git a/src/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java similarity index 100% rename from src/tconstruct/blocks/ToolStationBlock.java rename to src/main/java/tconstruct/blocks/ToolStationBlock.java diff --git a/src/tconstruct/blocks/WoodRail.java b/src/main/java/tconstruct/blocks/WoodRail.java similarity index 100% rename from src/tconstruct/blocks/WoodRail.java rename to src/main/java/tconstruct/blocks/WoodRail.java diff --git a/src/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java similarity index 100% rename from src/tconstruct/blocks/component/SmelteryComponent.java rename to src/main/java/tconstruct/blocks/component/SmelteryComponent.java diff --git a/src/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java similarity index 100% rename from src/tconstruct/blocks/component/SmelteryScan.java rename to src/main/java/tconstruct/blocks/component/SmelteryScan.java diff --git a/src/tconstruct/blocks/component/TankAirComponent.java b/src/main/java/tconstruct/blocks/component/TankAirComponent.java similarity index 100% rename from src/tconstruct/blocks/component/TankAirComponent.java rename to src/main/java/tconstruct/blocks/component/TankAirComponent.java diff --git a/src/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/AdaptiveDrainLogic.java rename to src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java diff --git a/src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java rename to src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java diff --git a/src/tconstruct/blocks/logic/AqueductLogic.java b/src/main/java/tconstruct/blocks/logic/AqueductLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/AqueductLogic.java rename to src/main/java/tconstruct/blocks/logic/AqueductLogic.java diff --git a/src/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/CastingBasinLogic.java rename to src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java diff --git a/src/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/CastingChannelLogic.java rename to src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java diff --git a/src/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/CastingTableLogic.java rename to src/main/java/tconstruct/blocks/logic/CastingTableLogic.java diff --git a/src/tconstruct/blocks/logic/CraftingStationLogic.java b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/CraftingStationLogic.java rename to src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java diff --git a/src/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/DryingRackLogic.java rename to src/main/java/tconstruct/blocks/logic/DryingRackLogic.java diff --git a/src/tconstruct/blocks/logic/EquipLogic.java b/src/main/java/tconstruct/blocks/logic/EquipLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/EquipLogic.java rename to src/main/java/tconstruct/blocks/logic/EquipLogic.java diff --git a/src/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/FaucetLogic.java rename to src/main/java/tconstruct/blocks/logic/FaucetLogic.java diff --git a/src/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/FrypanLogic.java rename to src/main/java/tconstruct/blocks/logic/FrypanLogic.java diff --git a/src/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/FurnaceLogic.java rename to src/main/java/tconstruct/blocks/logic/FurnaceLogic.java diff --git a/src/tconstruct/blocks/logic/GolemCoreLogic.java b/src/main/java/tconstruct/blocks/logic/GolemCoreLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/GolemCoreLogic.java rename to src/main/java/tconstruct/blocks/logic/GolemCoreLogic.java diff --git a/src/tconstruct/blocks/logic/GolemPedestalLogic.java b/src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/GolemPedestalLogic.java rename to src/main/java/tconstruct/blocks/logic/GolemPedestalLogic.java diff --git a/src/tconstruct/blocks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/LandmineExplodeLogic.java rename to src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java diff --git a/src/tconstruct/blocks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/LandmineSpecialStackLogic.java rename to src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java diff --git a/src/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/LavaTankLogic.java rename to src/main/java/tconstruct/blocks/logic/LavaTankLogic.java diff --git a/src/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/LiquidTextureLogic.java rename to src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java diff --git a/src/tconstruct/blocks/logic/MultiServantLogic.java b/src/main/java/tconstruct/blocks/logic/MultiServantLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/MultiServantLogic.java rename to src/main/java/tconstruct/blocks/logic/MultiServantLogic.java diff --git a/src/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/PartBuilderLogic.java rename to src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java diff --git a/src/tconstruct/blocks/logic/PatternChestLogic.java b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/PatternChestLogic.java rename to src/main/java/tconstruct/blocks/logic/PatternChestLogic.java diff --git a/src/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/RedwireLogic.java rename to src/main/java/tconstruct/blocks/logic/RedwireLogic.java diff --git a/src/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/SmelteryDrainLogic.java rename to src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/SmelteryLogic.java rename to src/main/java/tconstruct/blocks/logic/SmelteryLogic.java diff --git a/src/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/StencilTableLogic.java rename to src/main/java/tconstruct/blocks/logic/StencilTableLogic.java diff --git a/src/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/TankAirLogic.java rename to src/main/java/tconstruct/blocks/logic/TankAirLogic.java diff --git a/src/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java similarity index 100% rename from src/tconstruct/blocks/logic/TileEntityLandmine.java rename to src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java diff --git a/src/tconstruct/blocks/logic/ToolForgeLogic.java b/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/ToolForgeLogic.java rename to src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java diff --git a/src/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/ToolStationLogic.java rename to src/main/java/tconstruct/blocks/logic/ToolStationLogic.java diff --git a/src/tconstruct/blocks/logic/TowerFurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java similarity index 100% rename from src/tconstruct/blocks/logic/TowerFurnaceLogic.java rename to src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java diff --git a/src/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeFluid.java rename to src/main/java/tconstruct/blocks/slime/SlimeFluid.java diff --git a/src/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeGel.java rename to src/main/java/tconstruct/blocks/slime/SlimeGel.java diff --git a/src/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeGrass.java rename to src/main/java/tconstruct/blocks/slime/SlimeGrass.java diff --git a/src/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeLeaves.java rename to src/main/java/tconstruct/blocks/slime/SlimeLeaves.java diff --git a/src/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeSapling.java rename to src/main/java/tconstruct/blocks/slime/SlimeSapling.java diff --git a/src/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java similarity index 100% rename from src/tconstruct/blocks/slime/SlimeTallGrass.java rename to src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java diff --git a/src/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java similarity index 100% rename from src/tconstruct/blocks/traps/BarricadeBlock.java rename to src/main/java/tconstruct/blocks/traps/BarricadeBlock.java diff --git a/src/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java similarity index 100% rename from src/tconstruct/blocks/traps/Landmine.java rename to src/main/java/tconstruct/blocks/traps/Landmine.java diff --git a/src/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java similarity index 100% rename from src/tconstruct/blocks/traps/Punji.java rename to src/main/java/tconstruct/blocks/traps/Punji.java diff --git a/src/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java similarity index 100% rename from src/tconstruct/client/CustomBowRenderer.java rename to src/main/java/tconstruct/client/CustomBowRenderer.java diff --git a/src/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java similarity index 100% rename from src/tconstruct/client/CustomFont.java rename to src/main/java/tconstruct/client/CustomFont.java diff --git a/src/tconstruct/client/RenderItemCopy.java b/src/main/java/tconstruct/client/RenderItemCopy.java similarity index 100% rename from src/tconstruct/client/RenderItemCopy.java rename to src/main/java/tconstruct/client/RenderItemCopy.java diff --git a/src/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java similarity index 100% rename from src/tconstruct/client/StepSoundSlime.java rename to src/main/java/tconstruct/client/StepSoundSlime.java diff --git a/src/tconstruct/client/SuperSoakerRender.java b/src/main/java/tconstruct/client/SuperSoakerRender.java similarity index 100% rename from src/tconstruct/client/SuperSoakerRender.java rename to src/main/java/tconstruct/client/SuperSoakerRender.java diff --git a/src/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java similarity index 100% rename from src/tconstruct/client/TClientEvents.java rename to src/main/java/tconstruct/client/TClientEvents.java diff --git a/src/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java similarity index 100% rename from src/tconstruct/client/TClientTickHandler.java rename to src/main/java/tconstruct/client/TClientTickHandler.java diff --git a/src/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java similarity index 100% rename from src/tconstruct/client/TControls.java rename to src/main/java/tconstruct/client/TControls.java diff --git a/src/tconstruct/client/TKeyHandler.java b/src/main/java/tconstruct/client/TKeyHandler.java similarity index 100% rename from src/tconstruct/client/TKeyHandler.java rename to src/main/java/tconstruct/client/TKeyHandler.java diff --git a/src/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java similarity index 99% rename from src/tconstruct/client/TProxyClient.java rename to src/main/java/tconstruct/client/TProxyClient.java index 5e49dcd0..827e953f 100644 --- a/src/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -339,6 +339,7 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16)); TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); + // Tool parts TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2)); TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2)); @@ -486,7 +487,8 @@ public class TProxyClient extends TProxyCommon searedbrick, searedbrick, searedbrick); TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null); - TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, + + TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, searedbrick); TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, @@ -538,7 +540,6 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye)); TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4)); - TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt)); TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt)); @@ -697,9 +698,9 @@ public class TProxyClient extends TProxyCommon { String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "pigiron" }; - String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider", + String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced", "flux" }; - int[] universalEffects = { 0, 1, 4, 9, 16, 17 }; + int[] universalEffects = { 0, 1, 4, 9, 16 }; int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; int[] harvestEffects = { 2 }; int[] nonUtility = { 6, 8, 10, 11, 12 }; diff --git a/src/main/java/tconstruct/client/TProxyClient.java.orig b/src/main/java/tconstruct/client/TProxyClient.java.orig new file mode 100644 index 00000000..ff901cb2 --- /dev/null +++ b/src/main/java/tconstruct/client/TProxyClient.java.orig @@ -0,0 +1,996 @@ +package tconstruct.client; + +import com.google.common.collect.Lists; +import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.relauncher.Side; +import java.io.InputStream; +import java.util.*; +import javax.xml.parsers.*; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.model.ModelSlime; +import net.minecraft.client.particle.*; +import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.settings.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.*; +import net.minecraft.util.*; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.RenderBlockFluid; +import org.lwjgl.opengl.GL11; +import org.w3c.dom.Document; +import tconstruct.TConstruct; +import tconstruct.blocks.SlimeExplosive; +import tconstruct.blocks.logic.*; +import tconstruct.client.armor.RenderArmorCast; +import tconstruct.client.block.*; +import tconstruct.client.entity.*; +import tconstruct.client.entity.item.ExplosiveRender; +import tconstruct.client.entity.projectile.*; +import tconstruct.client.gui.*; +import tconstruct.client.pages.*; +import tconstruct.client.tabs.*; +import tconstruct.common.*; +import tconstruct.entity.*; +import tconstruct.entity.item.*; +import tconstruct.entity.item.*; +import tconstruct.entity.projectile.*; +import tconstruct.inventory.ContainerLandmine; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.client.*; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.ToolCore; +import tconstruct.util.config.PHConstruct; +import tconstruct.util.player.*; + +public class TProxyClient extends TProxyCommon +{ + public static SmallFontRenderer smallFontRenderer; + public static Icon metalBall; + public static Minecraft mc; + public static RenderItem itemRenderer = new RenderItem(); + + public static ArmorExtended armorExtended = new ArmorExtended(); + public static KnapsackInventory knapsack = new KnapsackInventory(); + + @Override + public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) + { + if (ID == toolStationID) + return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == partBuilderID) + return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == patternChestID) + return new PatternChestGui(player.inventory, (PatternChestLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == frypanGuiID) + return new FrypanGui(player.inventory, (FrypanLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == smelteryGuiID) + { + if (PHConstruct.newSmeltery) + return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + else + return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + } + if (ID == stencilTableID) + return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + if (ID == toolForgeID) + return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + + if (ID == landmineID) + return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z))); + if (ID == craftingStationID) + return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z); + + if (ID == furnaceID) + return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z)); + + if (ID == manualGuiID) + { + ItemStack stack = player.getCurrentEquippedItem(); + return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); + } + if (ID == inventoryGui) + { + GuiInventory inventory = new GuiInventory(player); + TabRegistry.addTabsToInventory(inventory); + return inventory; + } + if (ID == armorGuiID) + { + TProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer); + return new ArmorExtendedGui(player.inventory, TProxyClient.armorExtended); + } + if (ID == knapsackGuiID) + { + TProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer); + return new KnapsackGui(player.inventory, TProxyClient.knapsack); + } + return null; + } + + public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + + public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glScalef(2f, 2f, 2f); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + GL11.glRotatef(45, 0, 1, 0); + GL11.glRotatef(60, 1, 0, 0); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } + + public static boolean classMatches (Object paramObject, String paramString) + { + try + { + return paramObject.getClass().getName().equals(paramString); + } + catch (Exception localException) + { + return false; + } + } + + public void registerTickHandler () + { + TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT); + // TickRegistry.registerTickHandler(new TimeTicker(), Side.CLIENT); + // TickRegistry.registerTickHandler(new TCommonTickHandler(), + // Side.CLIENT); + } + + /* Registers any rendering code. */ + public void registerRenderer () + { + Minecraft mc = Minecraft.getMinecraft(); + MinecraftForge.EVENT_BUS.register(new TClientEvents()); + smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); + RenderingRegistry.registerBlockHandler(new TableRender()); + RenderingRegistry.registerBlockHandler(new TableForgeRender()); + RenderingRegistry.registerBlockHandler(new FrypanRender()); + RenderingRegistry.registerBlockHandler(new TankRender()); + RenderingRegistry.registerBlockHandler(new TankAirRender()); + RenderingRegistry.registerBlockHandler(new SearedRender()); + RenderingRegistry.registerBlockHandler(new OreberryRender()); + RenderingRegistry.registerBlockHandler(new BarricadeRender()); + RenderingRegistry.registerBlockHandler(new DryingRackRender()); + RenderingRegistry.registerBlockHandler(new PaneRender()); + RenderingRegistry.registerBlockHandler(new PaneConnectedRender()); + RenderingRegistry.registerBlockHandler(new RenderLandmine()); + RenderingRegistry.registerBlockHandler(new PunjiRender()); + RenderingRegistry.registerBlockHandler(new RenderBlockFluid()); + RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel()); + RenderingRegistry.registerBlockHandler(new SlimeChannelRender()); + RenderingRegistry.registerBlockHandler(new SlimePadRender()); + + if (!PHConstruct.newSmeltery) + RenderingRegistry.registerBlockHandler(new SmelteryRender()); + + // Special Renderers + ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender()); + ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender()); + // ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class, + // new GolemCoreSpecialRender()); + + // Entities + RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender()); + RenderingRegistry.registerEntityRenderingHandler(BlueSlime.class, new SlimeRender(new ModelSlime(16), new ModelSlime(0), 0.25F)); + + RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); + RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); + RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); + RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom()); + RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom()); + RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Item.firework)); + RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender()); + // RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, + // new PlayerArmorRender()); // <-- Works, woo! + + MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer()); + VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png")); + + ToolCoreRenderer renderer = new ToolCoreRenderer(); + MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer); + MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer); + + addRenderMappings(); + addToolButtons(); + } + + public static Document diary; + public static Document volume1; + public static Document volume2; + public static Document smelter; + + public void readManuals () + { + DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory); + volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory); + volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory); + smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory); + initManualIcons(); + initManualRecipes(); + initManualPages(); + } + + Document readManual (String location, DocumentBuilderFactory dbFactory) + { + try + { + InputStream stream = TConstruct.class.getResourceAsStream(location); + DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); + Document doc = dBuilder.parse(stream); + doc.getDocumentElement().normalize(); + return doc; + } + catch (Exception e) + { + e.printStackTrace(); + return null; + } + } + + public void initManualIcons () + { + TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TContent.manualBook, 1, 2)); + TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TContent.smeltery)); + TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TContent.blankPattern, 1, 1)); + TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TContent.searedBlock)); + // TConstructClientRegistry.registerManualIcon("liquidiron", new + // ItemStack(TContent.liquidMetalStill)); + TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TContent.lavaTank)); + TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TContent.smeltery, 1, 2)); + TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TContent.smeltery, 1, 1)); + TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TContent.searedBlock, 1, 1)); + TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TContent.materials, 1, 13)); + TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TContent.materials, 1, 14)); + TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TContent.materials, 1, 5)); + TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TContent.materials, 1, 15)); + TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TContent.blankPattern, 1, 0)); + TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TContent.toolStationWood, 1, 0)); + TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1)); + TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TContent.toolStationWood, 1, 5)); + TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10)); + TConstructClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood)); + TConstructClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling)); + TConstructClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench)); + TConstructClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal)); + + TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TContent.materials, 1, 18)); + TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TContent.materials, 1, 7)); + + // Tool Materials + TConstructClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks)); + TConstructClientRegistry.registerManualIcon("stoneblock", new ItemStack(Block.stone)); + TConstructClientRegistry.registerManualIcon("ironingot", new ItemStack(Item.ingotIron)); + TConstructClientRegistry.registerManualIcon("flint", new ItemStack(Item.flint)); + TConstructClientRegistry.registerManualIcon("cactus", new ItemStack(Block.cactus)); + TConstructClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone)); + TConstructClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian)); + TConstructClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack)); + TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TContent.materials, 1, 17)); + TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TContent.materials, 1, 1)); + TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TContent.materials, 1, 0)); + TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TContent.materials, 1, 3)); + TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4)); + TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9)); + TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16)); +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); +======= + TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34)); + +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + + // Tool parts + TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TContent.knifeBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TContent.chiselHead, 1, 2)); + + TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TContent.hammerHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TContent.excavatorHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TContent.scytheBlade, 1, 2)); + TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TContent.broadAxeHead, 1, 2)); + TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TContent.largeSwordBlade, 1, 2)); + + TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); + + TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TContent.binding, 1, 4)); + TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TContent.wideGuard, 1, 4)); + TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TContent.handGuard, 1, 4)); + TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TContent.crossbar, 1, 4)); + + TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0)); + TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17)); + TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17)); + + TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0)); + TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2)); + TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0)); +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + +======= + +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16)); + TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15)); + TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25)); + TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24)); + TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23)); + + // ToolIcons + TConstructClientRegistry.registerManualIcon("pickicon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("mattockicon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("swordicon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("longswordicon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.handGuard, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("rapiericon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("daggerIcon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.knifeBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, "")); + TConstructClientRegistry.registerManualIcon("shortbowIcon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), "")); + TConstructClientRegistry.registerManualIcon("arrowIcon", + ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), "")); + + TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( + TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), "")); + TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( + TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); + TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), + new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); + TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack( + TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), "")); + TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), + new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), "")); + TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), + new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), "")); + } + + public void initManualRecipes () + { + ItemStack pattern = new ItemStack(TContent.blankPattern, 1, 0); + + ItemStack stick = new ItemStack(Item.stick, 1, 0); + ItemStack plank = new ItemStack(Block.planks, 1, 0); +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); +======= + ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0); +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + ItemStack workbench = new ItemStack(Block.workbench, 1, 0); + ItemStack chest = new ItemStack(Block.chest, 1, 0); + ItemStack log = new ItemStack(Block.wood, 1, 0); + ItemStack mossycobble = new ItemStack(Block.cobblestoneMossy); + ItemStack netherrack = new ItemStack(Block.netherrack); + + ItemStack dirt = new ItemStack(Block.dirt, 1, 0); + ItemStack sand = new ItemStack(Block.sand, 1, 0); + ItemStack gravel = new ItemStack(Block.gravel, 1, 0); + ItemStack clay = new ItemStack(Item.clay, 1, 0); + ItemStack glass = new ItemStack(Block.glass, 1, 0); + ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0); + + ItemStack grout = new ItemStack(TContent.craftedSoil, 2, 1); + ItemStack searedbrick = new ItemStack(TContent.materials, 1, 2); + ItemStack searedbrickBlock = new ItemStack(TContent.smeltery, 1, 2); + + ItemStack coal = new ItemStack(Item.coal); + ItemStack paper = new ItemStack(Item.paper); + ItemStack slimeball = new ItemStack(Item.slimeBall); + ItemStack slimyMud = new ItemStack(TContent.craftedSoil); + ItemStack blazerod = new ItemStack(Item.blazeRod); + ItemStack firecharge = new ItemStack(Item.fireballCharge); + ItemStack string = new ItemStack(Item.silk); + + ItemStack silkyCloth = new ItemStack(TContent.materials, 1, 25); + + ItemStack graveyardsoil = new ItemStack(TContent.craftedSoil, 1, 3); + ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4); + + // TConstruct recipes +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); +======= + TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null); +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null); + TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null); + TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null); + TConstructClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank); + TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TContent.toolStationWood, 1, 0), null, pattern, null, workbench); + TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log); + TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest); + TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank); + TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null); + TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null); + TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack( + TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock); + + TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand); + TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TContent.materials, 1, 1), slimyMud); + TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TContent.materials, 1, 0), paper, paper, paper, paper); + TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TContent.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, + mossycobble, mossycobble, mossycobble); + TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TContent.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava), + firecharge, blazerod, firecharge, blazerod); + TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TContent.materials, 1, 24), string, string, string, string); + TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TContent.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null, + silkyCloth, null); + + TConstructClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null); + TConstructClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); + + TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay); + TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout); + TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, + searedbrick, searedbrick, searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, + null); +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, +======= + + TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null, +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + searedbrick); + + TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, + searedbrick, searedbrick, searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TContent.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, + searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TContent.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, + glass, searedbrick); + + TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TContent.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, + searedbrick, null, searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null); + TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TContent.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, + searedbrick); + TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, + searedbrick, searedbrick); + + //Traps + ItemStack reed = new ItemStack(Item.reed); + TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed); + TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log); + + //Machines + ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14); + ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13); + ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1); + ItemStack redstone = new ItemStack(Item.redstone); + + // Modifier recipes + ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); + TConstructClientRegistry.registerManualIcon("ironpick", ironpick); + ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.handGuard, 1, 10), ""); + TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword); + + TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond)); + TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald)); + TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone)); + TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 7)); + TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis)); + TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 6)); + TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz)); + TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder)); + TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8)); + TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26)); + TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6)); + + TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase)); + TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian)); + TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye)); + TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4)); + +<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt)); +======= +>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt)); + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt)); + + TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold)); + TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar)); + + TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel)); + TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null); + TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null); + TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian)); + TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null); + + } + + public static Map> pageClasses = new HashMap>(); + + public static void registerManualPage (String type, Class clazz) + { + pageClasses.put(type, clazz); + } + + public static Class getPageClass (String type) + { + return pageClasses.get(type); + } + + void initManualPages () + { + TProxyClient.registerManualPage("crafting", CraftingPage.class); + TProxyClient.registerManualPage("picture", PicturePage.class); + TProxyClient.registerManualPage("text", TextPage.class); + TProxyClient.registerManualPage("intro", TextPage.class); + TProxyClient.registerManualPage("sectionpage", SectionPage.class); + TProxyClient.registerManualPage("intro", TitlePage.class); + TProxyClient.registerManualPage("contents", ContentsTablePage.class); + TProxyClient.registerManualPage("furnace", FurnacePage.class); + TProxyClient.registerManualPage("sidebar", SidebarPage.class); + TProxyClient.registerManualPage("materialstats", MaterialPage.class); + TProxyClient.registerManualPage("toolpage", ToolPage.class); + TProxyClient.registerManualPage("modifier", ModifierPage.class); + TProxyClient.registerManualPage("blockcast", BlockCastPage.class); + + TProxyClient.registerManualPage("blank", BlankPage.class); + } + + public static Document getManualFromStack (ItemStack stack) + { + switch (stack.getItemDamage()) + { + case 0: + return volume1; + case 1: + return volume2; + case 2: + return smelter; + case 3: + return diary; + } + + return null; + } + + static int[][] itemIcons = { new int[] { 0, 3, 0 }, // Repair + new int[] { 1, 4, 0 }, // Pickaxe + new int[] { 2, 5, 0 }, // Shovel + new int[] { 2, 6, 0 }, // Axe + // new int[] {2, 9, 0}, //Lumber Axe + // new int[] {1, 7, 0}, //Ice Axe + new int[] { 3, 8, 0 }, // Mattock + new int[] { 1, 0, 1 }, // Broadsword + new int[] { 1, 1, 1 }, // Longsword + new int[] { 1, 2, 1 }, // Rapier + new int[] { 1, 5, 1 }, // Dagger + new int[] { 2, 3, 1 }, // Frying pan + new int[] { 2, 4, 1 }, // Battlesign + new int[] { 2, 6, 1 } // Chisel + }; + + static int[][] iconCoords = { new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, // Repair + new int[] { 0, 0, 1, 13 }, new int[] { 2, 3, 3, 13 }, // Pickaxe + new int[] { 3, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Shovel + new int[] { 2, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Axe + // new int[] { 6, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, //Lumber + // Axe + // new int[] { 0, 0, 5, 13 }, new int[] { 2, 3, 3, 13 }, //Ice Axe + new int[] { 2, 0, 3, 13 }, new int[] { 2, 3, 2, 13 }, // Mattock + new int[] { 1, 0, 2, 13 }, new int[] { 2, 3, 3, 13 }, // Broadsword + new int[] { 1, 0, 3, 13 }, new int[] { 2, 3, 3, 13 }, // Longsword + new int[] { 1, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Rapier + new int[] { 7, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Dagger + new int[] { 4, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Frying + // Pan + new int[] { 5, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Battlesign + new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel + }; + + static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Hatchet", + // "Lumber Axe", + // "Ice Axe", + "Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" }; + + static String[] toolDescriptions = { + "The main way to repair or change your tools. Place a tool and a material on the left to get started.", + "The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", + "The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", + "The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", + // "The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", + // "The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", + "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", + "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", + "The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate", + "The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low", + "The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle", + "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", + // "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle" + "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle", + "The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle" }; + + void addToolButtons () + { + for (int i = 0; i < toolNames.length; i++) + { + addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); + } + + addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", + "The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod"); + addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow", + "Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching"); + addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", + "The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High"); + addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", + "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average"); + addTierTwoButton(5, 12, 0, new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Excavator", + "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average"); + addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", + "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE"); + addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver", + "The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average"); + addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe", + "The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:" + + "\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average"); + } + + void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) + { + TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + } + + void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) + { + TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png")); + } + + void addRenderMappings () + { + String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", + "blueslime", "pigiron" }; + String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider", + "reinforced", "flux" }; + int[] universalEffects = { 0, 1, 4, 9, 16 }; + int[] weaponEffects = { 3, 5, 7, 13, 14, 15 }; + int[] harvestEffects = { 2 }; + int[] nonUtility = { 6, 8, 10, 11, 12 }; + + for (int partIter = 0; partIter < partTypes.length; partIter++) + { + TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); + } + + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + for (int i = 0; i < effectTypes.length; i++) + { + TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true); + } + } + + String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; + for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) + { + TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); + } + + String[] fletching = { "feather", "leaf", "slime", "blueslime" }; + for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++) + { + TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true); + } + } + + /* Keybindings */ + public static TControls controlInstance; + + public void registerKeys () + { + controlInstance = new TControls(); + TickRegistry.registerTickHandler(controlInstance, Side.CLIENT); + uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance); + + TabRegistry.registerTab(new InventoryTabVanilla()); + TabRegistry.registerTab(new InventoryTabArmorExtended()); + TabRegistry.registerTab(new InventoryTabKnapsack()); + } + + public void uploadKeyBindingsToGame (GameSettings settings, TKeyHandler keyhandler) + { + ArrayList harvestedBindings = Lists.newArrayList(); + for (KeyBinding kb : keyhandler.keyBindings) + { + harvestedBindings.add(kb); + } + + KeyBinding[] modKeyBindings = harvestedBindings.toArray(new KeyBinding[harvestedBindings.size()]); + KeyBinding[] allKeys = new KeyBinding[settings.keyBindings.length + modKeyBindings.length]; + System.arraycopy(settings.keyBindings, 0, allKeys, 0, settings.keyBindings.length); + System.arraycopy(modKeyBindings, 0, allKeys, settings.keyBindings.length, modKeyBindings.length); + settings.keyBindings = allKeys; + settings.loadOptions(); + } + + public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ) + { + this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ); + } + + public EntityFX doSpawnParticle (String par1Str, double par2, double par4, double par6, double par8, double par10, double par12) + { + if (this.mc == null) + this.mc = Minecraft.getMinecraft(); + + if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null) + { + int i = this.mc.gameSettings.particleSetting; + + if (i == 1 && mc.theWorld.rand.nextInt(3) == 0) + { + i = 2; + } + + double d6 = this.mc.renderViewEntity.posX - par2; + double d7 = this.mc.renderViewEntity.posY - par4; + double d8 = this.mc.renderViewEntity.posZ - par6; + EntityFX entityfx = null; + + if (par1Str.equals("hugeexplosion")) + { + this.mc.effectRenderer.addEffect(entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12)); + } + else if (par1Str.equals("largeexplode")) + { + this.mc.effectRenderer.addEffect(entityfx = new EntityLargeExplodeFX(mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12)); + } + else if (par1Str.equals("fireworksSpark")) + { + this.mc.effectRenderer.addEffect(entityfx = new EntityFireworkSparkFX(mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)); + } + + if (entityfx != null) + { + return (EntityFX) entityfx; + } + else + { + double d9 = 16.0D; + + if (d6 * d6 + d7 * d7 + d8 * d8 > d9 * d9) + { + return null; + } + else if (i > 1) + { + return null; + } + else + { + if (par1Str.equals("bubble")) + { + entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("suspended")) + { + entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("depthsuspend")) + { + entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("townaura")) + { + entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("crit")) + { + entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("smoke")) + { + entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("mobSpell")) + { + entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); + ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); + } + else if (par1Str.equals("mobSpellAmbient")) + { + entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); + ((EntityFX) entityfx).setAlphaF(0.15F); + ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); + } + else if (par1Str.equals("spell")) + { + entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("instantSpell")) + { + entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); + } + else if (par1Str.equals("witchMagic")) + { + entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); + float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F; + ((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f); + } + else if (par1Str.equals("note")) + { + entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("portal")) + { + entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("enchantmenttable")) + { + entityfx = new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("explode")) + { + entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("flame")) + { + entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("lava")) + { + entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6); + } + else if (par1Str.equals("footstep")) + { + entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6); + } + else if (par1Str.equals("splash")) + { + entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("largesmoke")) + { + entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F); + } + else if (par1Str.equals("cloud")) + { + entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("reddust")) + { + entityfx = new EntityReddustFX(mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12); + } + else if (par1Str.equals("snowballpoof")) + { + entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Item.snowball); + } + else if (par1Str.equals("dripWater")) + { + entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water); + } + else if (par1Str.equals("dripLava")) + { + entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava); + } + else if (par1Str.equals("snowshovel")) + { + entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("blueslime")) + { + entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TContent.strangeFood); + } + else if (par1Str.equals("heart")) + { + entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + } + else if (par1Str.equals("angryVillager")) + { + entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12); + ((EntityFX) entityfx).setParticleTextureIndex(81); + ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); + } + else if (par1Str.equals("happyVillager")) + { + entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); + ((EntityFX) entityfx).setParticleTextureIndex(82); + ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); + } + + if (entityfx != null) + { + this.mc.effectRenderer.addEffect((EntityFX) entityfx); + } + + return (EntityFX) entityfx; + } + } + } + else + { + return null; + } + } + + @Override + public void postInit () + { + //MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast()); + } + +} diff --git a/src/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java similarity index 100% rename from src/tconstruct/client/ToolCoreRenderer.java rename to src/main/java/tconstruct/client/ToolCoreRenderer.java diff --git a/src/tconstruct/client/armor/RenderArmorCast.java b/src/main/java/tconstruct/client/armor/RenderArmorCast.java similarity index 100% rename from src/tconstruct/client/armor/RenderArmorCast.java rename to src/main/java/tconstruct/client/armor/RenderArmorCast.java diff --git a/src/tconstruct/client/armor/WingModel.java b/src/main/java/tconstruct/client/armor/WingModel.java similarity index 100% rename from src/tconstruct/client/armor/WingModel.java rename to src/main/java/tconstruct/client/armor/WingModel.java diff --git a/src/tconstruct/client/block/BarricadeRender.java b/src/main/java/tconstruct/client/block/BarricadeRender.java similarity index 100% rename from src/tconstruct/client/block/BarricadeRender.java rename to src/main/java/tconstruct/client/block/BarricadeRender.java diff --git a/src/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java similarity index 100% rename from src/tconstruct/client/block/BlockRenderCastingChannel.java rename to src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java diff --git a/src/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java similarity index 100% rename from src/tconstruct/client/block/BlockSkinRenderHelper.java rename to src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java diff --git a/src/tconstruct/client/block/BreakingFX.java b/src/main/java/tconstruct/client/block/BreakingFX.java similarity index 100% rename from src/tconstruct/client/block/BreakingFX.java rename to src/main/java/tconstruct/client/block/BreakingFX.java diff --git a/src/tconstruct/client/block/CastingBasinSpecialRender.java b/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java similarity index 100% rename from src/tconstruct/client/block/CastingBasinSpecialRender.java rename to src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java diff --git a/src/tconstruct/client/block/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java similarity index 100% rename from src/tconstruct/client/block/CastingTableSpecialRenderer.java rename to src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java diff --git a/src/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/client/block/DryingRackRender.java similarity index 100% rename from src/tconstruct/client/block/DryingRackRender.java rename to src/main/java/tconstruct/client/block/DryingRackRender.java diff --git a/src/tconstruct/client/block/DryingRackSpecialRender.java b/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java similarity index 100% rename from src/tconstruct/client/block/DryingRackSpecialRender.java rename to src/main/java/tconstruct/client/block/DryingRackSpecialRender.java diff --git a/src/tconstruct/client/block/FrypanRender.java b/src/main/java/tconstruct/client/block/FrypanRender.java similarity index 100% rename from src/tconstruct/client/block/FrypanRender.java rename to src/main/java/tconstruct/client/block/FrypanRender.java diff --git a/src/tconstruct/client/block/GolemCoreRender.java b/src/main/java/tconstruct/client/block/GolemCoreRender.java similarity index 100% rename from src/tconstruct/client/block/GolemCoreRender.java rename to src/main/java/tconstruct/client/block/GolemCoreRender.java diff --git a/src/tconstruct/client/block/GolemCoreSpecialRender.java b/src/main/java/tconstruct/client/block/GolemCoreSpecialRender.java similarity index 100% rename from src/tconstruct/client/block/GolemCoreSpecialRender.java rename to src/main/java/tconstruct/client/block/GolemCoreSpecialRender.java diff --git a/src/tconstruct/client/block/OreberryRender.java b/src/main/java/tconstruct/client/block/OreberryRender.java similarity index 100% rename from src/tconstruct/client/block/OreberryRender.java rename to src/main/java/tconstruct/client/block/OreberryRender.java diff --git a/src/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java similarity index 100% rename from src/tconstruct/client/block/PaneConnectedRender.java rename to src/main/java/tconstruct/client/block/PaneConnectedRender.java diff --git a/src/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java similarity index 100% rename from src/tconstruct/client/block/PaneRender.java rename to src/main/java/tconstruct/client/block/PaneRender.java diff --git a/src/tconstruct/client/block/PunjiRender.java b/src/main/java/tconstruct/client/block/PunjiRender.java similarity index 100% rename from src/tconstruct/client/block/PunjiRender.java rename to src/main/java/tconstruct/client/block/PunjiRender.java diff --git a/src/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/client/block/RenderLandmine.java similarity index 100% rename from src/tconstruct/client/block/RenderLandmine.java rename to src/main/java/tconstruct/client/block/RenderLandmine.java diff --git a/src/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java similarity index 100% rename from src/tconstruct/client/block/RenderLiquid.java rename to src/main/java/tconstruct/client/block/RenderLiquid.java diff --git a/src/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java similarity index 100% rename from src/tconstruct/client/block/SearedRender.java rename to src/main/java/tconstruct/client/block/SearedRender.java diff --git a/src/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java similarity index 100% rename from src/tconstruct/client/block/SlimeChannelRender.java rename to src/main/java/tconstruct/client/block/SlimeChannelRender.java diff --git a/src/tconstruct/client/block/SlimePadRender.java b/src/main/java/tconstruct/client/block/SlimePadRender.java similarity index 100% rename from src/tconstruct/client/block/SlimePadRender.java rename to src/main/java/tconstruct/client/block/SlimePadRender.java diff --git a/src/tconstruct/client/block/SmallFontRenderer.java b/src/main/java/tconstruct/client/block/SmallFontRenderer.java similarity index 100% rename from src/tconstruct/client/block/SmallFontRenderer.java rename to src/main/java/tconstruct/client/block/SmallFontRenderer.java diff --git a/src/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java similarity index 100% rename from src/tconstruct/client/block/SmelteryRender.java rename to src/main/java/tconstruct/client/block/SmelteryRender.java diff --git a/src/tconstruct/client/block/TableForgeRender.java b/src/main/java/tconstruct/client/block/TableForgeRender.java similarity index 100% rename from src/tconstruct/client/block/TableForgeRender.java rename to src/main/java/tconstruct/client/block/TableForgeRender.java diff --git a/src/tconstruct/client/block/TableRender.java b/src/main/java/tconstruct/client/block/TableRender.java similarity index 100% rename from src/tconstruct/client/block/TableRender.java rename to src/main/java/tconstruct/client/block/TableRender.java diff --git a/src/tconstruct/client/block/TankAirRender.java b/src/main/java/tconstruct/client/block/TankAirRender.java similarity index 100% rename from src/tconstruct/client/block/TankAirRender.java rename to src/main/java/tconstruct/client/block/TankAirRender.java diff --git a/src/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/client/block/TankRender.java similarity index 100% rename from src/tconstruct/client/block/TankRender.java rename to src/main/java/tconstruct/client/block/TankRender.java diff --git a/src/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java similarity index 100% rename from src/tconstruct/client/entity/CartRender.java rename to src/main/java/tconstruct/client/entity/CartRender.java diff --git a/src/tconstruct/client/entity/CrystalModelSmall.java b/src/main/java/tconstruct/client/entity/CrystalModelSmall.java similarity index 100% rename from src/tconstruct/client/entity/CrystalModelSmall.java rename to src/main/java/tconstruct/client/entity/CrystalModelSmall.java diff --git a/src/tconstruct/client/entity/CrystalRender.java b/src/main/java/tconstruct/client/entity/CrystalRender.java similarity index 100% rename from src/tconstruct/client/entity/CrystalRender.java rename to src/main/java/tconstruct/client/entity/CrystalRender.java diff --git a/src/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/client/entity/FancyItemRender.java similarity index 100% rename from src/tconstruct/client/entity/FancyItemRender.java rename to src/main/java/tconstruct/client/entity/FancyItemRender.java diff --git a/src/tconstruct/client/entity/GolemBaseModel.java b/src/main/java/tconstruct/client/entity/GolemBaseModel.java similarity index 100% rename from src/tconstruct/client/entity/GolemBaseModel.java rename to src/main/java/tconstruct/client/entity/GolemBaseModel.java diff --git a/src/tconstruct/client/entity/ModelPullcart.java b/src/main/java/tconstruct/client/entity/ModelPullcart.java similarity index 100% rename from src/tconstruct/client/entity/ModelPullcart.java rename to src/main/java/tconstruct/client/entity/ModelPullcart.java diff --git a/src/tconstruct/client/entity/ModelWagon.java b/src/main/java/tconstruct/client/entity/ModelWagon.java similarity index 100% rename from src/tconstruct/client/entity/ModelWagon.java rename to src/main/java/tconstruct/client/entity/ModelWagon.java diff --git a/src/tconstruct/client/entity/SlimeModel.java b/src/main/java/tconstruct/client/entity/SlimeModel.java similarity index 100% rename from src/tconstruct/client/entity/SlimeModel.java rename to src/main/java/tconstruct/client/entity/SlimeModel.java diff --git a/src/tconstruct/client/entity/SlimeRender.java b/src/main/java/tconstruct/client/entity/SlimeRender.java similarity index 100% rename from src/tconstruct/client/entity/SlimeRender.java rename to src/main/java/tconstruct/client/entity/SlimeRender.java diff --git a/src/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java similarity index 100% rename from src/tconstruct/client/entity/item/ExplosiveRender.java rename to src/main/java/tconstruct/client/entity/item/ExplosiveRender.java diff --git a/src/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java similarity index 100% rename from src/tconstruct/client/entity/projectile/ArrowRender.java rename to src/main/java/tconstruct/client/entity/projectile/ArrowRender.java diff --git a/src/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java similarity index 100% rename from src/tconstruct/client/entity/projectile/ArrowRenderCustom.java rename to src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java diff --git a/src/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java similarity index 100% rename from src/tconstruct/client/entity/projectile/DaggerRender.java rename to src/main/java/tconstruct/client/entity/projectile/DaggerRender.java diff --git a/src/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java similarity index 100% rename from src/tconstruct/client/entity/projectile/DaggerRenderCustom.java rename to src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java diff --git a/src/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java similarity index 100% rename from src/tconstruct/client/entity/projectile/LaunchedItemRender.java rename to src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java diff --git a/src/tconstruct/client/entity/projectile/RangedRenderBase.java b/src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java similarity index 100% rename from src/tconstruct/client/entity/projectile/RangedRenderBase.java rename to src/main/java/tconstruct/client/entity/projectile/RangedRenderBase.java diff --git a/src/tconstruct/client/event/EventCloakRender.java b/src/main/java/tconstruct/client/event/EventCloakRender.java similarity index 100% rename from src/tconstruct/client/event/EventCloakRender.java rename to src/main/java/tconstruct/client/event/EventCloakRender.java diff --git a/src/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java similarity index 100% rename from src/tconstruct/client/gui/AdaptiveSmelteryGui.java rename to src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java diff --git a/src/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java similarity index 100% rename from src/tconstruct/client/gui/ArmorExtendedGui.java rename to src/main/java/tconstruct/client/gui/ArmorExtendedGui.java diff --git a/src/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java similarity index 100% rename from src/tconstruct/client/gui/CraftingStationGui.java rename to src/main/java/tconstruct/client/gui/CraftingStationGui.java diff --git a/src/tconstruct/client/gui/FrypanGui.java b/src/main/java/tconstruct/client/gui/FrypanGui.java similarity index 100% rename from src/tconstruct/client/gui/FrypanGui.java rename to src/main/java/tconstruct/client/gui/FrypanGui.java diff --git a/src/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java similarity index 100% rename from src/tconstruct/client/gui/FurnaceGui.java rename to src/main/java/tconstruct/client/gui/FurnaceGui.java diff --git a/src/tconstruct/client/gui/GuiButtonTool.java b/src/main/java/tconstruct/client/gui/GuiButtonTool.java similarity index 100% rename from src/tconstruct/client/gui/GuiButtonTool.java rename to src/main/java/tconstruct/client/gui/GuiButtonTool.java diff --git a/src/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java similarity index 100% rename from src/tconstruct/client/gui/GuiLandmine.java rename to src/main/java/tconstruct/client/gui/GuiLandmine.java diff --git a/src/tconstruct/client/gui/GuiManual.java b/src/main/java/tconstruct/client/gui/GuiManual.java similarity index 100% rename from src/tconstruct/client/gui/GuiManual.java rename to src/main/java/tconstruct/client/gui/GuiManual.java diff --git a/src/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java similarity index 100% rename from src/tconstruct/client/gui/KnapsackGui.java rename to src/main/java/tconstruct/client/gui/KnapsackGui.java diff --git a/src/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java similarity index 100% rename from src/tconstruct/client/gui/NewContainerGui.java rename to src/main/java/tconstruct/client/gui/NewContainerGui.java diff --git a/src/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java similarity index 100% rename from src/tconstruct/client/gui/PartCrafterGui.java rename to src/main/java/tconstruct/client/gui/PartCrafterGui.java diff --git a/src/tconstruct/client/gui/PatternChestGui.java b/src/main/java/tconstruct/client/gui/PatternChestGui.java similarity index 100% rename from src/tconstruct/client/gui/PatternChestGui.java rename to src/main/java/tconstruct/client/gui/PatternChestGui.java diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java similarity index 100% rename from src/tconstruct/client/gui/SmelteryGui.java rename to src/main/java/tconstruct/client/gui/SmelteryGui.java diff --git a/src/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java similarity index 100% rename from src/tconstruct/client/gui/StencilTableGui.java rename to src/main/java/tconstruct/client/gui/StencilTableGui.java diff --git a/src/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java similarity index 100% rename from src/tconstruct/client/gui/ToolForgeGui.java rename to src/main/java/tconstruct/client/gui/ToolForgeGui.java diff --git a/src/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java similarity index 100% rename from src/tconstruct/client/gui/ToolStationGui.java rename to src/main/java/tconstruct/client/gui/ToolStationGui.java diff --git a/src/tconstruct/client/gui/TurnPageButton.java b/src/main/java/tconstruct/client/gui/TurnPageButton.java similarity index 100% rename from src/tconstruct/client/gui/TurnPageButton.java rename to src/main/java/tconstruct/client/gui/TurnPageButton.java diff --git a/src/tconstruct/client/pages/BlankPage.java b/src/main/java/tconstruct/client/pages/BlankPage.java similarity index 100% rename from src/tconstruct/client/pages/BlankPage.java rename to src/main/java/tconstruct/client/pages/BlankPage.java diff --git a/src/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java similarity index 100% rename from src/tconstruct/client/pages/BlockCastPage.java rename to src/main/java/tconstruct/client/pages/BlockCastPage.java diff --git a/src/tconstruct/client/pages/BookPage.java b/src/main/java/tconstruct/client/pages/BookPage.java similarity index 100% rename from src/tconstruct/client/pages/BookPage.java rename to src/main/java/tconstruct/client/pages/BookPage.java diff --git a/src/tconstruct/client/pages/ContentsTablePage.java b/src/main/java/tconstruct/client/pages/ContentsTablePage.java similarity index 100% rename from src/tconstruct/client/pages/ContentsTablePage.java rename to src/main/java/tconstruct/client/pages/ContentsTablePage.java diff --git a/src/tconstruct/client/pages/CraftingPage.java b/src/main/java/tconstruct/client/pages/CraftingPage.java similarity index 100% rename from src/tconstruct/client/pages/CraftingPage.java rename to src/main/java/tconstruct/client/pages/CraftingPage.java diff --git a/src/tconstruct/client/pages/FurnacePage.java b/src/main/java/tconstruct/client/pages/FurnacePage.java similarity index 100% rename from src/tconstruct/client/pages/FurnacePage.java rename to src/main/java/tconstruct/client/pages/FurnacePage.java diff --git a/src/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java similarity index 100% rename from src/tconstruct/client/pages/MaterialPage.java rename to src/main/java/tconstruct/client/pages/MaterialPage.java diff --git a/src/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java similarity index 100% rename from src/tconstruct/client/pages/ModifierPage.java rename to src/main/java/tconstruct/client/pages/ModifierPage.java diff --git a/src/tconstruct/client/pages/PicturePage.java b/src/main/java/tconstruct/client/pages/PicturePage.java similarity index 100% rename from src/tconstruct/client/pages/PicturePage.java rename to src/main/java/tconstruct/client/pages/PicturePage.java diff --git a/src/tconstruct/client/pages/SectionPage.java b/src/main/java/tconstruct/client/pages/SectionPage.java similarity index 100% rename from src/tconstruct/client/pages/SectionPage.java rename to src/main/java/tconstruct/client/pages/SectionPage.java diff --git a/src/tconstruct/client/pages/SidebarPage.java b/src/main/java/tconstruct/client/pages/SidebarPage.java similarity index 100% rename from src/tconstruct/client/pages/SidebarPage.java rename to src/main/java/tconstruct/client/pages/SidebarPage.java diff --git a/src/tconstruct/client/pages/TextPage.java b/src/main/java/tconstruct/client/pages/TextPage.java similarity index 100% rename from src/tconstruct/client/pages/TextPage.java rename to src/main/java/tconstruct/client/pages/TextPage.java diff --git a/src/tconstruct/client/pages/TitlePage.java b/src/main/java/tconstruct/client/pages/TitlePage.java similarity index 100% rename from src/tconstruct/client/pages/TitlePage.java rename to src/main/java/tconstruct/client/pages/TitlePage.java diff --git a/src/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java similarity index 100% rename from src/tconstruct/client/pages/ToolPage.java rename to src/main/java/tconstruct/client/pages/ToolPage.java diff --git a/src/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java similarity index 100% rename from src/tconstruct/client/tabs/AbstractTab.java rename to src/main/java/tconstruct/client/tabs/AbstractTab.java diff --git a/src/tconstruct/client/tabs/InventoryTabArmorExtended.java b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java similarity index 100% rename from src/tconstruct/client/tabs/InventoryTabArmorExtended.java rename to src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java diff --git a/src/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java similarity index 100% rename from src/tconstruct/client/tabs/InventoryTabKnapsack.java rename to src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java diff --git a/src/tconstruct/client/tabs/InventoryTabVanilla.java b/src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java similarity index 100% rename from src/tconstruct/client/tabs/InventoryTabVanilla.java rename to src/main/java/tconstruct/client/tabs/InventoryTabVanilla.java diff --git a/src/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java similarity index 100% rename from src/tconstruct/client/tabs/TabRegistry.java rename to src/main/java/tconstruct/client/tabs/TabRegistry.java diff --git a/src/tconstruct/common/BowRecipe.java b/src/main/java/tconstruct/common/BowRecipe.java similarity index 100% rename from src/tconstruct/common/BowRecipe.java rename to src/main/java/tconstruct/common/BowRecipe.java diff --git a/src/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java similarity index 99% rename from src/tconstruct/common/TContent.java rename to src/main/java/tconstruct/common/TContent.java index 93473e2b..fb03ea7d 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -261,7 +261,6 @@ public class TContent implements IFuelHandler public static Item oreBerries; //Tool modifiers - public static ModElectric modE; public static ModFlux modF; public static ModLapis modL; @@ -1186,7 +1185,7 @@ public class TContent implements IFuelHandler // ToolStation Recipes (Wooden Version) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "craftingTableWood")); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingSlabWood, 1, 0)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); @@ -1213,7 +1212,7 @@ public class TContent implements IFuelHandler GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1)); GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book); GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2)); - // alternativ Vanilla Book Recipe + // alternative Vanilla Book Recipe GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern); // Paperstack Recipe GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); @@ -1236,7 +1235,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk))); // Silky Jewel Recipes GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); - // Wooden Armor Recipes + // Wooden Armor Recipes GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[] { "www", "w w", 'w', "logWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); @@ -1254,7 +1253,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 11), patBlock, '#', new ItemStack(materials, 1, 12)); //Aluminum raw -> ingot - + GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum @@ -1528,8 +1527,6 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); - modE = new ModElectric(); - tb.registerToolMod(modE); modF = new ModFlux(); tb.registerToolMod(modF); @@ -2265,27 +2262,6 @@ public class TContent implements IFuelHandler if (basicCell != null) TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); - /* IC2 */ - - //ItemStack reBattery = ic2.api.item.Items.getItem("reBattery"); - Object reBattery = getStaticItem("reBattery", "ic2.core.Ic2Items"); - if (reBattery != null) - { - modE.batteries.add((ItemStack) reBattery); - } - //ItemStack chargedReBattery = ic2.api.item.Items.getItem("chargedReBattery"); - Object chargedReBattery = getStaticItem("chargedReBattery", "ic2.core.Ic2Items"); - if (chargedReBattery != null) - { - modE.batteries.add((ItemStack) chargedReBattery); - } - //ItemStack electronicCircuit = ic2.api.item.Items.getItem("electronicCircuit"); - Object electronicCircuit = getStaticItem("electronicCircuit", "ic2.core.Ic2Items"); - if (electronicCircuit != null) - modE.circuits.add((ItemStack) electronicCircuit); - - if (chargedReBattery != null && electronicCircuit != null) - TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), (ItemStack) chargedReBattery, (ItemStack) electronicCircuit); /* Thaumcraft */ Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); diff --git a/src/main/java/tconstruct/common/TContent.java.orig b/src/main/java/tconstruct/common/TContent.java.orig new file mode 100644 index 00000000..229ee491 --- /dev/null +++ b/src/main/java/tconstruct/common/TContent.java.orig @@ -0,0 +1,2533 @@ +package tconstruct.common; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import tconstruct.library.crafting.ToolBuilder; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.*; +import java.lang.reflect.Field; +import java.util.*; +import net.minecraft.block.*; +import net.minecraft.block.material.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; +import net.minecraft.item.crafting.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.stats.Achievement; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.*; +import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.oredict.*; +import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; +import tconstruct.blocks.*; +import tconstruct.blocks.logic.*; +import tconstruct.blocks.slime.*; +import tconstruct.blocks.traps.*; +import tconstruct.client.StepSoundSlime; +import tconstruct.entity.*; +import tconstruct.entity.item.*; +import tconstruct.entity.projectile.*; +import tconstruct.items.*; +import tconstruct.items.armor.*; +import tconstruct.items.blocks.*; +import tconstruct.items.tools.*; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.client.*; +import tconstruct.library.client.FluidRenderProperties.Applications; +import tconstruct.library.crafting.*; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.util.IPattern; +import tconstruct.modifiers.*; +import tconstruct.util.*; +import tconstruct.util.config.*; + +public class TContent implements IFuelHandler +{ + // Supresses console spam when iguana's tweaks remove stuff + public static boolean supressMissingToolLogs = false; + + //Patterns and other materials + public static Item blankPattern; + public static Item materials; + public static Item toolRod; + public static Item toolShard; + public static Item woodPattern; + public static Item metalPattern; + //public static Item armorPattern; + + public static Item manualBook; + public static Item buckets; + public static Item titleIcon; + + public static Item strangeFood; + public static Item diamondApple; + public static Item jerky; + //public static Item stonePattern; + //public static Item netherPattern; + + //Tools + public static ToolCore pickaxe; + public static ToolCore shovel; + public static ToolCore hatchet; + public static ToolCore broadsword; + public static ToolCore longsword; + public static ToolCore rapier; + public static ToolCore dagger; + public static ToolCore cutlass; + + public static ToolCore frypan; + public static ToolCore battlesign; + public static ToolCore chisel; + public static ToolCore mattock; + + public static ToolCore scythe; + public static ToolCore lumberaxe; + public static ToolCore cleaver; + public static ToolCore excavator; + public static ToolCore hammer; + public static ToolCore battleaxe; + + public static ToolCore shortbow; + public static ToolCore arrow; + + public static Item potionLauncher; + + //Tool parts + public static Item binding; + public static Item toughBinding; + public static Item toughRod; + public static Item largePlate; + + public static Item pickaxeHead; + public static Item shovelHead; + public static Item hatchetHead; + public static Item frypanHead; + public static Item signHead; + public static Item chiselHead; + public static Item scytheBlade; + public static Item broadAxeHead; + public static Item excavatorHead; + public static Item hammerHead; + + public static Item swordBlade; + public static Item largeSwordBlade; + public static Item knifeBlade; + + public static Item wideGuard; + public static Item handGuard; + public static Item crossbar; + public static Item fullGuard; + + public static Item bowstring; + public static Item arrowhead; + public static Item fletching; + + //Crafting blocks + public static Block toolStationWood; + public static Block toolStationStone; + public static Block toolForge; + public static Block craftingStationWood; + public static Block craftingSlabWood; + public static Block furnaceSlab; + + public static Block heldItemBlock; + public static Block craftedSoil; + + public static Block smeltery; + public static Block lavaTank; + public static Block searedBlock; + public static Block castingChannel; + public static Block metalBlock; + public static Block tankAir; + + public static Block dryingRack; + + //Decoration + public static Block stoneTorch; + public static Block stoneLadder; + public static Block multiBrick; + public static Block multiBrickFancy; + + public static Block searedSlab; + public static Block speedSlab; + + public static Block meatBlock; + public static Block woolSlab1; + public static Block woolSlab2; + public static Block glueBlock; + + //Traps + public static Block landmine; + public static Block punji; + public static Block barricadeOak; + public static Block barricadeSpruce; + public static Block barricadeBirch; + public static Block barricadeJungle; + public static Block slimeExplosive; + + //InfiBlocks + public static Block speedBlock; + public static Block clearGlass; + //public static Block stainedGlass; + public static Block stainedGlassClear; + public static Block glassPane; + //public static Block stainedGlassPane; + public static Block stainedGlassClearPane; + public static Block glassMagicSlab; + public static Block stainedGlassMagicSlab; + public static Block stainedGlassClearMagicSlab; + + //Liquids + public static Material liquidMetal; + + public static Fluid moltenIronFluid; + public static Fluid moltenGoldFluid; + public static Fluid moltenCopperFluid; + public static Fluid moltenTinFluid; + public static Fluid moltenAluminumFluid; + public static Fluid moltenCobaltFluid; + public static Fluid moltenArditeFluid; + public static Fluid moltenBronzeFluid; + public static Fluid moltenAlubrassFluid; + public static Fluid moltenManyullynFluid; + public static Fluid moltenAlumiteFluid; + public static Fluid moltenObsidianFluid; + public static Fluid moltenSteelFluid; + public static Fluid moltenGlassFluid; + public static Fluid moltenStoneFluid; + public static Fluid moltenEmeraldFluid; + public static Fluid bloodFluid; + public static Fluid moltenNickelFluid; + public static Fluid moltenLeadFluid; + public static Fluid moltenSilverFluid; + public static Fluid moltenShinyFluid; + public static Fluid moltenInvarFluid; + public static Fluid moltenElectrumFluid; + public static Fluid moltenEnderFluid; + public static Fluid blueSlimeFluid; + public static Fluid pigIronFluid; + + public static Block moltenIron; + public static Block moltenGold; + public static Block moltenCopper; + public static Block moltenTin; + public static Block moltenAluminum; + public static Block moltenCobalt; + public static Block moltenArdite; + public static Block moltenBronze; + public static Block moltenAlubrass; + public static Block moltenManyullyn; + public static Block moltenAlumite; + public static Block moltenObsidian; + public static Block moltenSteel; + public static Block moltenGlass; + public static Block moltenStone; + public static Block moltenEmerald; + public static Block blood; + public static Block moltenNickel; + public static Block moltenLead; + public static Block moltenSilver; + public static Block moltenShiny; + public static Block moltenInvar; + public static Block moltenElectrum; + public static Block moltenEnder; + + //Slime + public static StepSound slimeStep; + public static Block slimePool; + public static Block slimeGel; + public static Block slimeGrass; + public static Block slimeTallGrass; + public static SlimeLeaves slimeLeaves; + public static SlimeSapling slimeSapling; + + public static Block slimeChannel; + public static Block slimePad; + + //Glue + public static Fluid glueFluid; + public static Block glueFluidBlock; + + //Ores + public static Block oreSlag; + public static Block oreGravel; + public static OreberryBush oreBerry; + public static OreberryBush oreBerrySecond; + public static Item oreBerries; + + //Tool modifiers + public static ModFlux modF; + public static ModLapis modL; + + //Wearables + public static Item heavyHelmet; + public static Item heavyChestplate; + public static Item heavyPants; + public static Item heavyBoots; + public static Item glove; + public static Item knapsack; + + public static Item heartCanister; + public static Item goldHead; + + //Rail-related + public static Block woodenRail; + + //Chest hooks + public static ChestGenHooks tinkerHouseChest; + public static ChestGenHooks tinkerHousePatterns; + + //Armor - basic + public static Item helmetWood; + public static Item chestplateWood; + public static Item leggingsWood; + public static Item bootsWood; + public static EnumArmorMaterial materialWood; + + //Signal & Logic + public static Block signalBus; + public static Block signalTerminal; + + public static Item spoolWire; + public static Item lengthWire; + + //Temporary items + //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); + + public TContent() + { + registerItems(); + registerBlocks(); + registerMaterials(); + addCraftingRecipes(); + setupToolTabs(); + addLoot(); + if (PHConstruct.achievementsEnabled) + { + addAchievements(); + } + } + + public void createEntities () + { + EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true); + EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true); + //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); + + EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); + //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); + } + + public static Fluid[] fluids = new Fluid[27]; + public static Block[] fluidBlocks = new Block[26]; + + void registerBlocks () + { + //Tool Station + toolStationWood = new ToolStationBlock(PHConstruct.woodStation, Material.wood).setUnlocalizedName("ToolStation"); + GameRegistry.registerBlock(toolStationWood, ToolStationItemBlock.class, "ToolStationBlock"); + GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation"); + GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter"); + GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder"); + GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper"); + + toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge"); + GameRegistry.registerBlock(toolForge, MetadataItemBlock.class, "ToolForgeBlock"); + GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge"); + + craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation"); + GameRegistry.registerBlock(craftingStationWood, "CraftingStation"); + GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation"); + + craftingSlabWood = new CraftingSlab(PHConstruct.woodCrafterSlab, Material.wood).setUnlocalizedName("CraftingSlab"); + GameRegistry.registerBlock(craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab"); + + furnaceSlab = new FurnaceSlab(PHConstruct.furnaceSlab, Material.rock).setUnlocalizedName("FurnaceSlab"); + GameRegistry.registerBlock(furnaceSlab, "FurnaceSlab"); + GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace"); + + heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood).setUnlocalizedName("Frypan"); + GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); + GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic"); + + craftedSoil = new SoilBlock(PHConstruct.craftedSoil).setLightOpacity(0).setUnlocalizedName("TConstruct.Soil"); + craftedSoil.stepSound = Block.soundGravelFootstep; + GameRegistry.registerBlock(craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil"); + + searedSlab = new SearedSlab(PHConstruct.searedSlab).setUnlocalizedName("SearedSlab"); + searedSlab.stepSound = Block.soundStoneFootstep; + GameRegistry.registerBlock(searedSlab, SearedSlabItem.class, "SearedSlab"); + + speedSlab = new SpeedSlab(PHConstruct.speedSlab).setUnlocalizedName("SpeedSlab"); + speedSlab.stepSound = Block.soundStoneFootstep; + GameRegistry.registerBlock(speedSlab, SpeedSlabItem.class, "SpeedSlab"); + + metalBlock = new TMetalBlock(PHConstruct.metalBlock, Material.iron, 10.0F).setUnlocalizedName("tconstruct.metalblock"); + metalBlock.stepSound = Block.soundMetalFootstep; + GameRegistry.registerBlock(metalBlock, MetalItemBlock.class, "MetalBlock"); + + meatBlock = new MeatBlock(PHConstruct.meatBlock).setUnlocalizedName("tconstruct.meatblock"); + GameRegistry.registerBlock(meatBlock, HamboneItemBlock.class, "MeatBlock"); + + OreDictionary.registerOre("hambone", new ItemStack(meatBlock)); + LanguageRegistry.addName(meatBlock, "Hambone"); + GameRegistry.addRecipe(new ItemStack(meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw)); + + glueBlock = new GlueBlock(PHConstruct.glueBlock).setUnlocalizedName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); + GameRegistry.registerBlock(glueBlock, "GlueBlock"); + OreDictionary.registerOre("blockRubber", new ItemStack(glueBlock)); + + woolSlab1 = new SlabBase(PHConstruct.woolSlab1, Material.cloth, Block.cloth, 0, 8).setUnlocalizedName("cloth"); + woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); + GameRegistry.registerBlock(woolSlab1, WoolSlab1Item.class, "WoolSlab1"); + woolSlab2 = new SlabBase(PHConstruct.woolSlab2, Material.cloth, Block.cloth, 8, 8).setUnlocalizedName("cloth"); + woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); + GameRegistry.registerBlock(woolSlab2, WoolSlab2Item.class, "WoolSlab2"); + + //Smeltery + smeltery = new SmelteryBlock(PHConstruct.smeltery).setUnlocalizedName("Smeltery"); + GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); + if (PHConstruct.newSmeltery) + { + GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain"); + } + else + { + GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); + } + GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants"); + + lavaTank = new LavaTankBlock(PHConstruct.lavaTank).setUnlocalizedName("LavaTank"); + lavaTank.setStepSound(Block.soundGlassFootstep); + GameRegistry.registerBlock(lavaTank, LavaTankItemBlock.class, "LavaTank"); + GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank"); + + searedBlock = new SearedBlock(PHConstruct.searedTable).setUnlocalizedName("SearedBlock"); + GameRegistry.registerBlock(searedBlock, SearedTableItemBlock.class, "SearedBlock"); + GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); + GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); + GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin"); + + castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).setUnlocalizedName("CastingChannel"); + GameRegistry.registerBlock(castingChannel, CastingChannelItem.class, "CastingChannel"); + GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel"); + + tankAir = new TankAirBlock(PHConstruct.airTank, Material.leaves).setBlockUnbreakable().setUnlocalizedName("tconstruct.tank.air"); + GameRegistry.registerBlock(tankAir, "TankAir"); + GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air"); + + //Traps + landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) + .setUnlocalizedName("landmine"); + GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine"); + GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine"); + + punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji"); + GameRegistry.registerBlock(punji, "trap.punji"); + + barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak"); + GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak"); + + barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce"); + GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce"); + + barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch"); + GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch"); + + barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle"); + GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle"); + + slimeExplosive = new SlimeExplosive(PHConstruct.slimeExplosive).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("explosive.slime"); + GameRegistry.registerBlock(slimeExplosive, MetadataItemBlock.class, "explosive.slime"); + + dryingRack = new DryingRack(PHConstruct.dryingRack).setUnlocalizedName("Armor.DryingRack"); + GameRegistry.registerBlock(dryingRack, "Armor.DryingRack"); + GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack"); + + //Liquids + liquidMetal = new MaterialLiquid(MapColor.tntColor); + + moltenIronFluid = new Fluid("iron.molten"); + if (!FluidRegistry.registerFluid(moltenIronFluid)) + moltenIronFluid = FluidRegistry.getFluid("iron.molten"); + moltenIron = new TConstructFluid(PHConstruct.moltenIron, moltenIronFluid, Material.lava, "liquid_iron").setUnlocalizedName("metal.molten.iron"); + GameRegistry.registerBlock(moltenIron, "metal.molten.iron"); + fluids[0] = moltenIronFluid; + fluidBlocks[0] = moltenIron; + moltenIronFluid.setBlockID(moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenIronFluid, 1000), new ItemStack(buckets, 1, 0), new ItemStack(Item.bucketEmpty))); + + moltenGoldFluid = new Fluid("gold.molten"); + if (!FluidRegistry.registerFluid(moltenGoldFluid)) + moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); + moltenGold = new TConstructFluid(PHConstruct.moltenGold, moltenGoldFluid, Material.lava, "liquid_gold").setUnlocalizedName("metal.molten.gold"); + GameRegistry.registerBlock(moltenGold, "metal.molten.gold"); + fluids[1] = moltenGoldFluid; + fluidBlocks[1] = moltenGold; + moltenGoldFluid.setBlockID(moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGoldFluid, 1000), new ItemStack(buckets, 1, 1), new ItemStack(Item.bucketEmpty))); + + moltenCopperFluid = new Fluid("copper.molten"); + if (!FluidRegistry.registerFluid(moltenCopperFluid)) + moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); + moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, moltenCopperFluid, Material.lava, "liquid_copper").setUnlocalizedName("metal.molten.copper"); + GameRegistry.registerBlock(moltenCopper, "metal.molten.copper"); + fluids[2] = moltenCopperFluid; + fluidBlocks[2] = moltenCopper; + moltenCopperFluid.setBlockID(moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCopperFluid, 1000), new ItemStack(buckets, 1, 2), new ItemStack(Item.bucketEmpty))); + + moltenTinFluid = new Fluid("tin.molten"); + if (!FluidRegistry.registerFluid(moltenTinFluid)) + moltenTinFluid = FluidRegistry.getFluid("tin.molten"); + moltenTin = new TConstructFluid(PHConstruct.moltenTin, moltenTinFluid, Material.lava, "liquid_tin").setUnlocalizedName("metal.molten.tin"); + GameRegistry.registerBlock(moltenTin, "metal.molten.tin"); + fluids[3] = moltenTinFluid; + fluidBlocks[3] = moltenTin; + moltenTinFluid.setBlockID(moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenTinFluid, 1000), new ItemStack(buckets, 1, 3), new ItemStack(Item.bucketEmpty))); + + moltenAluminumFluid = new Fluid("aluminum.molten"); + if (!FluidRegistry.registerFluid(moltenAluminumFluid)) + moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); + moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, moltenAluminumFluid, Material.lava, "liquid_aluminum").setUnlocalizedName("metal.molten.aluminum"); + GameRegistry.registerBlock(moltenAluminum, "metal.molten.aluminum"); + fluids[4] = moltenAluminumFluid; + fluidBlocks[4] = moltenAluminum; + moltenAluminumFluid.setBlockID(moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAluminumFluid, 1000), new ItemStack(buckets, 1, 4), new ItemStack(Item.bucketEmpty))); + + moltenCobaltFluid = new Fluid("cobalt.molten"); + if (!FluidRegistry.registerFluid(moltenCobaltFluid)) + moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); + moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, moltenCobaltFluid, Material.lava, "liquid_cobalt").setUnlocalizedName("metal.molten.cobalt"); + GameRegistry.registerBlock(moltenCobalt, "metal.molten.cobalt"); + fluids[5] = moltenCobaltFluid; + fluidBlocks[5] = moltenCobalt; + moltenCobaltFluid.setBlockID(moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenCobaltFluid, 1000), new ItemStack(buckets, 1, 5), new ItemStack(Item.bucketEmpty))); + + moltenArditeFluid = new Fluid("ardite.molten"); + if (!FluidRegistry.registerFluid(moltenArditeFluid)) + moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); + moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, moltenArditeFluid, Material.lava, "liquid_ardite").setUnlocalizedName("metal.molten.ardite"); + GameRegistry.registerBlock(moltenArdite, "metal.molten.ardite"); + fluids[6] = moltenArditeFluid; + fluidBlocks[6] = moltenArdite; + moltenArditeFluid.setBlockID(moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenArditeFluid, 1000), new ItemStack(buckets, 1, 6), new ItemStack(Item.bucketEmpty))); + + moltenBronzeFluid = new Fluid("bronze.molten"); + if (!FluidRegistry.registerFluid(moltenBronzeFluid)) + moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); + moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, moltenBronzeFluid, Material.lava, "liquid_bronze").setUnlocalizedName("metal.molten.bronze"); + GameRegistry.registerBlock(moltenBronze, "metal.molten.bronze"); + fluids[7] = moltenBronzeFluid; + fluidBlocks[7] = moltenBronze; + moltenBronzeFluid.setBlockID(moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenBronzeFluid, 1000), new ItemStack(buckets, 1, 7), new ItemStack(Item.bucketEmpty))); + + moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); + if (!FluidRegistry.registerFluid(moltenAlubrassFluid)) + moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); + moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, moltenAlubrassFluid, Material.lava, "liquid_alubrass").setUnlocalizedName("metal.molten.alubrass"); + GameRegistry.registerBlock(moltenAlubrass, "metal.molten.alubrass"); + fluids[8] = moltenAlubrassFluid; + fluidBlocks[8] = moltenAlubrass; + moltenAlubrassFluid.setBlockID(moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlubrassFluid, 1000), new ItemStack(buckets, 1, 8), new ItemStack(Item.bucketEmpty))); + + moltenManyullynFluid = new Fluid("manyullyn.molten"); + if (!FluidRegistry.registerFluid(moltenManyullynFluid)) + moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); + moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, moltenManyullynFluid, Material.lava, "liquid_manyullyn").setUnlocalizedName("metal.molten.manyullyn"); + GameRegistry.registerBlock(moltenManyullyn, "metal.molten.manyullyn"); + fluids[9] = moltenManyullynFluid; + fluidBlocks[9] = moltenManyullyn; + moltenManyullynFluid.setBlockID(moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenManyullynFluid, 1000), new ItemStack(buckets, 1, 9), new ItemStack(Item.bucketEmpty))); + + moltenAlumiteFluid = new Fluid("alumite.molten"); + if (!FluidRegistry.registerFluid(moltenAlumiteFluid)) + moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); + moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, moltenAlumiteFluid, Material.lava, "liquid_alumite").setUnlocalizedName("metal.molten.alumite"); + GameRegistry.registerBlock(moltenAlumite, "metal.molten.alumite"); + fluids[10] = moltenAlumiteFluid; + fluidBlocks[10] = moltenAlumite; + moltenAlumiteFluid.setBlockID(moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenAlumiteFluid, 1000), new ItemStack(buckets, 1, 10), new ItemStack(Item.bucketEmpty))); + + moltenObsidianFluid = new Fluid("obsidian.molten"); + if (!FluidRegistry.registerFluid(moltenObsidianFluid)) + moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); + moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, moltenObsidianFluid, Material.lava, "liquid_obsidian").setUnlocalizedName("metal.molten.obsidian"); + GameRegistry.registerBlock(moltenObsidian, "metal.molten.obsidian"); + fluids[11] = moltenObsidianFluid; + fluidBlocks[11] = moltenObsidian; + moltenObsidianFluid.setBlockID(moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenObsidianFluid, 1000), new ItemStack(buckets, 1, 11), new ItemStack(Item.bucketEmpty))); + + moltenSteelFluid = new Fluid("steel.molten"); + if (!FluidRegistry.registerFluid(moltenSteelFluid)) + moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); + moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, moltenSteelFluid, Material.lava, "liquid_steel").setUnlocalizedName("metal.molten.steel"); + GameRegistry.registerBlock(moltenSteel, "metal.molten.steel"); + fluids[12] = moltenSteelFluid; + fluidBlocks[12] = moltenSteel; + moltenSteelFluid.setBlockID(moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSteelFluid, 1000), new ItemStack(buckets, 1, 12), new ItemStack(Item.bucketEmpty))); + + moltenGlassFluid = new Fluid("glass.molten"); + if (!FluidRegistry.registerFluid(moltenGlassFluid)) + moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); + moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, moltenGlassFluid, Material.lava, "liquid_glass", true).setUnlocalizedName("metal.molten.glass"); + GameRegistry.registerBlock(moltenGlass, "metal.molten.glass"); + fluids[13] = moltenGlassFluid; + fluidBlocks[13] = moltenGlass; + moltenGlassFluid.setBlockID(moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenGlassFluid, 1000), new ItemStack(buckets, 1, 13), new ItemStack(Item.bucketEmpty))); + + moltenStoneFluid = new Fluid("stone.seared"); + if (!FluidRegistry.registerFluid(moltenStoneFluid)) + moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); + moltenStone = new TConstructFluid(PHConstruct.moltenStone, moltenStoneFluid, Material.lava, "liquid_stone").setUnlocalizedName("molten.stone"); + GameRegistry.registerBlock(moltenStone, "molten.stone"); + fluids[14] = moltenStoneFluid; + fluidBlocks[14] = moltenStone; + moltenStoneFluid.setBlockID(moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenStoneFluid, 1000), new ItemStack(buckets, 1, 14), new ItemStack(Item.bucketEmpty))); + + moltenEmeraldFluid = new Fluid("emerald.liquid"); + if (!FluidRegistry.registerFluid(moltenEmeraldFluid)) + moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); + moltenEmerald = new TConstructFluid(PHConstruct.moltenEmerald, moltenEmeraldFluid, Material.water, "liquid_villager").setUnlocalizedName("molten.emerald"); + GameRegistry.registerBlock(moltenEmerald, "molten.emerald"); + fluids[15] = moltenEmeraldFluid; + fluidBlocks[15] = moltenEmerald; + moltenEmeraldFluid.setBlockID(moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEmeraldFluid, 1000), new ItemStack(buckets, 1, 15), new ItemStack(Item.bucketEmpty))); + + bloodFluid = new Fluid("blood"); + if (!FluidRegistry.registerFluid(bloodFluid)) + bloodFluid = FluidRegistry.getFluid("blood"); + blood = new BloodBlock(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); + GameRegistry.registerBlock(blood, "liquid.blood"); + fluids[16] = bloodFluid; + fluidBlocks[16] = blood; + bloodFluid.setBlockID(blood).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(bloodFluid, 1000), new ItemStack(buckets, 1, 16), new ItemStack(Item.bucketEmpty))); + + moltenNickelFluid = new Fluid("nickel.molten"); + if (!FluidRegistry.registerFluid(moltenNickelFluid)) + moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); + moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, moltenNickelFluid, Material.lava, "liquid_ferrous").setUnlocalizedName("metal.molten.nickel"); + GameRegistry.registerBlock(moltenNickel, "metal.molten.nickel"); + fluids[17] = moltenNickelFluid; + fluidBlocks[17] = moltenNickel; + moltenNickelFluid.setBlockID(moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenNickelFluid, 1000), new ItemStack(buckets, 1, 17), new ItemStack(Item.bucketEmpty))); + + moltenLeadFluid = new Fluid("lead.molten"); + if (!FluidRegistry.registerFluid(moltenLeadFluid)) + moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); + moltenLead = new TConstructFluid(PHConstruct.moltenLead, moltenLeadFluid, Material.lava, "liquid_lead").setUnlocalizedName("metal.molten.lead"); + GameRegistry.registerBlock(moltenLead, "metal.molten.lead"); + fluids[18] = moltenLeadFluid; + fluidBlocks[18] = moltenLead; + moltenLeadFluid.setBlockID(moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenLeadFluid, 1000), new ItemStack(buckets, 1, 18), new ItemStack(Item.bucketEmpty))); + + moltenSilverFluid = new Fluid("silver.molten"); + if (!FluidRegistry.registerFluid(moltenSilverFluid)) + moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); + moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, moltenSilverFluid, Material.lava, "liquid_silver").setUnlocalizedName("metal.molten.silver"); + GameRegistry.registerBlock(moltenSilver, "metal.molten.silver"); + fluids[19] = moltenSilverFluid; + fluidBlocks[19] = moltenSilver; + moltenSilverFluid.setBlockID(moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenSilverFluid, 1000), new ItemStack(buckets, 1, 19), new ItemStack(Item.bucketEmpty))); + + moltenShinyFluid = new Fluid("platinum.molten"); + if (!FluidRegistry.registerFluid(moltenShinyFluid)) + moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); + moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, moltenShinyFluid, Material.lava, "liquid_shiny").setUnlocalizedName("metal.molten.shiny"); + GameRegistry.registerBlock(moltenShiny, "metal.molten.shiny"); + fluids[20] = moltenShinyFluid; + fluidBlocks[20] = moltenShiny; + moltenShinyFluid.setBlockID(moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenShinyFluid, 1000), new ItemStack(buckets, 1, 20), new ItemStack(Item.bucketEmpty))); + + moltenInvarFluid = new Fluid("invar.molten"); + if (!FluidRegistry.registerFluid(moltenInvarFluid)) + moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); + moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, moltenInvarFluid, Material.lava, "liquid_invar").setUnlocalizedName("metal.molten.invar"); + GameRegistry.registerBlock(moltenInvar, "metal.molten.invar"); + fluids[21] = moltenInvarFluid; + fluidBlocks[21] = moltenInvar; + moltenInvarFluid.setBlockID(moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenInvarFluid, 1000), new ItemStack(buckets, 1, 21), new ItemStack(Item.bucketEmpty))); + + moltenElectrumFluid = new Fluid("electrum.molten"); + if (!FluidRegistry.registerFluid(moltenElectrumFluid)) + moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); + moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, moltenElectrumFluid, Material.lava, "liquid_electrum").setUnlocalizedName("metal.molten.electrum"); + GameRegistry.registerBlock(moltenElectrum, "metal.molten.electrum"); + fluids[22] = moltenElectrumFluid; + fluidBlocks[22] = moltenElectrum; + moltenElectrumFluid.setBlockID(moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenElectrumFluid, 1000), new ItemStack(buckets, 1, 22), new ItemStack(Item.bucketEmpty))); + + moltenEnderFluid = new Fluid("ender"); + if (!FluidRegistry.registerFluid(moltenEnderFluid)) + { + moltenEnderFluid = FluidRegistry.getFluid("ender"); + moltenEnder = Block.blocksList[moltenEnderFluid.getBlockID()]; + if (moltenEnder == null) + TConstruct.logger.info("Molten ender block missing!"); + } + else + { + moltenEnder = new TConstructFluid(PHConstruct.moltenEnder, moltenEnderFluid, Material.water, "liquid_ender").setUnlocalizedName("fluid.ender"); + GameRegistry.registerBlock(moltenEnder, "fluid.ender"); + moltenEnderFluid.setBlockID(moltenEnder).setDensity(3000).setViscosity(6000); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(moltenEnderFluid, 1000), new ItemStack(buckets, 1, 23), new ItemStack(Item.bucketEmpty))); + } + fluids[23] = moltenEnderFluid; + fluidBlocks[23] = moltenEnder; + + //Slime + slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f); + + blueSlimeFluid = new Fluid("slime.blue"); + if (!FluidRegistry.registerFluid(blueSlimeFluid)) + blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); + slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.slime"); + GameRegistry.registerBlock(slimePool, "liquid.slime"); + fluids[24] = blueSlimeFluid; + fluidBlocks[24] = slimePool; + blueSlimeFluid.setBlockID(slimePool); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); + + //Glue + glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + if (!FluidRegistry.registerFluid(glueFluid)) + glueFluid = FluidRegistry.getFluid("glue"); + glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.glue"); + GameRegistry.registerBlock(glueFluidBlock, "liquid.glue"); + fluids[25] = glueFluid; + fluidBlocks[25] = glueFluidBlock; + glueFluid.setBlockID(glueFluidBlock); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(glueFluid, 1000), new ItemStack(buckets, 1, 26), new ItemStack(Item.bucketEmpty))); + + pigIronFluid = new Fluid("pigiron.molten"); + if (!FluidRegistry.registerFluid(pigIronFluid)) + pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); + else + pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); + fluids[26] = pigIronFluid; + + slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); + GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); + + slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).setUnlocalizedName("slime.grass"); + GameRegistry.registerBlock(slimeGrass, SlimeGrassItemBlock.class, "slime.grass"); + + slimeTallGrass = new SlimeTallGrass(PHConstruct.slimeTallGrass).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("slime.grass.tall"); + GameRegistry.registerBlock(slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall"); + + slimeLeaves = (SlimeLeaves) new SlimeLeaves(PHConstruct.slimeLeaves).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.leaves"); + GameRegistry.registerBlock(slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves"); + + slimeSapling = (SlimeSapling) new SlimeSapling(PHConstruct.slimeSapling).setStepSound(slimeStep).setUnlocalizedName("slime.sapling"); + GameRegistry.registerBlock(slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling"); + + slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water).setStepSound(slimeStep).setUnlocalizedName("slime.channel"); + GameRegistry.registerBlock(slimeChannel, "slime.channel"); + TConstructRegistry.drawbridgeState[slimeChannel.blockID] = 1; + + slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(slimeStep).setUnlocalizedName("slime.pad"); + GameRegistry.registerBlock(slimePad, "slime.pad"); + TConstructRegistry.drawbridgeState[slimePad.blockID] = 1; + + //Decoration + stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); + GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch"); + stoneLadder = new StoneLadder(PHConstruct.stoneLadder).setUnlocalizedName("decoration.stoneladder"); + GameRegistry.registerBlock(stoneLadder, "decoration.stoneladder"); + + multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick"); + GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick"); + multiBrickFancy = new MultiBrickFancy(PHConstruct.multiBrickFancy).setUnlocalizedName("Decoration.BrickFancy"); + GameRegistry.registerBlock(multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + + //Ores + String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; + oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setUnlocalizedName("ore.berries.one"); + GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one"); + String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; + oreBerrySecond = (OreberryBush) new OreberryBushEssence(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setUnlocalizedName("ore.berries.two"); + GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); + + String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; + oreSlag = new MetalOre(PHConstruct.oreSlag, Material.rock, 10.0F, oreTypes).setUnlocalizedName("tconstruct.stoneore"); + GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick"); + MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); + + oreGravel = new GravelOre(PHConstruct.oreGravel).setUnlocalizedName("GravelOre").setUnlocalizedName("tconstruct.gravelore"); + GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre"); + + MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2); + MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4); + + speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock"); + GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock"); + + //Glass + clearGlass = new GlassBlockConnected(PHConstruct.glass, "clear", false).setUnlocalizedName("GlassBlock"); + clearGlass.stepSound = Block.soundGlassFootstep; + GameRegistry.registerBlock(clearGlass, GlassBlockItem.class, "GlassBlock"); + + glassPane = new GlassPaneConnected(PHConstruct.glassPane, "clear", false); + GameRegistry.registerBlock(glassPane, GlassPaneItem.class, "GlassPane"); + + stainedGlassClear = new GlassBlockConnectedMeta(PHConstruct.stainedGlassClear, "stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", + "cyan", "purple", "blue", "brown", "green", "red", "black").setUnlocalizedName("GlassBlock.StainedClear"); + stainedGlassClear.stepSound = Block.soundGlassFootstep; + GameRegistry.registerBlock(stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); + + stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); + GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + + //Rail + woodenRail = new WoodRail(PHConstruct.woodenRail).setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); + GameRegistry.registerBlock(woodenRail, "rail.wood"); + + } + + void registerItems () + { + titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); + GameRegistry.registerItem(titleIcon, "titleIcon"); + String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; + blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); + GameRegistry.registerItem(blankPattern, "blankPattern"); + + materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); + toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); + toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); + woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + //armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); + GameRegistry.registerItem(materials, "materials"); + GameRegistry.registerItem(woodPattern, "woodPattern"); + GameRegistry.registerItem(metalPattern, "metalPattern"); + //GameRegistry.registerItem(armorPattern, "armorPattern"); + + TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); + TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); + TConstructRegistry.addItemToDirectory("metalPattern", metalPattern); + //TConstructRegistry.addItemToDirectory("armorPattern", armorPattern); + + String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead", + "knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" }; + + for (int i = 1; i < patternTypes.length; i++) + { + TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(woodPattern, 1, i)); + } + for (int i = 0; i < patternTypes.length; i++) + { + TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(metalPattern, 1, i)); + } + /*String[] armorPartTypes = { "helmet", "chestplate", "leggings", "boots" }; + for (int i = 1; i < armorPartTypes.length; i++) + { + TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + "Cast", new ItemStack(armorPattern, 1, i)); + }*/ + + manualBook = new Manual(PHConstruct.manual); + GameRegistry.registerItem(manualBook, "manualBook"); + buckets = new FilledBucket(PHConstruct.buckets); + GameRegistry.registerItem(buckets, "buckets"); + + pickaxe = new Pickaxe(PHConstruct.pickaxe); + shovel = new Shovel(PHConstruct.shovel); + hatchet = new Hatchet(PHConstruct.axe); + broadsword = new Broadsword(PHConstruct.broadsword); + longsword = new Longsword(PHConstruct.longsword); + rapier = new Rapier(PHConstruct.rapier); + dagger = new Dagger(PHConstruct.dagger); + cutlass = new Cutlass(PHConstruct.cutlass); + + frypan = new FryingPan(PHConstruct.frypan); + battlesign = new BattleSign(PHConstruct.battlesign); + mattock = new Mattock(PHConstruct.mattock); + chisel = new Chisel(PHConstruct.chisel); + + lumberaxe = new LumberAxe(PHConstruct.lumberaxe); + cleaver = new Cleaver(PHConstruct.cleaver); + scythe = new Scythe(PHConstruct.scythe); + excavator = new Excavator(PHConstruct.excavator); + hammer = new Hammer(PHConstruct.hammer); + battleaxe = new Battleaxe(PHConstruct.battleaxe); + + shortbow = new Shortbow(PHConstruct.shortbow); + arrow = new Arrow(PHConstruct.arrow); + + Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, + shortbow, arrow }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", + "scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; + + for (int i = 0; i < tools.length; i++) + { + GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat + TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); + } + + potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); + GameRegistry.registerItem(potionLauncher, "potionLauncher"); + + pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); + shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); + hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead"); + binding = new ToolPart(PHConstruct.binding, "_binding", "Binding").setUnlocalizedName("tconstruct.Binding"); + toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding"); + toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod"); + largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate"); + + swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade"); + wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard"); + handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard"); + crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar"); + knifeBlade = new ToolPart(PHConstruct.knifeBlade, "_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade"); + fullGuard = new ToolPartHidden(PHConstruct.fullGuard, "_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard"); + + frypanHead = new ToolPart(PHConstruct.frypanHead, "_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead"); + signHead = new ToolPart(PHConstruct.signHead, "_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead"); + chiselHead = new ToolPart(PHConstruct.chiselHead, "_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead"); + + scytheBlade = new ToolPart(PHConstruct.scytheBlade, "_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade"); + broadAxeHead = new ToolPart(PHConstruct.lumberHead, "_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead"); + excavatorHead = new ToolPart(PHConstruct.excavatorHead, "_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead"); + largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade"); + hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead"); + + bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.Bowstring"); + arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead"); + fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching"); + + Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, largePlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard, + frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring, fletching, arrowhead }; + String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", + "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring", + "fletching", "arrowhead" }; + + for (int i = 0; i < toolParts.length; i++) + { + GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 compat + TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); + } + + diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); + strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); + oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); + GameRegistry.registerItem(diamondApple, "diamondApple"); + GameRegistry.registerItem(strangeFood, "strangeFood"); + GameRegistry.registerItem(oreBerries, "oreBerries"); + + jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); + GameRegistry.registerItem(jerky, "jerky"); + + //Wearables + //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); + heartCanister = new HeartCanister(PHConstruct.heartCanister).setUnlocalizedName("tconstruct.canister"); + //heavyBoots = new TArmorBase(PHConstruct.heavyBoots, 3).setUnlocalizedName("tconstruct.HeavyBoots"); + //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); + knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); + goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); + //GameRegistry.registerItem(heavyHelmet, "heavyHelmet"); + GameRegistry.registerItem(heartCanister, "heartCanister"); + //GameRegistry.registerItem(heavyBoots, "heavyBoots"); + //GameRegistry.registerItem(glove, "glove"); + GameRegistry.registerItem(knapsack, "knapsack"); + GameRegistry.registerItem(goldHead, "goldHead"); + + LiquidCasting basinCasting = TConstruct.getBasinCasting(); + materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); + helmetWood = new ArmorBasic(PHConstruct.woodHelmet, materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood"); + chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); + leggingsWood = new ArmorBasic(PHConstruct.woodPants, materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); + bootsWood = new ArmorBasic(PHConstruct.woodBoots, materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); + GameRegistry.registerItem(helmetWood, "helmetWood"); + GameRegistry.registerItem(chestplateWood, "chestplateWood"); + GameRegistry.registerItem(leggingsWood, "leggingsWood"); + GameRegistry.registerItem(bootsWood, "bootsWood"); + + // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); + + String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper", + "ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper", + "nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze", + "nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" }; + + for (int i = 0; i < materialStrings.length; i++) + { + TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(materials, 1, i)); + } + + String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" }; + + for (int i = 0; i < oreberries.length; i++) + { + TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(oreBerries, 1, i)); + } + + TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(diamondApple, 1, 0)); + TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(strangeFood, 1, 0)); + + TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(heartCanister, 1, 0)); + TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(heartCanister, 1, 1)); + TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(heartCanister, 1, 2)); + + //Vanilla stack sizes + Item.doorWood.setMaxStackSize(16); + Item.doorIron.setMaxStackSize(16); + Item.snowball.setMaxStackSize(64); + Item.boat.setMaxStackSize(16); + Item.minecartEmpty.setMaxStackSize(3); + Item.minecartCrate.setMaxStackSize(3); + Item.minecartPowered.setMaxStackSize(3); + Item.itemsList[Block.cake.blockID].setMaxStackSize(16); + //Block.torchWood.setTickRandomly(false); + } + + void registerMaterials () + { + TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", ""); + TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", "Stonebound"); + TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", ""); + TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", ""); + TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", "Jagged"); + TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); + TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); + TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound"); + TConstructRegistry.addToolMaterial(8, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", ""); + TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "Writable"); + TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", ""); + TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", "Stonebound"); + TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", ""); + TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", ""); + TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); + TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); + TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); + TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "Tasty"); + + TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); //Wood + TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); //Stone + TConstructRegistry.addBowMaterial(2, 576, 40, 1.2f); //Iron + TConstructRegistry.addBowMaterial(3, 10, 80, 0.2f); //Flint + TConstructRegistry.addBowMaterial(4, 384, 20, 1.0f); //Cactus + TConstructRegistry.addBowMaterial(5, 192, 30, 1.0f); //Bone + TConstructRegistry.addBowMaterial(6, 10, 80, 0.2f); //Obsidian + TConstructRegistry.addBowMaterial(7, 10, 80, 0.2f); //Netherrack + TConstructRegistry.addBowMaterial(8, 1536, 20, 1.2f); //Slime + TConstructRegistry.addBowMaterial(9, 48, 25, 0.5f); //Paper + TConstructRegistry.addBowMaterial(10, 1152, 40, 1.2f); //Cobalt + TConstructRegistry.addBowMaterial(11, 960, 40, 1.2f); //Ardite + TConstructRegistry.addBowMaterial(12, 1536, 40, 1.2f); //Manyullyn + TConstructRegistry.addBowMaterial(13, 384, 40, 1.2f); //Copper + TConstructRegistry.addBowMaterial(14, 576, 40, 1.2f); //Bronze + TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); //Alumite + TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); //Steel + TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); //Blue Slime + TConstructRegistry.addBowMaterial(18, 384, 20, 1.2f); //Slime + + //Material ID, mass, fragility + TConstructRegistry.addArrowMaterial(0, 0.69F, 1.0F, 100F); //Wood + TConstructRegistry.addArrowMaterial(1, 2.5F, 5.0F, 100F); //Stone + TConstructRegistry.addArrowMaterial(2, 7.2F, 0.5F, 100F); //Iron + TConstructRegistry.addArrowMaterial(3, 2.65F, 1.0F, 100F); //Flint + TConstructRegistry.addArrowMaterial(4, 0.76F, 1.0F, 100F); //Cactus + TConstructRegistry.addArrowMaterial(5, 0.69F, 1.0F, 100); //Bone + TConstructRegistry.addArrowMaterial(6, 2.4F, 1.0F, 100F); //Obsidian + TConstructRegistry.addArrowMaterial(7, 3.5F, 1.0F, 100F); //Netherrack + TConstructRegistry.addArrowMaterial(8, 0.42F, 0.0F, 100F); //Slime + TConstructRegistry.addArrowMaterial(9, 1.1F, 3.0F, 90F); //Paper + TConstructRegistry.addArrowMaterial(10, 8.9F, 0.25F, 100F); //Cobalt + TConstructRegistry.addArrowMaterial(11, 7.2F, 0.25F, 100F); //Ardite + TConstructRegistry.addArrowMaterial(12, 10.6F, 0.1F, 100F); //Manyullyn + TConstructRegistry.addArrowMaterial(13, 8.96F, 0.5F, 100F); //Copper + TConstructRegistry.addArrowMaterial(14, 7.9F, 0.25F, 100F); //Bronze + TConstructRegistry.addArrowMaterial(15, 4.7F, 0.25F, 100F); //Alumite + TConstructRegistry.addArrowMaterial(16, 7.6F, 0.25F, 100F); //Steel + TConstructRegistry.addArrowMaterial(17, 0.42F, 0.0F, 100F); //Blue Slime + TConstructRegistry.addArrowMaterial(18, 6.8F, 0.5F, 100F); //Iron + + TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String + TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F, 0.05F); //Feather + for (int i = 0; i < 4; i++) + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves, 1, i), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //All four vanialla Leaves + TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F, 0.12F); //Slime + TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F, 0.12F); //BlueSlime + + PatternBuilder pb = PatternBuilder.instance; + if (PHConstruct.enableTWood) + pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick), new ItemStack(Item.stick), 0); + else + pb.registerMaterialSet("Wood", new ItemStack(Item.stick, 2), new ItemStack(Item.stick), 0); + if (PHConstruct.enableTStone) + { + pb.registerFullMaterial(Block.stone, 2, "Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 1); + pb.registerMaterial(Block.cobblestone, 2, "Stone"); + } + else + pb.registerMaterialSet("Stone", new ItemStack(TContent.toolShard, 1, 1), new ItemStack(TContent.toolRod, 1, 1), 0); + pb.registerFullMaterial(Item.ingotIron, 2, "Iron", new ItemStack(TContent.toolShard, 1, 2), new ItemStack(TContent.toolRod, 1, 2), 2); + if (PHConstruct.enableTFlint) + pb.registerFullMaterial(Item.flint, 2, "Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); + else + pb.registerMaterialSet("Flint", new ItemStack(TContent.toolShard, 1, 3), new ItemStack(TContent.toolRod, 1, 3), 3); + if (PHConstruct.enableTCactus) + pb.registerFullMaterial(Block.cactus, 2, "Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); + else + pb.registerMaterialSet("Cactus", new ItemStack(TContent.toolShard, 1, 4), new ItemStack(TContent.toolRod, 1, 4), 4); + if (PHConstruct.enableTBone) + pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); + else + pb.registerMaterialSet("Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); + pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", new ItemStack(TContent.toolShard, 1, 6), new ItemStack(TContent.toolRod, 1, 6), 6); + pb.registerMaterial(new ItemStack(materials, 1, 18), 2, "Obsidian"); + if (PHConstruct.enableTNetherrack) + pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); + else + pb.registerMaterialSet("Netherrack", new ItemStack(TContent.toolShard, 1, 7), new ItemStack(TContent.toolRod, 1, 7), 7); + if (PHConstruct.enableTSlime) + pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); + else + pb.registerMaterialSet("Slime", new ItemStack(TContent.toolShard, 1, 8), new ItemStack(TContent.toolRod, 1, 17), 8); + if (PHConstruct.enableTPaper) + pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper, 2), new ItemStack(toolRod, 1, 9), 9); + else + pb.registerMaterialSet("BlueSlime", new ItemStack(Item.paper, 2), new ItemStack(TContent.toolRod, 1, 9), 9); + pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); + pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11); + pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12); + pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13); + pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); + pb.registerMaterialSet("Alumite", new ItemStack(toolShard, 1, 15), new ItemStack(toolRod, 1, 15), 15); + pb.registerMaterialSet("Steel", new ItemStack(toolShard, 1, 16), new ItemStack(toolRod, 1, 16), 16); + if (PHConstruct.enableTBlueSlime) + pb.registerFullMaterial(new ItemStack(materials, 1, 17), 2, "BlueSlime", new ItemStack(toolShard, 1, 17), new ItemStack(toolRod, 1, 17), 17); + else + pb.registerMaterialSet("BlueSlime", new ItemStack(TContent.toolShard, 1, 17), new ItemStack(TContent.toolRod, 1, 17), 17); + pb.registerFullMaterial(new ItemStack(materials, 1, 34), 2, "PigIron", new ItemStack(toolShard, 1, 18), new ItemStack(toolRod, 1, 18), 18); + + pb.addToolPattern((IPattern) woodPattern); + } + + public static Item[] patternOutputs; + public static FluidStack[] liquids; + + void addCraftingRecipes () + { + addPartMapping(); + + addRecipesForToolBuilder(); + addRecipesForTableCasting(); + addRecipesForBasinCasting(); + addRecipesForSmeltery(); + addRecipesForChisel(); + addRecipesForFurnace(); + addRecipesForCraftingTable(); + addRecipesForDryingRack(); + } + + private void addRecipesForCraftingTable () + { + String[] patBlock = { "###", "###", "###" }; + String[] patSurround = { "###", "#m#", "###" }; + + Object[] toolForgeBlocks = { "blockIron", "blockGold", Block.blockDiamond, Block.blockEmerald, "blockCobalt", "blockArdite", "blockManyullyn", "blockCopper", "blockBronze", "blockTin", + "blockAluminum", "blockAluminumBrass", "blockAlumite", "blockSteel" }; + + // ToolForge Recipes (Metal Version) + for (int sc = 0; sc < toolForgeBlocks.length; sc++) + { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolForge, 1, sc), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(toolStationWood, 1, 0), 'm', + toolForgeBlocks[sc])); + // adding slab version recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 1, 5), "bbb", "msm", "m m", 'b', new ItemStack(smeltery, 1, 2), 's', new ItemStack(craftingSlabWood, 1, 1), 'm', + toolForgeBlocks[sc])); + } + + // ToolStation Recipes (Wooden Version) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "craftingTableWood")); +<<<<<<< HEAD:src/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); +======= + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingStationWood, 1, 0)); +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 0), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(craftingSlabWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 2), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); + if (PHConstruct.stencilTableCrafting) + { + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); + } + GameRegistry.addRecipe(new ItemStack(furnaceSlab, 1, 0), "###", "# #", "###", '#', new ItemStack(Block.stoneSingleSlab, 1, 3)); + + // Blank Pattern Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); + // Manual Book Recipes + GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0)); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2)); +<<<<<<< HEAD:src/tconstruct/common/TContent.java + // alternativ Vanilla Book Recipe +======= + // alternative Vanilla Book Recipe +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern); + // Paperstack Recipe + GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); + // Mossball Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 6), patBlock, '#', "stoneMossy")); + // LavaCrystal Recipes -Auto-smelt + GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.fireballCharge, 'x', Item.blazeRod); + GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'x', Item.fireballCharge, 'c', Item.blazeRod); + // Slimy sand Recipes + GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); + GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 2), strangeFood, strangeFood, strangeFood, strangeFood, Block.sand, Block.dirt); + // Grout Recipes + GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 2, 1), Item.clay, Block.sand, Block.gravel); + GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.stainedClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); + GameRegistry.addRecipe(new ItemStack(craftedSoil, 8, 1), "sgs", "gcg", "sgs", 'c', new ItemStack(Block.blockClay, 1, Short.MAX_VALUE), 's', Block.sand, 'g', Block.gravel); + // Graveyard Soil Recipes + GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 3), Block.dirt, Item.rottenFlesh, new ItemStack(Item.dyePowder, 1, 15)); + // Silky Cloth Recipes + GameRegistry.addRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', new ItemStack(materials, 1, 24), '#', new ItemStack(Item.silk)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk))); + // Silky Jewel Recipes + GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald)); +<<<<<<< HEAD:src/tconstruct/common/TContent.java + // Wooden Armor Recipes +======= + // Wooden Armor Recipes +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[] { "www", "w w", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(bootsWood, new Object[] { "w w", "w w", 'w', "logWood" })); + // Metal conversion Recipes + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 3), patBlock, '#', new ItemStack(materials, 1, 9)); // Copper + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 5), patBlock, '#', new ItemStack(materials, 1, 10)); // Tin + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 11)); // Aluminum + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 6), patBlock, '#', new ItemStack(materials, 1, 12)); // Aluminum + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 4), patBlock, '#', new ItemStack(materials, 1, 13)); // Bronze + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 7), patBlock, '#', new ItemStack(materials, 1, 14)); // AluBrass + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 0), patBlock, '#', new ItemStack(materials, 1, 3)); // Cobalt + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 1), patBlock, '#', new ItemStack(materials, 1, 4)); // Ardite + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 2), patBlock, '#', new ItemStack(materials, 1, 5)); // Manyullyn + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 8), patBlock, '#', new ItemStack(materials, 1, 15)); // Alumite + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 9), patBlock, '#', new ItemStack(materials, 1, 16)); // Steel + GameRegistry.addRecipe(new ItemStack(metalBlock, 1, 11), patBlock, '#', new ItemStack(materials, 1, 12)); //Aluminum raw -> ingot +<<<<<<< HEAD:src/tconstruct/common/TContent.java + +======= + +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "m", 'm', new ItemStack(metalBlock, 1, 3)); //Copper + GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "m", 'm', new ItemStack(metalBlock, 1, 5)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "m", 'm', new ItemStack(metalBlock, 1, 6)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 9, 13), "m", 'm', new ItemStack(metalBlock, 1, 4)); //Bronze + GameRegistry.addRecipe(new ItemStack(materials, 9, 14), "m", 'm', new ItemStack(metalBlock, 1, 7)); //AluBrass + GameRegistry.addRecipe(new ItemStack(materials, 9, 3), "m", 'm', new ItemStack(metalBlock, 1, 0)); //Cobalt + GameRegistry.addRecipe(new ItemStack(materials, 9, 4), "m", 'm', new ItemStack(metalBlock, 1, 1)); //Ardite + GameRegistry.addRecipe(new ItemStack(materials, 9, 5), "m", 'm', new ItemStack(metalBlock, 1, 2)); //Manyullyn + GameRegistry.addRecipe(new ItemStack(materials, 9, 15), "m", 'm', new ItemStack(metalBlock, 1, 8)); //Alumite + GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel + + GameRegistry.addRecipe(new ItemStack(Item.ingotIron), patBlock, '#', new ItemStack(materials, 1, 19)); //Iron + GameRegistry.addRecipe(new ItemStack(materials, 1, 9), patBlock, '#', new ItemStack(materials, 1, 20)); //Copper + GameRegistry.addRecipe(new ItemStack(materials, 1, 10), patBlock, '#', new ItemStack(materials, 1, 21)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 1, 11), patBlock, '#', new ItemStack(materials, 1, 22)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 1, 14), patBlock, '#', new ItemStack(materials, 1, 24)); //Aluminum Brass + GameRegistry.addRecipe(new ItemStack(materials, 1, 18), patBlock, '#', new ItemStack(materials, 1, 27)); //Obsidian + GameRegistry.addRecipe(new ItemStack(materials, 1, 3), patBlock, '#', new ItemStack(materials, 1, 28)); //Cobalt + GameRegistry.addRecipe(new ItemStack(materials, 1, 4), patBlock, '#', new ItemStack(materials, 1, 29)); //Ardite + GameRegistry.addRecipe(new ItemStack(materials, 1, 5), patBlock, '#', new ItemStack(materials, 1, 30)); //Manyullyn + GameRegistry.addRecipe(new ItemStack(materials, 1, 13), patBlock, '#', new ItemStack(materials, 1, 31)); //Bronze + GameRegistry.addRecipe(new ItemStack(materials, 1, 15), patBlock, '#', new ItemStack(materials, 1, 32)); //Alumite + GameRegistry.addRecipe(new ItemStack(materials, 1, 16), patBlock, '#', new ItemStack(materials, 1, 33)); //Steel + + GameRegistry.addRecipe(new ItemStack(materials, 9, 19), "m", 'm', new ItemStack(Item.ingotIron)); //Iron + GameRegistry.addRecipe(new ItemStack(materials, 9, 20), "m", 'm', new ItemStack(materials, 1, 9)); //Copper + GameRegistry.addRecipe(new ItemStack(materials, 9, 21), "m", 'm', new ItemStack(materials, 1, 10)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 11)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 9, 22), "m", 'm', new ItemStack(materials, 1, 12)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 9, 24), "m", 'm', new ItemStack(materials, 1, 14)); //Aluminum Brass + GameRegistry.addRecipe(new ItemStack(materials, 9, 27), "m", 'm', new ItemStack(materials, 1, 18)); //Obsidian + GameRegistry.addRecipe(new ItemStack(materials, 9, 28), "m", 'm', new ItemStack(materials, 1, 3)); //Cobalt + GameRegistry.addRecipe(new ItemStack(materials, 9, 29), "m", 'm', new ItemStack(materials, 1, 4)); //Ardite + GameRegistry.addRecipe(new ItemStack(materials, 9, 30), "m", 'm', new ItemStack(materials, 1, 5)); //Manyullyn + GameRegistry.addRecipe(new ItemStack(materials, 9, 31), "m", 'm', new ItemStack(materials, 1, 13)); //Bronze + GameRegistry.addRecipe(new ItemStack(materials, 9, 32), "m", 'm', new ItemStack(materials, 1, 15)); //Alumite + GameRegistry.addRecipe(new ItemStack(materials, 9, 33), "m", 'm', new ItemStack(materials, 1, 16)); //Steel + + // stained Glass Recipes + String[] dyeTypes = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", + "dyeMagenta", "dyeOrange", "dyeWhite" }; + String color = ""; + for (int i = 0; i < 16; i++) + { + color = dyeTypes[15 - i]; + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.cloth, 8, i), patSurround, 'm', color, '#', new ItemStack(Block.cloth, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', clearGlass)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, clearGlass)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClear, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClear, 1, i), color, new ItemStack(stainedGlassClear, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', glassPane)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, glassPane)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stainedGlassClearPane, 8, i), patSurround, 'm', color, '#', new ItemStack(stainedGlassClearPane, 1, Short.MAX_VALUE))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(stainedGlassClearPane, 1, i), color, new ItemStack(stainedGlassClearPane, 1, Short.MAX_VALUE))); + } + + // Glass Recipes + GameRegistry.addRecipe(new ItemStack(Item.glassBottle, 3), new Object[] { "# #", " # ", '#', clearGlass }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Block.daylightSensor), new Object[] { "GGG", "QQQ", "WWW", 'G', "glass", 'Q', Item.netherQuartz, 'W', "slabWood" })); + GameRegistry.addRecipe(new ItemStack(Block.beacon, 1), new Object[] { "GGG", "GSG", "OOO", 'G', clearGlass, 'S', Item.netherStar, 'O', Block.obsidian }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(glassPane, 16, 0), "GGG", "GGG", 'G', clearGlass)); + + // Smeltery Components Recipes + ItemStack searedBrick = new ItemStack(materials, 1, 2); + GameRegistry.addRecipe(new ItemStack(smeltery, 1, 0), "bbb", "b b", "bbb", 'b', searedBrick); //Controller + GameRegistry.addRecipe(new ItemStack(smeltery, 1, 1), "b b", "b b", "b b", 'b', searedBrick); //Drain + GameRegistry.addRecipe(new ItemStack(smeltery, 1, 2), "bb", "bb", 'b', searedBrick); //Bricks + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 0), patSurround, '#', searedBrick, 'm', "glass")); //Tank + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 1), "bgb", "ggg", "bgb", 'b', searedBrick, 'g', "glass")); //Glass + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(lavaTank, 1, 2), "bgb", "bgb", "bgb", 'b', searedBrick, 'g', "glass")); //Window + GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 0), "bbb", "b b", "b b", 'b', searedBrick); //Table + GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 1), "b b", " b ", 'b', searedBrick); //Faucet + GameRegistry.addRecipe(new ItemStack(searedBlock, 1, 2), "b b", "b b", "bbb", 'b', searedBrick); //Basin + GameRegistry.addRecipe(new ItemStack(castingChannel, 4, 0), "b b", "bbb", 'b', searedBrick); //Channel + + // Jack o'Latern Recipe - Stone Torch + GameRegistry.addRecipe(new ItemStack(Block.pumpkinLantern, 1, 0), "p", "s", 'p', new ItemStack(Block.pumpkin), 's', new ItemStack(stoneTorch)); + // Stone Torch Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', "stoneRod")); + // Stone Ladder Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(stoneLadder, 3), "w w", "www", "w w", 'w', "stoneRod")); + // Wooden Rail Recipe + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(woodenRail, 4, 0), "b b", "bxb", "b b", 'b', "plankWood", 'x', "stickWood")); + // Stonesticks Recipes + GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone)); + GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone)); + // + ItemStack aluBrass = new ItemStack(materials, 1, 14); + // Clock Recipe - Vanilla alternativ + GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone)); + // Gold Pressure Plate - Vanilla alternativ + GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); + //Accessories +<<<<<<< HEAD:src/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); +======= + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(heartCanister, 1, 0), "##", "##", '#', "ingotNaturalAluminum")); + GameRegistry.addRecipe(new ItemStack(diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Item.diamond), '#', new ItemStack(Item.appleRed)); + GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 2), new ItemStack(diamondApple), new ItemStack(materials, 1, 8), new ItemStack(heartCanister, 1, 0), new ItemStack( + heartCanister, 1, 1)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', "ingotGold")); + GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', aluBrass); + // Drying Rack Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); + //Landmine Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 1), "mcm", "rpr", 'm', Block.stone, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 2), "mcm", "rpr", 'm', Block.obsidian, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + Block.pressurePlateStone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 3), "mcm", "rpr", 'm', Item.redstoneRepeater, 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', + Block.pressurePlateStone)); + + //Ultra hardcore recipes + GameRegistry.addRecipe(new ItemStack(goldHead), patSurround, '#', new ItemStack(Item.ingotGold), 'm', new ItemStack(Item.skull, 1, 3)); + + // Slab Smeltery Components Recipes + for (int i = 0; i < 7; i++) + { + GameRegistry.addRecipe(new ItemStack(speedSlab, 6, i), "bbb", 'b', new ItemStack(speedBlock, 1, i)); + } + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 0), "bbb", 'b', new ItemStack(smeltery, 1, 2)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 1), "bbb", 'b', new ItemStack(smeltery, 1, 4)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 2), "bbb", 'b', new ItemStack(smeltery, 1, 5)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 3), "bbb", 'b', new ItemStack(smeltery, 1, 6)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 4), "bbb", 'b', new ItemStack(smeltery, 1, 8)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 5), "bbb", 'b', new ItemStack(smeltery, 1, 9)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 6), "bbb", 'b', new ItemStack(smeltery, 1, 10)); + GameRegistry.addRecipe(new ItemStack(searedSlab, 6, 7), "bbb", 'b', new ItemStack(smeltery, 1, 11)); + + // Wool Slab Recipes + for (int sc = 0; sc <= 7; sc++) + { + GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc)); + GameRegistry.addRecipe(new ItemStack(woolSlab2, 6, sc), "www", 'w', new ItemStack(Block.cloth, 1, sc + 8)); + + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); + GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); + } + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); + //Trap Recipes + GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); + GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', "logWood")); + // Advanced WorkBench Recipes + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "crafterWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', "craftingTableWood")); + //Slab crafters + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "crafterWood")); +<<<<<<< HEAD:src/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); +======= + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(craftingSlabWood, 6, 0), "bbb", 'b', "craftingTableWood")); GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 0), "b", 'b', new ItemStack(craftingStationWood, 1, 0)); +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 1), "b", 'b', new ItemStack(toolStationWood, 1, 0)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 1)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 2)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 3)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 2), "b", 'b', new ItemStack(toolStationWood, 1, 4)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 4), "b", 'b', new ItemStack(toolStationWood, 1, 5)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 10)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 11)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 12)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 3), "b", 'b', new ItemStack(toolStationWood, 1, 13)); + GameRegistry.addRecipe(new ItemStack(craftingSlabWood, 1, 5), "b", 'b', new ItemStack(toolForge, 1, Short.MAX_VALUE)); + // EssenceExtractor Recipe + //Slime Recipes + GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 0), "##", "##", '#', strangeFood); + GameRegistry.addRecipe(new ItemStack(strangeFood, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 0)); + GameRegistry.addRecipe(new ItemStack(slimeGel, 1, 1), "##", "##", '#', Item.slimeBall); + GameRegistry.addRecipe(new ItemStack(Item.slimeBall, 4, 0), "#", '#', new ItemStack(slimeGel, 1, 1)); + //slimeExplosive + GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 0), Item.slimeBall, Block.tnt); + GameRegistry.addShapelessRecipe(new ItemStack(slimeExplosive, 1, 2), strangeFood, Block.tnt); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimeExplosive, 1, 0), "slimeball", Block.tnt)); + + GameRegistry.addShapelessRecipe(new ItemStack(slimeChannel, 1, 0), new ItemStack(slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, "slimeBall")); + } + + private void addRecipesForFurnace () + { + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 3, new ItemStack(craftedSoil, 1, 4), 0.2f); //Concecrated Soil + + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime + //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); + //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); + FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); + FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); + FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 11), 0.5f); + + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f); + //FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); + + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f); + + FurnaceRecipes.smelting().addSmelting(speedBlock.blockID, 0, new ItemStack(speedBlock, 1, 2), 0.2f); + } + + private void addPartMapping () + { + /* Tools */ + patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, + toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead, null }; + + int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; + + if (PHConstruct.craftMetalTools) + { + for (int mat = 0; mat < 18; mat++) + { + for (int meta = 0; meta < patternOutputs.length; meta++) + { + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); + } + } + } + else + { + for (int mat = 0; mat < nonMetals.length; mat++) + { + for (int meta = 0; meta < patternOutputs.length; meta++) + { + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); + } + } + } + } + + private void addRecipesForToolBuilder () + { + ToolBuilder tb = ToolBuilder.instance; + tb.addNormalToolRecipe(pickaxe, pickaxeHead, toolRod, binding); + tb.addNormalToolRecipe(broadsword, swordBlade, toolRod, wideGuard); + tb.addNormalToolRecipe(hatchet, hatchetHead, toolRod); + tb.addNormalToolRecipe(shovel, shovelHead, toolRod); + tb.addNormalToolRecipe(longsword, swordBlade, toolRod, handGuard); + tb.addNormalToolRecipe(rapier, swordBlade, toolRod, crossbar); + tb.addNormalToolRecipe(frypan, frypanHead, toolRod); + tb.addNormalToolRecipe(battlesign, signHead, toolRod); + tb.addNormalToolRecipe(mattock, hatchetHead, toolRod, shovelHead); + tb.addNormalToolRecipe(dagger, knifeBlade, toolRod, crossbar); + tb.addNormalToolRecipe(cutlass, swordBlade, toolRod, fullGuard); + tb.addNormalToolRecipe(chisel, chiselHead, toolRod); + + tb.addNormalToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod); + tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, largePlate, toughBinding); + tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, largePlate, toughRod); + tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, largePlate, toughBinding); + tb.addNormalToolRecipe(hammer, hammerHead, toughRod, largePlate, largePlate); + tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); + + //tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod); + BowRecipe recipe = new BowRecipe(toolRod, bowstring, toolRod, shortbow); + tb.addCustomToolRecipe(recipe); + tb.addNormalToolRecipe(arrow, arrowhead, toolRod, fletching); + + ItemStack diamond = new ItemStack(Item.diamond); + tb.registerToolMod(new ModRepair()); + tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); + tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); + + modF = new ModFlux(); + tb.registerToolMod(modF); + + ItemStack redstoneItem = new ItemStack(Item.redstone); + ItemStack redstoneBlock = new ItemStack(Block.blockRedstone); + tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem }, 2, 1)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneItem }, 2, 2)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock }, 2, 9)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneItem, redstoneBlock }, 2, 10)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { redstoneBlock, redstoneBlock }, 2, 18)); + + ItemStack lapisItem = new ItemStack(Item.dyePowder, 1, 4); + ItemStack lapisBlock = new ItemStack(Block.blockLapis); + modL = new ModLapis(new ItemStack[] { lapisItem }, 10, 1); + tb.registerToolMod(modL); + tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisItem }, 10, 2)); + tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock }, 10, 9)); + tb.registerToolMod(new ModLapis(new ItemStack[] { lapisItem, lapisBlock }, 10, 10)); + tb.registerToolMod(new ModLapis(new ItemStack[] { lapisBlock, lapisBlock }, 10, 18)); + + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); + ItemStack blazePowder = new ItemStack(Item.blazePowder); + tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder }, 7, 1)); + tb.registerToolMod(new ModBlaze(new ItemStack[] { blazePowder, blazePowder }, 7, 2)); + tb.registerToolMod(new ModAutoSmelt(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); + + ItemStack quartzItem = new ItemStack(Item.netherQuartz); + ItemStack quartzBlock = new ItemStack(Block.blockNetherQuartz, 1, Short.MAX_VALUE); + tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem }, 11, 1)); + tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzItem }, 11, 2)); + tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock }, 11, 4)); + tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzItem, quartzBlock }, 11, 5)); + tb.registerToolMod(new ModAttack("Quartz", new ItemStack[] { quartzBlock, quartzBlock }, 11, 8)); + + tb.registerToolMod(new ModExtraModifier(new ItemStack[] { diamond, new ItemStack(Block.blockGold) }, "Tier1Free")); + tb.registerToolMod(new ModExtraModifier(new ItemStack[] { new ItemStack(Item.netherStar) }, "Tier2Free")); + + ItemStack silkyJewel = new ItemStack(materials, 1, 26); + tb.registerToolMod(new ModButtertouch(new ItemStack[] { silkyJewel }, 12)); + + ItemStack piston = new ItemStack(Block.pistonBase); + tb.registerToolMod(new ModPiston(new ItemStack[] { piston }, 3, 1)); + tb.registerToolMod(new ModPiston(new ItemStack[] { piston, piston }, 3, 2)); + + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(Block.obsidian), new ItemStack(Item.enderPearl) }, 13, "Beheading", 1, "\u00a7d", "Beheading")); + + ItemStack holySoil = new ItemStack(craftedSoil, 1, 4); + tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil }, 14, 1)); + tb.registerToolMod(new ModSmite("Smite", new ItemStack[] { holySoil, holySoil }, 14, 2)); + + ItemStack spidereyeball = new ItemStack(Item.fermentedSpiderEye); + tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball }, 15, 1)); + tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball, spidereyeball }, 15, 2)); + + ItemStack obsidianPlate = new ItemStack(largePlate, 1, 6); + tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1)); + + TConstructRegistry.registerActiveToolMod(new TActiveOmniMod()); + } + + private void addRecipesForTableCasting () + { + /* Smeltery */ + ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); + ItemStack gemcast = new ItemStack(metalPattern, 1, 26); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + //Blank + tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); + tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); + + //Ingots + tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4), ingotcast, 80); //stone + + //Misc + tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); + tableCasting.addCastingRecipe(new ItemStack(materials, 1, 36), new FluidStack(glueFluid, TConstruct.ingotLiquidValue), null, 50); + + //Buckets + ItemStack bucket = new ItemStack(Item.bucketEmpty); + + for (int sc = 0; sc < 24; sc++) + { + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + } + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 26), new FluidStack(fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + + // Clear glass pane casting + tableCasting.addCastingRecipe(new ItemStack(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); + + // Metal toolpart casting + liquids = new FluidStack[] { new FluidStack(moltenIronFluid, 1), new FluidStack(moltenCopperFluid, 1), new FluidStack(moltenCobaltFluid, 1), new FluidStack(moltenArditeFluid, 1), + new FluidStack(moltenManyullynFluid, 1), new FluidStack(moltenBronzeFluid, 1), new FluidStack(moltenAlumiteFluid, 1), new FluidStack(moltenObsidianFluid, 1), + new FluidStack(moltenSteelFluid, 1), new FluidStack(pigIronFluid, 1) }; + int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 }; //ItemStack damage value + int fluidAmount = 0; + Fluid fs = null; + + for (int iter = 0; iter < patternOutputs.length; iter++) + { + if (patternOutputs[iter] != null) + { + ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); + + tableCasting.addCastingRecipe(cast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + + for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) + { + fs = liquids[iterTwo].getFluid(); + fluidAmount = ((IPattern) metalPattern).getPatternCost(cast) * TConstruct.ingotLiquidValue / 2; + ItemStack metalCast = new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]); + tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50); + Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount); + } + } + } + + ItemStack[] ingotShapes = { new ItemStack(Item.brick), new ItemStack(Item.netherrackBrick), new ItemStack(materials, 1, 2) }; + for (int i = 0; i < ingotShapes.length; i++) + { + tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), ingotShapes[i], false, 50); + tableCasting.addCastingRecipe(ingotcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), ingotShapes[i], false, 50); + } + + ItemStack fullguardCast = new ItemStack(metalPattern, 1, 22); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(fullGuard, 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(fullguardCast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(fullGuard, 1, Short.MAX_VALUE), false, 50); + + // Golden Food Stuff + FluidStack goldAmount = null; + if (PHConstruct.goldAppleRecipe) + { + goldAmount = new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 8); + } + else + { + goldAmount = new FluidStack(moltenGoldFluid, TConstruct.nuggetLiquidValue * 8); + } + tableCasting.addCastingRecipe(new ItemStack(Item.appleGold, 1), goldAmount, new ItemStack(Item.appleRed), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.goldenCarrot, 1), goldAmount, new ItemStack(Item.carrot), true, 50); + tableCasting.addCastingRecipe(new ItemStack(Item.speckledMelon, 1), goldAmount, new ItemStack(Item.melon), true, 50); + tableCasting.addCastingRecipe(new ItemStack(goldHead), goldAmount, new ItemStack(Item.skull, 1, 3), true, 50); + } + + private void addRecipesForBasinCasting () + { + LiquidCasting basinCasting = TConstructRegistry.getBasinCasting(); + // Block Casting + basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), new FluidStack(moltenIronFluid, TConstruct.blockLiquidValue), null, true, 100); //Iron + basinCasting.addCastingRecipe(new ItemStack(Block.blockGold), new FluidStack(moltenGoldFluid, TConstruct.blockLiquidValue), null, true, 100); //gold + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 3), new FluidStack(moltenCopperFluid, TConstruct.blockLiquidValue), null, true, 100); //copper + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 5), new FluidStack(moltenTinFluid, TConstruct.blockLiquidValue), null, true, 100); //tin + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 6), new FluidStack(moltenAluminumFluid, TConstruct.blockLiquidValue), null, true, 100); //aluminum + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 0), new FluidStack(moltenCobaltFluid, TConstruct.blockLiquidValue), null, true, 100); //cobalt + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 1), new FluidStack(moltenArditeFluid, TConstruct.blockLiquidValue), null, true, 100); //ardite + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 4), new FluidStack(moltenBronzeFluid, TConstruct.blockLiquidValue), null, true, 100); //bronze + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 7), new FluidStack(moltenAlubrassFluid, TConstruct.blockLiquidValue), null, true, 100); //albrass + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 2), new FluidStack(moltenManyullynFluid, TConstruct.blockLiquidValue), null, true, 100); //manyullyn + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 8), new FluidStack(moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); //alumite + basinCasting.addCastingRecipe(new ItemStack(Block.obsidian), new FluidStack(moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian + basinCasting.addCastingRecipe(new ItemStack(metalBlock, 1, 9), new FluidStack(moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); //steel + basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass + basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone + basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640 * 9), null, true, 100); //emerald + basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone + basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone + basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender + basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue + + // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); + + //Armor casts + /*FluidRenderProperties frp = new FluidRenderProperties(Applications.BASIN.minHeight, 0.65F, Applications.BASIN); + FluidStack aluFlu = new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 10); + FluidStack gloFlu = new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 10); + ItemStack[] armor = { new ItemStack(helmetWood), new ItemStack(chestplateWood), new ItemStack(leggingsWood), new ItemStack(bootsWood) }; + for (int sc = 0; sc < armor.length; sc++) + { + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), aluFlu, armor[sc], 50, frp); + basinCasting.addCastingRecipe(new ItemStack(armorPattern, 1, sc), gloFlu, armor[sc], 50, frp); + }*/ + } + + private void addRecipesForSmeltery () + { + //Alloy Smelting + Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsBronzeAlloy), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), + new FluidStack(moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAluminumBrassAlloy), new FluidStack(moltenAluminumFluid, + TConstruct.ingotLiquidValue * 3), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsAlumiteAlloy), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), + new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite + Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), + new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn + Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), + new FluidStack(moltenEmeraldFluid, 640), new FluidStack(bloodFluid, 80)); //Pigiron + + // Stone parts + for (int sc = 0; sc < patternOutputs.length; sc++) + { + if (patternOutputs[sc] != null) + { + Smeltery.addMelting(FluidType.Stone, new ItemStack(patternOutputs[sc], 1, 1), 1, (8 * ((IPattern) woodPattern).getPatternCost(new ItemStack(woodPattern, 1, sc + 1))) / 2); + } + } + + // Chunks + Smeltery.addMelting(FluidType.Stone, new ItemStack(toolShard, 1, 1), 0, 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(toolShard, 1, 2), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(toolShard, 1, 6), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Cobalt, new ItemStack(toolShard, 1, 10), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Ardite, new ItemStack(toolShard, 1, 11), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Manyullyn, new ItemStack(toolShard, 1, 12), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Copper, new ItemStack(toolShard, 1, 13), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Bronze, new ItemStack(toolShard, 1, 14), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Alumite, new ItemStack(toolShard, 1, 15), 0, TConstruct.chunkLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(toolShard, 1, 16), 0, TConstruct.chunkLiquidValue); + + // Items + + Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Glue, new ItemStack(materials, 1, 36), 0, TConstruct.ingotLiquidValue); + + Smeltery.addMelting(FluidType.Ender, new ItemStack(Item.enderPearl, 4), 0, 250); + Smeltery.addMelting(metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); + Smeltery.addMelting(FluidType.Water, new ItemStack(Item.snowball, 1, 0), 0, 125); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.flintAndSteel, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.compass, 1, 0), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bucketEmpty), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartEmpty), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartCrate), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartPowered), 0, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartHopper), 50, TConstruct.ingotLiquidValue * 10); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 640); + + //Blocks melt as themselves! + //Ore + Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(oreGravel, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(oreGravel, 1, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + + //Blocks + Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Block.blockGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 9)); + Smeltery.addMelting(Block.obsidian, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(Block.ice, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 1000)); + Smeltery.addMelting(Block.blockSnow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 500)); + Smeltery.addMelting(Block.snow, 0, 75, new FluidStack(FluidRegistry.getFluid("water"), 250)); + Smeltery.addMelting(Block.sand, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Block.glass, 0, 625, new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME)); + Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); + Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640 * 9)); + Smeltery.addMelting(glueBlock, 0, 250, new FluidStack(glueFluid, TConstruct.blockLiquidValue)); + Smeltery.addMelting(craftedSoil, 1, 600, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 4)); + + Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); + Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); + + for (int i = 0; i < 16; i++) + { + Smeltery.addMelting(stainedGlassClear, i, 500, new FluidStack(moltenGlassFluid, 1000)); + Smeltery.addMelting(stainedGlassClearPane, i, 350, new FluidStack(moltenGlassFluid, 250)); + } + + //Bricks + Smeltery.addMelting(multiBrick, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(multiBrickFancy, 4, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(multiBrick, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(multiBrickFancy, 5, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue)); + Smeltery.addMelting(multiBrick, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + Smeltery.addMelting(multiBrickFancy, 0, 800, new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); + + //Vanilla blocks + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.fenceIron), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.pressurePlateIron), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.pressurePlateGold, 4), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Block.railPowered), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railDetector), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.railActivator), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Obsidian, new ItemStack(Block.enchantmentTable), 0, TConstruct.ingotLiquidValue * 4); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.cauldron), 0, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 0), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 1), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.anvil, 1, 2), 200, TConstruct.ingotLiquidValue * 31); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Block.hopperBlock), 0, TConstruct.ingotLiquidValue * 5); + + //Vanilla Armor + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.helmetIron, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.plateIron, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.legsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.bootsIron, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.helmetGold, 1, 0), 50, TConstruct.ingotLiquidValue * 5); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.plateGold, 1, 0), 50, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.legsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 7); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.bootsGold, 1, 0), 50, TConstruct.ingotLiquidValue * 4); + + Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.helmetChain, 1, 0), 25, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.plateChain, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.legsChain, 1, 0), 50, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Steel, new ItemStack(Item.bootsChain, 1, 0), 25, TConstruct.ingotLiquidValue); + + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.horseArmorIron, 1), 100, TConstruct.ingotLiquidValue * 8); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.horseArmorGold, 1), 100, TConstruct.ingotLiquidValue * 8); + + //Vanilla tools + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.hoeIron, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.swordIron, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shovelIron, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.pickaxeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.axeIron, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.hoeGold, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.swordGold, 1, 0), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.shovelGold, 1, 0), 0, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.pickaxeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Item.axeGold, 1, 0), 0, TConstruct.ingotLiquidValue * 3); + } + + private void addRecipesForDryingRack () + { + //Drying rack + DryingRackRecipes.addDryingRecipe(Item.beefRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 0)); + DryingRackRecipes.addDryingRecipe(Item.chickenRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 1)); + DryingRackRecipes.addDryingRecipe(Item.porkRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 2)); + //DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 3)); + DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 4)); + DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(jerky, 1, 5)); + + //DryingRackRecipes.addDryingRecipe(new ItemStack(jerky, 1, 5), 20 * 60 * 10, Item.leather); + } + + private void addRecipesForChisel () + { + /* Detailing */ + Detailing chiseling = TConstructRegistry.getChiselDetailing(); + chiseling.addDetailing(Block.stone, 0, Block.stoneBrick, 0, chisel); + chiseling.addDetailing(speedBlock, 0, speedBlock, 1, chisel); + chiseling.addDetailing(speedBlock, 2, speedBlock, 3, chisel); + chiseling.addDetailing(speedBlock, 3, speedBlock, 4, chisel); + chiseling.addDetailing(speedBlock, 4, speedBlock, 5, chisel); + chiseling.addDetailing(speedBlock, 5, speedBlock, 6, chisel); + + chiseling.addDetailing(Block.obsidian, 0, multiBrick, 0, chisel); + chiseling.addDetailing(Block.sandStone, 0, Block.sandStone, 2, chisel); + chiseling.addDetailing(Block.sandStone, 2, Block.sandStone, 1, chisel); + chiseling.addDetailing(Block.sandStone, 1, multiBrick, 1, chisel); + //chiseling.addDetailing(Block.netherrack, 0, multiBrick, 2, chisel); + //chiseling.addDetailing(Block.stone_refined, 0, multiBrick, 3, chisel); + chiseling.addDetailing(Item.ingotIron, 0, multiBrick, 4, chisel); + chiseling.addDetailing(Item.ingotGold, 0, multiBrick, 5, chisel); + chiseling.addDetailing(Item.dyePowder, 4, multiBrick, 6, chisel); + chiseling.addDetailing(Item.diamond, 0, multiBrick, 7, chisel); + chiseling.addDetailing(Item.redstone, 0, multiBrick, 8, chisel); + chiseling.addDetailing(Item.bone, 0, multiBrick, 9, chisel); + chiseling.addDetailing(Item.slimeBall, 0, multiBrick, 10, chisel); + chiseling.addDetailing(strangeFood, 0, multiBrick, 11, chisel); + chiseling.addDetailing(Block.whiteStone, 0, multiBrick, 12, chisel); + chiseling.addDetailing(materials, 18, multiBrick, 13, chisel); + + // adding multiBrick / multiBrickFanxy meta 0-13 to list + for (int sc = 0; sc < 14; sc++) + { + chiseling.addDetailing(multiBrick, sc, multiBrickFancy, sc, chisel); + } + + chiseling.addDetailing(Block.stoneBrick, 0, multiBrickFancy, 15, chisel); + chiseling.addDetailing(multiBrickFancy, 15, multiBrickFancy, 14, chisel); + chiseling.addDetailing(multiBrickFancy, 14, Block.stoneBrick, 3, chisel); + /*chiseling.addDetailing(multiBrick, 14, multiBrickFancy, 14, chisel); + chiseling.addDetailing(multiBrick, 15, multiBrickFancy, 15, chisel);*/ + + chiseling.addDetailing(smeltery, 4, smeltery, 6, chisel); + chiseling.addDetailing(smeltery, 6, smeltery, 11, chisel); + chiseling.addDetailing(smeltery, 11, smeltery, 2, chisel); + chiseling.addDetailing(smeltery, 2, smeltery, 8, chisel); + chiseling.addDetailing(smeltery, 8, smeltery, 9, chisel); + chiseling.addDetailing(smeltery, 9, smeltery, 10, chisel); + } + + void setupToolTabs () + { + TConstructRegistry.materialTab.init(new ItemStack(titleIcon, 1, 255)); + TConstructRegistry.blockTab.init(new ItemStack(toolStationWood)); + ItemStack tool = new ItemStack(longsword, 1, 0); + + NBTTagCompound compound = new NBTTagCompound(); + compound.setCompoundTag("InfiTool", new NBTTagCompound()); + compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2); + compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0); + compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10); + tool.setTagCompound(compound); + + //TConstruct. + TConstructRegistry.toolTab.init(tool); + } + + public void addLoot () + { + //Item, min, max, weight + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 10)); + + tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27); + tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(heartCanister, 1, 1), 1, 1, 1)); + int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 }; + Item[] partTypes = { pickaxeHead, shovelHead, hatchetHead, binding, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, frypanHead, signHead, chiselHead }; + + for (int partIter = 0; partIter < partTypes.length; partIter++) + { + for (int typeIter = 0; typeIter < validTypes.length; typeIter++) + { + tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15)); + } + } + + tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30); + for (int i = 0; i < 13; i++) + { + tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, i + 1), 1, 3, 20)); + } + tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(woodPattern, 1, 22), 1, 3, 40)); + } + + public static String[] liquidNames; + + public void oreRegistry () + { + OreDictionary.registerOre("oreCobalt", new ItemStack(oreSlag, 1, 1)); + OreDictionary.registerOre("oreArdite", new ItemStack(oreSlag, 1, 2)); + OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); + OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); + OreDictionary.registerOre("oreAluminum", new ItemStack(oreSlag, 1, 5)); + OreDictionary.registerOre("oreAluminium", new ItemStack(oreSlag, 1, 5)); + + OreDictionary.registerOre("oreIron", new ItemStack(oreGravel, 1, 0)); + OreDictionary.registerOre("oreGold", new ItemStack(oreGravel, 1, 1)); + OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5)); + OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2)); + OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3)); + OreDictionary.registerOre("oreAluminum", new ItemStack(oreGravel, 1, 4)); + OreDictionary.registerOre("oreAluminium", new ItemStack(oreGravel, 1, 4)); + + OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3)); + OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); + OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); + OreDictionary.registerOre("ingotCopper", new ItemStack(materials, 1, 9)); + OreDictionary.registerOre("ingotTin", new ItemStack(materials, 1, 10)); + OreDictionary.registerOre("ingotAluminum", new ItemStack(materials, 1, 11)); + OreDictionary.registerOre("ingotAluminium", new ItemStack(materials, 1, 11)); + OreDictionary.registerOre("ingotBronze", new ItemStack(materials, 1, 13)); + OreDictionary.registerOre("ingotAluminumBrass", new ItemStack(materials, 1, 14)); + OreDictionary.registerOre("ingotAluminiumBrass", new ItemStack(materials, 1, 14)); + OreDictionary.registerOre("ingotAlumite", new ItemStack(materials, 1, 15)); + OreDictionary.registerOre("ingotSteel", new ItemStack(materials, 1, 16)); + ensureOreIsRegistered("ingotIron", new ItemStack(Item.ingotIron)); + ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold)); + OreDictionary.registerOre("ingotObsidian", new ItemStack(materials, 1, 18)); + OreDictionary.registerOre("ingotPigIron", new ItemStack(materials, 1, 34)); + OreDictionary.registerOre("itemRawRubber", new ItemStack(materials, 1, 36)); + + OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0)); + OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1)); + OreDictionary.registerOre("blockManyullyn", new ItemStack(metalBlock, 1, 2)); + OreDictionary.registerOre("blockCopper", new ItemStack(metalBlock, 1, 3)); + OreDictionary.registerOre("blockBronze", new ItemStack(metalBlock, 1, 4)); + OreDictionary.registerOre("blockTin", new ItemStack(metalBlock, 1, 5)); + OreDictionary.registerOre("blockAluminum", new ItemStack(metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminium", new ItemStack(metalBlock, 1, 6)); + OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); + OreDictionary.registerOre("blockAluminiumBrass", new ItemStack(metalBlock, 1, 7)); + OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); + OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); + ensureOreIsRegistered("blockIron", new ItemStack(Block.blockIron)); + ensureOreIsRegistered("blockGold", new ItemStack(Block.blockGold)); + + OreDictionary.registerOre("nuggetIron", new ItemStack(materials, 1, 19)); + OreDictionary.registerOre("nuggetIron", new ItemStack(oreBerries, 1, 0)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(materials, 1, 20)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(oreBerries, 1, 2)); + OreDictionary.registerOre("nuggetTin", new ItemStack(materials, 1, 21)); + OreDictionary.registerOre("nuggetTin", new ItemStack(oreBerries, 1, 3)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminum", new ItemStack(oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(materials, 1, 22)); + OreDictionary.registerOre("nuggetAluminium", new ItemStack(oreBerries, 1, 4)); + OreDictionary.registerOre("nuggetAluminumBrass", new ItemStack(materials, 1, 24)); + OreDictionary.registerOre("nuggetAluminiumBrass", new ItemStack(materials, 1, 24)); + OreDictionary.registerOre("nuggetObsidian", new ItemStack(materials, 1, 27)); + OreDictionary.registerOre("nuggetCobalt", new ItemStack(materials, 1, 28)); + OreDictionary.registerOre("nuggetArdite", new ItemStack(materials, 1, 29)); + OreDictionary.registerOre("nuggetManyullyn", new ItemStack(materials, 1, 30)); + OreDictionary.registerOre("nuggetBronze", new ItemStack(materials, 1, 31)); + OreDictionary.registerOre("nuggetAlumite", new ItemStack(materials, 1, 32)); + OreDictionary.registerOre("nuggetSteel", new ItemStack(materials, 1, 33)); + OreDictionary.registerOre("nuggetGold", new ItemStack(oreBerries, 1, 1)); + ensureOreIsRegistered("nuggetGold", new ItemStack(Item.goldNugget)); + OreDictionary.registerOre("nuggetPigIron", new ItemStack(materials, 1, 35)); + + OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab1, 1, Short.MAX_VALUE)); + OreDictionary.registerOre("slabCloth", new ItemStack(woolSlab2, 1, Short.MAX_VALUE)); + + ensureOreIsRegistered("stoneMossy", new ItemStack(Block.stoneBrick, 1, 1)); + ensureOreIsRegistered("stoneMossy", new ItemStack(Block.cobblestoneMossy)); + + OreDictionary.registerOre("crafterWood", new ItemStack(Block.workbench, 1)); + OreDictionary.registerOre("craftingTableWood", new ItemStack(Block.workbench, 1)); + + OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); + + String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", + "blueslime" }; + for (int i = 0; i < matNames.length; i++) + OreDictionary.registerOre(matNames[i] + "Rod", new ItemStack(toolRod, 1, i)); + OreDictionary.registerOre("thaumiumRod", new ItemStack(toolRod, 1, 31)); + + String[] glassTypes = { "glassBlack", "glassRed", "glassGreen", "glassBrown", "glassBlue", "glassPurple", "glassCyan", "glassLightGray", "glassGray", "glassPink", "glassLime", "glassYellow", + "glassLightBlue", "glassMagenta", "glassOrange", "glassWhite" }; + for (int i = 0; i < 16; i++) + { + OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(stainedGlassClear, 1, i)); + } + + BlockDispenser.dispenseBehaviorRegistry.putObject(titleIcon, new TDispenserBehaviorSpawnEgg()); + + BlockDispenser.dispenseBehaviorRegistry.putObject(arrow, new TDispenserBehaviorArrow()); + + //Vanilla stuff + OreDictionary.registerOre("slimeball", new ItemStack(Item.slimeBall)); + OreDictionary.registerOre("slimeball", new ItemStack(strangeFood, 1, 0)); + OreDictionary.registerOre("slimeball", new ItemStack(materials, 1, 36)); + OreDictionary.registerOre("glass", new ItemStack(clearGlass)); + OreDictionary.registerOre("glass", new ItemStack(Block.glass)); + RecipeRemover.removeShapedRecipe(new ItemStack(Block.pistonStickyBase)); + RecipeRemover.removeShapedRecipe(new ItemStack(Item.magmaCream)); + RecipeRemover.removeShapedRecipe(new ItemStack(Item.leash)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.leash, 2), "ss ", "sS ", " s", 's', Item.silk, 'S', "slimeball")); + } + + private void ensureOreIsRegistered (String oreName, ItemStack is) + { + int oreId = OreDictionary.getOreID(is); + if (oreId == -1) + { + OreDictionary.registerOre(oreName, is); + } + } + + public static boolean thaumcraftAvailable; + + public void intermodCommunication () + { + if (Loader.isModLoaded("Thaumcraft")) + { + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 12)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 13)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 14)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerry, 1, 15)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 12)); + FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(oreBerrySecond, 1, 13)); + } + if (Loader.isModLoaded("Mystcraft")) + { + MystImcHandler.blacklistFluids(); + } + if (Loader.isModLoaded("BuildCraft|Transport")) + { + BCImcHandler.registerFacades(); + } + /* FORESTRY + * Edit these strings to change what items are added to the backpacks + * Format info: "[backpack ID]@[item ID].[metadata or *]:[next item]" and so on + * Avaliable backpack IDs: forester, miner, digger, hunter, adventurer, builder + * May add more backpack items later - Spyboticsguy + */ + if (Loader.isModLoaded("Forestry")) + { + String builderItems = "builder@" + String.valueOf(stoneTorch.blockID) + ":*"; + FMLInterModComms.sendMessage("Forestry", "add-backpack-items", builderItems); + } + if (!Loader.isModLoaded("AppliedEnergistics")) + { + AEImcHandler.registerForSpatialIO(); + } + } + + private static boolean initRecipes; + + public static void modRecipes () + { + if (!initRecipes) + { + initRecipes = true; + if (PHConstruct.removeVanillaToolRecipes) + { + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeWood)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordWood)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeStone)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordStone)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeIron)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordIron)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeDiamond)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordDiamond)); + + RecipeRemover.removeAnyRecipe(new ItemStack(Item.pickaxeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.axeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.shovelGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.hoeGold)); + RecipeRemover.removeAnyRecipe(new ItemStack(Item.swordGold)); + } + } + } + + public static void addShapedRecipeFirst (List recipeList, ItemStack itemstack, Object... objArray) + { + String var3 = ""; + int var4 = 0; + int var5 = 0; + int var6 = 0; + + if (objArray[var4] instanceof String[]) + { + String[] var7 = ((String[]) objArray[var4++]); + + for (int var8 = 0; var8 < var7.length; ++var8) + { + String var9 = var7[var8]; + ++var6; + var5 = var9.length(); + var3 = var3 + var9; + } + } + else + { + while (objArray[var4] instanceof String) + { + String var11 = (String) objArray[var4++]; + ++var6; + var5 = var11.length(); + var3 = var3 + var11; + } + } + + HashMap var12; + + for (var12 = new HashMap(); var4 < objArray.length; var4 += 2) + { + Character var13 = (Character) objArray[var4]; + ItemStack var14 = null; + + if (objArray[var4 + 1] instanceof Item) + { + var14 = new ItemStack((Item) objArray[var4 + 1]); + } + else if (objArray[var4 + 1] instanceof Block) + { + var14 = new ItemStack((Block) objArray[var4 + 1], 1, Short.MAX_VALUE); + } + else if (objArray[var4 + 1] instanceof ItemStack) + { + var14 = (ItemStack) objArray[var4 + 1]; + } + + var12.put(var13, var14); + } + + ItemStack[] var15 = new ItemStack[var5 * var6]; + + for (int var16 = 0; var16 < var5 * var6; ++var16) + { + char var10 = var3.charAt(var16); + + if (var12.containsKey(Character.valueOf(var10))) + { + var15[var16] = ((ItemStack) var12.get(Character.valueOf(var10))).copy(); + } + else + { + var15[var16] = null; + } + } + + ShapedRecipes var17 = new ShapedRecipes(var5, var6, var15, itemstack); + recipeList.add(0, var17); + } + + public void modIntegration () + { + ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), ""); + /*TE3 Flux*/ + ItemStack batHardened = GameRegistry.findItemStack("ThermalExpansion", "capacitorHardened", 1); + if (batHardened != null) + { + modF.batteries.add(batHardened); + } + ItemStack basicCell = GameRegistry.findItemStack("ThermalExpansion", "cellBasic", 1); + if (basicCell != null) + { + modF.batteries.add(basicCell); + } + if (batHardened != null) + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); + if (basicCell != null) + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); +<<<<<<< HEAD:src/tconstruct/common/TContent.java + + /* IC2 */ +======= +>>>>>>> origin/gradle:src/main/java/tconstruct/common/TContent.java + + + /* Thaumcraft */ + Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); + if (obj != null) + { + TConstruct.logger.info("Thaumcraft detected. Adding thaumium tools."); + thaumcraftAvailable = true; + TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); + TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "Thaumic"); + PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(toolShard, 1, 31), new ItemStack(toolRod, 1, 31), 31); + for (int meta = 0; meta < patternOutputs.length; meta++) + { + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); + } + + TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(bowstring, 1, 1), 1F, 1F, 0.9f); + TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); + TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F, 100F); + } + else + { + TConstruct.logger.warning("Thaumcraft not detected."); + } + + if (Loader.isModLoaded("Natura")) + { + try + { + Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent"); + TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(bowstring, 1, 2), 1.2F, 0.8F, 1.3f); + } + catch (Exception e) + { + } //No need to handle + } + + ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + LiquidCasting basinCasting = TConstructRegistry.instance.getBasinCasting(); + + /* Thermal Expansion 3 Metals */ + ArrayList ores = OreDictionary.getOres("ingotNickel"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenNickelFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotLead"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenLeadFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotSilver"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenSilverFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotPlatinum"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenShinyFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + } + ores = OreDictionary.getOres("ingotInvar"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenInvarFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(moltenInvarFluid, 24), new FluidStack(moltenIronFluid, 16), new FluidStack(moltenNickelFluid, 8)); //Invar + } + ores = OreDictionary.getOres("ingotElectrum"); + if (ores.size() > 0) + { + tableCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenElectrumFluid, TConstruct.ingotLiquidValue), ingotcast, 80); + Smeltery.addAlloyMixing(new FluidStack(moltenElectrumFluid, 16), new FluidStack(moltenGoldFluid, 8), new FluidStack(moltenSilverFluid, 8)); //Electrum + } + + ores = OreDictionary.getOres("blockNickel"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenNickelFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockLead"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenLeadFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockSilver"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenSilverFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockPlatinum"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenShinyFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockInvar"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenInvarFluid, TConstruct.blockLiquidValue), null, 100); + } + ores = OreDictionary.getOres("blockElectrum"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(ores.get(0), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue), null, 100); + } + + /* Extra Utilities */ + ores = OreDictionary.getOres("compressedGravel1x"); + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(new ItemStack(speedBlock, 9), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue), ores.get(0), 100); + } + ores = OreDictionary.getOres("compressedGravel2x"); //Higher won't save properly + if (ores.size() > 0) + { + basinCasting.addCastingRecipe(new ItemStack(speedBlock, 81), new FluidStack(moltenElectrumFluid, TConstruct.blockLiquidValue * 9), ores.get(0), 100); + } + + /* Rubber */ + ores = OreDictionary.getOres("itemRubber"); + if (ores.size() > 0) + { + FurnaceRecipes.smelting().addSmelting(materials.itemID, 36, ores.get(0), 0.2f); + } + //new ItemStack(materials, 1, 36) + } + + public static Object getStaticItem (String name, String classPackage) + { + try + { + Class clazz = Class.forName(classPackage); + Field field = clazz.getDeclaredField(name); + Object ret = field.get(null); + if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) + return ret; + return null; + } + catch (Exception e) + { + TConstruct.logger.warning("Could not find " + name); + return null; + } + } + + @Override + public int getBurnTime (ItemStack fuel) + { + if (fuel.itemID == materials.itemID && fuel.getItemDamage() == 7) + return 26400; + return 0; + } + + public void addOreDictionarySmelteryRecipes () + { + List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime }); + for (FluidType ft : FluidType.values()) + { + if (exceptions.contains(ft)) + continue; + + // Nuggets + Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + + // Ingots, Dust + registerIngotCasting(ft); + Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue); + + // Factorization support + Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + + // Ores + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre); + + // NetherOres support + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2); + + // Blocks + Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + + if (ft.isToolpart) + { + registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); + registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + } + } + + //Compressed materials + for (int i = 1; i <= 8; i++) + { + Smeltery.addDictionaryMelting("compressedCobblestone" + i + "x", FluidType.Stone, 0, TConstruct.ingotLiquidValue / 18 * (9 ^ i)); + } + Smeltery.addDictionaryMelting("compressedSand1x", FluidType.Glass, 175, FluidContainerRegistry.BUCKET_VOLUME * 9); + + registerPatternMaterial("plankWood", 2, "Wood"); + registerPatternMaterial("stickWood", 1, "Wood"); + registerPatternMaterial("slabWood", 1, "Wood"); + registerPatternMaterial("compressedCobblestone1x", 18, "Stone"); + } + + private void registerPatternMaterial (String oreName, int value, String materialName) + { + for (ItemStack ore : OreDictionary.getOres(oreName)) + { + PatternBuilder.instance.registerMaterial(ore, value, materialName); + } + } + + private void registerIngotCasting (FluidType ft) + { + ItemStack pattern = new ItemStack(TContent.metalPattern, 1, 0); + LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); + for (ItemStack ore : OreDictionary.getOres("ingot" + ft.toString())) + { + tableCasting.addCastingRecipe(pattern, new FluidStack(TContent.moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(pattern, new FluidStack(TContent.moltenGoldFluid, TConstruct.oreLiquidValue), new ItemStack(ore.itemID, 1, ore.getItemDamage()), false, 50); + tableCasting.addCastingRecipe(new ItemStack(ore.itemID, 1, ore.getItemDamage()), new FluidStack(ft.fluid, TConstruct.ingotLiquidValue), pattern, 80); + } + + } + + public void addAchievements () + { + HashMap achievements = TAchievements.achievements; + + achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement()); + achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.tinkerer", new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); + achievements.put("tconstruct.preparedFight", + new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); + achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() + .registerAchievement()); + achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.enemySlayer", + new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); + achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) + .setSpecial().registerAchievement()); + } +} diff --git a/src/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java similarity index 100% rename from src/tconstruct/common/TProxyCommon.java rename to src/main/java/tconstruct/common/TProxyCommon.java diff --git a/src/tconstruct/common/TimeTicker.java b/src/main/java/tconstruct/common/TimeTicker.java similarity index 100% rename from src/tconstruct/common/TimeTicker.java rename to src/main/java/tconstruct/common/TimeTicker.java diff --git a/src/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java similarity index 100% rename from src/tconstruct/entity/BlueSlime.java rename to src/main/java/tconstruct/entity/BlueSlime.java diff --git a/src/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java similarity index 100% rename from src/tconstruct/entity/CartEntity.java rename to src/main/java/tconstruct/entity/CartEntity.java diff --git a/src/tconstruct/entity/Crystal.java b/src/main/java/tconstruct/entity/Crystal.java similarity index 100% rename from src/tconstruct/entity/Crystal.java rename to src/main/java/tconstruct/entity/Crystal.java diff --git a/src/tconstruct/entity/CrystalGuardian.java b/src/main/java/tconstruct/entity/CrystalGuardian.java similarity index 100% rename from src/tconstruct/entity/CrystalGuardian.java rename to src/main/java/tconstruct/entity/CrystalGuardian.java diff --git a/src/tconstruct/entity/FakeBlockEntity.java b/src/main/java/tconstruct/entity/FakeBlockEntity.java similarity index 100% rename from src/tconstruct/entity/FakeBlockEntity.java rename to src/main/java/tconstruct/entity/FakeBlockEntity.java diff --git a/src/tconstruct/entity/FancyEntityItem.java b/src/main/java/tconstruct/entity/FancyEntityItem.java similarity index 100% rename from src/tconstruct/entity/FancyEntityItem.java rename to src/main/java/tconstruct/entity/FancyEntityItem.java diff --git a/src/tconstruct/entity/MetalSlime.java b/src/main/java/tconstruct/entity/MetalSlime.java similarity index 100% rename from src/tconstruct/entity/MetalSlime.java rename to src/main/java/tconstruct/entity/MetalSlime.java diff --git a/src/tconstruct/entity/Skyla.java b/src/main/java/tconstruct/entity/Skyla.java similarity index 100% rename from src/tconstruct/entity/Skyla.java rename to src/main/java/tconstruct/entity/Skyla.java diff --git a/src/tconstruct/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java similarity index 100% rename from src/tconstruct/entity/item/EntityLandmineFirework.java rename to src/main/java/tconstruct/entity/item/EntityLandmineFirework.java diff --git a/src/tconstruct/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/entity/item/ExplosivePrimed.java similarity index 100% rename from src/tconstruct/entity/item/ExplosivePrimed.java rename to src/main/java/tconstruct/entity/item/ExplosivePrimed.java diff --git a/src/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java similarity index 100% rename from src/tconstruct/entity/projectile/ArrowEntity.java rename to src/main/java/tconstruct/entity/projectile/ArrowEntity.java diff --git a/src/tconstruct/entity/projectile/DaggerEntity.java b/src/main/java/tconstruct/entity/projectile/DaggerEntity.java similarity index 100% rename from src/tconstruct/entity/projectile/DaggerEntity.java rename to src/main/java/tconstruct/entity/projectile/DaggerEntity.java diff --git a/src/tconstruct/entity/projectile/LaunchedPotion.java b/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java similarity index 100% rename from src/tconstruct/entity/projectile/LaunchedPotion.java rename to src/main/java/tconstruct/entity/projectile/LaunchedPotion.java diff --git a/src/tconstruct/entity/projectile/RotatingBase.java b/src/main/java/tconstruct/entity/projectile/RotatingBase.java similarity index 100% rename from src/tconstruct/entity/projectile/RotatingBase.java rename to src/main/java/tconstruct/entity/projectile/RotatingBase.java diff --git a/src/tconstruct/inventory/ActiveContainer.java b/src/main/java/tconstruct/inventory/ActiveContainer.java similarity index 100% rename from src/tconstruct/inventory/ActiveContainer.java rename to src/main/java/tconstruct/inventory/ActiveContainer.java diff --git a/src/tconstruct/inventory/ActiveSlot.java b/src/main/java/tconstruct/inventory/ActiveSlot.java similarity index 100% rename from src/tconstruct/inventory/ActiveSlot.java rename to src/main/java/tconstruct/inventory/ActiveSlot.java diff --git a/src/tconstruct/inventory/AdaptiveSmelteryContainer.java b/src/main/java/tconstruct/inventory/AdaptiveSmelteryContainer.java similarity index 100% rename from src/tconstruct/inventory/AdaptiveSmelteryContainer.java rename to src/main/java/tconstruct/inventory/AdaptiveSmelteryContainer.java diff --git a/src/tconstruct/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java similarity index 100% rename from src/tconstruct/inventory/ArmorExtendedContainer.java rename to src/main/java/tconstruct/inventory/ArmorExtendedContainer.java diff --git a/src/tconstruct/inventory/ContainerLandmine.java b/src/main/java/tconstruct/inventory/ContainerLandmine.java similarity index 100% rename from src/tconstruct/inventory/ContainerLandmine.java rename to src/main/java/tconstruct/inventory/ContainerLandmine.java diff --git a/src/tconstruct/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/inventory/CraftingStationContainer.java similarity index 100% rename from src/tconstruct/inventory/CraftingStationContainer.java rename to src/main/java/tconstruct/inventory/CraftingStationContainer.java diff --git a/src/tconstruct/inventory/FrypanContainer.java b/src/main/java/tconstruct/inventory/FrypanContainer.java similarity index 100% rename from src/tconstruct/inventory/FrypanContainer.java rename to src/main/java/tconstruct/inventory/FrypanContainer.java diff --git a/src/tconstruct/inventory/FurnaceContainer.java b/src/main/java/tconstruct/inventory/FurnaceContainer.java similarity index 100% rename from src/tconstruct/inventory/FurnaceContainer.java rename to src/main/java/tconstruct/inventory/FurnaceContainer.java diff --git a/src/tconstruct/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/inventory/InventoryCraftingStation.java similarity index 100% rename from src/tconstruct/inventory/InventoryCraftingStation.java rename to src/main/java/tconstruct/inventory/InventoryCraftingStation.java diff --git a/src/tconstruct/inventory/InventoryCraftingStationResult.java b/src/main/java/tconstruct/inventory/InventoryCraftingStationResult.java similarity index 100% rename from src/tconstruct/inventory/InventoryCraftingStationResult.java rename to src/main/java/tconstruct/inventory/InventoryCraftingStationResult.java diff --git a/src/tconstruct/inventory/KnapsackContainer.java b/src/main/java/tconstruct/inventory/KnapsackContainer.java similarity index 100% rename from src/tconstruct/inventory/KnapsackContainer.java rename to src/main/java/tconstruct/inventory/KnapsackContainer.java diff --git a/src/tconstruct/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java similarity index 100% rename from src/tconstruct/inventory/PartCrafterChestContainer.java rename to src/main/java/tconstruct/inventory/PartCrafterChestContainer.java diff --git a/src/tconstruct/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/inventory/PartCrafterContainer.java similarity index 100% rename from src/tconstruct/inventory/PartCrafterContainer.java rename to src/main/java/tconstruct/inventory/PartCrafterContainer.java diff --git a/src/tconstruct/inventory/PatternChestContainer.java b/src/main/java/tconstruct/inventory/PatternChestContainer.java similarity index 100% rename from src/tconstruct/inventory/PatternChestContainer.java rename to src/main/java/tconstruct/inventory/PatternChestContainer.java diff --git a/src/tconstruct/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/inventory/PatternShaperContainer.java similarity index 100% rename from src/tconstruct/inventory/PatternShaperContainer.java rename to src/main/java/tconstruct/inventory/PatternShaperContainer.java diff --git a/src/tconstruct/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/inventory/SlotArmorCopy.java similarity index 100% rename from src/tconstruct/inventory/SlotArmorCopy.java rename to src/main/java/tconstruct/inventory/SlotArmorCopy.java diff --git a/src/tconstruct/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/inventory/SlotBehavedOnly.java similarity index 100% rename from src/tconstruct/inventory/SlotBehavedOnly.java rename to src/main/java/tconstruct/inventory/SlotBehavedOnly.java diff --git a/src/tconstruct/inventory/SlotBlocksOnly.java b/src/main/java/tconstruct/inventory/SlotBlocksOnly.java similarity index 100% rename from src/tconstruct/inventory/SlotBlocksOnly.java rename to src/main/java/tconstruct/inventory/SlotBlocksOnly.java diff --git a/src/tconstruct/inventory/SlotFrypan.java b/src/main/java/tconstruct/inventory/SlotFrypan.java similarity index 100% rename from src/tconstruct/inventory/SlotFrypan.java rename to src/main/java/tconstruct/inventory/SlotFrypan.java diff --git a/src/tconstruct/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/inventory/SlotOnlyTake.java similarity index 100% rename from src/tconstruct/inventory/SlotOnlyTake.java rename to src/main/java/tconstruct/inventory/SlotOnlyTake.java diff --git a/src/tconstruct/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java similarity index 100% rename from src/tconstruct/inventory/SlotOpaqueBlocksOnly.java rename to src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java diff --git a/src/tconstruct/inventory/SlotPartBuilder.java b/src/main/java/tconstruct/inventory/SlotPartBuilder.java similarity index 100% rename from src/tconstruct/inventory/SlotPartBuilder.java rename to src/main/java/tconstruct/inventory/SlotPartBuilder.java diff --git a/src/tconstruct/inventory/SlotPattern.java b/src/main/java/tconstruct/inventory/SlotPattern.java similarity index 100% rename from src/tconstruct/inventory/SlotPattern.java rename to src/main/java/tconstruct/inventory/SlotPattern.java diff --git a/src/tconstruct/inventory/SlotTool.java b/src/main/java/tconstruct/inventory/SlotTool.java similarity index 100% rename from src/tconstruct/inventory/SlotTool.java rename to src/main/java/tconstruct/inventory/SlotTool.java diff --git a/src/tconstruct/inventory/SlotToolForge.java b/src/main/java/tconstruct/inventory/SlotToolForge.java similarity index 100% rename from src/tconstruct/inventory/SlotToolForge.java rename to src/main/java/tconstruct/inventory/SlotToolForge.java diff --git a/src/tconstruct/inventory/SmelteryContainer.java b/src/main/java/tconstruct/inventory/SmelteryContainer.java similarity index 100% rename from src/tconstruct/inventory/SmelteryContainer.java rename to src/main/java/tconstruct/inventory/SmelteryContainer.java diff --git a/src/tconstruct/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/inventory/ToolForgeContainer.java similarity index 100% rename from src/tconstruct/inventory/ToolForgeContainer.java rename to src/main/java/tconstruct/inventory/ToolForgeContainer.java diff --git a/src/tconstruct/inventory/ToolStationContainer.java b/src/main/java/tconstruct/inventory/ToolStationContainer.java similarity index 100% rename from src/tconstruct/inventory/ToolStationContainer.java rename to src/main/java/tconstruct/inventory/ToolStationContainer.java diff --git a/src/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java similarity index 100% rename from src/tconstruct/items/ArmorPattern.java rename to src/main/java/tconstruct/items/ArmorPattern.java diff --git a/src/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/items/Bowstring.java similarity index 100% rename from src/tconstruct/items/Bowstring.java rename to src/main/java/tconstruct/items/Bowstring.java diff --git a/src/tconstruct/items/CraftingItem.java b/src/main/java/tconstruct/items/CraftingItem.java similarity index 100% rename from src/tconstruct/items/CraftingItem.java rename to src/main/java/tconstruct/items/CraftingItem.java diff --git a/src/tconstruct/items/DiamondApple.java b/src/main/java/tconstruct/items/DiamondApple.java similarity index 100% rename from src/tconstruct/items/DiamondApple.java rename to src/main/java/tconstruct/items/DiamondApple.java diff --git a/src/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java similarity index 100% rename from src/tconstruct/items/FilledBucket.java rename to src/main/java/tconstruct/items/FilledBucket.java diff --git a/src/tconstruct/items/Fletching.java b/src/main/java/tconstruct/items/Fletching.java similarity index 100% rename from src/tconstruct/items/Fletching.java rename to src/main/java/tconstruct/items/Fletching.java diff --git a/src/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java similarity index 100% rename from src/tconstruct/items/GoldenHead.java rename to src/main/java/tconstruct/items/GoldenHead.java diff --git a/src/tconstruct/items/Jerky.java b/src/main/java/tconstruct/items/Jerky.java similarity index 100% rename from src/tconstruct/items/Jerky.java rename to src/main/java/tconstruct/items/Jerky.java diff --git a/src/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java similarity index 100% rename from src/tconstruct/items/Manual.java rename to src/main/java/tconstruct/items/Manual.java diff --git a/src/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/items/MaterialItem.java similarity index 100% rename from src/tconstruct/items/MaterialItem.java rename to src/main/java/tconstruct/items/MaterialItem.java diff --git a/src/tconstruct/items/MetalPattern.java b/src/main/java/tconstruct/items/MetalPattern.java similarity index 100% rename from src/tconstruct/items/MetalPattern.java rename to src/main/java/tconstruct/items/MetalPattern.java diff --git a/src/tconstruct/items/OreBerries.java b/src/main/java/tconstruct/items/OreBerries.java similarity index 100% rename from src/tconstruct/items/OreBerries.java rename to src/main/java/tconstruct/items/OreBerries.java diff --git a/src/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java similarity index 100% rename from src/tconstruct/items/Pattern.java rename to src/main/java/tconstruct/items/Pattern.java diff --git a/src/tconstruct/items/SpecialFood.java b/src/main/java/tconstruct/items/SpecialFood.java similarity index 100% rename from src/tconstruct/items/SpecialFood.java rename to src/main/java/tconstruct/items/SpecialFood.java diff --git a/src/tconstruct/items/StrangeFood.java b/src/main/java/tconstruct/items/StrangeFood.java similarity index 100% rename from src/tconstruct/items/StrangeFood.java rename to src/main/java/tconstruct/items/StrangeFood.java diff --git a/src/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java similarity index 100% rename from src/tconstruct/items/TitleIcon.java rename to src/main/java/tconstruct/items/TitleIcon.java diff --git a/src/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java similarity index 100% rename from src/tconstruct/items/ToolPart.java rename to src/main/java/tconstruct/items/ToolPart.java diff --git a/src/tconstruct/items/ToolPartHidden.java b/src/main/java/tconstruct/items/ToolPartHidden.java similarity index 100% rename from src/tconstruct/items/ToolPartHidden.java rename to src/main/java/tconstruct/items/ToolPartHidden.java diff --git a/src/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/items/ToolShard.java similarity index 100% rename from src/tconstruct/items/ToolShard.java rename to src/main/java/tconstruct/items/ToolShard.java diff --git a/src/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/items/armor/ArmorBasic.java similarity index 100% rename from src/tconstruct/items/armor/ArmorBasic.java rename to src/main/java/tconstruct/items/armor/ArmorBasic.java diff --git a/src/tconstruct/items/armor/ArmorStandard.java b/src/main/java/tconstruct/items/armor/ArmorStandard.java similarity index 100% rename from src/tconstruct/items/armor/ArmorStandard.java rename to src/main/java/tconstruct/items/armor/ArmorStandard.java diff --git a/src/tconstruct/items/armor/Glove.java b/src/main/java/tconstruct/items/armor/Glove.java similarity index 100% rename from src/tconstruct/items/armor/Glove.java rename to src/main/java/tconstruct/items/armor/Glove.java diff --git a/src/tconstruct/items/armor/HeartCanister.java b/src/main/java/tconstruct/items/armor/HeartCanister.java similarity index 100% rename from src/tconstruct/items/armor/HeartCanister.java rename to src/main/java/tconstruct/items/armor/HeartCanister.java diff --git a/src/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/items/armor/Knapsack.java similarity index 100% rename from src/tconstruct/items/armor/Knapsack.java rename to src/main/java/tconstruct/items/armor/Knapsack.java diff --git a/src/tconstruct/items/armor/TArmorBase.java b/src/main/java/tconstruct/items/armor/TArmorBase.java similarity index 100% rename from src/tconstruct/items/armor/TArmorBase.java rename to src/main/java/tconstruct/items/armor/TArmorBase.java diff --git a/src/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java similarity index 100% rename from src/tconstruct/items/blocks/BarricadeItem.java rename to src/main/java/tconstruct/items/blocks/BarricadeItem.java diff --git a/src/tconstruct/items/blocks/CastingChannelItem.java b/src/main/java/tconstruct/items/blocks/CastingChannelItem.java similarity index 100% rename from src/tconstruct/items/blocks/CastingChannelItem.java rename to src/main/java/tconstruct/items/blocks/CastingChannelItem.java diff --git a/src/tconstruct/items/blocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/CraftedSoilItemBlock.java rename to src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java diff --git a/src/tconstruct/items/blocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/CraftingSlabItemBlock.java rename to src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java diff --git a/src/tconstruct/items/blocks/GlassBlockItem.java b/src/main/java/tconstruct/items/blocks/GlassBlockItem.java similarity index 100% rename from src/tconstruct/items/blocks/GlassBlockItem.java rename to src/main/java/tconstruct/items/blocks/GlassBlockItem.java diff --git a/src/tconstruct/items/blocks/GlassPaneItem.java b/src/main/java/tconstruct/items/blocks/GlassPaneItem.java similarity index 100% rename from src/tconstruct/items/blocks/GlassPaneItem.java rename to src/main/java/tconstruct/items/blocks/GlassPaneItem.java diff --git a/src/tconstruct/items/blocks/GravelOreItem.java b/src/main/java/tconstruct/items/blocks/GravelOreItem.java similarity index 100% rename from src/tconstruct/items/blocks/GravelOreItem.java rename to src/main/java/tconstruct/items/blocks/GravelOreItem.java diff --git a/src/tconstruct/items/blocks/HamboneItemBlock.java b/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/HamboneItemBlock.java rename to src/main/java/tconstruct/items/blocks/HamboneItemBlock.java diff --git a/src/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java similarity index 100% rename from src/tconstruct/items/blocks/ItemBlockLandmine.java rename to src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java diff --git a/src/tconstruct/items/blocks/LavaTankItemBlock.java b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/LavaTankItemBlock.java rename to src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java diff --git a/src/tconstruct/items/blocks/MetadataItemBlock.java b/src/main/java/tconstruct/items/blocks/MetadataItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/MetadataItemBlock.java rename to src/main/java/tconstruct/items/blocks/MetadataItemBlock.java diff --git a/src/tconstruct/items/blocks/MetalItemBlock.java b/src/main/java/tconstruct/items/blocks/MetalItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/MetalItemBlock.java rename to src/main/java/tconstruct/items/blocks/MetalItemBlock.java diff --git a/src/tconstruct/items/blocks/MetalOreItemBlock.java b/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/MetalOreItemBlock.java rename to src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java diff --git a/src/tconstruct/items/blocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java similarity index 100% rename from src/tconstruct/items/blocks/MultiBrickFancyItem.java rename to src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java diff --git a/src/tconstruct/items/blocks/MultiBrickItem.java b/src/main/java/tconstruct/items/blocks/MultiBrickItem.java similarity index 100% rename from src/tconstruct/items/blocks/MultiBrickItem.java rename to src/main/java/tconstruct/items/blocks/MultiBrickItem.java diff --git a/src/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java similarity index 100% rename from src/tconstruct/items/blocks/OreberryBushItem.java rename to src/main/java/tconstruct/items/blocks/OreberryBushItem.java diff --git a/src/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java similarity index 100% rename from src/tconstruct/items/blocks/OreberryBushSecondItem.java rename to src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java diff --git a/src/tconstruct/items/blocks/SearedSlabItem.java b/src/main/java/tconstruct/items/blocks/SearedSlabItem.java similarity index 100% rename from src/tconstruct/items/blocks/SearedSlabItem.java rename to src/main/java/tconstruct/items/blocks/SearedSlabItem.java diff --git a/src/tconstruct/items/blocks/SearedTableItemBlock.java b/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SearedTableItemBlock.java rename to src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java diff --git a/src/tconstruct/items/blocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SlimeGelItemBlock.java rename to src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java diff --git a/src/tconstruct/items/blocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SlimeGrassItemBlock.java rename to src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java diff --git a/src/tconstruct/items/blocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SlimeLeavesItemBlock.java rename to src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java diff --git a/src/tconstruct/items/blocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SlimeSaplingItemBlock.java rename to src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java diff --git a/src/tconstruct/items/blocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java similarity index 100% rename from src/tconstruct/items/blocks/SlimeTallGrassItem.java rename to src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java diff --git a/src/tconstruct/items/blocks/SmelteryItemBlock.java b/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/SmelteryItemBlock.java rename to src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java diff --git a/src/tconstruct/items/blocks/SoilSlabItem.java b/src/main/java/tconstruct/items/blocks/SoilSlabItem.java similarity index 100% rename from src/tconstruct/items/blocks/SoilSlabItem.java rename to src/main/java/tconstruct/items/blocks/SoilSlabItem.java diff --git a/src/tconstruct/items/blocks/SpeedBlockItem.java b/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java similarity index 100% rename from src/tconstruct/items/blocks/SpeedBlockItem.java rename to src/main/java/tconstruct/items/blocks/SpeedBlockItem.java diff --git a/src/tconstruct/items/blocks/SpeedSlabItem.java b/src/main/java/tconstruct/items/blocks/SpeedSlabItem.java similarity index 100% rename from src/tconstruct/items/blocks/SpeedSlabItem.java rename to src/main/java/tconstruct/items/blocks/SpeedSlabItem.java diff --git a/src/tconstruct/items/blocks/StainedGlassClearItem.java b/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java similarity index 100% rename from src/tconstruct/items/blocks/StainedGlassClearItem.java rename to src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java diff --git a/src/tconstruct/items/blocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java similarity index 100% rename from src/tconstruct/items/blocks/StainedGlassClearPaneItem.java rename to src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java diff --git a/src/tconstruct/items/blocks/ToolStationItemBlock.java b/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java similarity index 100% rename from src/tconstruct/items/blocks/ToolStationItemBlock.java rename to src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java diff --git a/src/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java similarity index 100% rename from src/tconstruct/items/blocks/WoolSlab1Item.java rename to src/main/java/tconstruct/items/blocks/WoolSlab1Item.java diff --git a/src/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java similarity index 100% rename from src/tconstruct/items/blocks/WoolSlab2Item.java rename to src/main/java/tconstruct/items/blocks/WoolSlab2Item.java diff --git a/src/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java similarity index 94% rename from src/tconstruct/items/tools/Arrow.java rename to src/main/java/tconstruct/items/tools/Arrow.java index 0162d97e..655e38ae 100644 --- a/src/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -174,24 +174,24 @@ public class Arrow extends ToolCore return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { String color = ""; //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); + int power = tags.getInteger("Energy"); if (power != 0) { - if (power <= this.getMaxCharge(stack) / 3) + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; else color = "\u00a76"; } - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); + String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + list.add(energy); } if (tags.hasKey("InfiTool")) { diff --git a/src/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java similarity index 100% rename from src/tconstruct/items/tools/BattleSign.java rename to src/main/java/tconstruct/items/tools/BattleSign.java diff --git a/src/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java similarity index 100% rename from src/tconstruct/items/tools/Battleaxe.java rename to src/main/java/tconstruct/items/tools/Battleaxe.java diff --git a/src/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java similarity index 100% rename from src/tconstruct/items/tools/BowBase.java rename to src/main/java/tconstruct/items/tools/BowBase.java diff --git a/src/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java similarity index 100% rename from src/tconstruct/items/tools/Broadsword.java rename to src/main/java/tconstruct/items/tools/Broadsword.java diff --git a/src/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java similarity index 100% rename from src/tconstruct/items/tools/Chisel.java rename to src/main/java/tconstruct/items/tools/Chisel.java diff --git a/src/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java similarity index 100% rename from src/tconstruct/items/tools/Cleaver.java rename to src/main/java/tconstruct/items/tools/Cleaver.java diff --git a/src/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java similarity index 100% rename from src/tconstruct/items/tools/Cutlass.java rename to src/main/java/tconstruct/items/tools/Cutlass.java diff --git a/src/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java similarity index 100% rename from src/tconstruct/items/tools/Dagger.java rename to src/main/java/tconstruct/items/tools/Dagger.java diff --git a/src/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java similarity index 100% rename from src/tconstruct/items/tools/Excavator.java rename to src/main/java/tconstruct/items/tools/Excavator.java diff --git a/src/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java similarity index 100% rename from src/tconstruct/items/tools/FryingPan.java rename to src/main/java/tconstruct/items/tools/FryingPan.java diff --git a/src/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java similarity index 100% rename from src/tconstruct/items/tools/Hammer.java rename to src/main/java/tconstruct/items/tools/Hammer.java diff --git a/src/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java similarity index 100% rename from src/tconstruct/items/tools/Hatchet.java rename to src/main/java/tconstruct/items/tools/Hatchet.java diff --git a/src/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java similarity index 100% rename from src/tconstruct/items/tools/Longsword.java rename to src/main/java/tconstruct/items/tools/Longsword.java diff --git a/src/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java similarity index 100% rename from src/tconstruct/items/tools/LumberAxe.java rename to src/main/java/tconstruct/items/tools/LumberAxe.java diff --git a/src/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java similarity index 100% rename from src/tconstruct/items/tools/Mattock.java rename to src/main/java/tconstruct/items/tools/Mattock.java diff --git a/src/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java similarity index 100% rename from src/tconstruct/items/tools/Pickaxe.java rename to src/main/java/tconstruct/items/tools/Pickaxe.java diff --git a/src/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java similarity index 100% rename from src/tconstruct/items/tools/PotionLauncher.java rename to src/main/java/tconstruct/items/tools/PotionLauncher.java diff --git a/src/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java similarity index 100% rename from src/tconstruct/items/tools/Rapier.java rename to src/main/java/tconstruct/items/tools/Rapier.java diff --git a/src/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java similarity index 100% rename from src/tconstruct/items/tools/Scythe.java rename to src/main/java/tconstruct/items/tools/Scythe.java diff --git a/src/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java similarity index 93% rename from src/tconstruct/items/tools/Shortbow.java rename to src/main/java/tconstruct/items/tools/Shortbow.java index 3df3735c..30462825 100644 --- a/src/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -100,24 +100,24 @@ public class Shortbow extends BowBase return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { String color = ""; //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); + int power = tags.getInteger("Energy"); if (power != 0) { - if (power <= this.getMaxCharge(stack) / 3) + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; else color = "\u00a76"; } - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); + String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + list.add(energy); } if (tags.hasKey("InfiTool")) { diff --git a/src/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java similarity index 100% rename from src/tconstruct/items/tools/Shovel.java rename to src/main/java/tconstruct/items/tools/Shovel.java diff --git a/src/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java similarity index 100% rename from src/tconstruct/library/ActiveToolMod.java rename to src/main/java/tconstruct/library/ActiveToolMod.java diff --git a/src/tconstruct/library/ItemBlocklike.java b/src/main/java/tconstruct/library/ItemBlocklike.java similarity index 100% rename from src/tconstruct/library/ItemBlocklike.java rename to src/main/java/tconstruct/library/ItemBlocklike.java diff --git a/src/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java similarity index 100% rename from src/tconstruct/library/TConstructRegistry.java rename to src/main/java/tconstruct/library/TConstructRegistry.java diff --git a/src/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java similarity index 59% rename from src/tconstruct/library/armor/ArmorCore.java rename to src/main/java/tconstruct/library/armor/ArmorCore.java index 108c174d..03ba0f05 100644 --- a/src/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -1,6 +1,6 @@ package tconstruct.library.armor; -import ic2.api.item.*; +import tconstruct.library.util.MathUtils; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IBehaviorDispenseItem; import net.minecraft.entity.*; @@ -10,12 +10,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +import cofh.api.energy.IEnergyContainerItem; /** * NBTTags * Main tag - InfiArmor */ -public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem, IBoxable, ISpecialArmor +public abstract class ArmorCore extends ItemArmor implements IEnergyContainerItem, ISpecialArmor { public static final String SET_NAME = "InfiArmor"; @@ -23,6 +24,11 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDispenseArmorCopy(); public final int baseProtection; + //TE power constants -- TODO grab these from the items added + protected int capacity = 400000; + protected int maxReceive = 75; + protected int maxExtract = 75; + public ArmorCore(int par1, int baseProtection, EnumArmorPart part) { super(par1, EnumArmorMaterial.CHAIN, 0, 0); @@ -94,19 +100,19 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem data = tags.getCompoundTag(SET_NAME); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > damage) + int energy = tags.getInteger("Energy"); + if (energy > damage) { - charge -= damage; - tags.setInteger("charge", charge); + energy -= damage; + tags.setInteger("Energy", energy); return; } else { - damage -= charge; - tags.setInteger("charge", 0); + damage -= energy; + tags.setInteger("Energy", 0); int dmg = data.getInteger("Damage"); dmg += damage; data.setInteger("Damage", dmg); @@ -121,143 +127,81 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem } } - /* - * IC2 API support - */ - - @Override - public boolean canBeStoredInToolbox (ItemStack stack) + //TE support section -- from COFH core API reference section + public void setMaxTransfer (int maxTransfer) { - return true; + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + } + + public void setMaxReceive (int maxReceive) + { + this.maxReceive = maxReceive; + } + + public void setMaxExtract (int maxExtract) + { + this.maxExtract = maxExtract; + } + + /* IEnergyContainerItem */ + @Override + public int receiveEnergy (ItemStack container, int maxReceive, boolean simulate) + { + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) + return 0; + int energy = tags.getInteger("Energy"); + int energyReceived = MathUtils.minInt(capacity - energy, MathUtils.minInt(this.maxReceive, maxReceive)); + if (!simulate) + { + energy += energyReceived; + tags.setInteger("Energy", energy); + container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 2) / getMaxEnergyStored(container)); + + } + return energyReceived; } @Override - public boolean canProvideEnergy (ItemStack stack) + public int extractEnergy (ItemStack container, int maxExtract, boolean simulate) { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge"); - } - - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - return tags.hasKey("charge") ? 10000 : 0; - } - - @Override - public int getTier (ItemStack stack) - { - return 0; - } - - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge") ? 32 : 0; - } - - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) { return 0; } - - if (amount > 0) + int energy = tags.getInteger("Energy"); + int energyExtracted = MathUtils.minInt(energy, MathUtils.minInt(this.maxExtract, maxExtract)); + if (!simulate) { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } + energy -= energyExtracted; + tags.setInteger("Energy", energy); + container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 1) / getMaxEnergyStored(container)); - int charge = tags.getInteger("charge"); - - if (amount > getMaxCharge(stack)) - { - amount = getMaxCharge(stack); - } - - charge += amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } - return amount; } - - else - return 0; + return energyExtracted; } @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) + public int getEnergyStored (ItemStack container) { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) { return 0; } - - if (amount > 0) - { - if (amount > getTransferLimit(stack)) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - - charge -= amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } - - return charge; - } - - else + return tags.getInteger("Energy"); + } + @Override + public int getMaxEnergyStored (ItemStack container) + { + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) return 0; + return capacity; } - - @Override - public boolean canUse (ItemStack stack, int amount) - { - return false; - } - - @Override - public boolean canShowChargeToolTip (ItemStack stack) - { - return false; - } + //end of TE support section // Vanilla overrides public boolean isItemTool (ItemStack par1ItemStack) @@ -300,12 +244,12 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > 0) + int energy = tags.getInteger("Energy"); + if (energy > 0) { - return this.getMaxCharge(stack); + return this.getMaxEnergyStored(stack); } } @@ -320,12 +264,12 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > 0) + int energy = tags.getInteger("Energy"); + if (energy > 0) { - return this.getMaxCharge(stack) - charge; + return this.getMaxEnergyStored(stack) - energy; } } diff --git a/src/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java similarity index 100% rename from src/tconstruct/library/armor/BehaviorDispenseArmorCopy.java rename to src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java diff --git a/src/tconstruct/library/armor/EnumArmorPart.java b/src/main/java/tconstruct/library/armor/EnumArmorPart.java similarity index 100% rename from src/tconstruct/library/armor/EnumArmorPart.java rename to src/main/java/tconstruct/library/armor/EnumArmorPart.java diff --git a/src/tconstruct/library/blocks/AdaptiveInventoryLogic.java b/src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java similarity index 100% rename from src/tconstruct/library/blocks/AdaptiveInventoryLogic.java rename to src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java diff --git a/src/tconstruct/library/blocks/ExpandableInventoryLogic.java b/src/main/java/tconstruct/library/blocks/ExpandableInventoryLogic.java similarity index 100% rename from src/tconstruct/library/blocks/ExpandableInventoryLogic.java rename to src/main/java/tconstruct/library/blocks/ExpandableInventoryLogic.java diff --git a/src/tconstruct/library/blocks/IDrawbridgeLogicBase.java b/src/main/java/tconstruct/library/blocks/IDrawbridgeLogicBase.java similarity index 100% rename from src/tconstruct/library/blocks/IDrawbridgeLogicBase.java rename to src/main/java/tconstruct/library/blocks/IDrawbridgeLogicBase.java diff --git a/src/tconstruct/library/blocks/InventoryBlock.java b/src/main/java/tconstruct/library/blocks/InventoryBlock.java similarity index 100% rename from src/tconstruct/library/blocks/InventoryBlock.java rename to src/main/java/tconstruct/library/blocks/InventoryBlock.java diff --git a/src/tconstruct/library/blocks/InventoryLogic.java b/src/main/java/tconstruct/library/blocks/InventoryLogic.java similarity index 100% rename from src/tconstruct/library/blocks/InventoryLogic.java rename to src/main/java/tconstruct/library/blocks/InventoryLogic.java diff --git a/src/tconstruct/library/blocks/InventorySlab.java b/src/main/java/tconstruct/library/blocks/InventorySlab.java similarity index 100% rename from src/tconstruct/library/blocks/InventorySlab.java rename to src/main/java/tconstruct/library/blocks/InventorySlab.java diff --git a/src/tconstruct/library/client/FluidRenderProperties.java b/src/main/java/tconstruct/library/client/FluidRenderProperties.java similarity index 100% rename from src/tconstruct/library/client/FluidRenderProperties.java rename to src/main/java/tconstruct/library/client/FluidRenderProperties.java diff --git a/src/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java similarity index 100% rename from src/tconstruct/library/client/TConstructClientRegistry.java rename to src/main/java/tconstruct/library/client/TConstructClientRegistry.java diff --git a/src/tconstruct/library/client/ToolGuiElement.java b/src/main/java/tconstruct/library/client/ToolGuiElement.java similarity index 100% rename from src/tconstruct/library/client/ToolGuiElement.java rename to src/main/java/tconstruct/library/client/ToolGuiElement.java diff --git a/src/tconstruct/library/component/IComponentHolder.java b/src/main/java/tconstruct/library/component/IComponentHolder.java similarity index 100% rename from src/tconstruct/library/component/IComponentHolder.java rename to src/main/java/tconstruct/library/component/IComponentHolder.java diff --git a/src/tconstruct/library/component/LogicComponent.java b/src/main/java/tconstruct/library/component/LogicComponent.java similarity index 100% rename from src/tconstruct/library/component/LogicComponent.java rename to src/main/java/tconstruct/library/component/LogicComponent.java diff --git a/src/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java similarity index 100% rename from src/tconstruct/library/component/MultiFluidTank.java rename to src/main/java/tconstruct/library/component/MultiFluidTank.java diff --git a/src/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java similarity index 100% rename from src/tconstruct/library/component/TankLayerScan.java rename to src/main/java/tconstruct/library/component/TankLayerScan.java diff --git a/src/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java similarity index 100% rename from src/tconstruct/library/crafting/AlloyMix.java rename to src/main/java/tconstruct/library/crafting/AlloyMix.java diff --git a/src/tconstruct/library/crafting/CastingRecipe.java b/src/main/java/tconstruct/library/crafting/CastingRecipe.java similarity index 100% rename from src/tconstruct/library/crafting/CastingRecipe.java rename to src/main/java/tconstruct/library/crafting/CastingRecipe.java diff --git a/src/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java similarity index 100% rename from src/tconstruct/library/crafting/Detailing.java rename to src/main/java/tconstruct/library/crafting/Detailing.java diff --git a/src/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java similarity index 100% rename from src/tconstruct/library/crafting/DryingRackRecipes.java rename to src/main/java/tconstruct/library/crafting/DryingRackRecipes.java diff --git a/src/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java similarity index 100% rename from src/tconstruct/library/crafting/FluidType.java rename to src/main/java/tconstruct/library/crafting/FluidType.java diff --git a/src/tconstruct/library/crafting/LiquidCasting.java b/src/main/java/tconstruct/library/crafting/LiquidCasting.java similarity index 100% rename from src/tconstruct/library/crafting/LiquidCasting.java rename to src/main/java/tconstruct/library/crafting/LiquidCasting.java diff --git a/src/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java similarity index 100% rename from src/tconstruct/library/crafting/PatternBuilder.java rename to src/main/java/tconstruct/library/crafting/PatternBuilder.java diff --git a/src/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java similarity index 100% rename from src/tconstruct/library/crafting/ShapelessToolRecipe.java rename to src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java diff --git a/src/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java similarity index 100% rename from src/tconstruct/library/crafting/Smeltery.java rename to src/main/java/tconstruct/library/crafting/Smeltery.java diff --git a/src/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java similarity index 100% rename from src/tconstruct/library/crafting/ToolBuilder.java rename to src/main/java/tconstruct/library/crafting/ToolBuilder.java diff --git a/src/tconstruct/library/crafting/ToolRecipe.java b/src/main/java/tconstruct/library/crafting/ToolRecipe.java similarity index 100% rename from src/tconstruct/library/crafting/ToolRecipe.java rename to src/main/java/tconstruct/library/crafting/ToolRecipe.java diff --git a/src/tconstruct/library/event/PartBuilderEvent.java b/src/main/java/tconstruct/library/event/PartBuilderEvent.java similarity index 100% rename from src/tconstruct/library/event/PartBuilderEvent.java rename to src/main/java/tconstruct/library/event/PartBuilderEvent.java diff --git a/src/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java similarity index 100% rename from src/tconstruct/library/event/ToolCraftEvent.java rename to src/main/java/tconstruct/library/event/ToolCraftEvent.java diff --git a/src/tconstruct/library/event/ToolCraftedEvent.java b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java similarity index 100% rename from src/tconstruct/library/event/ToolCraftedEvent.java rename to src/main/java/tconstruct/library/event/ToolCraftedEvent.java diff --git a/src/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java similarity index 85% rename from src/tconstruct/library/tools/AbilityHelper.java rename to src/main/java/tconstruct/library/tools/AbilityHelper.java index af8390cf..131a4c2b 100644 --- a/src/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -1,8 +1,5 @@ package tconstruct.library.tools; -import ic2.api.item.ICustomElectricItem; -import ic2.api.item.IElectricItem; - import java.util.Iterator; import java.util.List; import java.util.Random; @@ -389,16 +386,11 @@ public class AbilityHelper public static boolean damageElectricTool (ItemStack stack, NBTTagCompound tags, Entity entity) { - if (tags.hasKey("charge") || tags.hasKey("Energy")) + if (tags.hasKey("Energy")) { NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); - int charge = -1; int energy = -1; - if (tags.hasKey("charge")) - { - charge = tags.getInteger("charge"); - } if (tags.hasKey("Energy")) { energy = tags.getInteger("Energy"); @@ -430,22 +422,6 @@ public class AbilityHelper float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; trueSpeed += bonusLog; trueSpeed *= 6; - if (charge > 0) - { - if (charge < trueSpeed) - { - if (charge > 0) - tags.setInteger("charge", 0); - return false; - } - - charge -= trueSpeed; - ToolCore tool = (ToolCore) stack.getItem(); - stack.setItemDamage(1 + (tool.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / tool.getMaxCharge(stack)); - tags.setInteger("charge", charge); - if (entity instanceof EntityPlayer) - chargeFromArmor(stack, (EntityPlayer) entity); - } if (energy > 0) { if (energy < trueSpeed) @@ -468,98 +444,6 @@ public class AbilityHelper } } - static void chargeFromArmor (ItemStack stack, EntityPlayer player) - { - boolean inContainer = false; - - for (int armorIter = 0; armorIter < 4; ++armorIter) - { - ItemStack armor = player.inventory.armorInventory[armorIter]; - - if (armor != null && armor.getItem() instanceof IElectricItem) - { - IElectricItem electricArmor = (IElectricItem) armor.getItem(); - ToolCore tool = (ToolCore) stack.getItem(); - - if (electricArmor.canProvideEnergy(stack) && electricArmor.getTier(stack) >= ((IElectricItem) stack.getItem()).getTier(stack)) - { - int chargeAmount = tool.charge(stack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true); - chargeAmount = discharge(armor, chargeAmount, Integer.MAX_VALUE, true, false); - - if (chargeAmount > 0) - { - tool.charge(stack, chargeAmount, Integer.MAX_VALUE, true, false); - inContainer = true; - } - } - } - } - - if (inContainer) - { - player.openContainer.detectAndSendChanges(); - } - } - - public static int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - IElectricItem ielectricitem = (IElectricItem) stack.getItem(); - - if (ielectricitem instanceof ICustomElectricItem) - { - return ((ICustomElectricItem) ielectricitem).discharge(stack, amount, tier, ignoreTransferLimit, simulate); - } - else if (amount >= 0 && stack.stackSize <= 1 && ielectricitem.getTier(stack) <= tier) - { - if (amount > ielectricitem.getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = ielectricitem.getTransferLimit(stack); - } - - NBTTagCompound tags = stack.getTagCompound(); - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - - charge -= amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.itemID = charge > 0 ? ielectricitem.getChargedItemId(stack) : ielectricitem.getEmptyItemId(stack); - - if (stack.getItem() instanceof IElectricItem) - { - ielectricitem = (IElectricItem) stack.getItem(); - - if (stack.getMaxDamage() > 2) - { - if (stack.getItemDamage() + 1 < stack.getMaxDamage()) - stack.setItemDamage(1 + (ielectricitem.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / ielectricitem.getMaxCharge(stack)); - } - else - { - stack.setItemDamage(0); - } - } - else - { - stack.setItemDamage(0); - } - } - - return amount; - } - else - { - return 0; - } - - } - public static void breakTool (ItemStack stack, NBTTagCompound tags, Entity entity) { tags.getCompoundTag("InfiTool").setBoolean("Broken", true); diff --git a/src/tconstruct/library/tools/ArrowMaterial.java b/src/main/java/tconstruct/library/tools/ArrowMaterial.java similarity index 100% rename from src/tconstruct/library/tools/ArrowMaterial.java rename to src/main/java/tconstruct/library/tools/ArrowMaterial.java diff --git a/src/tconstruct/library/tools/BowMaterial.java b/src/main/java/tconstruct/library/tools/BowMaterial.java similarity index 100% rename from src/tconstruct/library/tools/BowMaterial.java rename to src/main/java/tconstruct/library/tools/BowMaterial.java diff --git a/src/tconstruct/library/tools/BowstringMaterial.java b/src/main/java/tconstruct/library/tools/BowstringMaterial.java similarity index 100% rename from src/tconstruct/library/tools/BowstringMaterial.java rename to src/main/java/tconstruct/library/tools/BowstringMaterial.java diff --git a/src/tconstruct/library/tools/CustomMaterial.java b/src/main/java/tconstruct/library/tools/CustomMaterial.java similarity index 100% rename from src/tconstruct/library/tools/CustomMaterial.java rename to src/main/java/tconstruct/library/tools/CustomMaterial.java diff --git a/src/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java similarity index 100% rename from src/tconstruct/library/tools/DualHarvestTool.java rename to src/main/java/tconstruct/library/tools/DualHarvestTool.java diff --git a/src/tconstruct/library/tools/FletchingMaterial.java b/src/main/java/tconstruct/library/tools/FletchingMaterial.java similarity index 100% rename from src/tconstruct/library/tools/FletchingMaterial.java rename to src/main/java/tconstruct/library/tools/FletchingMaterial.java diff --git a/src/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java similarity index 100% rename from src/tconstruct/library/tools/HarvestTool.java rename to src/main/java/tconstruct/library/tools/HarvestTool.java diff --git a/src/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java similarity index 86% rename from src/tconstruct/library/tools/ToolCore.java rename to src/main/java/tconstruct/library/tools/ToolCore.java index f70c7f94..647a076b 100644 --- a/src/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -1,8 +1,5 @@ package tconstruct.library.tools; -import ic2.api.item.IBoxable; -import ic2.api.item.ICustomElectricItem; - import java.lang.reflect.Field; import java.util.HashMap; import java.util.Iterator; @@ -60,9 +57,9 @@ import cpw.mods.fml.relauncher.SideOnly; * @see ToolMod */ -public abstract class ToolCore extends Item implements IEnergyContainerItem, ICustomElectricItem, IBoxable, IBattlegearWeapon +public abstract class ToolCore extends Item implements IEnergyContainerItem, IBattlegearWeapon { - //TE power constants -- TODO grab these from the + //TE power constants -- TODO grab these from the items added protected int capacity = 400000; protected int maxReceive = 75; protected int maxExtract = 75; @@ -341,25 +338,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) - { - String color = ""; - //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); - - if (power != 0) - { - if (power <= this.getMaxCharge(stack) / 3) - color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; - } - - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); - } if (tags.hasKey("Energy")) { String color = ""; @@ -843,13 +821,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu { return 0; } - - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return this.getMaxCharge(stack); - } if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -866,13 +837,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu { return 0; } - - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return getMaxCharge(stack) - charge; - } if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -882,142 +846,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu return tags.getCompoundTag("InfiTool").getInteger("Damage"); } - /* IC2 Support - * Every tool can be an electric tool if you modify it right - */ - @Override - public boolean canBeStoredInToolbox (ItemStack stack) - { - return true; - } - @Override - public boolean canProvideEnergy (ItemStack stack) - { - return false; - /*NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return false; - - return true;*/ - } - - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - return 10000; - } - - @Override - public int getTier (ItemStack itemStack) - { - return 0; - } - - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - return 32; - } - - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > getMaxCharge(stack) - charge) - { - amount = getMaxCharge(stack) - charge; - } - - charge += amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } - - return amount; - } - - else - return 0; - } - - @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags == null || !tags.hasKey("charge")) - return 0; - - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - charge -= amount; - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } - return amount; - } - else - return 0; - } - - @Override - public boolean canShowChargeToolTip (ItemStack itemStack) - { - return false; - } - - @Override - public boolean canUse (ItemStack itemStack, int amount) - { - return false; - } /* Battlegear support, IBattlegearWeapon */ diff --git a/src/tconstruct/library/tools/ToolMaterial.java b/src/main/java/tconstruct/library/tools/ToolMaterial.java similarity index 100% rename from src/tconstruct/library/tools/ToolMaterial.java rename to src/main/java/tconstruct/library/tools/ToolMaterial.java diff --git a/src/tconstruct/library/tools/ToolMod.java b/src/main/java/tconstruct/library/tools/ToolMod.java similarity index 100% rename from src/tconstruct/library/tools/ToolMod.java rename to src/main/java/tconstruct/library/tools/ToolMod.java diff --git a/src/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java similarity index 100% rename from src/tconstruct/library/tools/Weapon.java rename to src/main/java/tconstruct/library/tools/Weapon.java diff --git a/src/tconstruct/library/util/CoordTuple.java b/src/main/java/tconstruct/library/util/CoordTuple.java similarity index 100% rename from src/tconstruct/library/util/CoordTuple.java rename to src/main/java/tconstruct/library/util/CoordTuple.java diff --git a/src/tconstruct/library/util/CoordTuplePair.java b/src/main/java/tconstruct/library/util/CoordTuplePair.java similarity index 100% rename from src/tconstruct/library/util/CoordTuplePair.java rename to src/main/java/tconstruct/library/util/CoordTuplePair.java diff --git a/src/tconstruct/library/util/CoordTupleSort.java b/src/main/java/tconstruct/library/util/CoordTupleSort.java similarity index 100% rename from src/tconstruct/library/util/CoordTupleSort.java rename to src/main/java/tconstruct/library/util/CoordTupleSort.java diff --git a/src/tconstruct/library/util/IActiveLogic.java b/src/main/java/tconstruct/library/util/IActiveLogic.java similarity index 100% rename from src/tconstruct/library/util/IActiveLogic.java rename to src/main/java/tconstruct/library/util/IActiveLogic.java diff --git a/src/tconstruct/library/util/IFacingLogic.java b/src/main/java/tconstruct/library/util/IFacingLogic.java similarity index 100% rename from src/tconstruct/library/util/IFacingLogic.java rename to src/main/java/tconstruct/library/util/IFacingLogic.java diff --git a/src/tconstruct/library/util/IMasterLogic.java b/src/main/java/tconstruct/library/util/IMasterLogic.java similarity index 100% rename from src/tconstruct/library/util/IMasterLogic.java rename to src/main/java/tconstruct/library/util/IMasterLogic.java diff --git a/src/tconstruct/library/util/IMasterNode.java b/src/main/java/tconstruct/library/util/IMasterNode.java similarity index 100% rename from src/tconstruct/library/util/IMasterNode.java rename to src/main/java/tconstruct/library/util/IMasterNode.java diff --git a/src/tconstruct/library/util/IPattern.java b/src/main/java/tconstruct/library/util/IPattern.java similarity index 100% rename from src/tconstruct/library/util/IPattern.java rename to src/main/java/tconstruct/library/util/IPattern.java diff --git a/src/tconstruct/library/util/IServantLogic.java b/src/main/java/tconstruct/library/util/IServantLogic.java similarity index 100% rename from src/tconstruct/library/util/IServantLogic.java rename to src/main/java/tconstruct/library/util/IServantLogic.java diff --git a/src/tconstruct/library/util/IToolPart.java b/src/main/java/tconstruct/library/util/IToolPart.java similarity index 100% rename from src/tconstruct/library/util/IToolPart.java rename to src/main/java/tconstruct/library/util/IToolPart.java diff --git a/src/tconstruct/library/util/MathUtils.java b/src/main/java/tconstruct/library/util/MathUtils.java similarity index 100% rename from src/tconstruct/library/util/MathUtils.java rename to src/main/java/tconstruct/library/util/MathUtils.java diff --git a/src/tconstruct/library/util/PiercingEntityDamage.java b/src/main/java/tconstruct/library/util/PiercingEntityDamage.java similarity index 100% rename from src/tconstruct/library/util/PiercingEntityDamage.java rename to src/main/java/tconstruct/library/util/PiercingEntityDamage.java diff --git a/src/tconstruct/library/util/TabTools.java b/src/main/java/tconstruct/library/util/TabTools.java similarity index 100% rename from src/tconstruct/library/util/TabTools.java rename to src/main/java/tconstruct/library/util/TabTools.java diff --git a/src/tconstruct/library/util/ValueCoordTuple.java b/src/main/java/tconstruct/library/util/ValueCoordTuple.java similarity index 100% rename from src/tconstruct/library/util/ValueCoordTuple.java rename to src/main/java/tconstruct/library/util/ValueCoordTuple.java diff --git a/src/tconstruct/modifiers/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/ModAntiSpider.java similarity index 100% rename from src/tconstruct/modifiers/ModAntiSpider.java rename to src/main/java/tconstruct/modifiers/ModAntiSpider.java diff --git a/src/tconstruct/modifiers/ModAttack.java b/src/main/java/tconstruct/modifiers/ModAttack.java similarity index 100% rename from src/tconstruct/modifiers/ModAttack.java rename to src/main/java/tconstruct/modifiers/ModAttack.java diff --git a/src/tconstruct/modifiers/ModAutoSmelt.java b/src/main/java/tconstruct/modifiers/ModAutoSmelt.java similarity index 100% rename from src/tconstruct/modifiers/ModAutoSmelt.java rename to src/main/java/tconstruct/modifiers/ModAutoSmelt.java diff --git a/src/tconstruct/modifiers/ModBlaze.java b/src/main/java/tconstruct/modifiers/ModBlaze.java similarity index 100% rename from src/tconstruct/modifiers/ModBlaze.java rename to src/main/java/tconstruct/modifiers/ModBlaze.java diff --git a/src/tconstruct/modifiers/ModBoolean.java b/src/main/java/tconstruct/modifiers/ModBoolean.java similarity index 100% rename from src/tconstruct/modifiers/ModBoolean.java rename to src/main/java/tconstruct/modifiers/ModBoolean.java diff --git a/src/tconstruct/modifiers/ModButtertouch.java b/src/main/java/tconstruct/modifiers/ModButtertouch.java similarity index 100% rename from src/tconstruct/modifiers/ModButtertouch.java rename to src/main/java/tconstruct/modifiers/ModButtertouch.java diff --git a/src/tconstruct/modifiers/ModDurability.java b/src/main/java/tconstruct/modifiers/ModDurability.java similarity index 100% rename from src/tconstruct/modifiers/ModDurability.java rename to src/main/java/tconstruct/modifiers/ModDurability.java diff --git a/src/tconstruct/modifiers/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/ModExtraModifier.java similarity index 100% rename from src/tconstruct/modifiers/ModExtraModifier.java rename to src/main/java/tconstruct/modifiers/ModExtraModifier.java diff --git a/src/tconstruct/modifiers/ModFlux.java b/src/main/java/tconstruct/modifiers/ModFlux.java similarity index 97% rename from src/tconstruct/modifiers/ModFlux.java rename to src/main/java/tconstruct/modifiers/ModFlux.java index e271a8d2..2386536f 100644 --- a/src/tconstruct/modifiers/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/ModFlux.java @@ -18,7 +18,7 @@ public class ModFlux extends ModBoolean public ModFlux() { - super(new ItemStack[0], 17, "Flux", "\u00a7e", ""); + super(new ItemStack[0], 9, "Flux", "\u00a7e", ""); } @Override diff --git a/src/tconstruct/modifiers/ModInteger.java b/src/main/java/tconstruct/modifiers/ModInteger.java similarity index 100% rename from src/tconstruct/modifiers/ModInteger.java rename to src/main/java/tconstruct/modifiers/ModInteger.java diff --git a/src/tconstruct/modifiers/ModLapis.java b/src/main/java/tconstruct/modifiers/ModLapis.java similarity index 100% rename from src/tconstruct/modifiers/ModLapis.java rename to src/main/java/tconstruct/modifiers/ModLapis.java diff --git a/src/tconstruct/modifiers/ModPiston.java b/src/main/java/tconstruct/modifiers/ModPiston.java similarity index 100% rename from src/tconstruct/modifiers/ModPiston.java rename to src/main/java/tconstruct/modifiers/ModPiston.java diff --git a/src/tconstruct/modifiers/ModPotion.java b/src/main/java/tconstruct/modifiers/ModPotion.java similarity index 100% rename from src/tconstruct/modifiers/ModPotion.java rename to src/main/java/tconstruct/modifiers/ModPotion.java diff --git a/src/tconstruct/modifiers/ModRedstone.java b/src/main/java/tconstruct/modifiers/ModRedstone.java similarity index 100% rename from src/tconstruct/modifiers/ModRedstone.java rename to src/main/java/tconstruct/modifiers/ModRedstone.java diff --git a/src/tconstruct/modifiers/ModReinforced.java b/src/main/java/tconstruct/modifiers/ModReinforced.java similarity index 100% rename from src/tconstruct/modifiers/ModReinforced.java rename to src/main/java/tconstruct/modifiers/ModReinforced.java diff --git a/src/tconstruct/modifiers/ModRepair.java b/src/main/java/tconstruct/modifiers/ModRepair.java similarity index 100% rename from src/tconstruct/modifiers/ModRepair.java rename to src/main/java/tconstruct/modifiers/ModRepair.java diff --git a/src/tconstruct/modifiers/ModSmite.java b/src/main/java/tconstruct/modifiers/ModSmite.java similarity index 100% rename from src/tconstruct/modifiers/ModSmite.java rename to src/main/java/tconstruct/modifiers/ModSmite.java diff --git a/src/tconstruct/modifiers/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/TActiveOmniMod.java similarity index 100% rename from src/tconstruct/modifiers/TActiveOmniMod.java rename to src/main/java/tconstruct/modifiers/TActiveOmniMod.java diff --git a/src/tconstruct/plugins/ICompatPlugin.java b/src/main/java/tconstruct/plugins/ICompatPlugin.java similarity index 100% rename from src/tconstruct/plugins/ICompatPlugin.java rename to src/main/java/tconstruct/plugins/ICompatPlugin.java diff --git a/src/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java similarity index 100% rename from src/tconstruct/plugins/PluginController.java rename to src/main/java/tconstruct/plugins/PluginController.java diff --git a/src/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java similarity index 100% rename from src/tconstruct/plugins/fmp/ForgeMultiPart.java rename to src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java diff --git a/src/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java b/src/main/java/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java similarity index 100% rename from src/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java rename to src/main/java/tconstruct/plugins/fmp/register/ConnectedTexturesMicroMaterial.java diff --git a/src/tconstruct/plugins/fmp/register/RegisterWithFMP.java b/src/main/java/tconstruct/plugins/fmp/register/RegisterWithFMP.java similarity index 100% rename from src/tconstruct/plugins/fmp/register/RegisterWithFMP.java rename to src/main/java/tconstruct/plugins/fmp/register/RegisterWithFMP.java diff --git a/src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java similarity index 100% rename from src/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/MineFactoryReloaded.java diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java new file mode 100644 index 00000000..556eb21f --- /dev/null +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/drinkable/Drinkables.java @@ -0,0 +1,27 @@ +package tconstruct.plugins.minefactoryreloaded.drinkable; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler; + +public class Drinkables implements ILiquidDrinkHandler +{ + + @Override + public void onDrink (EntityPlayer player) + { + //boost health when drink + if (player != null) + { + PotionEffect potion = player.getActivePotionEffect(Potion.field_76434_w); + int duration = 0; + if (potion != null) + duration = potion.duration; + player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0)); + } + + } + +} diff --git a/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java new file mode 100644 index 00000000..327240e7 --- /dev/null +++ b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/GrindableHorse.java @@ -0,0 +1,38 @@ +package tconstruct.plugins.minefactoryreloaded.harvestables; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import powercrystals.minefactoryreloaded.api.IFactoryGrindable; +import powercrystals.minefactoryreloaded.api.MobDrop; +import tconstruct.common.TContent; + +public class GrindableHorse implements IFactoryGrindable +{ + @Override + public Class getGrindableEntity () + { + return EntityHorse.class; + } + + @Override + public List grind (World world, EntityLivingBase entity, Random random) + { + List drops = new ArrayList(); + + drops.add(new MobDrop(10, new ItemStack(TContent.materials, random.nextInt(4) + 1, 36))); + + return drops; + } + + @Override + public boolean processEntity (EntityLivingBase entity) + { + return false; + } +} diff --git a/src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java similarity index 100% rename from src/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/harvestables/HarvestableOreBerry.java diff --git a/src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java b/src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java similarity index 100% rename from src/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java rename to src/main/java/tconstruct/plugins/minefactoryreloaded/mfrRegistering.java diff --git a/src/tconstruct/plugins/nei/NEICompat.java b/src/main/java/tconstruct/plugins/nei/NEICompat.java similarity index 100% rename from src/tconstruct/plugins/nei/NEICompat.java rename to src/main/java/tconstruct/plugins/nei/NEICompat.java diff --git a/src/tconstruct/plugins/nei/NotEnoughItems.java b/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java similarity index 100% rename from src/tconstruct/plugins/nei/NotEnoughItems.java rename to src/main/java/tconstruct/plugins/nei/NotEnoughItems.java diff --git a/src/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java similarity index 100% rename from src/tconstruct/plugins/waila/CastingChannelDataProvider.java rename to src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java diff --git a/src/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java similarity index 100% rename from src/tconstruct/plugins/waila/SearedTankDataProvider.java rename to src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java diff --git a/src/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java similarity index 100% rename from src/tconstruct/plugins/waila/SmelteryDataProvider.java rename to src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java diff --git a/src/tconstruct/plugins/waila/Waila.java b/src/main/java/tconstruct/plugins/waila/Waila.java similarity index 100% rename from src/tconstruct/plugins/waila/Waila.java rename to src/main/java/tconstruct/plugins/waila/Waila.java diff --git a/src/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java similarity index 100% rename from src/tconstruct/plugins/waila/WailaRegistrar.java rename to src/main/java/tconstruct/plugins/waila/WailaRegistrar.java diff --git a/src/tconstruct/preloader/ASMInterfaceRepair.java b/src/main/java/tconstruct/preloader/ASMInterfaceRepair.java similarity index 100% rename from src/tconstruct/preloader/ASMInterfaceRepair.java rename to src/main/java/tconstruct/preloader/ASMInterfaceRepair.java diff --git a/src/tconstruct/preloader/TConstructLoaderContainer.java b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java similarity index 99% rename from src/tconstruct/preloader/TConstructLoaderContainer.java rename to src/main/java/tconstruct/preloader/TConstructLoaderContainer.java index 1b2e5972..7c57f48e 100644 --- a/src/tconstruct/preloader/TConstructLoaderContainer.java +++ b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java @@ -115,7 +115,7 @@ public class TConstructLoaderContainer extends DummyModContainer implements IFML return true; } - @Override + public String[] getLibraryRequestClass () { return null; diff --git a/src/tconstruct/preloader/helpers/PropertyManager.java b/src/main/java/tconstruct/preloader/helpers/PropertyManager.java similarity index 100% rename from src/tconstruct/preloader/helpers/PropertyManager.java rename to src/main/java/tconstruct/preloader/helpers/PropertyManager.java diff --git a/src/tconstruct/util/CallableSuppConfig.java b/src/main/java/tconstruct/util/CallableSuppConfig.java similarity index 100% rename from src/tconstruct/util/CallableSuppConfig.java rename to src/main/java/tconstruct/util/CallableSuppConfig.java diff --git a/src/tconstruct/util/CallableUnsuppConfig.java b/src/main/java/tconstruct/util/CallableUnsuppConfig.java similarity index 100% rename from src/tconstruct/util/CallableUnsuppConfig.java rename to src/main/java/tconstruct/util/CallableUnsuppConfig.java diff --git a/src/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java similarity index 100% rename from src/tconstruct/util/DamageSourceFireworkExplode.java rename to src/main/java/tconstruct/util/DamageSourceFireworkExplode.java diff --git a/src/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java similarity index 100% rename from src/tconstruct/util/DamageSourceLandmine.java rename to src/main/java/tconstruct/util/DamageSourceLandmine.java diff --git a/src/tconstruct/util/DozenalConverter.java b/src/main/java/tconstruct/util/DozenalConverter.java similarity index 100% rename from src/tconstruct/util/DozenalConverter.java rename to src/main/java/tconstruct/util/DozenalConverter.java diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java similarity index 100% rename from src/tconstruct/util/EnvironmentChecks.java rename to src/main/java/tconstruct/util/EnvironmentChecks.java diff --git a/src/tconstruct/util/MiningExplosion.java b/src/main/java/tconstruct/util/MiningExplosion.java similarity index 100% rename from src/tconstruct/util/MiningExplosion.java rename to src/main/java/tconstruct/util/MiningExplosion.java diff --git a/src/tconstruct/util/RecipeRemover.java b/src/main/java/tconstruct/util/RecipeRemover.java similarity index 100% rename from src/tconstruct/util/RecipeRemover.java rename to src/main/java/tconstruct/util/RecipeRemover.java diff --git a/src/tconstruct/util/SmelteryDamageSource.java b/src/main/java/tconstruct/util/SmelteryDamageSource.java similarity index 100% rename from src/tconstruct/util/SmelteryDamageSource.java rename to src/main/java/tconstruct/util/SmelteryDamageSource.java diff --git a/src/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java similarity index 100% rename from src/tconstruct/util/TCraftingHandler.java rename to src/main/java/tconstruct/util/TCraftingHandler.java diff --git a/src/tconstruct/util/TDispenserBehaviorArrow.java b/src/main/java/tconstruct/util/TDispenserBehaviorArrow.java similarity index 100% rename from src/tconstruct/util/TDispenserBehaviorArrow.java rename to src/main/java/tconstruct/util/TDispenserBehaviorArrow.java diff --git a/src/tconstruct/util/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java similarity index 100% rename from src/tconstruct/util/TDispenserBehaviorSpawnEgg.java rename to src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java diff --git a/src/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java similarity index 99% rename from src/tconstruct/util/TEventHandler.java rename to src/main/java/tconstruct/util/TEventHandler.java index 9cc61b06..272f438f 100644 --- a/src/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -532,13 +532,8 @@ public class TEventHandler @ForgeSubscribe public void registerOre (OreRegisterEvent evt) { - if (evt.Name == "battery") - TConstruct.content.modE.batteries.add(evt.Ore); - - else if (evt.Name == "basicCircuit") - TConstruct.content.modE.circuits.add(evt.Ore); - - else if (evt.Name == "crystalQuartz") + + if (evt.Name == "crystalQuartz") { ToolBuilder.instance.registerToolMod(new ModAttack("Quartz", new ItemStack[] { evt.Ore }, 11, 2)); } diff --git a/src/tconstruct/util/TEventHandlerAchievement.java b/src/main/java/tconstruct/util/TEventHandlerAchievement.java similarity index 100% rename from src/tconstruct/util/TEventHandlerAchievement.java rename to src/main/java/tconstruct/util/TEventHandlerAchievement.java diff --git a/src/tconstruct/util/config/AEImcHandler.java b/src/main/java/tconstruct/util/config/AEImcHandler.java similarity index 100% rename from src/tconstruct/util/config/AEImcHandler.java rename to src/main/java/tconstruct/util/config/AEImcHandler.java diff --git a/src/tconstruct/util/config/BCImcHandler.java b/src/main/java/tconstruct/util/config/BCImcHandler.java similarity index 100% rename from src/tconstruct/util/config/BCImcHandler.java rename to src/main/java/tconstruct/util/config/BCImcHandler.java diff --git a/src/tconstruct/util/config/BOPConfig.java b/src/main/java/tconstruct/util/config/BOPConfig.java similarity index 100% rename from src/tconstruct/util/config/BOPConfig.java rename to src/main/java/tconstruct/util/config/BOPConfig.java diff --git a/src/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java similarity index 100% rename from src/tconstruct/util/config/DimensionBlacklist.java rename to src/main/java/tconstruct/util/config/DimensionBlacklist.java diff --git a/src/tconstruct/util/config/MystImcHandler.java b/src/main/java/tconstruct/util/config/MystImcHandler.java similarity index 100% rename from src/tconstruct/util/config/MystImcHandler.java rename to src/main/java/tconstruct/util/config/MystImcHandler.java diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java similarity index 100% rename from src/tconstruct/util/config/PHConstruct.java rename to src/main/java/tconstruct/util/config/PHConstruct.java diff --git a/src/tconstruct/util/config/TwilightForestConfig.java b/src/main/java/tconstruct/util/config/TwilightForestConfig.java similarity index 100% rename from src/tconstruct/util/config/TwilightForestConfig.java rename to src/main/java/tconstruct/util/config/TwilightForestConfig.java diff --git a/src/tconstruct/util/landmine/Helper.java b/src/main/java/tconstruct/util/landmine/Helper.java similarity index 100% rename from src/tconstruct/util/landmine/Helper.java rename to src/main/java/tconstruct/util/landmine/Helper.java diff --git a/src/tconstruct/util/landmine/behavior/Behavior.java b/src/main/java/tconstruct/util/landmine/behavior/Behavior.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/Behavior.java rename to src/main/java/tconstruct/util/landmine/behavior/Behavior.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorDefault.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorDefault.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorDummy.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorDummy.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorExplosive.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorFirecharge.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorFirework.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorPotion.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorPreventExplode.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorProjectile.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorShears.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java diff --git a/src/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java rename to src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java diff --git a/src/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java rename to src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java diff --git a/src/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java similarity index 100% rename from src/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java rename to src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java diff --git a/src/tconstruct/util/network/TPacketHandler.java b/src/main/java/tconstruct/util/network/TPacketHandler.java similarity index 100% rename from src/tconstruct/util/network/TPacketHandler.java rename to src/main/java/tconstruct/util/network/TPacketHandler.java diff --git a/src/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java similarity index 100% rename from src/tconstruct/util/player/ArmorExtended.java rename to src/main/java/tconstruct/util/player/ArmorExtended.java diff --git a/src/tconstruct/util/player/ArmorExtendedClient.java b/src/main/java/tconstruct/util/player/ArmorExtendedClient.java similarity index 100% rename from src/tconstruct/util/player/ArmorExtendedClient.java rename to src/main/java/tconstruct/util/player/ArmorExtendedClient.java diff --git a/src/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java similarity index 100% rename from src/tconstruct/util/player/KnapsackInventory.java rename to src/main/java/tconstruct/util/player/KnapsackInventory.java diff --git a/src/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java similarity index 100% rename from src/tconstruct/util/player/TPlayerHandler.java rename to src/main/java/tconstruct/util/player/TPlayerHandler.java diff --git a/src/tconstruct/util/player/TPlayerStats.java b/src/main/java/tconstruct/util/player/TPlayerStats.java similarity index 100% rename from src/tconstruct/util/player/TPlayerStats.java rename to src/main/java/tconstruct/util/player/TPlayerStats.java diff --git a/src/tconstruct/worldgen/OreberryBushGen.java b/src/main/java/tconstruct/worldgen/OreberryBushGen.java similarity index 100% rename from src/tconstruct/worldgen/OreberryBushGen.java rename to src/main/java/tconstruct/worldgen/OreberryBushGen.java diff --git a/src/tconstruct/worldgen/OverworldProvider.java b/src/main/java/tconstruct/worldgen/OverworldProvider.java similarity index 100% rename from src/tconstruct/worldgen/OverworldProvider.java rename to src/main/java/tconstruct/worldgen/OverworldProvider.java diff --git a/src/tconstruct/worldgen/PlantGen.java b/src/main/java/tconstruct/worldgen/PlantGen.java similarity index 100% rename from src/tconstruct/worldgen/PlantGen.java rename to src/main/java/tconstruct/worldgen/PlantGen.java diff --git a/src/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java similarity index 100% rename from src/tconstruct/worldgen/SlimeIslandGen.java rename to src/main/java/tconstruct/worldgen/SlimeIslandGen.java diff --git a/src/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java similarity index 100% rename from src/tconstruct/worldgen/SlimeTreeGen.java rename to src/main/java/tconstruct/worldgen/SlimeTreeGen.java diff --git a/src/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java similarity index 100% rename from src/tconstruct/worldgen/SurfaceOreGen.java rename to src/main/java/tconstruct/worldgen/SurfaceOreGen.java diff --git a/src/tconstruct/worldgen/TBaseWorldGenerator.java b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java similarity index 100% rename from src/tconstruct/worldgen/TBaseWorldGenerator.java rename to src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java diff --git a/src/tconstruct/worldgen/TerrainGenEventHandler.java b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java similarity index 100% rename from src/tconstruct/worldgen/TerrainGenEventHandler.java rename to src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java diff --git a/src/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java similarity index 100% rename from src/tconstruct/worldgen/village/ComponentSmeltery.java rename to src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java diff --git a/src/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java similarity index 100% rename from src/tconstruct/worldgen/village/ComponentToolWorkshop.java rename to src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java diff --git a/src/tconstruct/worldgen/village/TVillageTrades.java b/src/main/java/tconstruct/worldgen/village/TVillageTrades.java similarity index 100% rename from src/tconstruct/worldgen/village/TVillageTrades.java rename to src/main/java/tconstruct/worldgen/village/TVillageTrades.java diff --git a/src/tconstruct/worldgen/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java similarity index 100% rename from src/tconstruct/worldgen/village/VillageSmelteryHandler.java rename to src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java diff --git a/src/tconstruct/worldgen/village/VillageToolStationHandler.java b/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java similarity index 100% rename from src/tconstruct/worldgen/village/VillageToolStationHandler.java rename to src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java diff --git a/src/tconstruct/modifiers/ModElectric.java b/src/tconstruct/modifiers/ModElectric.java deleted file mode 100644 index 309be061..00000000 --- a/src/tconstruct/modifiers/ModElectric.java +++ /dev/null @@ -1,87 +0,0 @@ -package tconstruct.modifiers; - -import ic2.api.item.IElectricItem; - -import java.util.ArrayList; - -import tconstruct.library.tools.ToolCore; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -/* IC2 support */ - -public class ModElectric extends ModBoolean -{ - public ArrayList circuits = new ArrayList(); - public ArrayList batteries = new ArrayList(); - - public ModElectric() - { - super(new ItemStack[0], 9, "Electric", "\u00a7e", ""); - } - - @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { - if (input[0] == null || input[1] == null) - return false; - - boolean circuit = false; - boolean battery = false; - - for (ItemStack stack : circuits) - { - if (stack.isItemEqual(input[0]) || stack.isItemEqual(input[1])) - circuit = true; - } - - for (ItemStack stack : batteries) - { - if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IElectricItem) - { - battery = true; - } - if (stack.itemID == input[1].itemID && input[1].getItem() instanceof IElectricItem) - { - battery = true; - } - } - return circuit && battery && canModify(tool, input); - } - - /*@Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0; - - return false; - }*/ - - @Override - public void modify (ItemStack[] input, ItemStack tool) - { - NBTTagCompound tags = tool.getTagCompound(); - - if (!tags.hasKey(key)) - { - tags.setBoolean(key, true); - - int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); - modifiers -= 1; - tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); - int charge = 0; - if (input[0].getItem() instanceof IElectricItem && input[0].hasTagCompound()) - charge = input[0].getTagCompound().getInteger("charge"); - if (input[1].getItem() instanceof IElectricItem && input[1].hasTagCompound()) - charge = input[1].getTagCompound().getInteger("charge"); - tags.setInteger("charge", charge); - tags.setInteger(key, 1); - addModifierTip(tool, "\u00a7eElectric"); - ToolCore toolcore = (ToolCore) tool.getItem(); - tool.setItemDamage(1 + (toolcore.getMaxCharge(tool) - charge) * (tool.getMaxDamage() - 1) / toolcore.getMaxCharge(tool)); - } - } -}