diff --git a/build.gradle b/build.gradle index 187c072fe..ee72ae275 100644 --- a/build.gradle +++ b/build.gradle @@ -3,18 +3,55 @@ buildscript { mavenCentral() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" + url = "https://files.minecraftforge.net/maven" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + // classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'maven' + + +// apply plugin: 'com.matthewprenger.cursegradle' +ext.configFile = file('build.properties') +ext.config = parseConfig(configFile) +ext.priv = parseConfig(file('private.properties')) + +version = "${config.version}-${config.build_number}" +group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = config.mod_name + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' + +minecraft { + mappings channel: 'snapshot', version: '20180921-1.13' + runs { + client = { + properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' + properties 'forge.logging.console.level': 'debug' + workingDirectory project.file('run').canonicalPath + source sourceSets.main + } + server = { + properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' + properties 'forge.logging.console.level': 'debug' + workingDirectory project.file('run').canonicalPath + source sourceSets.main + } + } + // replace 'GRADLE:BUILD', config.build_number + // replace 'GRADLE:VERSION', config.version + + // replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. +} + +dependencies { + minecraft 'net.minecraftforge.test:forge:1.13-24.0.150-1.13-pre' +} repositories { mavenCentral() @@ -34,39 +71,11 @@ repositories { } } -apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.matthewprenger.cursegradle' -apply plugin: 'maven' - -ext.configFile = file('build.properties') - -ext.config = parseConfig(configFile) -ext.priv = parseConfig(file('private.properties')) - -version = "${config.version}-${config.build_number}" -group = "vazkii.botania" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = config.mod_name - if (System.getenv().BUILD_NUMBER != null) { //adds the build number to the end of the version string if on a build server version += ".${System.getenv().BUILD_NUMBER}" } -minecraft { - version = "${config.mc_version}-${config.forge_version}" - runDir = "eclipse/assets" - - mappings = config.mc_mappings - //This, does the token replacement. - //Though, I reccomend this to be replaced with a token such as @VERSION@ - replace 'GRADLE:BUILD', config.build_number - replace 'GRADLE:VERSION', config.version - - replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. - useDepAts = true - makeObfSourceJar = false -} - //This here is for SCP configurations { sshAntTask @@ -76,7 +85,13 @@ configurations { jar { manifest { - attributes 'FMLAT': 'botania_at.cfg' + attributes(["Specification-Title": "botania", + "Specification-Vendor": "botania", + "Specification-Version": "24.0", + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor": "botania", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) } //rename the default output, for some better... sanity with scipts @@ -88,38 +103,15 @@ jar { } dependencies { - deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" - deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" - deobfCompile "mezz.jei:jei_1.12.2:4.13.1.220" - deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" + //deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" + //deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" + //deobfCompile "mezz.jei:jei_1.12.2:4.13.1.220" + //deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" } -compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -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' - } -} - task deobfJar(type: Jar) { from(sourceSets.main.output) archiveName = "${baseName} ${version}-deobf.${extension}" @@ -240,6 +232,7 @@ def parseConfig(File config) { } } +/* curseforge { if(priv == null){ return @@ -259,6 +252,7 @@ curseforge { } } } +*/ uploadArchives { repositories { @@ -267,6 +261,6 @@ uploadArchives { } } } -tasks.uploadArchives.dependsOn reobfJar +// tasks.uploadArchives.dependsOn reobfJar defaultTasks 'clean', 'build', 'sortArtifacts', 'incrementBuildNumber', 'upload' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a95168..7a3265ee9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25143337a..949819d28 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Thu Jan 03 14:54:29 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index f9553162f..e95643d6a --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,84 @@ -@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 - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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= - -@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 Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_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=%* - -: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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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