This repository has been archived by the owner on Jun 18, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged release/0.0.1-gamma into master
- Loading branch information
Showing
38 changed files
with
841 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,3 +20,4 @@ build | |
| # other | ||
| eclipse | ||
| run | ||
| desktop.ini | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,78 +1,78 @@ | ||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| maven { url = "http://files.minecraftforge.net/maven" } | ||
| } | ||
| dependencies { | ||
| classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' | ||
| } | ||
| } | ||
| apply plugin: 'net.minecraftforge.gradle.forge' | ||
| //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup. | ||
|
|
||
|
|
||
| version = "1.0" | ||
| group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = "modid" | ||
|
|
||
| sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly. | ||
| compileJava { | ||
| sourceCompatibility = targetCompatibility = "1.6" | ||
| } | ||
|
|
||
| minecraft { | ||
| version = "1.10.2-12.18.2.2099" | ||
| runDir = "run" | ||
|
|
||
| // the mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD snapshot are built nightly. | ||
| // stable_# stables are built at the discretion of the MCP team. | ||
| // Use non-default mappings at your own risk. they may not allways work. | ||
| // simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings = "snapshot_20160518" | ||
| // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
| } | ||
|
|
||
| dependencies { | ||
| // you may put jars on which you depend on in ./libs | ||
| // or you may define them like so.. | ||
| //compile "some.group:artifact:version:classifier" | ||
| //compile "some.group:artifact:version" | ||
|
|
||
| // real examples | ||
| //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, | ||
| // except that these dependencies get remapped to your current MCP mappings | ||
| //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
| //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // for more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
|
||
| } | ||
|
|
||
| processResources | ||
| { | ||
| // this will ensure that this task is redone when the versions change. | ||
| inputs.property "version", project.version | ||
| inputs.property "mcversion", project.minecraft.version | ||
|
|
||
| // 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' | ||
| } | ||
| } | ||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| maven { url = "http://files.minecraftforge.net/maven" } | ||
| } | ||
| dependencies { | ||
| classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' | ||
| } | ||
| } | ||
| apply plugin: 'net.minecraftforge.gradle.forge' | ||
| //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup. | ||
|
|
||
|
|
||
| version = "1.0" | ||
| group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html | ||
| archivesBaseName = "modid" | ||
|
|
||
| sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly. | ||
| compileJava { | ||
| sourceCompatibility = targetCompatibility = "1.6" | ||
| } | ||
|
|
||
| minecraft { | ||
| version = "1.10.2-12.18.2.2099" | ||
| runDir = "run" | ||
|
|
||
| // the mappings can be changed at any time, and must be in the following format. | ||
| // snapshot_YYYYMMDD snapshot are built nightly. | ||
| // stable_# stables are built at the discretion of the MCP team. | ||
| // Use non-default mappings at your own risk. they may not allways work. | ||
| // simply re-run your setup task after changing the mappings to update your workspace. | ||
| mappings = "snapshot_20160518" | ||
| // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. | ||
| } | ||
|
|
||
| dependencies { | ||
| // you may put jars on which you depend on in ./libs | ||
| // or you may define them like so.. | ||
| //compile "some.group:artifact:version:classifier" | ||
| //compile "some.group:artifact:version" | ||
|
|
||
| // real examples | ||
| //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env | ||
| //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env | ||
|
|
||
| // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. | ||
| //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, | ||
| // except that these dependencies get remapped to your current MCP mappings | ||
| //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
| //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' | ||
|
|
||
| // for more info... | ||
| // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html | ||
| // http://www.gradle.org/docs/current/userguide/dependency_management.html | ||
|
|
||
| } | ||
|
|
||
| processResources | ||
| { | ||
| // this will ensure that this task is redone when the versions change. | ||
| inputs.property "version", project.version | ||
| inputs.property "mcversion", project.minecraft.version | ||
|
|
||
| // 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' | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Changelog: | ||
| Changelog: | ||
| Build 2099: | ||
| LexManos: | ||
| Revert commits related to filtering proxy and Automatic Subscriber | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +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 | ||
| @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 |
Oops, something went wrong.