diff --git a/.gitignore b/.gitignore index 5c737ddfa..f99fd0df2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,14 @@ /.gradle #occupational hazards -/eclipse/ +/projects/ /repo/ /buildSrc #Patch rejects *.rej /patches-/ + # FML changelog changelog.txt /patches_old/ diff --git a/build.gradle b/build.gradle index 14c572359..f77c1c76d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,6 @@ buildscript { repositories { - maven { - name = "central_mirrior" - url = "http://uk.maven.org/maven2" - } mavenCentral() - mavenLocal() maven { name = "forge" url = "http://files.minecraftforge.net/maven" @@ -16,71 +11,184 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' } } -configurations { - deployJars -} - -import static net.minecraftforge.gradle.dev.ForgeDevPlugin.* - -apply plugin: 'maven' -apply plugin: 'forgedev' - -repositories { - maven { - name = "central_mirrior" - url = "http://uk.maven.org/maven2" - } - mavenLocal() - flatDir { - name "fileRepo" - dirs "repo" - } -} +apply plugin: "maven" +apply plugin: "net.minecraftforge.gradle.patcher" +apply plugin: "net.minecraftforge.gradle.launch4j" minecraft { - version = '1.8' - mcpVersion = '9.10' - mappings = 'snapshot_nodoc_20141130' - fmlDir = projectDir.getAbsolutePath() + "/fml"; - mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper' - tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker' + version = "1.8" + //mappings = 'stable_16' + mappings = "snapshot_nodoc_20141130" + workspaceDir = "projects" + versionJson = "fml/jsons/1.8-dev.json" + buildUserdev = true + buildInstaller = true installerVersion = "1.4" + + def common = { + patchPrefixOriginal "../src-base/minecraft" + patchPrefixChanged "../src-work/minecraft" + mainClassClient "net.minecraft.launchwrapper.Launch" + tweakClassClient "net.minecraftforge.fml.common.launcher.FMLTweaker" + mainClassServer "net.minecraft.launchwrapper.Launch" + tweakClassServer "net.minecraftforge.fml.common.launcher.FMLServerTweaker" + } + + projects { + fml { + rootDir 'fml' + patchDir "fml/patches/minecraft" + patchAfter "clean" + genPatchesFrom "clean" + + with common + } + forge { + rootDir "." + patchDir "patches/minecraft" + patchAfter "fml" + genPatchesFrom "fml" + + with common + } + } } group = 'net.minecraftforge' -version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java') +version = getVersionFromJava(file("src/main/java/net/minecraftforge/common/ForgeVersion.java")) -jenkins { - job = 'minecraftforge' +extractFmlSources { exclude "**/SideOnly.java", "**/Side.java" } + +genGradleProjects { addTestCompileDep "junit:junit:4.12" } + +processJson { + releaseJson = "fml/jsons/1.8-rel.json" + addReplacements([ + "@minecraft_version@": project.minecraft.version, + "@version@": project.version, + "@project@": "forge", + "@artifact@": "net.minecraftforge:forge:${project.version}", + "@universal_jar@": { outputJar.archiveName }, + "@timestamp@": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + ]) } -// crowdin stuff -if (project.hasProperty("crowdinKey")) - tasks.getLocalizations.apiKey = project.crowdinKey +task changelog(type: JenkinsChangelog) { + // skip if there is no forge jenkins pass + onlyIf { project.hasProperty('forgeJenkinsPass') } + + outputs.upToDateWhen { false } // never up to date + serverRoot = "http://ci.jenkins.minecraftforge.net/" + jobName = "minecraftforge" + targetBuild = System.env['BUILD_NUMBER'] ?: 0; + authName = "console_script" + authPassword = project.hasProperty('forgeJenkinsPass') ? project.getProperty('forgeJenkinsPass') : ""; + output = "build/distributions/${project.name}-${project.version}-changelog.txt" +} + +task crowdin(type: CrowdinDownload) { + output = "build/crowdin.zip" + projectId = 'minecraft-forge' + extract = false // we wanna keep it as a zip. not extract it to a folder named "crowdin.zip" + + // task auomatically skips if this is null + if (project.hasProperty('crowdinKey')) + apiKey = project.crowdinKey +} + +def extraTxts = [ + changelog, // yeah we can do thi, because gradle and groovy are awesome + "fml/LICENSE-fml.txt", + "fml/CREDITS-fml.txt", + "MinecraftForge-Credits.txt", + "MinecraftForge-License.txt", + "Paulscode SoundSystem CodecIBXM License.txt", + "Paulscode IBXM Library License.txt" +] + +outputJar { + classifier = 'universal' + from extraTxts + + // add crowdin locales + from { crowdin.getDidWork() ? zipTree(crowdin) : null} + dependsOn 'crowdin' + + manifest.attributes([ + "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper", + "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker", + "Class-Path": getServerClasspath(file("fml/jsons/1.8-rel.json")) + ]) +} + +installer { + classifier = 'installer' + from extraTxts + from "src/main/resources/forge_logo.png" + rename "forge_logo\\.png", "big_logo.png" +} + +task signUniversal(type: SignJar, dependsOn: 'outputJar') { + onlyIf { + project.hasProperty('jarsigner') + } + + def jarsigner = [:]; + + if (project.hasProperty('jarsigner')) + jarsigner = project.jarsigner; + + alias = 'forge' + exclude "paulscode/**" + storePass = jarsigner.storepass + keyPass = jarsigner.keypass + keyStore = jarsigner.keystore + inputFile = outputJar.archivePath + outputFile = outputJar.archivePath +} +uploadArchives.dependsOn signUniversal +build.dependsOn signUniversal + +// launch4j launch4j { + jar = installer.archivePath.canonicalPath + outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath + icon = file('icon.ico').canonicalPath + manifest = file('l4jManifest.xml').canonicalPath jreMinVersion = '1.6.0' + initialHeapPercent = 5; + maxHeapPercent = 100; +} +tasks.generateXmlConfig.dependsOn installer +tasks.build.dependsOn 'launch4j' + +// MAVEN + +artifacts { + archives changelog.output + archives file("build/distributions/${project.name}-${project.version}-installer-win.exe") } uploadArchives { - repositories { - add getProject().repositories.mavenLocal() - } repositories.mavenDeployer { - configuration = configurations.deployJars - if (project.hasProperty("filesmaven")) { - logger.info('Publishing to files server') - repository(url: project.filesmaven.url) { - authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key) + dependsOn 'build' + + if (project.hasProperty('forgeMavenPass')) + { + repository(url: "http://files.minecraftforge.net/maven/manage/upload") { + authentication(userName: "forge", project.getProperty('forgeMavenPass')) // the elvis operator. look it up. } - } else { - logger.info('Publishing to repo folder') + } + else + { + // local repo folder. Might wanna juset use gradle install if you wanans end it to maven-local repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath()) } @@ -88,49 +196,120 @@ uploadArchives { groupId = project.group version = project.version artifactId = project.archivesBaseName - } - pom.project { - name project.archivesBaseName - packaging 'jar' - description 'Minecraft Forge API' - url 'https://github.com/MinecraftForge/MinecraftForge' - - scm { + project { + name project.archivesBaseName + packaging 'jar' + description 'Minecraft Forge API' url 'https://github.com/MinecraftForge/MinecraftForge' - connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git' - developerConnection 'scm:git:git@github.com:MinecraftForge/MinecraftForge.git' - } - issueManagement { - system 'github' - url 'https://github.com/MinecraftForge/MinecraftForge/issues' - } + scm { + url 'https://github.com/MinecraftForge/MinecraftForge' + connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git' + developerConnection 'scm:git:git@github.com:MinecraftForge/MinecraftForge.git' + } - licenses { - license { - name 'Forge Public License' - url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt' - distribution 'repo' + issueManagement { + system 'github' + url 'https://github.com/MinecraftForge/MinecraftForge/issues' } - } - developers { - developer { - id 'cpw' - name 'cpw' - roles { role 'developer' } + licenses { + license { + name 'Forge Public License' + url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt' + distribution 'repo' + } } - developer { - id 'LexManos' - name 'Lex Manos' - roles { role 'developer' } - } - developer { - id 'AbrarSyed' - name 'Abrar Syed' - roles { role 'contributor' } + + developers { + developer { + id 'cpw' + name 'cpw' + roles { role 'developer' } + } + developer { + id 'LexManos' + name 'Lex Manos' + roles { role 'developer' } + } + developer { + id 'AbrarSyed' + name 'Abrar Syed' + roles { role 'contributor' } + } } } } } } + +// HELPER METHODS + +import groovy.json.JsonSlurper; + +String getServerClasspath(File file) +{ + def node = new JsonSlurper().parse(file); + def out = new StringBuilder() + node.versionInfo.libraries.each { lib -> + if (lib.serverreq) + { + // group : artifact : version + def split = lib.name.split(':') + def group = split[0].replace('.', '/') + def artifact = split[1] + def version = split[2] + out += "libraries/$group/$artifact/$version/$artifact-${version}.jar " + } + } + out += "minecraft_server.${minecraft.version}.jar" + + return out.toString(); +} + +String getVersionFromJava(File file) +{ + String major = "0"; + String minor = "0"; + String revision = "0"; + String build = "0"; + + String prefix = "public static final int"; + file.eachLine{ String s -> + s = s.trim(); + if (s.startsWith(prefix)) + { + s = s.substring(prefix.length(), s.length() - 1); + s = s.replace('=', ' ').replace("Version", "").replaceAll(" +", " ").trim(); + String[] pts = s.split(" "); + + if (pts[0].equals("major")) major = pts[pts.length - 1]; + else if (pts[0] == "minor") minor = pts[pts.length - 1]; + else if (pts[0] == "revision") revision = pts[pts.length - 1]; + } + } + + if (System.getenv().containsKey("BUILD_NUMBER")) + { + build = System.getenv("BUILD_NUMBER"); + } + + String branch = null; + if (!System.getenv().containsKey("GIT_BRANCH")) + { + // TODO: use grgit + branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim() + } + else + { + branch = System.getenv("GIT_BRANCH"); + branch = branch.substring(branch.lastIndexOf('/') + 1); + } + + def out = "${minecraft.version.replace('-', '_')}-$major.$minor.$revision.$build" + + if (branch && branch != 'master' && branch != 'HEAD') + out += "-$branch" + + return out; +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..b5166dad4 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 000000000..7822bea01 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat May 16 19:56:41 CDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..91a7e269e --- /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 000000000..8a0b282aa --- /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/icon.ico b/icon.ico new file mode 100644 index 000000000..f47d8ec3e Binary files /dev/null and b/icon.ico differ diff --git a/l4jManifest.xml b/l4jManifest.xml new file mode 100644 index 000000000..a57d63e79 --- /dev/null +++ b/l4jManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +