diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..625578b1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# exclude all +/* + +# include important folders +# need gradle +!gradle/ +!gradlew +!gradlew.bat +!build.gradle +!build.properties + +# include markdowns +!README.md +!License.md + +# include sourcecode +!src/ + +# include important mods required for running +# need to include run first to exclude all existing to add mods later on +!run/ +run/* +!run/mods + +# include special libs like BC +!libs/ + +# include git important files +!.gitmodules +!.gitignore + +# include travis build +!.travis.yml \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..579fa86d --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +Applied Energistics 2 +========================= + +### Information + +[Website](http://ae-mod.info/) + +[Latest Releases](http://ae-mod.info/Downloads/) + +[IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1) + +### Contributing + +Bugfixes and Compatability patches are generally welcome. If you want to contribute something which changes game mechanics, no matter how small, please talk to someone with commit privileges first, its best to remember that those with commit access determine the direction of the mod as a whole. + +### License & Copyright + +Applied Energistics 2 is (c) 2013 - 2014 AlgorithmX2 and licensed under LGPL v3. See the LICENSE.txt for details or go to http://www.gnu.org/licenses/lgpl-3.0.txt for more information. diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..187c42ba --- /dev/null +++ b/build.gradle @@ -0,0 +1,189 @@ +buildscript { + + repositories { + + mavenCentral() + + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + + } + + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } + +} + +apply plugin: 'forge' + +repositories { + + maven { + name 'CB Maven FS' + url "http://chickenbones.net/maven/" + } + + maven { + name "IC2 Player Repo" + url "http://maven.ic2.player.to/" + } + + maven { + name "Waila Mobius Repo" + url "http://mobiusstrip.eu/maven" + } + +} + +configurations.all { + resolutionStrategy.cacheDynamicVersionsFor 7200, 'hours' +} + +// define the properties file +ext.configFile = file "build.properties" + +configFile.withReader { + // read config. it shall from now on be referenced as simply config or as project.config + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +targetCompatibility = JavaVersion.VERSION_1_6 + +version = config.version+"-"+config.aechannel+"-"+config.build +group = config.group +archivesBaseName = config.archivesBaseName + +dependencies { + + compile "net.industrial-craft:industrialcraft-2:${config.ic2_version}-experimental:dev" + + compile "codechicken:ForgeMultipart:${config.cb_minecraft_version}-${config.fmp_version}:dev" + compile "codechicken:CodeChickenLib:${config.cb_minecraft_version}-${config.code_chicken_lib_version}:dev" + compile "codechicken:CodeChickenCore:${config.cb_minecraft_version}-${config.code_chicken_core_version}:dev" + compile "codechicken:NotEnoughItems:${config.cb_minecraft_version}-${config.nei_version}:dev" + + compile "mcp.mobius.waila:Waila:${config.waila_version}" + + compile files(fileTree(dir: 'libs', includes: ['*.jar'])) + // compile "com.mod-buildcraft:buildcraft:6.0.8:dev" +} + + +// Add Coremod Manifest +jar { + + manifest { + attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore' + attributes 'FMLCorePluginContainsFMLMod': 'true' + } + +} + +compileJava { + + exclude("appeng/api/integration/*") + exclude("appeng/integration/modules/helpers/dead/**") + exclude("appeng/integration/modules/dead/**") +// exclude("appeng/fmp/**") + +} + +minecraft { + version = config.minecraft_version + "-" + config.forge_version + + replace "@version@", project.version + replace "@aechannel@", config.aechannel + + runDir = "run" +} + +sourceSets { + + main { + + java { + srcDirs += 'src/main/java/' + srcDirs += 'src/api/java/' + include 'appeng/api/**' + } + + resources { + srcDir 'src/main/resources/' + include "assets/appliedenergistics2/recipes/*.recipe", + "assets/appliedenergistics2/lang/*.lang", + "assets/appliedenergistics2/textures/blocks/*", + "assets/appliedenergistics2/textures/guis/*", + "assets/appliedenergistics2/textures/models/*", + "assets/appliedenergistics2/textures/items/*" + } + } + +} + +processResources { + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + expand 'version': project.version, 'mcversion': config.minecraft_version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} + +task myJavadocs(type: Javadoc) { + source = sourceSets.api.java + include "appeng/api/**" + + classpath = configurations.compile +} + +task javadocJar(type: Jar, dependsOn: myJavadocs) { + classifier = 'javadoc' + from 'build/docs/javadoc/' +} + +task devJar(type: Jar) { + + manifest { + attributes 'FMLCorePlugin': 'appeng.transformer.AppEngCore' + attributes 'FMLCorePluginContainsFMLMod': 'true' + } + + from(sourceSets.main.output) { + include "appeng/**" + include "assets/**" + include 'mcmod.info' + } + + classifier = 'dev' +} + +task apiJar(type: Jar) { + + from(sourceSets.api.java) { + include "appeng/api/**" + } + + classifier = 'api' + +} + +artifacts { + archives devJar + archives apiJar + archives javadocJar +} \ No newline at end of file diff --git a/build.properties b/build.properties new file mode 100644 index 00000000..b98dfbc1 --- /dev/null +++ b/build.properties @@ -0,0 +1,14 @@ +build=_ +version=rv_ +aechannel=_ +group=appeng +archivesBaseName=appliedenergistics2 +minecraft_version=1.7.10 +forge_version=10.13.1.1217 +cb_minecraft_version=1.7.10 +fmp_version=1.1.0.306 +code_chicken_lib_version=1.1.1.104 +code_chicken_core_version=1.0.3.26 +nei_version=1.0.3.56 +ic2_version=2.2.643 +waila_version=1.5.3a_1.7.10 \ 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 00000000..b7612167 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..564e1a52 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Sep 13 21:58:22 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/resources/assets/appliedenergistics2/lang b/src/main/resources/assets/appliedenergistics2/lang new file mode 160000 index 00000000..f9625d88 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/lang @@ -0,0 +1 @@ +Subproject commit f9625d882cee0f6d3585aa9e08c0e9813e3b104f