diff --git a/.gitattributes b/.gitattributes index 6fadbded..813e896e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,22 +1,16 @@ -# Auto detect text files and perform LF normalization +# text stuff *.java text +*.sh text eol=lf +*.bat text eol=crlf +*.md text -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +#binary +*.dat binary +*.bin binary +*.png binary +*.exe binary +*.dll binary +*.zip binary +*.jar binary +*.7z binary +*.db binary diff --git a/.gitignore b/.gitignore index ff007088..47becfaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,15 @@ -/bin -/build -/download +#eclipse +.project +.classpath +.metadata +bin + +#idea +*.iml +.idea +out + +#gradle +build +.gradle + diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..70198168 --- /dev/null +++ b/build.gradle @@ -0,0 +1,217 @@ +// DONT TOUCH THE BUILDSCTPT[] BLOCK +// its special, and it is only there to make forgegradle work correctly. + +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.1-SNAPSHOT' + } +} + +apply plugin: 'forge' // adds the forge cuntionality +apply plugin: 'maven' // for uploading to a mnven repo + +// grab buildNumber +ext.buildnumber = 0 // this will be referenced as simply project.buildnumber from now on. + +if (System.env.hasProperty('buildnumber')) + project.buildnumber = System.getenv().BUILD_NUMBER +else + logger.lifecycle "SETTING BUILDNUMBER TO 0" + +version = "5.0.0" +group= "com.mod-buildcraft" +archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] + +minecraft { + version = "1.7.2-10.12.0.1029" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. + + assetDir = "run/assets" // the palce for FOrgegradle to download the assets. The assets that the launcher gets and stuff + + // replacing stuff in the source + replace '@VERSION@', project.version + replace '@MC_VERSION@', version + replace '@BUILD_NUMBER@', project.buildnumber +} + +// configure the source folders +sourceSets { + main { + java { + srcDir 'common/buildcraft' + // exclude 'some exclusion' + // include 'some inclusion' + } + resources { + srcDir 'buildcraft_resources' + // exclude 'some exclusion' + // include 'some inclusion' + + } + } +} + +processResources +{ + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + // ${version} and ${mcversion} are the exact strings bieng replaced + expand 'version':project.version, 'mcversion':project.minecraft.version, 'buildnumber':project.buildnumber + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + + // the localization repo... this wont crash if the localization folder does not exist + from('../BuildCraft-Localization/lang/buildcraft') { + into 'build/resources/main/assets/buildcraft/lang' + } +} + +// -------------------- +// extra jar section +// ------------------- + +// for the benfit of the jars, we will now now add the buildnumber to the jars +project.version += '.' + project.buildnumber + +// add a source jar +task sourceJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'sources' +} + +// add a javadoc jar +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from 'build/docs/javadoc' +} + +// because the normal output has been made to be obfuscated +task deobfJar(type: Jar) { + from sourceSets.main.output + classifier = 'dev' +} + +// make sure all of these happen when we run build +build.dependsOn sourceJar, javadocJar, deobfJar + +// -------------------- +// maven section +// ------------------- + +// create the deployerJars dependency configuration +configurations { + deployerJars +} + +dependencies { + // dependency in deployerJars, for maven deployment. see definition in mavenDeployer{} below + deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" +} + +// specify artifacts to be uploaded +artifacts { + // the default jar is already here by defualt + archives sourceJar + archives javadocJar + archives deobfJar +} + +uploadArchives { + // make sure this happens after reobfuscation + dependsOn 'reobf' + + repositories { + if (project.hasProperty("filesmaven")) { // if this is the Forge server, and this stuff is defined... + logger.info('Publishing to files server') + + mavenDeployer { + // specify the jars that maven needs to deploy here + configuration = configurations.deployerJars + + // authentication, again, specially set in the forge server environment + repository(url: project.filesmaven.url) { + authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key) + } + + // here you specify all your metadata + // this is the definition of the maven pom.xml. This is simply a DSL to define the XML. Not actual fields or things to set. + pom { + groupId = project.group + version = project.version + '.' + project.buildnumber + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'A Minecraft mod adding all sourts of machinery' + url 'http://www.mod-buildcraft.com/' + + scm { + url 'https://github.com/BuildCraft/BuildCraft' + connection 'scm:git:git://github.com/BuildCraft/BuildCraft.git' + developerConnection 'scm:git:git@github.com:BuildCraft/BuildCraft.git' + } + + issueManagement { + system 'github' + url 'https://github.com/BuildCraft/BuildCraft/issues' + } + + licenses { + license { + name 'Minecraft Mod Public License' + url 'http://www.mod-buildcraft.com/MMPL-1.0.txt' + distribution 'repo' + } + } + + developers { + developer { + id 'SpaceToad' + name 'SpaceToad' + roles { role 'developer' } + } + developer { + id 'CovertJaguar' + name 'CovertJaguar' + roles { role 'developer' } + } + developer { + id 'SirSngir' + name 'SirSengir' + roles { role 'developer' } + } + developer { + id 'Krapht' + name 'Krapht' + roles { role 'developer' } + } + + } + } + } + } + } + else + { + // otherwise publishing to the local repo in ~/.m2 is fine... + add project.repositories.mavenLocal() + } + } +} diff --git a/buildcraft_resources/mcmod.info b/buildcraft_resources/mcmod.info index 2ded18c1..049c51ff 100644 --- a/buildcraft_resources/mcmod.info +++ b/buildcraft_resources/mcmod.info @@ -2,8 +2,8 @@ { "modid": "BuildCraft|Core", "name": "BuildCraft", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more!", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", @@ -19,8 +19,8 @@ { "modid": "BuildCraft|Builders", "name": "BC Builders", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Builders Component)", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", @@ -36,8 +36,8 @@ { "modid": "BuildCraft|Energy", "name": "BC Energy", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Energy Component)", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", @@ -53,8 +53,8 @@ { "modid": "BuildCraft|Factory", "name": "BC Factory", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Factory Component)", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", @@ -70,8 +70,8 @@ { "modid": "BuildCraft|Silicon", "name": "BC Silicon", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Silicon Component)", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", @@ -87,8 +87,8 @@ { "modid": "BuildCraft|Transport", "name": "BC Transport", - "version": "@VERSION@", - "mcversion": "@MC_VERSION@", + "version": "$version", + "mcversion": "$mcversion", "description": "Extending Minecraft with pipes, auto-crafting, quarries, engines and much more! (Transport Component)", "credits": "Created by SpaceToad", "logoFile": "assets/buildcraft/logo.png", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..3c7abdf1 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..99044556 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Feb 16 13:39:47 CST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.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..aec99730 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega