diff --git a/.classpath b/.classpath deleted file mode 100644 index 80bbfe6..0000000 --- a/.classpath +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 239b020..4b37269 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,24 @@ +*.class + +# Package Files # +*.war +*.ear +/build +/eclipse /bin -*.classpath -build.properties \ No newline at end of file +*.mtl +*.classpath +*.project +/.settings +/.gradle +/config +!/src/main/resources +/crash-reports +/logs +/mods +/resourcepacks +/saves +/screenshots +/options.txt +/libs diff --git a/.project b/.project deleted file mode 100644 index 467e229..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - TPPI-Tweaks - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..aead827 --- /dev/null +++ b/build.gradle @@ -0,0 +1,74 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + } +} + +apply plugin: 'forge' + +ext.configFile = file "build.properties" + +configFile.withReader { + // Load config. It shall from now be referenced as simply config or project.config + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +// Finds and sets version data +task buildInfo { + def cmd = "git rev-parse --short HEAD" + def proc = cmd.execute() + proc.waitFor() + if (proc.exitValue() == 0) { + ext.revision = proc.text.trim() + } else { + ext.revision = "GITBORK" + } + + if (System.getenv().BUILD_NUMBER != null) { + ext.buildNum = "${System.getenv().BUILD_NUMBER}" + } else { + ext.buildNum = "DEV.${project.buildInfo.revision}" + } +} +ext.artifact_version = 'NFG' +if (System.getenv().ARTIFACT_VERSION == null) { + artifact_version = "${config.mod_version}" +} +if (System.getenv().ARTIFACT_VERSION != null) { + artifact_version = "${system.getenv().ARTIFACT_VERSION}" +} + +version = "MC${config.minecraft_version}-${artifact_version}-${System.getenv().BUILD_NUMBER}" + +minecraft { + version = "1.6.4-9.11.1.964" +} + +dependencies { + compile fileTree(dir: 'libs', include: '*.jar') +} + +processResources +{ + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod/info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} \ No newline at end of file diff --git a/build.properties b/build.properties index 07a6f3b..cfc303d 100644 --- a/build.properties +++ b/build.properties @@ -1,17 +1,3 @@ -# Example build.properties file. Feel free to set these values to meet your needs on your system. -# -# dir.mc : Not Required. I use it as a base folder for other properties. This is where all my MC related stuff lives. -dir.mc= -# forge.version : Not Required. This is the path of the folder under my ${dir.mc} folder that I extract the Forge source distribution to. -forge.version=965 -# dir.forge : Not Required. The path to the forge folder extracted from the Forge source distribution. I use it in subsequent properties. -dir.forge=E:/Development/Let's Mod/development/forge -# -# dir.project : Required. This is the folder that you pulled the TreeCapitator repo to. -dir.project=E:/Development/Let's Mod/development/eclipse/TPPI-Tweaks -# dir.core.project : Required. This is the folder that you pulled the bspkrsCore repo to. -dir.core.project= -# dir.mcp : Required. The path to the mcp folder created by Forge when running install.cmd or install.sh. -dir.mcp=E:/Development/Let's Mod/development/forge/mcp -# dir.release : Required. The target path where the .jar/.zip files will be created. -dir.release=E:/Mod Builds \ No newline at end of file +minecraft_version=1.6.4 +forge_version=9.11.1.964 +mod_version=1.0.0 \ No newline at end of file diff --git a/build.xml b/build.xml deleted file mode 100644 index 37380b5..0000000 --- a/build.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - Generic ForgeMod Builder - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..667288a Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d9425c6 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Oct 29 18:00:54 CDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mod.properties b/mod.properties deleted file mode 100644 index d510171..0000000 --- a/mod.properties +++ /dev/null @@ -1,22 +0,0 @@ -version.minecraft=1.6.X -version.number=0.9.0 -version.build= - -mod.id=TPPITweaks -mod.tags= -mod.name=TPPI-Tweaks -mod.description=Additions and tweaks for the /r/feedthebeast modpack! -mod.authors=tterrag1098, wha-ha-ha, and others -mod.credits=Everyone from /r/feedthebeast, especially the devs and beta testers! -mod.url=http://github.com/TPPI-Dev -mod.Forge.updateUrl= -mod.ML.updateUrl= -mod.logoFile= -mod.screenshots= -mod.parent= -mod.Forge.requiredMods= -mod.ML.requiredMods= -mod.dependants= -mod.Forge.dependencies= -mod.ML.dependencies= -mod.useDependencyInformation=false \ No newline at end of file diff --git a/resources/assets/tppitweaks/textures/items/tppiGuide.png.mcmeta b/resources/assets/tppitweaks/textures/items/tppiGuide1.png.mcmeta similarity index 100% rename from resources/assets/tppitweaks/textures/items/tppiGuide.png.mcmeta rename to resources/assets/tppitweaks/textures/items/tppiGuide1.png.mcmeta diff --git a/src/appeng/api/Blocks.java b/src/main/java/appeng/api/Blocks.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/Blocks.java rename to src/main/java/appeng/api/Blocks.java diff --git a/src/appeng/api/DimentionalCoord.java b/src/main/java/appeng/api/DimentionalCoord.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/DimentionalCoord.java rename to src/main/java/appeng/api/DimentionalCoord.java diff --git a/src/appeng/api/IAEItemStack.java b/src/main/java/appeng/api/IAEItemStack.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IAEItemStack.java rename to src/main/java/appeng/api/IAEItemStack.java diff --git a/src/appeng/api/IAETagCompound.java b/src/main/java/appeng/api/IAETagCompound.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IAETagCompound.java rename to src/main/java/appeng/api/IAETagCompound.java diff --git a/src/appeng/api/IAppEngApi.java b/src/main/java/appeng/api/IAppEngApi.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IAppEngApi.java rename to src/main/java/appeng/api/IAppEngApi.java diff --git a/src/appeng/api/IAppEngGrinderRecipe.java b/src/main/java/appeng/api/IAppEngGrinderRecipe.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IAppEngGrinderRecipe.java rename to src/main/java/appeng/api/IAppEngGrinderRecipe.java diff --git a/src/appeng/api/ICellHandler.java b/src/main/java/appeng/api/ICellHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/ICellHandler.java rename to src/main/java/appeng/api/ICellHandler.java diff --git a/src/appeng/api/ICellRegistry.java b/src/main/java/appeng/api/ICellRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/ICellRegistry.java rename to src/main/java/appeng/api/ICellRegistry.java diff --git a/src/appeng/api/IExternalStorageHandler.java b/src/main/java/appeng/api/IExternalStorageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IExternalStorageHandler.java rename to src/main/java/appeng/api/IExternalStorageHandler.java diff --git a/src/appeng/api/IExternalStorageRegistry.java b/src/main/java/appeng/api/IExternalStorageRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IExternalStorageRegistry.java rename to src/main/java/appeng/api/IExternalStorageRegistry.java diff --git a/src/appeng/api/IGridCacheRegistry.java b/src/main/java/appeng/api/IGridCacheRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IGridCacheRegistry.java rename to src/main/java/appeng/api/IGridCacheRegistry.java diff --git a/src/appeng/api/IGrinderRecipeManager.java b/src/main/java/appeng/api/IGrinderRecipeManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IGrinderRecipeManager.java rename to src/main/java/appeng/api/IGrinderRecipeManager.java diff --git a/src/appeng/api/IItemComparisionProvider.java b/src/main/java/appeng/api/IItemComparisionProvider.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IItemComparisionProvider.java rename to src/main/java/appeng/api/IItemComparisionProvider.java diff --git a/src/appeng/api/IItemComparison.java b/src/main/java/appeng/api/IItemComparison.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IItemComparison.java rename to src/main/java/appeng/api/IItemComparison.java diff --git a/src/appeng/api/IItemList.java b/src/main/java/appeng/api/IItemList.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IItemList.java rename to src/main/java/appeng/api/IItemList.java diff --git a/src/appeng/api/ILocateableRegistry.java b/src/main/java/appeng/api/ILocateableRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/ILocateableRegistry.java rename to src/main/java/appeng/api/ILocateableRegistry.java diff --git a/src/appeng/api/ISpecialComparisonRegistry.java b/src/main/java/appeng/api/ISpecialComparisonRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/ISpecialComparisonRegistry.java rename to src/main/java/appeng/api/ISpecialComparisonRegistry.java diff --git a/src/appeng/api/IWirelessTermHandler.java b/src/main/java/appeng/api/IWirelessTermHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IWirelessTermHandler.java rename to src/main/java/appeng/api/IWirelessTermHandler.java diff --git a/src/appeng/api/IWirelessTermRegistery.java b/src/main/java/appeng/api/IWirelessTermRegistery.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/IWirelessTermRegistery.java rename to src/main/java/appeng/api/IWirelessTermRegistery.java diff --git a/src/appeng/api/Items.java b/src/main/java/appeng/api/Items.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/Items.java rename to src/main/java/appeng/api/Items.java diff --git a/src/appeng/api/Materials.java b/src/main/java/appeng/api/Materials.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/Materials.java rename to src/main/java/appeng/api/Materials.java diff --git a/src/appeng/api/README.txt b/src/main/java/appeng/api/README.txt old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/README.txt rename to src/main/java/appeng/api/README.txt diff --git a/src/appeng/api/TileRef.java b/src/main/java/appeng/api/TileRef.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/TileRef.java rename to src/main/java/appeng/api/TileRef.java diff --git a/src/appeng/api/Util.java b/src/main/java/appeng/api/Util.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/Util.java rename to src/main/java/appeng/api/Util.java diff --git a/src/appeng/api/WorldCoord.java b/src/main/java/appeng/api/WorldCoord.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/WorldCoord.java rename to src/main/java/appeng/api/WorldCoord.java diff --git a/src/appeng/api/config/ActionItems.java b/src/main/java/appeng/api/config/ActionItems.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/ActionItems.java rename to src/main/java/appeng/api/config/ActionItems.java diff --git a/src/appeng/api/config/CondenserOuput.java b/src/main/java/appeng/api/config/CondenserOuput.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/CondenserOuput.java rename to src/main/java/appeng/api/config/CondenserOuput.java diff --git a/src/appeng/api/config/EnableDisable.java b/src/main/java/appeng/api/config/EnableDisable.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/EnableDisable.java rename to src/main/java/appeng/api/config/EnableDisable.java diff --git a/src/appeng/api/config/FullnessMode.java b/src/main/java/appeng/api/config/FullnessMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/FullnessMode.java rename to src/main/java/appeng/api/config/FullnessMode.java diff --git a/src/appeng/api/config/FuzzyMode.java b/src/main/java/appeng/api/config/FuzzyMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/FuzzyMode.java rename to src/main/java/appeng/api/config/FuzzyMode.java diff --git a/src/appeng/api/config/IConfigEnum.java b/src/main/java/appeng/api/config/IConfigEnum.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/IConfigEnum.java rename to src/main/java/appeng/api/config/IConfigEnum.java diff --git a/src/appeng/api/config/InterfaceBlockingMode.java b/src/main/java/appeng/api/config/InterfaceBlockingMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/InterfaceBlockingMode.java rename to src/main/java/appeng/api/config/InterfaceBlockingMode.java diff --git a/src/appeng/api/config/InterfaceCraftingMode.java b/src/main/java/appeng/api/config/InterfaceCraftingMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/InterfaceCraftingMode.java rename to src/main/java/appeng/api/config/InterfaceCraftingMode.java diff --git a/src/appeng/api/config/ItemFlow.java b/src/main/java/appeng/api/config/ItemFlow.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/ItemFlow.java rename to src/main/java/appeng/api/config/ItemFlow.java diff --git a/src/appeng/api/config/ListMode.java b/src/main/java/appeng/api/config/ListMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/ListMode.java rename to src/main/java/appeng/api/config/ListMode.java diff --git a/src/appeng/api/config/MatchingMode.java b/src/main/java/appeng/api/config/MatchingMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/MatchingMode.java rename to src/main/java/appeng/api/config/MatchingMode.java diff --git a/src/appeng/api/config/OperationMode.java b/src/main/java/appeng/api/config/OperationMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/OperationMode.java rename to src/main/java/appeng/api/config/OperationMode.java diff --git a/src/appeng/api/config/PowerUnits.java b/src/main/java/appeng/api/config/PowerUnits.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/PowerUnits.java rename to src/main/java/appeng/api/config/PowerUnits.java diff --git a/src/appeng/api/config/RedstoneModeInput.java b/src/main/java/appeng/api/config/RedstoneModeInput.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/RedstoneModeInput.java rename to src/main/java/appeng/api/config/RedstoneModeInput.java diff --git a/src/appeng/api/config/RedstoneModeInputOnOff.java b/src/main/java/appeng/api/config/RedstoneModeInputOnOff.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/RedstoneModeInputOnOff.java rename to src/main/java/appeng/api/config/RedstoneModeInputOnOff.java diff --git a/src/appeng/api/config/RedstoneModeOutput.java b/src/main/java/appeng/api/config/RedstoneModeOutput.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/RedstoneModeOutput.java rename to src/main/java/appeng/api/config/RedstoneModeOutput.java diff --git a/src/appeng/api/config/SearchBoxMode.java b/src/main/java/appeng/api/config/SearchBoxMode.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/SearchBoxMode.java rename to src/main/java/appeng/api/config/SearchBoxMode.java diff --git a/src/appeng/api/config/SortDir.java b/src/main/java/appeng/api/config/SortDir.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/SortDir.java rename to src/main/java/appeng/api/config/SortDir.java diff --git a/src/appeng/api/config/SortOrder.java b/src/main/java/appeng/api/config/SortOrder.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/SortOrder.java rename to src/main/java/appeng/api/config/SortOrder.java diff --git a/src/appeng/api/config/StackModeInput.java b/src/main/java/appeng/api/config/StackModeInput.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/StackModeInput.java rename to src/main/java/appeng/api/config/StackModeInput.java diff --git a/src/appeng/api/config/StackModeOutput.java b/src/main/java/appeng/api/config/StackModeOutput.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/StackModeOutput.java rename to src/main/java/appeng/api/config/StackModeOutput.java diff --git a/src/appeng/api/config/TransferDir.java b/src/main/java/appeng/api/config/TransferDir.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/TransferDir.java rename to src/main/java/appeng/api/config/TransferDir.java diff --git a/src/appeng/api/config/ViewItems.java b/src/main/java/appeng/api/config/ViewItems.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/config/ViewItems.java rename to src/main/java/appeng/api/config/ViewItems.java diff --git a/src/appeng/api/events/AEWorldEvent.java b/src/main/java/appeng/api/events/AEWorldEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/AEWorldEvent.java rename to src/main/java/appeng/api/events/AEWorldEvent.java diff --git a/src/appeng/api/events/GridErrorEvent.java b/src/main/java/appeng/api/events/GridErrorEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridErrorEvent.java rename to src/main/java/appeng/api/events/GridErrorEvent.java diff --git a/src/appeng/api/events/GridPatternUpdateEvent.java b/src/main/java/appeng/api/events/GridPatternUpdateEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridPatternUpdateEvent.java rename to src/main/java/appeng/api/events/GridPatternUpdateEvent.java diff --git a/src/appeng/api/events/GridStorageUpdateEvent.java b/src/main/java/appeng/api/events/GridStorageUpdateEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridStorageUpdateEvent.java rename to src/main/java/appeng/api/events/GridStorageUpdateEvent.java diff --git a/src/appeng/api/events/GridTileConnectivityEvent.java b/src/main/java/appeng/api/events/GridTileConnectivityEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridTileConnectivityEvent.java rename to src/main/java/appeng/api/events/GridTileConnectivityEvent.java diff --git a/src/appeng/api/events/GridTileLoadEvent.java b/src/main/java/appeng/api/events/GridTileLoadEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridTileLoadEvent.java rename to src/main/java/appeng/api/events/GridTileLoadEvent.java diff --git a/src/appeng/api/events/GridTileUnloadEvent.java b/src/main/java/appeng/api/events/GridTileUnloadEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/GridTileUnloadEvent.java rename to src/main/java/appeng/api/events/GridTileUnloadEvent.java diff --git a/src/appeng/api/events/LocateableEventAnnounce.java b/src/main/java/appeng/api/events/LocateableEventAnnounce.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/LocateableEventAnnounce.java rename to src/main/java/appeng/api/events/LocateableEventAnnounce.java diff --git a/src/appeng/api/events/MultiBlockUpdateEvent.java b/src/main/java/appeng/api/events/MultiBlockUpdateEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/events/MultiBlockUpdateEvent.java rename to src/main/java/appeng/api/events/MultiBlockUpdateEvent.java diff --git a/src/appeng/api/exceptions/AppEngException.java b/src/main/java/appeng/api/exceptions/AppEngException.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/exceptions/AppEngException.java rename to src/main/java/appeng/api/exceptions/AppEngException.java diff --git a/src/appeng/api/exceptions/AppEngTileMissingException.java b/src/main/java/appeng/api/exceptions/AppEngTileMissingException.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/exceptions/AppEngTileMissingException.java rename to src/main/java/appeng/api/exceptions/AppEngTileMissingException.java diff --git a/src/appeng/api/me/items/IAEChargeableItem.java b/src/main/java/appeng/api/me/items/IAEChargeableItem.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/IAEChargeableItem.java rename to src/main/java/appeng/api/me/items/IAEChargeableItem.java diff --git a/src/appeng/api/me/items/IAEWrench.java b/src/main/java/appeng/api/me/items/IAEWrench.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/IAEWrench.java rename to src/main/java/appeng/api/me/items/IAEWrench.java diff --git a/src/appeng/api/me/items/IMemoryCard.java b/src/main/java/appeng/api/me/items/IMemoryCard.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/IMemoryCard.java rename to src/main/java/appeng/api/me/items/IMemoryCard.java diff --git a/src/appeng/api/me/items/ISpatialStorage.java b/src/main/java/appeng/api/me/items/ISpatialStorage.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/ISpatialStorage.java rename to src/main/java/appeng/api/me/items/ISpatialStorage.java diff --git a/src/appeng/api/me/items/IStorageCell.java b/src/main/java/appeng/api/me/items/IStorageCell.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/IStorageCell.java rename to src/main/java/appeng/api/me/items/IStorageCell.java diff --git a/src/appeng/api/me/items/IStorageComponent.java b/src/main/java/appeng/api/me/items/IStorageComponent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/items/IStorageComponent.java rename to src/main/java/appeng/api/me/items/IStorageComponent.java diff --git a/src/appeng/api/me/tiles/IAssemblerMB.java b/src/main/java/appeng/api/me/tiles/IAssemblerMB.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IAssemblerMB.java rename to src/main/java/appeng/api/me/tiles/IAssemblerMB.java diff --git a/src/appeng/api/me/tiles/IAssemblerPatternProvider.java b/src/main/java/appeng/api/me/tiles/IAssemblerPatternProvider.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IAssemblerPatternProvider.java rename to src/main/java/appeng/api/me/tiles/IAssemblerPatternProvider.java diff --git a/src/appeng/api/me/tiles/ICellContainer.java b/src/main/java/appeng/api/me/tiles/ICellContainer.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ICellContainer.java rename to src/main/java/appeng/api/me/tiles/ICellContainer.java diff --git a/src/appeng/api/me/tiles/ICellProvider.java b/src/main/java/appeng/api/me/tiles/ICellProvider.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ICellProvider.java rename to src/main/java/appeng/api/me/tiles/ICellProvider.java diff --git a/src/appeng/api/me/tiles/IColoredMETile.java b/src/main/java/appeng/api/me/tiles/IColoredMETile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IColoredMETile.java rename to src/main/java/appeng/api/me/tiles/IColoredMETile.java diff --git a/src/appeng/api/me/tiles/IConfigureableTile.java b/src/main/java/appeng/api/me/tiles/IConfigureableTile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IConfigureableTile.java rename to src/main/java/appeng/api/me/tiles/IConfigureableTile.java diff --git a/src/appeng/api/me/tiles/IConnectionSensitive.java b/src/main/java/appeng/api/me/tiles/IConnectionSensitive.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IConnectionSensitive.java rename to src/main/java/appeng/api/me/tiles/IConnectionSensitive.java diff --git a/src/appeng/api/me/tiles/ICraftingTracker.java b/src/main/java/appeng/api/me/tiles/ICraftingTracker.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ICraftingTracker.java rename to src/main/java/appeng/api/me/tiles/ICraftingTracker.java diff --git a/src/appeng/api/me/tiles/IDirectionalMETile.java b/src/main/java/appeng/api/me/tiles/IDirectionalMETile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IDirectionalMETile.java rename to src/main/java/appeng/api/me/tiles/IDirectionalMETile.java diff --git a/src/appeng/api/me/tiles/IExtendedCellProvider.java b/src/main/java/appeng/api/me/tiles/IExtendedCellProvider.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IExtendedCellProvider.java rename to src/main/java/appeng/api/me/tiles/IExtendedCellProvider.java diff --git a/src/appeng/api/me/tiles/IFulllyOptionalMETile.java b/src/main/java/appeng/api/me/tiles/IFulllyOptionalMETile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IFulllyOptionalMETile.java rename to src/main/java/appeng/api/me/tiles/IFulllyOptionalMETile.java diff --git a/src/appeng/api/me/tiles/IGridMachine.java b/src/main/java/appeng/api/me/tiles/IGridMachine.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IGridMachine.java rename to src/main/java/appeng/api/me/tiles/IGridMachine.java diff --git a/src/appeng/api/me/tiles/IGridTeleport.java b/src/main/java/appeng/api/me/tiles/IGridTeleport.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IGridTeleport.java rename to src/main/java/appeng/api/me/tiles/IGridTeleport.java diff --git a/src/appeng/api/me/tiles/IGridTileEntity.java b/src/main/java/appeng/api/me/tiles/IGridTileEntity.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IGridTileEntity.java rename to src/main/java/appeng/api/me/tiles/IGridTileEntity.java diff --git a/src/appeng/api/me/tiles/ILocateable.java b/src/main/java/appeng/api/me/tiles/ILocateable.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ILocateable.java rename to src/main/java/appeng/api/me/tiles/ILocateable.java diff --git a/src/appeng/api/me/tiles/IMEPowerStorage.java b/src/main/java/appeng/api/me/tiles/IMEPowerStorage.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IMEPowerStorage.java rename to src/main/java/appeng/api/me/tiles/IMEPowerStorage.java diff --git a/src/appeng/api/me/tiles/INonSignalBlock.java b/src/main/java/appeng/api/me/tiles/INonSignalBlock.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/INonSignalBlock.java rename to src/main/java/appeng/api/me/tiles/INonSignalBlock.java diff --git a/src/appeng/api/me/tiles/IOptionalMETile.java b/src/main/java/appeng/api/me/tiles/IOptionalMETile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IOptionalMETile.java rename to src/main/java/appeng/api/me/tiles/IOptionalMETile.java diff --git a/src/appeng/api/me/tiles/IOrientableTile.java b/src/main/java/appeng/api/me/tiles/IOrientableTile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IOrientableTile.java rename to src/main/java/appeng/api/me/tiles/IOrientableTile.java diff --git a/src/appeng/api/me/tiles/IPriorityTile.java b/src/main/java/appeng/api/me/tiles/IPriorityTile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IPriorityTile.java rename to src/main/java/appeng/api/me/tiles/IPriorityTile.java diff --git a/src/appeng/api/me/tiles/IStorageAware.java b/src/main/java/appeng/api/me/tiles/IStorageAware.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IStorageAware.java rename to src/main/java/appeng/api/me/tiles/IStorageAware.java diff --git a/src/appeng/api/me/tiles/IStorageMonitor.java b/src/main/java/appeng/api/me/tiles/IStorageMonitor.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/IStorageMonitor.java rename to src/main/java/appeng/api/me/tiles/IStorageMonitor.java diff --git a/src/appeng/api/me/tiles/ITileCable.java b/src/main/java/appeng/api/me/tiles/ITileCable.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ITileCable.java rename to src/main/java/appeng/api/me/tiles/ITileCable.java diff --git a/src/appeng/api/me/tiles/ITileIOCable.java b/src/main/java/appeng/api/me/tiles/ITileIOCable.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ITileIOCable.java rename to src/main/java/appeng/api/me/tiles/ITileIOCable.java diff --git a/src/appeng/api/me/tiles/ITileInterfaceApi.java b/src/main/java/appeng/api/me/tiles/ITileInterfaceApi.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ITileInterfaceApi.java rename to src/main/java/appeng/api/me/tiles/ITileInterfaceApi.java diff --git a/src/appeng/api/me/tiles/ITilePushable.java b/src/main/java/appeng/api/me/tiles/ITilePushable.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/ITilePushable.java rename to src/main/java/appeng/api/me/tiles/ITilePushable.java diff --git a/src/appeng/api/me/tiles/InterfaceCraftingPattern.java b/src/main/java/appeng/api/me/tiles/InterfaceCraftingPattern.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/tiles/InterfaceCraftingPattern.java rename to src/main/java/appeng/api/me/tiles/InterfaceCraftingPattern.java diff --git a/src/appeng/api/me/util/Grid.java b/src/main/java/appeng/api/me/util/Grid.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/Grid.java rename to src/main/java/appeng/api/me/util/Grid.java diff --git a/src/appeng/api/me/util/IAssemblerCluster.java b/src/main/java/appeng/api/me/util/IAssemblerCluster.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IAssemblerCluster.java rename to src/main/java/appeng/api/me/util/IAssemblerCluster.java diff --git a/src/appeng/api/me/util/IConfigManager.java b/src/main/java/appeng/api/me/util/IConfigManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IConfigManager.java rename to src/main/java/appeng/api/me/util/IConfigManager.java diff --git a/src/appeng/api/me/util/ICraftRequest.java b/src/main/java/appeng/api/me/util/ICraftRequest.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/ICraftRequest.java rename to src/main/java/appeng/api/me/util/ICraftRequest.java diff --git a/src/appeng/api/me/util/ICraftWatcher.java b/src/main/java/appeng/api/me/util/ICraftWatcher.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/ICraftWatcher.java rename to src/main/java/appeng/api/me/util/ICraftWatcher.java diff --git a/src/appeng/api/me/util/ICraftingPattern.java b/src/main/java/appeng/api/me/util/ICraftingPattern.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/ICraftingPattern.java rename to src/main/java/appeng/api/me/util/ICraftingPattern.java diff --git a/src/appeng/api/me/util/ICraftingPatternMAC.java b/src/main/java/appeng/api/me/util/ICraftingPatternMAC.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/ICraftingPatternMAC.java rename to src/main/java/appeng/api/me/util/ICraftingPatternMAC.java diff --git a/src/appeng/api/me/util/IGridCache.java b/src/main/java/appeng/api/me/util/IGridCache.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IGridCache.java rename to src/main/java/appeng/api/me/util/IGridCache.java diff --git a/src/appeng/api/me/util/IGridInterface.java b/src/main/java/appeng/api/me/util/IGridInterface.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IGridInterface.java rename to src/main/java/appeng/api/me/util/IGridInterface.java diff --git a/src/appeng/api/me/util/IMEInventory.java b/src/main/java/appeng/api/me/util/IMEInventory.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IMEInventory.java rename to src/main/java/appeng/api/me/util/IMEInventory.java diff --git a/src/appeng/api/me/util/IMEInventoryHandler.java b/src/main/java/appeng/api/me/util/IMEInventoryHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IMEInventoryHandler.java rename to src/main/java/appeng/api/me/util/IMEInventoryHandler.java diff --git a/src/appeng/api/me/util/IMEInventoryUtil.java b/src/main/java/appeng/api/me/util/IMEInventoryUtil.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/IMEInventoryUtil.java rename to src/main/java/appeng/api/me/util/IMEInventoryUtil.java diff --git a/src/appeng/api/me/util/ITileCraftingProvider.java b/src/main/java/appeng/api/me/util/ITileCraftingProvider.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/ITileCraftingProvider.java rename to src/main/java/appeng/api/me/util/ITileCraftingProvider.java diff --git a/src/appeng/api/me/util/InterfaceCraftingResponse.java b/src/main/java/appeng/api/me/util/InterfaceCraftingResponse.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/InterfaceCraftingResponse.java rename to src/main/java/appeng/api/me/util/InterfaceCraftingResponse.java diff --git a/src/appeng/api/me/util/TransitionResult.java b/src/main/java/appeng/api/me/util/TransitionResult.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/me/util/TransitionResult.java rename to src/main/java/appeng/api/me/util/TransitionResult.java diff --git a/src/appeng/api/movable/IMovableHandler.java b/src/main/java/appeng/api/movable/IMovableHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/movable/IMovableHandler.java rename to src/main/java/appeng/api/movable/IMovableHandler.java diff --git a/src/appeng/api/movable/IMovableRegistry.java b/src/main/java/appeng/api/movable/IMovableRegistry.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/movable/IMovableRegistry.java rename to src/main/java/appeng/api/movable/IMovableRegistry.java diff --git a/src/appeng/api/movable/IMovableTile.java b/src/main/java/appeng/api/movable/IMovableTile.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/movable/IMovableTile.java rename to src/main/java/appeng/api/movable/IMovableTile.java diff --git a/src/appeng/api/networkevents/MENetworkEvent.java b/src/main/java/appeng/api/networkevents/MENetworkEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/networkevents/MENetworkEvent.java rename to src/main/java/appeng/api/networkevents/MENetworkEvent.java diff --git a/src/appeng/api/networkevents/MENetworkEventSubscribe.java b/src/main/java/appeng/api/networkevents/MENetworkEventSubscribe.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/networkevents/MENetworkEventSubscribe.java rename to src/main/java/appeng/api/networkevents/MENetworkEventSubscribe.java diff --git a/src/appeng/api/networkevents/MENetworkPowerStorage.java b/src/main/java/appeng/api/networkevents/MENetworkPowerStorage.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/networkevents/MENetworkPowerStorage.java rename to src/main/java/appeng/api/networkevents/MENetworkPowerStorage.java diff --git a/src/appeng/api/networkevents/MENetworkStorageEvent.java b/src/main/java/appeng/api/networkevents/MENetworkStorageEvent.java old mode 100755 new mode 100644 similarity index 100% rename from src/appeng/api/networkevents/MENetworkStorageEvent.java rename to src/main/java/appeng/api/networkevents/MENetworkStorageEvent.java diff --git a/src/tppitweaks/AM2SpawnControls.java b/src/main/java/tppitweaks/AM2SpawnControls.java similarity index 100% rename from src/tppitweaks/AM2SpawnControls.java rename to src/main/java/tppitweaks/AM2SpawnControls.java diff --git a/src/tppitweaks/TPPITweaks.java b/src/main/java/tppitweaks/TPPITweaks.java similarity index 98% rename from src/tppitweaks/TPPITweaks.java rename to src/main/java/tppitweaks/TPPITweaks.java index 1ea1ffb..aad1451 100644 --- a/src/tppitweaks/TPPITweaks.java +++ b/src/main/java/tppitweaks/TPPITweaks.java @@ -37,7 +37,7 @@ @NetworkMod(serverSideRequired = true, clientSideRequired = true, channels = { Reference.CHANNEL }, packetHandler = PacketHandler.class) public class TPPITweaks { - public static final String VERSION = "0.9.0"; + public static final String VERSION = "1.0.0"; @Instance("TPPITweaks") public static TPPITweaks instance; diff --git a/src/tppitweaks/block/ModBlocks.java b/src/main/java/tppitweaks/block/ModBlocks.java similarity index 100% rename from src/tppitweaks/block/ModBlocks.java rename to src/main/java/tppitweaks/block/ModBlocks.java diff --git a/src/tppitweaks/block/TPPIBlock.java b/src/main/java/tppitweaks/block/TPPIBlock.java similarity index 100% rename from src/tppitweaks/block/TPPIBlock.java rename to src/main/java/tppitweaks/block/TPPIBlock.java diff --git a/src/tppitweaks/client/gui/ConfigGui.java b/src/main/java/tppitweaks/client/gui/ConfigGui.java similarity index 100% rename from src/tppitweaks/client/gui/ConfigGui.java rename to src/main/java/tppitweaks/client/gui/ConfigGui.java diff --git a/src/tppitweaks/client/gui/GuiHelper.java b/src/main/java/tppitweaks/client/gui/GuiHelper.java similarity index 100% rename from src/tppitweaks/client/gui/GuiHelper.java rename to src/main/java/tppitweaks/client/gui/GuiHelper.java diff --git a/src/tppitweaks/client/gui/InstructionsGui.java b/src/main/java/tppitweaks/client/gui/InstructionsGui.java similarity index 100% rename from src/tppitweaks/client/gui/InstructionsGui.java rename to src/main/java/tppitweaks/client/gui/InstructionsGui.java diff --git a/src/tppitweaks/client/gui/MaricultureGui.java b/src/main/java/tppitweaks/client/gui/MaricultureGui.java similarity index 100% rename from src/tppitweaks/client/gui/MaricultureGui.java rename to src/main/java/tppitweaks/client/gui/MaricultureGui.java diff --git a/src/tppitweaks/client/gui/ModDownload.java b/src/main/java/tppitweaks/client/gui/ModDownload.java similarity index 100% rename from src/tppitweaks/client/gui/ModDownload.java rename to src/main/java/tppitweaks/client/gui/ModDownload.java diff --git a/src/tppitweaks/client/gui/RestartGui.java b/src/main/java/tppitweaks/client/gui/RestartGui.java similarity index 100% rename from src/tppitweaks/client/gui/RestartGui.java rename to src/main/java/tppitweaks/client/gui/RestartGui.java diff --git a/src/tppitweaks/client/gui/UpdateGui.java b/src/main/java/tppitweaks/client/gui/UpdateGui.java similarity index 96% rename from src/tppitweaks/client/gui/UpdateGui.java rename to src/main/java/tppitweaks/client/gui/UpdateGui.java index a8fab30..69f72fe 100644 --- a/src/tppitweaks/client/gui/UpdateGui.java +++ b/src/main/java/tppitweaks/client/gui/UpdateGui.java @@ -30,8 +30,7 @@ public class UpdateGui extends GuiScreen public void initModInstallationMenus() { - if (!Loader.isModLoaded("TwilightForest")) - modScreens.add(new InstructionsGui(new ModDownload("Twilight Forest", "http://adf.ly/Zvi5J", "TwilightForest"))); + // No mods here! I'll leave the code for posterity's sake, as well as for others to use. iterator = modScreens.iterator(); diff --git a/src/tppitweaks/client/gui/library/container/ContainerBase.java b/src/main/java/tppitweaks/client/gui/library/container/ContainerBase.java similarity index 100% rename from src/tppitweaks/client/gui/library/container/ContainerBase.java rename to src/main/java/tppitweaks/client/gui/library/container/ContainerBase.java diff --git a/src/tppitweaks/client/gui/library/gui/GuiBase.java b/src/main/java/tppitweaks/client/gui/library/gui/GuiBase.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/GuiBase.java rename to src/main/java/tppitweaks/client/gui/library/gui/GuiBase.java diff --git a/src/tppitweaks/client/gui/library/gui/GuiBaseContainer.java b/src/main/java/tppitweaks/client/gui/library/gui/GuiBaseContainer.java similarity index 90% rename from src/tppitweaks/client/gui/library/gui/GuiBaseContainer.java rename to src/main/java/tppitweaks/client/gui/library/gui/GuiBaseContainer.java index cccb9d1..10e0af9 100644 --- a/src/tppitweaks/client/gui/library/gui/GuiBaseContainer.java +++ b/src/main/java/tppitweaks/client/gui/library/gui/GuiBaseContainer.java @@ -9,7 +9,6 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -24,7 +23,6 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cofh.gui.element.TabBase; -import cofh.gui.slot.SlotFalseCopy; /** * Base class for a modular GUIs. Works with Elements {@link ElementBase} and Tabs {@link TabBase} which are both modular elements. Use if your GUI requires access to an inventory. Based off of @@ -305,27 +303,6 @@ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) } } - @Override - protected void mouseClickMove(int mX, int mY, int lastClick, long timeSinceClick) - { - Slot slot = getSlotAtPosition(mX, mY); - ItemStack itemstack = getMinecraft().thePlayer.inventory.getItemStack(); - - if (field_94076_q && slot != null && itemstack != null && slot instanceof SlotFalseCopy) - { - if (lastIndex != slot.slotNumber) - { - lastIndex = slot.slotNumber; - handleMouseClick(slot, slot.slotNumber, 0, 0); - } - } - else - { - lastIndex = -1; - super.mouseClickMove(mX, mY, lastClick, timeSinceClick); - } - } - @Override public void setZLevel(float zlevel) { diff --git a/src/tppitweaks/client/gui/library/gui/IGuiBase.java b/src/main/java/tppitweaks/client/gui/library/gui/IGuiBase.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/IGuiBase.java rename to src/main/java/tppitweaks/client/gui/library/gui/IGuiBase.java diff --git a/src/tppitweaks/client/gui/library/gui/Parser.java b/src/main/java/tppitweaks/client/gui/library/gui/Parser.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/Parser.java rename to src/main/java/tppitweaks/client/gui/library/gui/Parser.java diff --git a/src/tppitweaks/client/gui/library/gui/button/GuiBetterSlider.java b/src/main/java/tppitweaks/client/gui/library/gui/button/GuiBetterSlider.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/button/GuiBetterSlider.java rename to src/main/java/tppitweaks/client/gui/library/gui/button/GuiBetterSlider.java diff --git a/src/tppitweaks/client/gui/library/gui/button/GuiRGBSlider.java b/src/main/java/tppitweaks/client/gui/library/gui/button/GuiRGBSlider.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/button/GuiRGBSlider.java rename to src/main/java/tppitweaks/client/gui/library/gui/button/GuiRGBSlider.java diff --git a/src/tppitweaks/client/gui/library/gui/button/GuideButton.java b/src/main/java/tppitweaks/client/gui/library/gui/button/GuideButton.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/button/GuideButton.java rename to src/main/java/tppitweaks/client/gui/library/gui/button/GuideButton.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementBase.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementBase.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementBase.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementBase.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementBaseContainer.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementBaseContainer.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementBaseContainer.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementBaseContainer.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementBubbles.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementBubbles.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementBubbles.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementBubbles.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementButton.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementButton.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementButton.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementButton.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementButtonIcon.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementButtonIcon.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementButtonIcon.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementButtonIcon.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementCrafting.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementCrafting.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementCrafting.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementCrafting.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementDownArrow.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementDownArrow.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementDownArrow.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementDownArrow.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementFakeItemSlot.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementFakeItemSlot.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementFakeItemSlot.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementFakeItemSlot.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementFire.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementFire.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementFire.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementFire.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementFluidTank.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementFluidTank.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementFluidTank.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementFluidTank.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementIcon.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementIcon.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementIcon.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementIcon.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemIcon.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIcon.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemIcon.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIcon.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithCount.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithCount.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithCount.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithCount.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlot.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlot.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlot.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlot.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlotAndCount.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlotAndCount.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlotAndCount.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemIconWithSlotAndCount.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemStackPanel.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemStackPanel.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemStackPanel.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemStackPanel.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementItemText.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemText.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementItemText.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementItemText.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementPlus.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementPlus.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementPlus.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementPlus.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementProgressBar.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementProgressBar.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementProgressBar.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementProgressBar.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementRedstoneFlux.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementRedstoneFlux.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementRedstoneFlux.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementRedstoneFlux.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementRightArrow.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementRightArrow.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementRightArrow.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementRightArrow.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementScrollBar.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollBar.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementScrollBar.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollBar.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementScrollPanel.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollPanel.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementScrollPanel.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollPanel.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementScrollPanelOverlay.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollPanelOverlay.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementScrollPanelOverlay.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementScrollPanelOverlay.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementText.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementText.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementText.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementText.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementTextBox.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementTextBox.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementTextBox.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementTextBox.java diff --git a/src/tppitweaks/client/gui/library/gui/element/ElementTextClickable.java b/src/main/java/tppitweaks/client/gui/library/gui/element/ElementTextClickable.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/element/ElementTextClickable.java rename to src/main/java/tppitweaks/client/gui/library/gui/element/ElementTextClickable.java diff --git a/src/tppitweaks/client/gui/library/gui/utils/ComparableItemStack.java b/src/main/java/tppitweaks/client/gui/library/gui/utils/ComparableItemStack.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/utils/ComparableItemStack.java rename to src/main/java/tppitweaks/client/gui/library/gui/utils/ComparableItemStack.java diff --git a/src/tppitweaks/client/gui/library/gui/utils/GuiUtils.java b/src/main/java/tppitweaks/client/gui/library/gui/utils/GuiUtils.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/utils/GuiUtils.java rename to src/main/java/tppitweaks/client/gui/library/gui/utils/GuiUtils.java diff --git a/src/tppitweaks/client/gui/library/gui/utils/ItemHelper.java b/src/main/java/tppitweaks/client/gui/library/gui/utils/ItemHelper.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/utils/ItemHelper.java rename to src/main/java/tppitweaks/client/gui/library/gui/utils/ItemHelper.java diff --git a/src/tppitweaks/client/gui/library/gui/utils/ThermalExpansionHelper.java b/src/main/java/tppitweaks/client/gui/library/gui/utils/ThermalExpansionHelper.java similarity index 100% rename from src/tppitweaks/client/gui/library/gui/utils/ThermalExpansionHelper.java rename to src/main/java/tppitweaks/client/gui/library/gui/utils/ThermalExpansionHelper.java diff --git a/src/tppitweaks/client/gui/modGuides/GuiGuideBase.java b/src/main/java/tppitweaks/client/gui/modGuides/GuiGuideBase.java similarity index 100% rename from src/tppitweaks/client/gui/modGuides/GuiGuideBase.java rename to src/main/java/tppitweaks/client/gui/modGuides/GuiGuideBase.java diff --git a/src/tppitweaks/client/gui/modGuides/GuiMod.java b/src/main/java/tppitweaks/client/gui/modGuides/GuiMod.java similarity index 100% rename from src/tppitweaks/client/gui/modGuides/GuiMod.java rename to src/main/java/tppitweaks/client/gui/modGuides/GuiMod.java diff --git a/src/tppitweaks/command/CommandTPPI.java b/src/main/java/tppitweaks/command/CommandTPPI.java similarity index 99% rename from src/tppitweaks/command/CommandTPPI.java rename to src/main/java/tppitweaks/command/CommandTPPI.java index 0c99dcf..fef910b 100644 --- a/src/tppitweaks/command/CommandTPPI.java +++ b/src/main/java/tppitweaks/command/CommandTPPI.java @@ -29,7 +29,6 @@ public class CommandTPPI extends CommandBase { - private static HashMap modProperNames = new HashMap(); private static HashSet validCommands = new HashSet(); @@ -315,4 +314,9 @@ public static String getProperName(String modid) return modProperNames.get(modid); } + @Override + public int compareTo(Object arg0) + { + return 0; // wat + } } diff --git a/src/tppitweaks/config/ConfigurationHandler.java b/src/main/java/tppitweaks/config/ConfigurationHandler.java similarity index 100% rename from src/tppitweaks/config/ConfigurationHandler.java rename to src/main/java/tppitweaks/config/ConfigurationHandler.java diff --git a/src/tppitweaks/core/CoreTPPITweaks.java b/src/main/java/tppitweaks/core/CoreTPPITweaks.java similarity index 95% rename from src/tppitweaks/core/CoreTPPITweaks.java rename to src/main/java/tppitweaks/core/CoreTPPITweaks.java index e3915ab..04fc45b 100644 --- a/src/tppitweaks/core/CoreTPPITweaks.java +++ b/src/main/java/tppitweaks/core/CoreTPPITweaks.java @@ -9,14 +9,6 @@ public class CoreTPPITweaks implements IFMLLoadingPlugin { - - @Override - @Deprecated - public String[] getLibraryRequestClass() - { - return null; - } - @Override public String[] getASMTransformerClass() { diff --git a/src/tppitweaks/creativeTab/CreativeTabTPPI.java b/src/main/java/tppitweaks/creativeTab/CreativeTabTPPI.java similarity index 100% rename from src/tppitweaks/creativeTab/CreativeTabTPPI.java rename to src/main/java/tppitweaks/creativeTab/CreativeTabTPPI.java diff --git a/src/tppitweaks/event/TPPIEventHandler.java b/src/main/java/tppitweaks/event/TPPIEventHandler.java similarity index 100% rename from src/tppitweaks/event/TPPIEventHandler.java rename to src/main/java/tppitweaks/event/TPPIEventHandler.java diff --git a/src/tppitweaks/item/ModItems.java b/src/main/java/tppitweaks/item/ModItems.java similarity index 100% rename from src/tppitweaks/item/ModItems.java rename to src/main/java/tppitweaks/item/ModItems.java diff --git a/src/tppitweaks/item/TPPIBook.java b/src/main/java/tppitweaks/item/TPPIBook.java similarity index 92% rename from src/tppitweaks/item/TPPIBook.java rename to src/main/java/tppitweaks/item/TPPIBook.java index f0e87a8..ef35593 100644 --- a/src/tppitweaks/item/TPPIBook.java +++ b/src/main/java/tppitweaks/item/TPPIBook.java @@ -1,5 +1,6 @@ package tppitweaks.item; +import java.io.FileNotFoundException; import java.util.List; import net.minecraft.client.renderer.texture.IconRegister; @@ -16,6 +17,7 @@ import tppitweaks.TPPITweaks; import tppitweaks.client.gui.GuiHelper; import tppitweaks.config.ConfigurationHandler; +import tppitweaks.util.FileLoader; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; @@ -105,6 +107,16 @@ public ItemStack addTextToBook(ItemStack book, int damage) nbttagcompound = book.getTagCompound(); bookPages = new NBTTagList("pages"); + if (ConfigurationHandler.changelog == null) + { + try { + ConfigurationHandler.loadChangelogText(FileLoader.getChangelogText()); + } catch (FileNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + for (int i = 0; i < ConfigurationHandler.changelog.size(); i++) { bookPages.appendTag(new NBTTagString("" + i, ConfigurationHandler.changelog.get(i))); diff --git a/src/tppitweaks/item/TPPIMaterial.java b/src/main/java/tppitweaks/item/TPPIMaterial.java similarity index 100% rename from src/tppitweaks/item/TPPIMaterial.java rename to src/main/java/tppitweaks/item/TPPIMaterial.java diff --git a/src/tppitweaks/lib/Reference.java b/src/main/java/tppitweaks/lib/Reference.java similarity index 96% rename from src/tppitweaks/lib/Reference.java rename to src/main/java/tppitweaks/lib/Reference.java index cfcd6d3..402f615 100644 --- a/src/tppitweaks/lib/Reference.java +++ b/src/main/java/tppitweaks/lib/Reference.java @@ -38,7 +38,8 @@ public class Reference + "after:xreliquary;" + "required-after:NotEnoughItems;" + "after:Railcraft;" - + "after:advancedgenetics"; + + "after:advancedgenetics;" + + "after:IC2"; public static String packName = "Test Pack Please Ignore"; public static String packVersion = "0.2.2"; diff --git a/src/tppitweaks/proxy/ClientProxy.java b/src/main/java/tppitweaks/proxy/ClientProxy.java similarity index 100% rename from src/tppitweaks/proxy/ClientProxy.java rename to src/main/java/tppitweaks/proxy/ClientProxy.java diff --git a/src/tppitweaks/proxy/CommonProxy.java b/src/main/java/tppitweaks/proxy/CommonProxy.java similarity index 100% rename from src/tppitweaks/proxy/CommonProxy.java rename to src/main/java/tppitweaks/proxy/CommonProxy.java diff --git a/src/tppitweaks/proxy/PacketHandler.java b/src/main/java/tppitweaks/proxy/PacketHandler.java similarity index 100% rename from src/tppitweaks/proxy/PacketHandler.java rename to src/main/java/tppitweaks/proxy/PacketHandler.java diff --git a/src/tppitweaks/recipetweaks/RecipeTweaks.java b/src/main/java/tppitweaks/recipetweaks/RecipeTweaks.java similarity index 99% rename from src/tppitweaks/recipetweaks/RecipeTweaks.java rename to src/main/java/tppitweaks/recipetweaks/RecipeTweaks.java index ace2022..8952aab 100644 --- a/src/tppitweaks/recipetweaks/RecipeTweaks.java +++ b/src/main/java/tppitweaks/recipetweaks/RecipeTweaks.java @@ -99,6 +99,10 @@ public static void doPlayerJoinRecipeTweaks() { RailcraftTweaks.registerOres(); } + if (okayToTweakIC2) + { + IC2Tweaks.doPostLoadRecipeAdditions(); + } recipesInitialized = true; } diff --git a/src/tppitweaks/recipetweaks/modTweaks/AM2Tweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/AM2Tweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/AM2Tweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/AM2Tweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/AdvancedGeneticsTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/AdvancedGeneticsTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/AdvancedGeneticsTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/AdvancedGeneticsTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java similarity index 62% rename from src/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java index 5040ac2..f6dac01 100644 --- a/src/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java +++ b/src/main/java/tppitweaks/recipetweaks/modTweaks/BigReactorsTweaks.java @@ -1,5 +1,6 @@ package tppitweaks.recipetweaks.modTweaks; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import tppitweaks.config.ConfigurationHandler; @@ -11,11 +12,11 @@ public static void init() { if (ConfigurationHandler.steelReactorCasings) { - TweakerBase.markItemForRecipeRemoval(erogenousbeef.bigreactors.common.BigReactors.blockReactorPart.blockID, 0); + TweakerBase.markItemForRecipeRemoval(((Block) erogenousbeef.bigreactors.common.BigReactors.blockReactorPart).blockID, 0); } if (ConfigurationHandler.glassFuelRods) { - TweakerBase.markItemForRecipeRemoval(erogenousbeef.bigreactors.common.BigReactors.blockYelloriumFuelRod.blockID, -1); + TweakerBase.markItemForRecipeRemoval(((Block) erogenousbeef.bigreactors.common.BigReactors.blockYelloriumFuelRod).blockID, -1); } } @@ -23,15 +24,14 @@ public static void addRecipes() { if (ConfigurationHandler.steelReactorCasings) { - ItemStack reactorPartStack = ((erogenousbeef.bigreactors.common.block.BlockReactorPart) erogenousbeef.bigreactors.common.BigReactors.blockReactorPart).getReactorCasingItemStack(); + ItemStack reactorPartStack = ((erogenousbeef.bigreactors.common.multiblock.block.BlockReactorPart) erogenousbeef.bigreactors.common.BigReactors.blockReactorPart).getReactorCasingItemStack(); reactorPartStack.stackSize = 4; GameRegistry.addRecipe(new ShapedOreRecipe(reactorPartStack, new Object[] { "ICI", "CUC", "ICI", 'I', "ingotSteel", 'C', "ingotGraphite", 'U', "ingotYellorium" })); } if (ConfigurationHandler.glassFuelRods) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(erogenousbeef.bigreactors.common.BigReactors.blockYelloriumFuelRod, 1), new Object[] { "ICI", "GUG", "ICI", Character.valueOf('I'), - erogenousbeef.bigreactors.common.BigReactors.blockReactorGlass, Character.valueOf('C'), "ingotIron", Character.valueOf('U'), "ingotYellorium", Character.valueOf('G'), "ingotGraphite" })); + erogenousbeef.bigreactors.common.BigReactors.blockMultiblockGlass, Character.valueOf('C'), "ingotIron", Character.valueOf('U'), "ingotYellorium", Character.valueOf('G'), "ingotGraphite" })); } } - } diff --git a/src/tppitweaks/recipetweaks/modTweaks/DATweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/DATweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/DATweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/DATweaks.java diff --git a/src/main/java/tppitweaks/recipetweaks/modTweaks/DCTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/DCTweaks.java new file mode 100644 index 0000000..4bd76cd --- /dev/null +++ b/src/main/java/tppitweaks/recipetweaks/modTweaks/DCTweaks.java @@ -0,0 +1,14 @@ +package tppitweaks.recipetweaks.modTweaks; + +import net.minecraft.item.Item; +import tppitweaks.config.ConfigurationHandler; +import bluedart.item.DartItem; + +public class DCTweaks { + + public static void init() + { + if (ConfigurationHandler.disableForceShears && DartItem.forceShears != null) + TweakerBase.markItemForRecipeRemoval(((Item) DartItem.forceShears).itemID, 0); + } +} diff --git a/src/tppitweaks/recipetweaks/modTweaks/EnderStorageTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/EnderStorageTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/EnderStorageTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/EnderStorageTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java similarity index 78% rename from src/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java index c75e8f1..88135fe 100644 --- a/src/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java +++ b/src/main/java/tppitweaks/recipetweaks/modTweaks/ExUTweaks.java @@ -17,10 +17,10 @@ public class ExUTweaks { - public static void init() { if(ConfigurationHandler.nerfEnderQuarry) { TweakerBase.markItemForRecipeRemoval(extrautils.ExtraUtils.enderQuarry.blockID, -1); + TweakerBase.markItemForRecipeRemoval(extrautils.ExtraUtils.decorative1Id, 11); } if(ConfigurationHandler.nerfRedstoneGen) { TweakerBase.markItemForRecipeRemoval(extrautils.ExtraUtils.generatorId, 4); @@ -62,20 +62,25 @@ public static void addRecipes() { if(ConfigurationHandler.nerfEnderQuarry) { ItemStack portal = new ItemStack(extrautils.ExtraUtils.portal); - ItemStack octoCobble = new ItemStack(extrautils.ExtraUtils.cobblestoneCompr, 1, 7); + ItemStack quadDirt = new ItemStack(extrautils.ExtraUtils.cobblestoneCompr, 1, 11); + ItemStack enderObs = new ItemStack(extrautils.ExtraUtils.decorative1, 1, 1); + ItemStack magicalWood = new ItemStack(extrautils.ExtraUtils.decorative1, 1, 8); + ItemStack enderCore = new ItemStack(extrautils.ExtraUtils.decorative1, 1, 11); + ItemStack DECM = new ItemStack(extrautils.ExtraUtils.decorative1, 1, 12); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tppiMaterial, 1, 3), "AWS", "PBP", - "GEG", + "GEG", 'A', extrautils.ExtraUtils.destructionPickaxe, 'W', extrautils.ExtraUtils.buildersWand, 'S', extrautils.ExtraUtils.erosionShovel, - 'P', octoCobble, - 'E', portal, - 'G', extrautils.ExtraUtils.cursedEarth, - 'B', Block.fenceIron + 'P', portal, + 'B', Block.fenceIron, + 'G', enderCore, + 'E', Loader.isModLoaded("ThermalExpansion") ? TETweaks.getResonantCell() : Item.enderPearl )); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.tppiMaterial, 1, 3), @@ -86,25 +91,35 @@ public static void addRecipes() { 'A', extrautils.ExtraUtils.destructionPickaxe, 'W', extrautils.ExtraUtils.buildersWand, 'S', extrautils.ExtraUtils.erosionShovel, - 'P', octoCobble, - 'E', portal, - 'G', extrautils.ExtraUtils.cursedEarth, - 'B', Block.fenceIron + 'P', portal, + 'B', Block.fenceIron, + 'G', enderCore, + 'E', Loader.isModLoaded("ThermalExpansion") ? TETweaks.getResonantCell() : Item.enderPearl )); GameRegistry.addRecipe(new ShapedOreRecipe(extrautils.ExtraUtils.enderQuarry, - "EsE", + "EQE", "CDC", "pPp", - 'E', new ItemStack(extrautils.ExtraUtils.decorative1, 1, 1), - 's', "treeSapling", - 'M', new ItemStack(extrautils.ExtraUtils.decorative1, 1, 8), - 'C', new ItemStack(extrautils.ExtraUtils.decorative1, 1, 11), - 'D', new ItemStack(extrautils.ExtraUtils.decorative1, 1, 12), + 'E', enderObs, + 'Q', quadDirt, + 'M', magicalWood, + 'C', enderCore, + 'D', DECM, 'P', new ItemStack(ModItems.tppiMaterial, 1, 3), 'p', extrautils.ExtraUtils.enderThermicPump == null ? new ItemStack(extrautils.ExtraUtils.decorative1, 1, 12) : extrautils.ExtraUtils.enderThermicPump )); + + GameRegistry.addRecipe(enderCore, + "ABA", + "BEB", + "ABA", + + 'A', magicalWood, + 'B', DECM, + 'E', Item.eyeOfEnder + ); } if(ConfigurationHandler.nerfRedstoneGen) { diff --git a/src/tppitweaks/recipetweaks/modTweaks/GregtechTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/GregtechTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/GregtechTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/GregtechTweaks.java diff --git a/src/main/java/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java new file mode 100644 index 0000000..94515da --- /dev/null +++ b/src/main/java/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java @@ -0,0 +1,72 @@ +package tppitweaks.recipetweaks.modTweaks; + +import ic2.core.Ic2Items; +import ic2.core.util.StackUtil; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import tppitweaks.config.ConfigurationHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; + +public class IC2Tweaks +{ + public static void init() + { + if (ConfigurationHandler.removeStupidEnergyCrystalRecipe) + TweakerBase.markItemForRecipeRemoval(((ItemStack)ic2.core.Ic2Items.energyCrystal).itemID, -1); + + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.iridiumDrill).itemID, -1); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.mvTransformer).itemID, 4); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.weedEx).itemID, -1); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.suBattery).itemID, -1); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.personalSafe).itemID, 0); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.nanoHelmet).itemID, -1); + TweakerBase.markItemForRecipeRemoval(((ItemStack)Ic2Items.electricJetpack).itemID, -1); + } + + public static void registerOres() + { + if (ConfigurationHandler.ic2TEGlassInterchangeability) + { + if (Loader.isModLoaded("IC2") && OreDictionary.getOreID(ic2.core.Ic2Items.reinforcedGlass) == -1) + { + OreDictionary.registerOre("glassReinforced", ic2.core.Ic2Items.reinforcedGlass); + } + for (ItemStack stack : OreDictionary.getOres("glassReinforced")) + { + OreDictionary.registerOre("glassHardened", stack); + } + for (ItemStack stack : OreDictionary.getOres("glassHardened")) + { + OreDictionary.registerOre("glassReinforced", stack); + } + } + } + + public static void addRecipes() { + if(ConfigurationHandler.doCharcoalBlockCompression) { + if(!OreDictionary.getOres("blockCharcoal").isEmpty()) { + ic2.core.block.machine.tileentity.TileEntityCompressor.addRecipe("blockCharcoal", 1, new ItemStack(Item.coal, 1, 0)); + } + } + } + + public static void doPostLoadRecipeAdditions() + { + /* copypasta code, ignore horrible formatting */ + + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.iridiumDrill, new Object[] { " I ", "IdI", " C ", Character.valueOf('I'), Ic2Items.iridiumPlate, Character.valueOf('d'), StackUtil.copyWithWildCard(Ic2Items.diamondDrill), Character.valueOf('C'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal) })); + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.mvTransformer, new Object[] { "C", "M", "C", Character.valueOf('M'), Ic2Items.machine, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem })); + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.weedEx, new Object[] { "R", "G", "C", Character.valueOf('R'), Item.redstone, Character.valueOf('G'), Ic2Items.grinPowder, Character.valueOf('C'), Ic2Items.cell })); + GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 5), new Object[] { "C", "R", "D", Character.valueOf('D'), "dustCoal", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem })); + GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 5), new Object[] { "C", "D", "R", Character.valueOf('D'), "dustCoal", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), Ic2Items.insulatedCopperCableItem })); + GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 8), new Object[] { "c", "C", "R", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), "dustHydratedCoal", Character.valueOf('c'), Ic2Items.insulatedCopperCableItem })); + GameRegistry.addRecipe(new ShapedOreRecipe(StackUtil.copyWithSize(Ic2Items.suBattery, 8), new Object[] { "c", "R", "C", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), "dustHydratedCoal", Character.valueOf('c'), Ic2Items.insulatedCopperCableItem })); + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.personalSafe, new Object[] { "c", "M", "C", Character.valueOf('c'), Ic2Items.recipeObjectCircuit, Character.valueOf('C'), Block.chest, Character.valueOf('M'), Ic2Items.machine })); + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.nanoHelmet, new Object[] { "CcC", "CGC", Character.valueOf('C'), Ic2Items.carbonPlate, Character.valueOf('c'), StackUtil.copyWithWildCard(Ic2Items.energyCrystal), Character.valueOf('G'), StackUtil.copyWithWildCard(Ic2Items.nightvisionGoggles) })); + GameRegistry.addRecipe(new ShapedOreRecipe(Ic2Items.electricJetpack, new Object[] { "ICI", "IBI", "G G", Character.valueOf('I'), Ic2Items.casingiron, Character.valueOf('C'), Ic2Items.recipeObjectAdvCircuit, Character.valueOf('B'), Ic2Items.batBox, Character.valueOf('G'), Item.glowstone })); + } +} diff --git a/src/tppitweaks/recipetweaks/modTweaks/MPSATweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/MPSATweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/MPSATweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/MPSATweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/MagicropsAndIC2Tweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsAndIC2Tweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/MagicropsAndIC2Tweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsAndIC2Tweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/MagicropsAndTETweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsAndTETweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/MagicropsAndTETweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsAndTETweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/MagicropsTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/MagicropsTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/MagicropsTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/MekanismTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/MekanismTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/MekanismTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/MekanismTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/OpenBlocksTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/OpenBlocksTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/OpenBlocksTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/OpenBlocksTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/RailcraftTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/RailcraftTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/RailcraftTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/RailcraftTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/ReliquaryTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/ReliquaryTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/ReliquaryTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/ReliquaryTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/SFMTweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/SFMTweaks.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/SFMTweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/SFMTweaks.java diff --git a/src/tppitweaks/recipetweaks/modTweaks/TETweaks.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/TETweaks.java similarity index 83% rename from src/tppitweaks/recipetweaks/modTweaks/TETweaks.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/TETweaks.java index da8f14c..6b2c64c 100644 --- a/src/tppitweaks/recipetweaks/modTweaks/TETweaks.java +++ b/src/main/java/tppitweaks/recipetweaks/modTweaks/TETweaks.java @@ -34,4 +34,14 @@ public static void addRecipes() { if (OreDictionary.getOres("dustRuby").size() != 0) thermalexpansion.util.crafting.PulverizerManager.addIngotNameToDustRecipe(2400, "gemRuby", OreDictionary.getOres("dustRuby").get(0)); } + + public static ItemStack getEnderium() + { + return thermalexpansion.item.TEItems.ingotEnderium.copy(); + } + + public static ItemStack getResonantCell() + { + return thermalexpansion.block.energycell.BlockEnergyCell.cellResonant.copy(); + } } diff --git a/src/tppitweaks/recipetweaks/modTweaks/TweakerBase.java b/src/main/java/tppitweaks/recipetweaks/modTweaks/TweakerBase.java similarity index 100% rename from src/tppitweaks/recipetweaks/modTweaks/TweakerBase.java rename to src/main/java/tppitweaks/recipetweaks/modTweaks/TweakerBase.java diff --git a/src/tppitweaks/util/CapeBufferDownload.java b/src/main/java/tppitweaks/util/CapeBufferDownload.java similarity index 100% rename from src/tppitweaks/util/CapeBufferDownload.java rename to src/main/java/tppitweaks/util/CapeBufferDownload.java diff --git a/src/tppitweaks/util/DesktopApi.java b/src/main/java/tppitweaks/util/DesktopApi.java similarity index 100% rename from src/tppitweaks/util/DesktopApi.java rename to src/main/java/tppitweaks/util/DesktopApi.java diff --git a/src/tppitweaks/util/FileLoader.java b/src/main/java/tppitweaks/util/FileLoader.java similarity index 100% rename from src/tppitweaks/util/FileLoader.java rename to src/main/java/tppitweaks/util/FileLoader.java diff --git a/src/tppitweaks/util/TPPIPlayerTracker.java b/src/main/java/tppitweaks/util/TPPIPlayerTracker.java similarity index 100% rename from src/tppitweaks/util/TPPIPlayerTracker.java rename to src/main/java/tppitweaks/util/TPPIPlayerTracker.java diff --git a/src/tppitweaks/util/TPPITickHandler.java b/src/main/java/tppitweaks/util/TPPITickHandler.java similarity index 94% rename from src/tppitweaks/util/TPPITickHandler.java rename to src/main/java/tppitweaks/util/TPPITickHandler.java index 4065426..bc2f9f5 100644 --- a/src/tppitweaks/util/TPPITickHandler.java +++ b/src/main/java/tppitweaks/util/TPPITickHandler.java @@ -31,13 +31,13 @@ public class TPPITickHandler implements ITickHandler public static String[] AbstractClientPlayer_locationCape = new String[] {"locationCape", "field_110313_e", "e"}; public static String[] AbstractClientPlayer_getDownloadImage = new String[] {"getDownloadImage", "func_110301_a", "a"}; - private int ticksElapsed = 0; + //private int ticksElapsed = 0; @SuppressWarnings("unchecked") @Override public void tickStart(EnumSet type, Object... tickData) { - if (ticksElapsed < 200 && ConfigurationHandler.allowCapes && mc.theWorld != null && !isPaused()) + if (ConfigurationHandler.allowCapes && mc.theWorld != null && mc.theWorld.getWorldTime() % 20 == 0 && !isPaused()) { for (EntityPlayer entityPlayer : (List) mc.theWorld.playerEntities) { @@ -72,7 +72,7 @@ public void tickStart(EnumSet type, Object... tickData) } } } - ticksElapsed++; + //ticksElapsed++; } } diff --git a/src/tppitweaks/util/TPPITweaksUtils.java b/src/main/java/tppitweaks/util/TPPITweaksUtils.java similarity index 100% rename from src/tppitweaks/util/TPPITweaksUtils.java rename to src/main/java/tppitweaks/util/TPPITweaksUtils.java diff --git a/src/tppitweaks/util/TxtParser.java b/src/main/java/tppitweaks/util/TxtParser.java similarity index 100% rename from src/tppitweaks/util/TxtParser.java rename to src/main/java/tppitweaks/util/TxtParser.java diff --git a/src/tppitweaks/util/Unzipper.java b/src/main/java/tppitweaks/util/Unzipper.java similarity index 100% rename from src/tppitweaks/util/Unzipper.java rename to src/main/java/tppitweaks/util/Unzipper.java diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..77b2bdf --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +FMLCorePlugin: tppitweaks.core.CoreTPPITweaks +FMLCorePluginContainsFMLMod: true + diff --git a/src/main/resources/assets/tppitweaks/config/hardconfig.zip b/src/main/resources/assets/tppitweaks/config/hardconfig.zip new file mode 100644 index 0000000..3c0732d Binary files /dev/null and b/src/main/resources/assets/tppitweaks/config/hardconfig.zip differ diff --git a/src/main/resources/assets/tppitweaks/lang/BookText.txt b/src/main/resources/assets/tppitweaks/lang/BookText.txt new file mode 100644 index 0000000..7114135 --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/BookText.txt @@ -0,0 +1,80 @@ +**This is the file that TPPI Tweaks reads its info from, it is used for changelogs and information on the modpack** +**To add to the file, type what you want, and separate pages by using the phrase ~~~ ** +**The code will interpret "~~~" as a page break, and format the book accordingly** +**In addition, adding a "~" to the end of a line will add a line break** +**Two asterisks at the beginning of a line is a comment** +**Three asterisks and a number will skip that amount of lines following** + +***12 +Example: +This is some very useful info +And I am typing it on multiple lines +to make this text file easier to read. +These lines don't have line breaks between them +in the book though because they don't end with "~". +~~~ +Now I am on page 2~ +Now I am one line down~ +~ +Now I am after a blank line + +**Begin book text after asterisks** +**************************************************************************** +Greetings everyone, and welcome to Test Pack Please Ignore!~ +~ +~ +We're really excited to bring this pack to you all. +~~~ +We also couldn't have done so without the Feed The Beast subreddit community, +who the pack is made by and for.~ +~ +Thank you all so very much for making TPPI possible! +~~~ +This book you're reading is added by our own custom mod, TPPI Tweaks.~ +~ +It will always automatically contain the most up-to-date information +on the pack, so check it often!~ +~ +Should you want a new copy, you can craft one with an iron ingot and three paper, +but this is not necessary to recieve new info!. +~~~ +Another feature of TPPI Tweaks is the in-game commands it adds.~ +~ +The changelog can be found by typing /tppi changelog, which will of course always +be up to date, no need to ever get a new copy.~ +~ +We're also working on a project to add in-game documentation for all +the mods in the pack, to be accessed via commands.~ +~~~ +Type /tppi guide to receive an all-around guide to the documentation system, +the easiest way to obtain info on any mod you wish.~ +~~~ +Type /tppi mods to get an individual book for a mod, or to get +a link if the mod has not had in-game documentation written for it yet.~ +/tppi mods list will give you a list of all mods that are possible to be used in the command. +~~~ +Naturally, this is a big job, and it's not yet finished. +~ +It is our hope that the community will get +involved in documenting these mods via our mod's system.~ +~ +If you'd like to help out with this documentation project or any other parts of TPPI's +development, feel free to type the command /tppi getInvolved to learn more. +~~~ +Lastly, the /tppi ores command will give you a book on TPPI's unique layer-based +ore generation system.~ +~ +Judge has worked very hard on it, and we're very happy that almost everyone sees it as a good change. +~~~ +That's about it. Have fun!~ +~ +~ +~ +~ +~ +~ +~ +~ +~ + Love,~ + -The Dev Team diff --git a/src/main/resources/assets/tppitweaks/lang/GetInvolved.txt b/src/main/resources/assets/tppitweaks/lang/GetInvolved.txt new file mode 100644 index 0000000..7f13839 --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/GetInvolved.txt @@ -0,0 +1,20 @@ +To get involved in TPPI's development, feel free to stop by reddit.com/r/testpackpleaseignore for general pack discussion.~ +~ +To talk to the dev team directly via IRC, visit #TestPackPleaseIgnore on irc.esper.net.~ +~~~ +The reddit is the place to go to discuss pack features and provide feedback, etc, but NOT report bugs.~ +~ +All bug reports should instead be submitted as issues on the TestPackPleaseIgnore repository, located at github.com/TPPI-Dev. +~~~ +If you want to help out with TPPI Tweaks and/or the in-game mod documentation project, +check out the TPPI-Tweaks github repository.~ +~ +The "SupportedMods.txt" file in our assets folder will let you add documentation. +~~~ +Make sure you follow the formatting guidelines outlined at the top of the file when documenting mods, and good luck!~ +~ +~ +~ +~ +~ + -Team \ No newline at end of file diff --git a/src/main/resources/assets/tppitweaks/lang/OreGen.txt b/src/main/resources/assets/tppitweaks/lang/OreGen.txt new file mode 100644 index 0000000..c5a40e4 --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/OreGen.txt @@ -0,0 +1,109 @@ +The ore spawning you'll see in this modpack will be a little different from what you are used to.~ +~ +Major metals used by multiple mods now spawn in "bands" of ore at +more constrained Y levels. +~~~ +This effectively buffs manual mining significantly, +since you can specifically target ores you want in the world, +while still keeping automatic mining and the amount of ores +per chunk about the same as normal. +~~~ +Ores in a layer spawn more often close to the center of their +Y ranges (usually a bit lower), unless otherwise stated.~ +~ +Starting from the top of the world, here are the ores we've tweaked and where you can expect to find them:~ +~~~ +Copper:~ +~ +Spawns in the top layers of the world in generous chunks that are centered within the mid 50s, +with the band itself extending about 5-6 blocks in either direction.~ +~~~ +TiC Aluminum:~ +~ +Aluminum can be found in small clusters of 3-4 ores +randomly distributed between Y levels 44 and 64.~ +~~~ +Iron:~ +~ +Iron is located in large clusters centered in the mid 40s of the world, +and going about 12 blocks in either direction.~ +~~~ +Tin:~ +~ +This ore spawns in chunks roughly as large as copper's, centered in the mid 30s, +again extending up to 6 blocks in either direction. +~~~ +Certus Quartz:~ +~ +Spawns in somewhat sparse, but larger chunks +randomly distributed between levels 36 and 54.~ +~~~ +Lead:~ +~ +You can find this ore in large, somewhat sparse clusters in the mid-upper 20s, +plus or minus 6.~ +~~~ +Silver:~ +~ +You can find this ore directly below and interspersed with lead, +in slightly smaller chunks.~ +~~~ +Gold:~ +~ +You can find this ore in sparse, mid-sized chunks centered in the mid teens of the world, +with a variance of 6. Appears up to the 20s, but commonly also near lava.~ +~~~ +Osmium:~ +~ +You can find osmium from Mekanism in mid-sized clusters centered in the low to mid teens, +but with a wide variance of 12 blocks in either direction, +extending from below lava level up to the silver and lead layers.~ +~~~ +Lapis:~ +~ +Lapis can be found centered in the low to mid teens, but it has a high variance of 14, +so it can appear as low as near bedrock and up near silver and lead, with a vein size slightly smaller than diamond.~ +~~~ +Redstone:~ +~ +Redstone is spawned in small, 4 ore clusters commonly in the low teens, with a variance of 6, +with some appearing up where gold is, and some also appearing at and below lava.~ +~~~ +Magical Crops Essence:~ +~ +You can find this ore in similar areas as redstone +in rare, mid-large sized chunks of ore. It spawns in the low teens with a variance of 5 blocks.~ +~~~ +Diamond:~ +~ +Diamond is unchanged from vanilla, in that it can spawn anywhere in the first 16 levels of the world. +Veins are in sparse, small to mid sized clusters anywhere from the levels 1 to 16.~ +~~~ +Ferrous Ore:~ +~ +Spawns in mid-sized clusters found randomly between levels 6 and 16.~ +~~~ +Yellorite:~ +~ +Spawns in the bottom 9 layers of the world in rare, large chunks of ore. +Dig below lava to find it. Yay!~ +~~~ +Coal:~ +~ +Like normal, with the exception that the ore veins are slightly larger and less frequently placed. +Spawns anywhere from levels 0 to 128. +~~~ +Unaffected Ores:~ +~ +-Power ore~ +-PR gems~ +-Dark Iron~ +-Ars Magica Ores~ +-Nether Ores~ +-End Ores~ +-Apatite~ +-Sulfur~ +-Thaumcraft Shards~ +-Gregtech Ores~ +~~~ +Have fun! \ No newline at end of file diff --git a/src/main/resources/assets/tppitweaks/lang/SupportedMods.txt b/src/main/resources/assets/tppitweaks/lang/SupportedMods.txt new file mode 100644 index 0000000..7cda338 --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/SupportedMods.txt @@ -0,0 +1,1037 @@ +**This is the file of supported mods and the info to go along with them** +**To add a mod to the file, type >ModCommandName, ModProperName<** +**The ModCommandName cannot have spaces, and will be used to call the mod's info command.** +**The ModProperName can have spaces - this is the "real name" of the mod, to be used in its guidebook title.** +**Example: >ThermalExpansion, Thermal Expansion 3<** +**After that, type any info about the mod. Mod information is naturally separated by the names of mods (inside ><)** +**To just specify a link, use <> (ex. ) and this will be put into the chat instead of a book** +**You CANNOT have a mod's documentation be both a book and a link, due to current limitations of the mod** +**That means, for mods where you want to link to a wiki, the link should be all that's there under it in this** +**documentation file.** +**The code will interpret "~~~" as a page break, and format the book accordingly** +**In addition, adding a "~" to the end of a line will add a line break** +**Two asterisks at the beginning of a line is a comment** +**Three asterisks and a number will skip that amount of lines following** + + +**Linked means there is a link to the wiki/website, but I (gr8pefish) still want to document it in-game if I have time** +**Incomplete means there is some documentation, but not as much as I would like** +**If you alter this code please update this to-do. Or if you are working on one, put your name next to it. Thanks!** +**TO DO:** +**additional builcraft objects** +**applied energistics [Linked]** +**bibliocraft [Linked]** +**big reactors [Linked]** +**blood magic [Linked]** +**buildcraft [Incomplete]** +**computercraft [Linked]** +**engineers toolbox [Linked]** +**extra cells [Linked]** +**extra bees** +**extra trees** +**factorization [Linked]** +**forestry-machines [Linked]** +**forestry-bees [Linked]** +**forestry-trees [Linked]** +**gregtech? [linked] (Maybe just a basics guide?)** +**hardcore ender expansion [Linked]** +**industrial craft [Burn477?] (posted in r/TPPI)** +**logistics pipes [Linked]** +**magical crops [Linked]** +**mariculture [Linked]** +**mekanism [Linked]** +**MFFS [Linked]** +**MPS [Linked]** +**MPSA [Linked]** +**MystCraft-WritingAges [Linked]** +**MystCraft-General [Linked]** +**Nuclear control [Linked]** +**Open blocks** +**portal gun [Linked]** +**project red [Linked]** +**quarry plus** +**railcraft-rails [Linked]** +**railcraft-other [Linked]** +**redstone arsenal [Incomplete]** +**reliquary {Linked}** +**steve's carts [Linked]** +**steve's factory manager [Linked]** +**thermal expansion (incomplete)** +**twilight forest [Linked]** +**witchery [Incomplete?]** + + +***15 +Example: +>ModName< +This is some very useful info +and I am typing it on multiple lines +to make this text file easier to read. +These lines don't have line breaks between them +in the book though because they don't end with "~". +~~~ +Now I am on page 2~ +Now I am one line down~ +~ +Now I am after a blank line +>ModName2< + + +**Begin line after asterisks** +**************************************************************************** +**>AdditionalBuildcraftObjects, Additional Buildcraft Objects<** + +>AdvancedSolarPanels, Advanced Solar Panels< +Advanced Solar Panels is an addon for Industrial Craft 2 (IC2). It only adds a couple of blocks, and they are mostly +solar panels that deliver high output for a very high initial material cost.~ +~ +The advanced solar panel generates 8 eu/t in daytime, 1 eu/t at night~ +The hybrid solar panel generates 64 eu/t in daytime, 8 eu/t at night~ +The ultimate hybrid solar panel generates 512 eu/t in daytime, 64 eu/t at night~ +~ +The mollecular assembler converts items into better versions of themselves for a high energy cost. For example, 1 Glowstone +becomes 1 Sunnarium (needed for the ultimate hybrid solar panel) with the input of 9,000,000 EU. THis machine can accept +any amount of energy, and any number of packets of energy (i.e. It won't explode). + +>AppliedEnergistics, Applied Energistics< + + +>ArsMagica, Ars Magica 2< +Ars Magica 2 is a magical mod with RPG elements. Think mana, spellcasting, levelling up, and fighting fearsome enemies!~ +~ +It's worth noting that, due to our having had to disable Dryads in TPPI, Nature Guardians must be summoned from their spawn eggs, which we've added a crafting recipe for. +~~~ +Other than that, check out the mod's own in-game guide!~ +~ +To get it, craft an Item Frame and +a normal Book, and get exploring!~ +~ +You'll have to find liquid Essence; a cyan liquid found in pools in forests and similar biomes.~ +~~~ +Once you've found an essence pool, place the Item Frame so that it is directly above +the pool of Essence, and place the Book inside the Item Frame.~ +~ +After some flashes and sparkles, your guidebook will be ready! +~~~ +If you find the book confusing, the first things you should craft to unlock the rest of the mod would be the +oculus, inscription table, and crafting alter, respectively.~ +~ +After doing that, the rest of the mod is yours to explore! + + +>BiblioCraft, BiblioCraft< + +**Will document fully when I have time** + +>BigReactors, Big Reactors< + + +>BiomesOPlenty, Biomes O Plenty< +Biomes O' Plenty (BOP) adds a large number of biomes to the world generation. It is also highly configurable; you can adjust which +biomes appear as well as adjust the landmass perecentage, village rarity and more.~ +~ +BOP also adds another Dimension, called "The Promised Land," which can be found by combining end stone and various ores +found in differnt biomes. The gems and their biome locations are as follows:~ +~ +Emerald: Forest/Mountain type biomes~ +Ruby: Desert type biomes~ +Peridot: Grassland type biomes~ +Topaz: Jungle/Tropical type biomes~ +Tanzanite: Snow type biomes~ +Apatite: Swamp type biomes + + +>BloodMagic, Blood Magic< + + +**Split into silicon, transport, etc? +>Buildcraft, Buildcraft 4< +Buildcraft adds a load of cool ways to automate crafting, processing, and mining.~ +~ +This mod adds "engines" which are ways to produce MJ. You can also use Thermal Expansion's dynamos, +but you must have an energy conduit between the dynamo and the machine.~ +~ +There are many different machines, for instance, the quarry. The quarry is an semi-automatic way to mine. You can use +landmarks to set the size of the quarry, but keep in mind 64x64 is the maximum size. Apply a redstone signal to landmarks +to see a red line extending for 64 blocks. The automatic crafting table crafts stuff, automatically! Totally unexpected! +~ +You can also use pipes to transport items, for instance you can make a automated smelter. If you want to learn better, +just start practicing and you'll get the hang of it, or you can watch a mod spotlight. +~ + +>BuildcraftAddon, Buildcraft Addon< +Buildcraft Addon adds only 3 items.~ +~ +The stair placer places stairs from your inventory into the world, similiar to the Builder's wand from Extra Utilities, +except this only works with stairs.~ +~ +The color selector and color sorter act as an addition to buildcraft transport's item coloring system. It acts as an improved +lazuli transport pipe in that it will color items to be sorted by the dazuli transport pipe. The color selector allows the user +to set multiple ghost items in it's GUI (accessed by right clicking) and then select the color the items will be colored to. +It requires a small amount of power to operate. It is very similar to Red Power 2's sorter.~ +The color selector lets you easily color a pipe as well. Right click it (while not pointing at anything) to open the GUI. + +>CarpentersBlocks, Carpenter's Blocks< +Carpenter's Blocks adds wooden frames of vanilla items that can be textured with other blocks to change the appearance.~ +~ +This mod is mainly used for aesthetic purposes.~ +~ +There are two tools in addition to the blocks added, the "Carpenter's Hammer" and the "Carpenter's Chisel". These are used +to alter the carpenter's blocks. +~~~ +Basics~ +~ +Once a Carpenter's block is placed in the world, right-click it with any full-size block (except TileEntities: chests, +machines, etc.) If the block is compatible, it will take on the appearance of the placed block and also any properties +of it (fire-resistance, explosion-resistance, etc.) To remove the block used for texturing shift left-click with the +carpenter's hammer. To alter the appearance further left/right click with the chisel to cycle through additional +patterns.~ +~ +In general, left-clicking a carpenter's block with the hammer will re-orient it (turn it left/right) while right-clicking +will change the block (ex: stairs -> corner stairs -> upside-down stairs -> etc.) +~~~ +Additionally, once a carpenter's block has an overlayed appearance another block can be placed on any side to create a +cover on the block. These can be altered indepently of the main block.~ +~ +Some items can be used as overlays even though they are not full blocks. These include: seeds, snowballs, vines, string, +wheat and mushrooms.~ +~ +All 16 dyes can be used to color a carpenter's blocks. This affects existing overlays, so placing dirt on a carpenter's +block and then putting purple dye on that will yield purple dirt! Also, the "chisel" mod plays nicely with this mod, so +many overlays are possible with that in mind.~ +~ +Since there are only a handful of blocks the following pages will describe the specifics on each block if special features +exist. +~~~ +Carpenter's Block~ +~ +Left/Right click with the hammer to change the block into a slab. The direction you hit the block changes the orientation +of the slab. +~~~ +Carpenter's Slope~ +~ +This block is amazing. Remember that right clicking with a hammer will change the block (It has many options, try them out!) +while left-clicking will re-orient the block. +~~~ +Carpenter's Door/Hatch~ +~ +Right clicking with the hammer will change the appearance while left-clicking will make the door/hatch open to either the right +or the left (or in the hatch's case the top or the bottom as well). Shift right-clicking will make it behave like either +an iron door or a wooden door (default). Also, if you have two carpenter's doors side by side, opening/closing one will +make both open/close! +~~~ +Carpenter's Bed~ +~ +Right/Left clicking with the hammer will change the appearance of the bed-sheets/pillow to a few built in patterns. You can +still texture the frame of the bed (note it is two blocks so you will need two dye). Shift right-clicking will restore +the bed's pattern to default. +~~~ +Carpenter's Button/Lever/Pressure Plate~ +~ +Left clicking with the hammer will invert the redstone output. For the pressure plate right clicking with the hammer will +cycle through triggers so that the pressure plate will only be activated by mobs, animals, players, or everyone. +~~~ +Carpenter's Collapsible Block~ +~ +This block is affected by left clicking any corner of the block with the hammer, as the corner selected will depress by +one pixel (to a maximum of only one pixel left). Right-clicking raises it by one pixel. Only the top of the block will +compress this way, trying to make a roof out of these blocks is not a good idea. +~~~ +Carpenter's Barrier/Gate~ +~ +Right clicking with the hammer will rotate between a few textures. Shift right clicking while on the default fence will +alter the size of the gap in the fence by one pixel. +~~~ +Carpenter's Daylight Sensor~ +~ +Left clicking with a hammer will invert the redstone output. Left clicking will cycle between activating for sunset/sunrise +or when light levels are low enough for monsters to spawn. +~~~ +Carpenter's Ladder~ +~ +The only thing special about this block is that it can be free-floating (It acts as it's own block and doesn't have to +be placed on a wall). +~~~ +Carpenter's Safe~ +~ +Similar to the strongbox from Thermal Expansion, this item is linked to the user. Sneak right click with the hammer to +lock/unlock the safe so others can access it. Right click with the hammer to change automation rules (extraction is +allowed, not allowed, etc.)~ +~ +The green/red light indicates if the safe is unlocked/locked respectively. The blue bar indicates how full the safe is. +Holding a gold ingot and right clicking on the safe will upgrade it to 54 slots (double chest's worth). The only way +to get the gold back is to break the safe. +~~~ +Carpenter's Flower Pot~ +~ +Right click with some soil (dirt) to place it in the pot and allow plants to be placed in it. Covers are supprted, but so +are built in patterns (although not both simultaneously). Left/Right click with the hammer to cycle through the patterns. +Sneak right click with the hammer to reset it to default.~ +~ +Most plants can be planted in this flower pot, you are no longer limited to flowers and cacti. Sneak left click with the +hammer to remove the plant and sneak right click to remove the cover. + + +>Chisel, Chisel< +Chisel is a mod that adds decorative blocks to minecraft. It modifies existing blocks by use of a chisel to create +aesthetic blocks similar to the original one.~ +~ +Chisel adds two blocks to world-generation, marble and limestone. They are purely for looks.~ +~ +To get started first craft a chisel with two sticks and an iron ingot (diagonally in a crafting table). There are two ways +to use it, either in-world or in a crafting GUI. +~~~ +To bring up the GUI, right click the chisel while it is in you hotbar. Here you can place the block to modify +in the center. Try it out with cobblestone, stone, dirt or something else that you have on hand. You will notice that +blocks appear on the blank slots to the sides. To chisel the block in the center simply left click on the desired block +that appears on the sides.~ +~ +You can hover over the chiseled blocks to get a more detailed description of each one. Some blocks even have connected +textures! It should also be noted that if you have 32 blocks in the center and you choose a chiseled block all 32 will be +transformed! However, you can chisel an already chiseled block and most chisel recipes will let you use this mechanism to +get the vanilla item back from an existing chiseled block.~ +~~~ +To chisel a block in-game simply left click the block to be altered. Keep left-clicking on the block to cycle through +the available options. NOTE: THIS IS CURRENTLY BUGGED, IT WILL CREATE AN INVISIBLE BLOCK. IT IS RECCOMENDED YOU USE THE +GUI METHOD INSTEAD.~ +~ +There are also some special items that chisel adds:~ +The "Ball O' Moss" creates an Area of effect "explosion" that changes nearbly blocks into mossy versions of them.~ +The "Cloud in a bottle" will spawn a cloud when thrown/broken.~ +~ +Finally, there are additional chisel-able blocks that this mod adds. They can be found in NEI. + + +>ComputerCraft, ComputerCraft< + +**People looking at this book will mostly be new to CC so a link gives them other resources to learning Lua** +**Even though in-game documentation is better, in this case I think they will use the internet anyway** +**Feel free to document it anyway if you have time/want to though!** + +>DamageIndicators, Damge Indicators< +Damage indicators is a small mod that adds a HUD displaying the health of the entity the player is looking at.~ +~ +Additionally, you can adjust the settings by pressing "." + + +>DartCraft, DartCraft< +To get started in Dartcraft you must first find some power ore. It glows bright yellow and is found deep in the earth (or +in the Nether). Use it, alongside some ingots to craft a force ingot and a force nugget. Then craft these along with a stick +in a diagonal to gain a force rod. Right click a bookcase with the force rod to recieve the Book of Mudora, which will have +information on all things Dartcraft. + +>DimensionalAnchors, Dimensional Anchors< +This mod adds in only one block, the dimesional anchor. This block loads chunks (16x16 squares) for the player in order +to make automation possible even if the player is absent.~ +~ +To open the GUI right click the block. The red arrow will decrease the number of loaded chunks while the green arrow will +increase them. + +>EmasherResource, Emashers Resource< +Emasher Resource adds various ores and items to the game. It is meant to be an inclusion to the mod Engineer's Toolbox. +Emasher Resource includes algae, hemp, limestone, red sandstone, and emery ore.~ +~ +Algae can be harvested by hand and when "planted" in water it will spead to every nearby water source block. It can also +be harvested and burned in a photobioreactor to create hydrogen to be burned as an energy source.~ +~ +Hemp can be used for armor, string, paper, cactus green, and hemp seeds. The seeds can be crafted into hemp seed oil +which can be used as a fuel.~ +~ +Limestone can be used to make quicklime which is used in Engineer's Toolbox's ore processing.~ +~ +Emery ore is simply used to make the grinder (Engineer's Toolbox). It is about as rare as diamonds.~ +~ +Red Sandstone is aesthetic? + +>EnderIO, EnderIO< +Ender IO adds compact liquid conduits, energy conduits and redstone conduits, power generation, machinery, remote area +access, and more. This mod is similar to Thermal Expansion; it supports RF and MJ.~ +~~~ +Machines~ +~ +All Machines consume power (MJ, the bar on the left side of the GUI) and can be upgraded with capacitors to increase their +energy storage (and their speed/energy consumption)~ +~ +SAG Mill~ +This item acts as a pulverizer/macerator, grinding ores into dusts to increase output.~ +~ +Alloy Smelter~ +This item acts as both a normal smelter (smelting 3 items at once) as well as an alloy smelter to make special alloys for +Ender IO.~ +~ +Painting Machine~ +This item can texture either fused quartz frames or conduit facade with an overlaying block's texture. Place the block with +the desired texture in the left hand slot and the frame/facade in the right hand slot. +~~~ +Energy and Conduits~ +~ +Generators~ +~ +Stirling Generator~ +Your basic generator, burning items such as coal to create power. 10 RF/t.~ +~ +Photovoltaic Cell~ +A solar panel. It produces 10 RF/t in sunlight.~ +~~~ +Power Storage/Information~ +~ +Power Monitor~ +This item allows you to monitor the power of all items connected to your Ender IO power grid and it's peripherals (ex: TE machines). +This block has two tabs. One displays information about the network while the other tab is for restone engine control.~ +~ +Capacitor Bank~ +This blcok acts as a scalable power storage option (it can become a multi-block). Each block added to the structure will +add it's power storage and at 2, 4, and 8 blocks the power output flow rate will increase. +~~~ +Conduits~ +~ +All the conduits can exist in the same block as another Ender IO conduit(s), allowing for some very compact setups. In +addition, they can be covered with a painted conduit facade to cover them up. Holding a conduit or a Yeta Wrench will +render the conduit facades invisible, allowing you to easily find your conduits.~ +~ +The liquid conduit transfers fluids. The rate of transfer is dependent on the fluid.~ +The redstone conduit transmits a redstine signal. A lever/button can be attached to it or a conduit switch can be used. +To active the conduit switch right clicj one of the small squares on the end of the conduit.~ +The energy conduits transfer energy at varying capacities.~ +The item conduits tranfer items; the empowered conduit has more filtering options.~ +~ +Both the item and liquid conduits have a GUI which can be accessed by right clicking the square that appears when the condit +connects to an inventory. This can be used to set insert/extraction modes. ALternatively a yeta wrench can be used to control +the output mode without entering the GUI. +~~~ +The Dimensional Transceiver~ +~ +This item acts as a tessaract, with the ability to transfer liquids, items, and power across dimensions through a single +block (to another transceiver on the same frequency). It has frequency settings in the GUI and will automatically output +energy/items to adjacent conduits/inventories. +~~~ +Tools~ +~ +Power Probe~ +This item will give information about a machine or even a network when right clicked on a machine. It is similar to a +portable power monitor.~ +~ +Yeta Wrench~ +This item acts as a wrench, meaning it can pick up machines (except IC2 machines) by shift right clicking the machine. +It also can see through facades, and only certain facades, the filter is indicated in the bottom left hand corner of the +screen and can be altered by shift right clicking while not aiming at a machine.~ +~~~ +Other~ +~ +Reservoir~ +This item, when built in a 2x2x1 square, will act as an infinite water source, much like in vanilla minecraft. The reservoir +can also auto-eject if right clicked with a wrench.~ +~ +Powered Light~ +This item will emit light but will require .1 Mj/t (or 1 Rf/t) to operate. It must be turned on with a redstone signal.~ +~ +Fused Quartz~ +This item acts as aesthetic glass with connected textures. The frame can also be painted by right clicking with a painted +fuzed quartz frame. + + +>EnderProspecting, Ender Prospecting< +Ender Prospecting adds a couple items to assist with manual mining. They are the Eye of Prospecting, the Talisman +of Prospecting, and the Totem of Prospecting.~ +~ +The Eye of prospecting can be crafted alongside any ore and will then be "tuned" to this ore. The next time you right +click the eye it will fly away from you, much liek an eye of ender, except it will fly toward the tuned ore. It will +then break, this item is one-time-use.~ +~ +The (Base) Talisman of Prospecting can be crafted with 5 tuned eyes to yield a tuned Talisman. It acts similarly to the +Eye, except it is reusable and has a smaller range. Every time the Talisman is right clicked it will indicate a direction +that the tuned or is.~ +~ +The Totem of Prospecting can be crafted/tuned similarly to the Talisman. It doesn't require being right clicked, but it +has an even smaller range and doesn't indicate a direction, only that the ore is in close proximity. + + +>EnderStorage, Ender Storage< +Ender Storage adds the Ender chest, the ender tank and the ender pouch. Each chest/pounch and tank will link to each other +assuming they are on the same "frequency" (indicated by the wool pads on top). The pads can be colored with each dye, +either in-game by clicking on the pads with a dye in hand, or by crafting the item below the dye frequency in a crafting +table.~ +~ +Ender pouches are merely a portable form of ender chests and can be linked to ender chests if they share the same frequency. +If you lose an ender item with item(s)/liquid(s) stored in it, they will remain stored in the chest with the frequency +they were stored in.~ +~ +If you place a diamond in the latch of an ender chest it will become linked to the player that placed the placed the +diamond, meaning that each player in a SMP server can have access to all 4096 frequencies. + + +>EngineersToolbox, Engineer's Toolbox< + + +**>ExtraBees, Extra Bees<** + +>ExtraCells, Extra Cells< + + +**>ExtraTrees, Extra Trees<** + +>ExtraUtilities, Extra Utilities< +Extra Utilities adds a bunch of useful blocks. It even adds it's own in game-documentation! Simply press use ("u") while +in NEI while hovering over an extra utilities block to see a description of the block. + +>Factorization, Factorization< + + +>FlatSigns, FlatSigns< +Flat signs alters existing signs in Minecraft by allowing flat versions of signs to be placed on the floor or the ceiling +by shift right clicking a sign on the floor/ceiling.~ +~ +It also allows for signs to be edited by using a sponge or the more durable sponge wipe. To craft a sponge just throw yellow +wool into water or on the ground while it is raining. + +>Forestry-Machines, Forestry-Machines< + + +>Forestry-Bees, Forestry-Bees< + + +>Forestry-Trees, Forestry-Trees< + + +>GasCraft, GasCraft< + + +>Gendustry, Gendustry< +Gendustry is a mod that acts as an add-on for Forestry's bee and tree (and butterfly) breeding systems. It adds a number +of blocks that will be discussed on the following page(s).~ +~ +Each block can accept EU, MJ, or RF. All blocks can input/output from any side. +~~~ +The Industrial Apiary~ +~ +This block requires 2 MJ/t to operate, has 4 slots for upgrades (but doesn't support frames), and also doesn't have the +90% production reduction of normal apiaries.~ +~ +The gague on the left is for power storage. The left slots are for a Queen/Princess and Drones, the middle 4 slots are for +upgrades, and the right 9 slots are for products and offspring.~ +~ +You can hover over the status icon (in the top right) to see more information about the block.~ +~ +Bees can be inserted and products can be extracted from any side. Upgrades cannot be automated, but the automation upgrade +will automatically move offspring back into the left slot to continue breeding~ +~ +The upgrades for gendustry are described by hovering over them in NEI. +~~~ +The Mutagen Producer~ +~ +This item will convert solid items into Mutagen (a liquid used to mutate bees/trees in the Mutatron).~ +~ +Items can be inserted into any side, and liquids will be automatically ejected to any adjacent pipe or tank.~ +~ +The items that are used as valid fuel sources are, in decreasing order of effectiveness, uranium, glowstone, and then +redstone. CLick on the recipes bar in the machine to see the detailed values for each item (power needed, mutagen produced). +~~~ +The Mutatron/Advanced Mutatron~ +~ +The Muatron consumes Mutagen to force mutations. It requires 1 bucket of mutagen (1000mb), 20,000 MJ per operation, and +a labware.~ +~ +The gauges on the left are for internal power and mutagen storage. For bees, princesses go in the top slot and +drones go in the bottom slot. For trees, saplings go in the top slot and pollen goes in the bottom slot. If a bee is +being mutated, the resulting bee will be a pure-bred bee. Ignoble bees have a 10% chance of not surviving the process.~ +~ +Bees and labware can be inserted from any side and results can be extracted from any side.~ +~ +The advanced mutatron allows a selection of mutation if there are multiple possible results. It can work twice as fast if +the energy supply is adequate. +~~~ +The Genetic Sampler/Imprinter~ +~ +Takes genetic samples from Bees, Trees, or even Butterflies, randomly selecting one genetic trait from the input and killing +the sampled creature in the process. It can also convert Extra-Bees serums into gendustry samples~ +~ +It consumes labware (top right) and blank samples (top left), as well as 20,000 MJ per operation.~ +~ +To use the samples, craft them with a template (shapeless receipe, any number of samples can be added at once). Every chromosome +(ex: fertility, species, etc.) can only be added once to a template, any additions will overwrite previous samples. All +samples must belong to the same species (ex: no using tree species on a bee). Unneeded templates/samples can be cleaned +by applying heat (ex: putting them in a furnace).~ +~ +The implanter replaces the traits of the input bee with the traits on the template (top left slot).~ +~ +It 80,000 MJ and a labware (top right slot) per operation. The template will not be consumed (or altered). Ignoble bees +have a 10% chance to not survive the process.~ +~ +The template can be removed form any side, but only when no imprinting is ongoing and the input slot is empty. +~~~ +The Industrial Grafter~ +~ +Acts as a powered Forestry grafter, that is very fast but also comsumes a lot of power.~ +~ +It can be charged in any machine that will charge MJ, RF, or tier 2 or higher EU (ex: capacitor bank, energetic infuser, +MFE). + + +>GregTech, GregTech< + +**GregTech is far, far too complex for Minecraft's Written Book format.** +**I think the only way to provide support for that mod is either a wiki link** +**Or a book format resembling Thaumcraft's or RotaryCraft's.** + +>GraviSuite, Gravitation Suite< +Gravitation Suite (Gravi Suite) is an addon for IC2 which adds very expenive, but powerful, EU-powered items. It adds both +tools and armor. +~~~ +Armor~ +~ +The Gravi-Chest Plate~ +~ +This item contains all of the functionality of the quantum chest plate as well as additional fucntions. It +provides creative mode flight and the ability to charge any EU items in your inventory. To toggle on/off flight, press 'f'. +To toggle on/off boost mode press 'ctrl'. This item also has 'hover mode'. This will allow you to fly much faster at an increased energy cost. The Gravi +Chest Plate can be charged in a MFSU or higher tier EU storage.~ +~ +Advanced Elextric Jetpack~ +~ +This item combines the electric jetpack and the advanced lappack. This item also has boost mode, hover mode, and, +obvioulsy, flight, as well as 1,000,00 EU energy storage.~ +~ +The Ultimate Solar Helmet~ +~ +This combines the ultimate hybrid solar panel from advanced solar panels with the quantum helmet to charge your armor at 512 EU/t +while still retaining the functionality of the quantum helmet.~ +~ +The Ultimate lappack~ +~ +This item holds 10,000,000 EU. +~~~ +Tools~ +~ +The tools can all be charged in a MFE or higher.~ +~ +The Vajra~ +~ +Thsi item can break any block (including bedrock) in one hit, even when flying or swimming, but it costs a very, very large +amount of EU per block broken~ +~ +Advanced Drill~ +Thsi drill is 35% faster than the diamond drill but it consumes significantly more power.~ +~ +Advanced Chainsaw~ +This chainsaw has a higher damage (12) than the normal chinsaw and it also operates 35% faster. + +>HardcoreEnderExpansion, Hardcore Ender Expansion< + + +>ImmibisMicroblocks, Immibis Microblocks< +Immibis Microblocks (along with Forge Multipart) creates the ability to cut down blocks into parts. This allows multiple +parts of blocks to exist in the same 1-block space, which wouldn't otherwise be possible. For example, torches are now +multiparts and so 2 of them can exist on the same intersection of a two walls. As another example, Thermal Expansion +pipes/conduits are multiparts, so a cover can be placed on them to "hide" the wiring while still retaining the +aesthetics of your house.~ +~ +To create multiparts simply craft a saw and then follow the NEI instructions to creaft your desired shape/size!~ +~ +Note: A large number of microblocks may cause lag. As long as you don't go beserk with them you should be fine though. + + +**>IndustrialCraft, IndustrialCraft (Experimental)<** +**Someone in the thread (Burn447) mentioned he was working on this** + +>Infinibows, Infinibows< +Infinibows is a small mod that just removes the need to have an arrow in your inventory to shoot a bow with the infinity +enchant. + +>LogisticsPipes, Logistics Pipes< + + +>MagicalCrops, Magical Crops< + + +>MagicBees, Magic Bees< +Magic bees is an addon for the Forestry bee-breeding system that also utilizes Thaumcraft. As a result, all of the information +for this mod can be found under the Magic Bees tab in the Thaumonomicon. If you are confused about bees in general, please +consult the "Forestry-Bees" book. + +>Mariculture, Mariculture< + + +>Mekanism, Mekanism< + + +>MFFS, Modular ForceField Systems< + + +>MFR, MineFactory Reloaded< +MineFactory Reloaded is a vast mod, comprising many useful +machines and automation devices. From conveyor belts to tree farms, +there is something in MFR for everybody.~ +~ +To get started, most of the MFR machines require rubber. Rubber trees are +generated throughout the landscape. Break the wood to acquire the flexible +material, then smelt it into rubber bars, and then again into raw plastic. +This plastic can then be crafted into sheets of plastic, which are the foundation +for most of the machines. +~ +Authors: Powercrystals, skyboy026 + +>ModularPowersuits, Modular Powersuits< + + +>Morph, Morph< +Morph is a mod that allows you to take on the characteristics (shape/size/ability(s)) of any creature you kill (except +bosses, although that is a config option).~ +~ +The flight ability is not able to be used until you reach the Nether, and do note that you will lose your morphs on death.~ +~ +To access your morphs, press "[" or "]", and then scroll down. Press "Enter" to select your morph.~ +~ +Morph also has a wheel for your favorite morphs, accessed by pressing "~"/"`". To add a morph to your favorites, press +the same key, "~", while selecting the desired morph in the menu. + +>MPSA, Modular Powersuits Addons< + + +>MystCraft-WritingAges, MystCraft-Writing< + + +>MystCraft-General, MystCraft-General<** + + +>Natura, Natura< +Natura adds world-generation, mainly in the form of some additional trees and some new blocks.~ +~ +The most notable are the berry bushes. These are found in the wild and will grow up and out and will produce berries +that can be harvested by right clicking on the bush. The berries don't fill your hunger very much, but they will +increase your saturation (a hidden value that determines when you will become hungry again), and you can even eat the +berries when full to max out your saturation.~ +~ +This mod also adds in generation to the Nether, allowing you to make bows that have a higher durability than vanilla ones.~ +~ +This mod also adds in cotton plants. These will grow until white balls appear on the plant, then can be harvested and will +revert to an earlier stage of growth rather than having to be replanted.~ +Finally, wheat/barley (wild form of wheat) can be crafted shapelessly into flour, which can then be smelted into bread. + +>NEI, Not Enough Items< +Not Enough Items (or NEI for short) adds the menu you see on your screen when opening your (or any) inventory. It is primarilly +used to show how to craft items and what items are used for. It can be disabled/hidden by pressing "o".~ +~ +To use NEI, hover over an item in the menu and press "r" for recipe to bring up how to make that item or press "u" for +use or what that item is used for. You will notice you also have a search bar on the bottom slot of your screen. This +can be used to limit the results shown on the right hand side tab. Double clicking the search bar will highlight results +that match whatever is typed into the search bar. Double clicking it agin will reset it.~ +~ +The left hand side of your screen contains saves, you can store your inventory in this save, and then loading it will +replace your inventory with the saved one (if cheat mode is enabled). In the top left you will see many options. Most +are self-explanatory, but the one you will likely use the most is next to the magnet; it will change your game mode.~ +~~~ +Options/NEI Modes~ +~ +At the bottom left you will see "options". Clicking on that will bring you to another menu screen. The most useful one +is the topmost one, "Inventory". There you can change between "recipe mode", "cheat mode", and "utility mode". Utility +mode will let you use the utilities in-game. Recipe mode will, when you left click an item on the main NEI panel, do the +same thing as pressing "r", while right clicking will do the same thing as pressing "u". Cheat mode will allow you to +obtain any number of items from the main NEI panel by clicking on them. Left clicking will give you 64 (a stack) of items, +while right clicking will give you one of the selected item. While in cheat mode you can drag items to the right hand +panel to delete them. +~~~ +Tips/Tricks~ +~ +Type in "@modnamehere" to see all the items from a specific mod.~ +You can right click the search bar to instantly clear it!! +In any crafting inventory, left clicking on the little '?' will overlay ghost images on the crafting grid to make it easy +to see what components go where. Shift left clicking will, if you have the items in your inventory, automatically put them +in the crafting grid in the correct location(s). + +>NetherOres, Nether Ores< +Nether ores adds ore generation to the Nether. These ores have a higher yield than their overworld counterparts, but +they also have a propesity to explode, so caution is necessary. + +>NotEnoughKeys, Not Enough Keys< +This mod adds a key-binding menu so it is more simple to navigat through the mess of conflicting keybinds. To access it +simply go into options -> controls and then modify as you see fit. + +>NuclearControl, Nuclear Control< + + +>ObsidiPlates, Obsidian Pressure Plates< +This mod adds a few pressure plates to the game.~ +~ +Obsidian Pressure Plates~ +Will only give off a redstone signal if a player is standing on them.~ +~ +Mossy Cobblestone Pressure Plates~ +Will only give off a signal if a NPC (ex: a villager) is standing on them.~ +~ +Both pressure plates can be silent (no clicking sound) and shrouded (see-through). It should be noted that to create a +silent and shrouded pressure plate you must apply silent first and then shrouded. + +**>OpenBlocks, OpenBlocks<** + +>OpenPeripheral, OpenPeripheral< +Open peripheral is an addon for ComputerCraft. It allows you to wrap a variety of items as peripherals.~ +~ +To see if an item is a valid peripheral (and to get the commands for it) do the following:~ +"side" is the side of the computer that the item to be wrapped as a peripheral is located (ex: "left", "top", etc). +The side should be enclosed in quotation marks.~ +p = peripheral.wrap("side")~ +print (p.listMethods())~ +~ +There are also some items that this mod adds, explained in the following page(s). +~~~ +PIM~ +This item allows you to access a player's inventory (if he/she) is standing on it.~ +~ +Sensor~ +This item allows you to scan the nearby area for information. Use listMethods() for more information.~ +~ +Peripheral Proxy~ +This item allows you to wrap certain items as peripherals through a modem. Make sure the arrows are facing the item to be +wrapped and the modem is on and is located on the back of the proxy.~ +~ +Ticket Machine~ +This item can be used to print out tickets for Railcraft.~ +~ +Terminal Glasses/Termianl Glasses Bridge~ +The glasses can be worn by a player and the information passed to the bridge will appear on the player's HUD.~ +~ +Duck Antenna~ +No idea :P + +>PluginsForForestry, Plugins for Forestry< +Plugins for forestry adds compatability between forestry and other mods. It adds the ability to use sugar and cactus in +a coke oven (railcraft) to make sugar/coal charcoal/coke for power. + +>PortalGun, Portal Gun< + + +>ProjectRed, Project Red< + + +**>QuarryPlus, Quarry Plus<** + +>Railcraft-Rails, Railcraft< + + +>Railcraft-Other, Railcraft-Other< + + +>RCDusts, RCDusts< +This mod adds metal dusts and recipes to the Railcraft rock crusher to +make it a fully capable ore processing machine, as well as adding several +tweaks for compatibility and some useful dust and railcraft-related configuration options. + +>RedstoneArsenal, Redstone Arsenal< +Redstone Arsenal adds tools and weaponry which harness the power of Redstone Flux, the +energy system added by Thermal Expansion. + +>Reliquary, Reliquary< + +**Outdated source but I don't think a lot has changed, it was merely ported to 1.6** + +>RemoteIO, RemoteIO< +Remote IO is a mod that allows you to link IO blocks to inventories, you are no longer limited to just 6 sides!~ +~ +For documentation on specific items simply craft the "Documentation Screen" and place any Remote IO item in the top +right hand slot to read a description on the block. + +>StevesCarts, Steve's Carts 2< + + +>StevesFactoryManager, Steve's Factory Manager< + + +>Thaumcraft, Thaumcraft 4< +Thaumcraft is a magical mod that requires you to "research" its items before you can craft them.~ +~ +There's all kinds of magical swag that you can build and play with, but it's probably best for you to +learn about it on your own.~ +~ +To get started, craft a iron capped wooden wand, +place a bookshelf on the ground, and right-click your wand on it.~ +~ +It should transform into a Thaumonomicon; the true guidebook for Thaumcraft!~ +~ +The only thing to know that is not documented in the book is that some research will be impossible, you can throw it +away and restart with newly generated research notes at any time though. + +>ThaumicTinkerer, Thaumic Tinkerer< +Thaumic Tinkerer is an addon to Thaumcraft (a magical mod). All the information is documented in the Thaumonomicon. + +>ThermalExpansion, Thermal Expansion 3< +Thermal Expansion (TE) is a "technology" mod that adds a power system called Redstone Flux (RF). +It has itemducts, fluiducts, and energy conduits for transporting items, liquids, and RF power +respectively, as well as a bunch of useful blocks for ore processing, automatic crafting, storage, and more.~ +~ +You can start generating RF power using the mod's dynamos and some energy conduits, with leadstone conduits being the +lowest tier. All TE conduits convert RF to MJ (Buildcraft energy) if needed. +You can rotate and pick up machines by right clicking and shift right clicking with a Crescent Hammer, +the mod's version of a wrench.~ +~~~ +All machines in the mod have their own configuration settings in their GUIs.~ +~ +The redstone behavior tab lets you choose how the machine will respond to redstone.~ +The configuration tab lets you choose where the machine will input and output its products, +be that energy, liquids, or power, on a per block face basis.~ +~ +Blue indicates an input on a given face, while orange indicates an output.~ +There are other colors used situationally depending on the machine. +For these, it's best to select that color in the configuration menu, then look +back at the main GUI of the machine.~ +The slot in the machine associated with that color will +be highlighted in that color. This should help indicate what that color's purpose is +for that particular machine. +~ + +>TinkersConstruct, Tinkers' Construct< +Tinkers' Construct is a mod that lets you build custom tools out of +various materials, each with their own special properties.~ +~ +To get started with the basics, check out the book "Materials And You" that +you should have spawned with. +~ + +>TinkersMechworks, Tinkers' Mechworks< +Tinker's Mechworks is an addon for Tinkers' Construct. It adds drawbridges, an igniter, and signal busses/terminals, all +of which are described on the following pages. +~~~ +Drawbridge~ +~ +The drawbridge can extend and retract 15 blocks in the direction it is facing. It is activated with a redstone signal. +The left slot is for a block that "disguises" the drawbridge to make it look like the block in the left slot. +The right slot is for the blocks that are to be extended/retracted.~ +~ +The extended drawbridge can extend up to 64 blocks.~ +~ +The advanced drawbridge can extend more than one type of block, as each block is placed in the GUI. +~~~ +Igniter~ +~ +The igniter will light the block in front of it on fire when given a redstoen signal and will extinguish the flame when +the resdtone signal is turned off. +~~~ +Signal Bus/Terminal/Wire~ +~ +These items function as redstone that can travel through blocks. To get started, craft a spool of wire by surrounding a +stone tool rod with 8 lengths of wire in a crafting table. The spool of wire can be crafted with additional lengths of wire +(up to 8 at a time maximum) to give the length of wire more length. The damage bar underneath the length of wire visually +represents how much wire is left.~ +~ +The spool of wire (truly the wire itself) is used to connect signal terminals to signal busses and back to signal terminals. +To connect the two right click on the top red part of the terminal with the spool of wire and then right click on the +signal bus with the same spool of wire. If you have enough wire and the terminal and the bus are 15 or less blocks away +you should see a small red line connecting the two. If you move your cursor away from the spool of wire on your hotbar the +red line will dissapear visually. Now you can connect the second terminal to the bus, using the length of wire, to +complete the circuit. +~~~ +Signal Bus/Terminal/Wire (continued)~ +~ +A redstone signal can be applied to the terminal (or the block the terminal is placed upon) and the redstone signal will +be transmitted to the terminal at the end of the wire. A terminal can connect to multiple busses but busses cannot connect +to other busses.~ +~ +Right clicking the white part of a signal terminal with an open hand will change the terminal's color. Only terminals of +the same color will send redstone signals. + +>TPPITweaks, TPPI Tweaks< +TPPITweaks is the mod made especially for the TPPI Modpack, +which is the representative modpack for /r/feedthebeast.~ +~ +It contains many tweaks for mods to better improve balance, +and some helpful objects to better guide +~~~ +the player in the modpack.~ +~ +Authors: wha-ha-ha, tterrag + +>Translocators, Translocators< +The Translocators mod adds 2 items to the game, the translocators themselves and a crafting grid.~ +~ +Translocators allow for the movement of items through a 1-block space. More info is on the following page.~ +~ +The crafting grid can be accessed by pressing 'c' (configurable in keybinds) and will bring up a grid to place items in. +Right click to place/remove items and press 'c' again on the grid to craft the item(s). +~~~ +Translocators can be placed on the side of an inventory/machine/tank. There are both item and liquid translocators.~ +~ +Right clicking on the protruding center of the translocator with an open hand will depress the center. Items/liquids will +always flow from the translocator with a protruding center to the translocator(s) with an inset center.~ +~ +Right clicking on the plate of the item translocator brings up a configurable filter. +~~~ +Adding a diamond nugget (a diamond in a crafting table gives 9) puts a translocator in regulate mode. +In this mode it will maintain a certain amount of items set in the filter in the inventory it’s attached to. +On an inserting face, it will only accept items to fill the inventory to the matching filter. +On an ejecting face, it will eject any items that don’t match the filter.~ +~ +Adding glowstone to the plate makes it transfer stacks at a time. +Adding redstone lets you toggle input/output with a redstone signal.~ +~ +Adding an iron ingot makes the translocator emit redstone signals to the attached inventory on certain conditions. +On an inserting face, it will emit if there is no room for any item that matches the filter. +On an ejecting face, it will emit if there is no place where any item can be put that matches the filter.~ +~ +Shift-Right clicking on the plate will strip and drop all upgrades placed on the translocator. +~~~ +Translocators will follow these rules:~ +~ +Items/liquids will always travel to non-redstone outputs if they can.~ +Items/Liquids will be evenly split between available outputs. Items will be taken from the slot with the largest quantity. + +>TwilightForest, Twilight Forest< + + +>Waila, Waila< +WAILA stands for "What Am I Looking At?" It introduces a HUD tooltip which indicates what block you are looking at. +It tells you the block name and what mod it is from.~ +~ +By adding the tooltip for the mod name in NEI you can now search "railcraft" instead of "@railcraft" to get the items +added by railcraft.~ +~ +It also adds some tooltip values for various items (ex: shows how much heat coal can produce in a firebox)~ +~ +There are also, by default, some (numpad) keybinds that can be used +as well:~ +1: Toggles on and off the HUD~ +2: Toggles on and off showinq liquids~ +3: Shows the uses for the item slected (through NEI)~ +4: SHows how the item selected can be used (through NEI)~ + +>Witchery, Witchery< +Witchery is a magical mod. It has it's own in-game documentation. To access it, type "Witchcraft" into NEI and then +obtain the books shown. The first one you will want to get is "Herbology" and then "Collectign Fumes." From there on it +is self-explanatory. +**** + +>WRCBE, Wireless Redstone - CBE< +At it's core Wireless Redstone ChickenBones Edition (WR-CBE) is a very simple mod; it allows you to wirelessly transmit +redstone signals. It even works across dimensions!~ +~ +For the items besides the wireless transmitter/receiver and the wireless remote I reccomend you check out ChickenBones' +Minecraft Forum page. He also describes SMP permissions commands on that post. However, The items stated above (the +only ones you will likely use) will be explained on the following page(s). +~~~ +Wireless Transmitter/Receiver~ +~ +Right click on the block to open the inventory. You can set a frequency for the redstone signal to transmit/receive from. +You can also access the advanced tab from here.~ +~ +In the advanced tab you will notice that you can add/remove names whick you can link to certain frequencies. This makes it +simple to remember what your different frequencies do and it is easy to switch back and forth between them.~ +~ +On the right you will notice a GUI that says Phase shift and some arrows. This allows you to color some frequencies with +vanilla dyes. Note: This is purely for easy identification, it does not affect the technical properties! +~~~ +Extra Info:~ +~ +The wireless remote is simply a portable wireless transmitter. It's gui can be opened by right-clicking.~ +~ +WR-CBE has ComputerCraft support. Wrap it as a peripheral and then use peripheral.getFreq(frequency) or +peripheral.setFreq(Frequency) + + +>ZansMinimap, Zan's Minimap< +Zan's Minimap (Voxel Map) provides the player with a convenient mini-map located in the top right hand corner of the +screen. It provides a variety of features.~ +~ +Adds an in-game waypoint system (that can show the location of your latest death).~ +~ +Adds a radar that can show a customizable number of mobs, animals, and players.~ +~ +The default key to access the menu is "M". There you can customize the look of your mini-map, configure the other keybinds +for the mod, change the radar/waypoints, and more. diff --git a/src/main/resources/assets/tppitweaks/lang/de_DE.lang b/src/main/resources/assets/tppitweaks/lang/de_DE.lang new file mode 100644 index 0000000..00c52be --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/de_DE.lang @@ -0,0 +1,7 @@ +tppiWelcomePacket.name=TPPI-Willkommenspaket +tppiChangelog.name=TPPI-Changelog +multicoreProcessor.name=ME-Multicore-Prozessor +multicoreProcessorUncooked.name=ME-Multicore-Prozessorbausatz +itemGroup.tabTPPI=TPPI Tweaks +tppiGuide.name=TPPI Mod-Guide +disassemblerCore.name=Zerlegungskern diff --git a/src/main/resources/assets/tppitweaks/lang/en_US.lang b/src/main/resources/assets/tppitweaks/lang/en_US.lang new file mode 100644 index 0000000..7a15170 --- /dev/null +++ b/src/main/resources/assets/tppitweaks/lang/en_US.lang @@ -0,0 +1,9 @@ +tppiWelcomePacket.name=TPPI Welcome Packet +tppiChangelog.name=TPPI Changelog +multicoreProcessor.name=ME Multicore Processor +multicoreProcessorUncooked.name=ME Multicore Processor Assembly +itemGroup.tabTPPI=TPPI Tweaks +tppiGuide.name=TPPI Mod Guide +disassemblerCore.name=Disassembly Core +miningCore.name=Enderman Mining Assistant +tile.redstoneCompressed.name=Compressed Redstone Block diff --git a/src/main/resources/assets/tppitweaks/textures/blocks/redstoneCompressed.png b/src/main/resources/assets/tppitweaks/textures/blocks/redstoneCompressed.png new file mode 100644 index 0000000..f85147d Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/blocks/redstoneCompressed.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/gui/guiGuide.png b/src/main/resources/assets/tppitweaks/textures/gui/guiGuide.png new file mode 100644 index 0000000..bc78394 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/gui/guiGuide.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/gui/guiGuide_alt.png b/src/main/resources/assets/tppitweaks/textures/gui/guiGuide_alt.png new file mode 100644 index 0000000..3aaf6c3 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/gui/guiGuide_alt.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/disassemblerCore.png b/src/main/resources/assets/tppitweaks/textures/items/disassemblerCore.png new file mode 100644 index 0000000..60c8d4b Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/disassemblerCore.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/miningCore.png b/src/main/resources/assets/tppitweaks/textures/items/miningCore.png new file mode 100644 index 0000000..1483186 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/miningCore.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png new file mode 100644 index 0000000..a1a952d Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png.mcmeta b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png.mcmeta new file mode 100644 index 0000000..f3b03de --- /dev/null +++ b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide1.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frametime": 10} } \ No newline at end of file diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiGuide2.png b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide2.png new file mode 100644 index 0000000..47fb85c Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide2.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiGuide_old.png b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide_old.png new file mode 100644 index 0000000..89411fe Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiGuide_old.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor.png b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor.png new file mode 100644 index 0000000..58bd163 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor2.png b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor2.png new file mode 100644 index 0000000..a2ffddb Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessor2.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppiProcessorUncooked.png b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessorUncooked.png new file mode 100644 index 0000000..f220a80 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppiProcessorUncooked.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppibook.png b/src/main/resources/assets/tppitweaks/textures/items/tppibook.png new file mode 100644 index 0000000..8407f82 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppibook.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppibook1.png b/src/main/resources/assets/tppitweaks/textures/items/tppibook1.png new file mode 100644 index 0000000..227d414 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppibook1.png differ diff --git a/src/main/resources/assets/tppitweaks/textures/items/tppibookALT.png b/src/main/resources/assets/tppitweaks/textures/items/tppibookALT.png new file mode 100644 index 0000000..7a99b52 Binary files /dev/null and b/src/main/resources/assets/tppitweaks/textures/items/tppibookALT.png differ diff --git a/src/mcmod.info b/src/main/resources/mcmod.info similarity index 100% rename from src/mcmod.info rename to src/main/resources/mcmod.info diff --git a/src/main/resources/mcmod.template b/src/main/resources/mcmod.template new file mode 100644 index 0000000..e8cb61b --- /dev/null +++ b/src/main/resources/mcmod.template @@ -0,0 +1,21 @@ +{ + "modinfoversion": 2, + "modlist": [{ + "modid": "@MODID@", + "name": "@MODNAME@", + "description": "@DESCRIPTION@", + "version": "@VERSION@", + "mcversion": "@MCVERSION@", + "url": "@URL@", + "updateUrl": "@UPDATEURL@", + "authors": [ @AUTHORS@ ], + "credits": "@CREDITS@", + "logoFile": "@LOGOFILE@", + "screenshots": [ @SCREENSHOTS@ ], + "parent": "@PARENT@", + "requiredMods": [ @REQUIREDMODS@ ], + "dependencies": [ @DEPENDENCIES@ ], + "dependants": [ @DEPENDANTS@ ], + "useDependencyInformation": "@USEDEPENDANCYINFORMATION@" + }] +} diff --git a/src/tppitweaks/recipetweaks/modTweaks/DCTweaks.java b/src/tppitweaks/recipetweaks/modTweaks/DCTweaks.java deleted file mode 100644 index 899e67e..0000000 --- a/src/tppitweaks/recipetweaks/modTweaks/DCTweaks.java +++ /dev/null @@ -1,13 +0,0 @@ -package tppitweaks.recipetweaks.modTweaks; - -import net.minecraft.item.Item; -import tppitweaks.config.ConfigurationHandler; - -public class DCTweaks { - - public static void init() - { - if (ConfigurationHandler.disableForceShears) - TweakerBase.markItemForRecipeRemoval(((Item)bluedart.item.DartItem.forceShears).itemID, 0); - } -} diff --git a/src/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java b/src/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java deleted file mode 100644 index 52a005a..0000000 --- a/src/tppitweaks/recipetweaks/modTweaks/IC2Tweaks.java +++ /dev/null @@ -1,43 +0,0 @@ -package tppitweaks.recipetweaks.modTweaks; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import tppitweaks.config.ConfigurationHandler; -import cpw.mods.fml.common.Loader; - -public class IC2Tweaks -{ - public static void init() - { - if (ConfigurationHandler.removeStupidEnergyCrystalRecipe) - TweakerBase.markItemForRecipeRemoval(((ItemStack)ic2.core.Ic2Items.energyCrystal).itemID, -1); - } - - public static void registerOres() - { - if (ConfigurationHandler.ic2TEGlassInterchangeability) - { - if (Loader.isModLoaded("IC2") && OreDictionary.getOreID(ic2.core.Ic2Items.reinforcedGlass) == -1) - { - OreDictionary.registerOre("glassReinforced", ic2.core.Ic2Items.reinforcedGlass); - } - for (ItemStack stack : OreDictionary.getOres("glassReinforced")) - { - OreDictionary.registerOre("glassHardened", stack); - } - for (ItemStack stack : OreDictionary.getOres("glassHardened")) - { - OreDictionary.registerOre("glassReinforced", stack); - } - } - } - - public static void addRecipes() { - if(ConfigurationHandler.doCharcoalBlockCompression) { - if(!OreDictionary.getOres("blockCharcoal").isEmpty()) { - ic2.core.block.machine.tileentity.TileEntityCompressor.addRecipe("blockCharcoal", 1, new ItemStack(Item.coal, 1, 0)); - } - } - } -} diff --git a/template_build.properties b/template_build.properties deleted file mode 100644 index a664009..0000000 --- a/template_build.properties +++ /dev/null @@ -1,15 +0,0 @@ -# Example build.properties file. Feel free to set these values to meet your needs on your system. -# -# dir.mc : Not Required. I use it as a base folder for other properties. This is where all the MC related stuff lives. -dir.mc= -# forge.version : Not Required. This is the path of the folder under my ${dir.mc} folder that I extract the Forge source distribution to. -forge.version= -# dir.forge : Not Required. The path to the forge folder extracted from the Forge source distribution. I use it in subsequent properties. -dir.forge= -# -# dir.project : Required. This is the folder that you pulled the TPPI-Tweaks repo to. -dir.project= -# dir.mcp : Required. The path to the mcp folder created by Forge when running install.cmd or install.sh. -dir.mcp= -# dir.release : Required. The target path where the .jar/.zip files will be created. -dir.release= \ No newline at end of file