diff --git a/.github/scripts/test-no-crash-reports.sh b/.github/scripts/test-no-crash-reports.sh new file mode 100644 index 0000000..c67e342 --- /dev/null +++ b/.github/scripts/test-no-crash-reports.sh @@ -0,0 +1,9 @@ +directory="run/crash-reports" +if [ -d $directory ]; then + echo "Crash reports detected:" + cat $directory/* + exit 1 +else + echo "No crash reports detected" + exit 0 +fi diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 index 0000000..a60a2b6 --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,45 @@ +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Build and test + +on: + pull_request: + branches: [ master, main ] + push: + branches: [ master, main ] + +jobs: + build-and-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup the workspace + run: ./gradlew setupCIWorkspace + + - name: Build the mod + run: ./gradlew build + + - name: Run server for 1 minute + run: | + mkdir run + echo "eula=true" > run/eula.txt + timeout 60 ./gradlew runServer || true + + - name: Test no crashes happend + run: | + chmod +x .github/scripts/test-no-crash-reports.sh + .github/scripts/test-no-crash-reports.sh diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml new file mode 100644 index 0000000..25c354b --- /dev/null +++ b/.github/workflows/release-tags.yml @@ -0,0 +1,45 @@ +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Release tagged build + +on: + push: + tags: + - '*' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set release version + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Setup the workspace + run: ./gradlew setupCIWorkspace + + - name: Build the mod + run: ./gradlew build + + - name: Release under current tag + uses: "marvinpinto/action-automatic-releases@latest" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "${{ env.RELEASE_VERSION }}" + prerelease: false + title: "${{ env.RELEASE_VERSION }}" + files: build/libs/*.jar diff --git a/.gitignore b/.gitignore index a907b14..558ad12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,140 +1,28 @@ -# Ignore All -/* - -# Except: - -# Source files & libraries -!/buildSrc -/buildSrc/* -!/buildSrc/src/ - -!/MineTweaker3-API -/MineTweaker3-API/* -!/MineTweaker3-API/src - -!/MineTweaker3-MC1112-Main -/MineTweaker3-MC1112-Main/* -!/MineTweaker3-MC1112-Main/src -!/MineTweaker3-MC1112-Main/build.gradle -/MineTweaker3-MC1112-Main/bin - -!/MineTweaker3-MC1112-Mod-JEI -/MineTweaker3-MC1112-Mod-JEI/* -!/MineTweaker3-MC1112-Mod-JEI/src -!/MineTweaker3-MC1112-Mod-JEI/libs -!/MineTweaker3-MC1112-Mod-JEI/build.gradle - -!/MineTweaker3-MC1102-Main -/MineTweaker3-MC1102-Main/* -!/MineTweaker3-MC1102-Main/src -!/MineTweaker3-MC1102-Main/build.gradle -/MineTweaker3-MC1102-Main/bin - -!/MineTweaker3-MC1102-Mod-JEI -/MineTweaker3-MC1102-Mod-JEI/* -!/MineTweaker3-MC1102-Mod-JEI/src -!/MineTweaker3-MC1102-Mod-JEI/libs -!/MineTweaker3-MC1102-Mod-JEI/build.gradle - -!/MineTweaker3-MC19-Main -/MineTweaker3-MC19-Main/* -!/MineTweaker3-MC19-Main/src -!/MineTweaker3-MC19-Main/build.gradle -/MineTweaker3-MC19-Main/bin - -!/MineTweaker3-MC19-Mod-JEI -/MineTweaker3-MC19-Mod-JEI/* -!/MineTweaker3-MC19-Mod-JEI/src -!/MineTweaker3-MC19-Mod-JEI/libs -!/MineTweaker3-MC19-Mod-JEI/build.gradle - -!/MineTweaker3-MC18-Main -/MineTweaker3-MC18-Main/* -!/MineTweaker3-MC18-Main/src -!/MineTweaker3-MC18-Main/build.gradle -/MineTweaker3-MC18-Main/bin - -!/MineTweaker3-MC18-Mod-JEI -/MineTweaker3-MC18-Mod-JEI/* -!/MineTweaker3-MC18-Mod-JEI/src -!/MineTweaker3-MC18-Mod-JEI/libs -!/MineTweaker3-MC18-Mod-JEI/build.gradle - - -!/MineTweaker3-MC1710-Main -/MineTweaker3-MC1710-Main/* -!/MineTweaker3-MC1710-Main/src -/MineTweaker3-MC1710-Main/bin -!/MineTweaker3-MC1710-Main/build.gradle - - -!/MineTweaker3-MC1710-Mod-Buildcraft -/MineTweaker3-MC1710-Mod-Buildcraft/* -!/MineTweaker3-MC1710-Mod-Buildcraft/src -!/MineTweaker3-MC1710-Mod-Buildcraft/libs -!/MineTweaker3-MC1710-Mod-Buildcraft/build.gradle - - -!/MineTweaker3-MC1710-Mod-Buildcraft61 -/MineTweaker3-MC1710-Mod-Buildcraft61/* -!/MineTweaker3-MC1710-Mod-Buildcraft61/src -!/MineTweaker3-MC1710-Mod-Buildcraft61/libs -!/MineTweaker3-MC1710-Mod-Buildcraft61/build.gradle - -!/MineTweaker3-MC1710-Mod-IC2 -/MineTweaker3-MC1710-Mod-IC2/* -!/MineTweaker3-MC1710-Mod-IC2/src -!/MineTweaker3-MC1710-Mod-IC2/libs -!/MineTweaker3-MC1710-Mod-IC2/build.gradle - -!/MineTweaker3-MC1102-Mod-IC2 -/MineTweaker3-MC1102-Mod-IC2/* -!/MineTweaker3-MC1102-Mod-IC2/src -!/MineTweaker3-MC1102-Mod-IC2/libs -!/MineTweaker3-MC1102-Mod-IC2/build.gradle - -!/MineTweaker3-MC1710-Mod-MFR -/MineTweaker3-MC1710-Mod-MFR/* -!/MineTweaker3-MC1710-Mod-MFR/src -!/MineTweaker3-MC1710-Mod-MFR/libs -!/MineTweaker3-MC1710-Mod-MFR/build.gradle - - -!/MineTweaker3-MC1710-Mod-NEI -/MineTweaker3-MC1710-Mod-NEI/* -!/MineTweaker3-MC1710-Mod-NEI/src -!/MineTweaker3-MC1710-Mod-NEI/libs -!/MineTweaker3-MC1710-Mod-NEI/build.gradle - - -!/ZenScript -/ZenScript/* -!/ZenScript/src - -!/MineTweaker3-Web - -# gradle -!/build.gradle -!/build.properties -!/settings.gradle -!/common.gradle -!/gradle.properties -!/gradlew* -!/gradle - -MineTweaker3-Web/doc - -# github -!/.gitignore -!/README.md - -# unwanted os-generated files -nbproject/ -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db -*~ +.gradle +.settings +/.idea/ +/run/ +/build/ +/eclipse/ +.classpath +.project +/bin/ +/config/ +/crash-reports/ +/logs/ +options.txt +/saves/ +usernamecache.json +banned-ips.json +banned-players.json +eula.txt +ops.json +server.properties +servers.dat +usercache.json +whitelist.json +/out/ +*.iml +*.ipr +*.iws +src/main/resources/mixins.*.json diff --git a/.gitmodules b/.gitmodules index f546270..6dfe95c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ZenScript"] path = ZenScript - url = https://github.com/CraftTweaker/ZenScript.git + url = https://github.com/GTNewHorizons/ZenScript.git diff --git a/.nb-gradle-properties b/.nb-gradle-properties deleted file mode 100644 index eecdb26..0000000 --- a/.nb-gradle-properties +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - debug - no - - runClient - - - - -Xdebug - - - - run - no - - runClient - - - - -Dfml.coreMods.load=minetweaker.mc172.transformer.MineTweakerTransformer - - - - run.single - no - - ${project}:runClient - - - - - - diff --git a/addon.gradle b/addon.gradle new file mode 100644 index 0000000..8582877 --- /dev/null +++ b/addon.gradle @@ -0,0 +1,17 @@ +sourceSets.main { + java.srcDir("ZenScript/src/main/java") +} + +task initZenScript(type: Exec) { + description = "Updates (and inits) git submodules" + group = "Build Setup" + commandLine("git", "submodule", "update", "--init", "--recursive", "--remote") + + // Checkout a specific commit. Otherwise the build will fail! + commandLine("git", "--git-dir=\"ZenScript/.git\"", "checkout", "e7144825") +} + +tasks.setupCIWorkspace.dependsOn initZenScript +tasks.setupDevWorkspace.dependsOn initZenScript +tasks.setupDecompWorkspace.dependsOn initZenScript +tasks.compileJava.dependsOn initZenScript diff --git a/build.gradle b/build.gradle index cec462e..18fedd3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,117 +1,529 @@ +//version: 928ecf7feb33a1149538b0e2cd17e3bc5f281428 +/* +DO NOT CHANGE THIS FILE! + +Also, you may replace this file at any time if there is an update available. +Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates. + */ + + +import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +import java.util.concurrent.TimeUnit + buildscript { repositories { - mavenCentral() - jcenter() - maven { - name = "gt" - url = "https://gregtech.overminddl1.com/" - } maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net" } maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { + name = "Scala CI dependencies" + url = "https://repo1.maven.org/maven2/" + } maven { name = "jitpack" url = "https://jitpack.io" } } dependencies { - classpath "com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT" + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4' } } -apply plugin: 'base' // To add "clean" task to the root project. -apply from: 'configuration.gradle' -apply plugin: "maven" - -subprojects { - apply from: rootProject.file('common.gradle') - apply plugin: 'eclipse' +plugins { + id 'idea' + id 'scala' + id("org.ajoberstar.grgit") version("3.1.1") + id("com.github.johnrengelman.shadow") version("4.0.4") + id("com.palantir.git-version") version("0.12.3") } + +apply plugin: 'forge' + +def projectJavaVersion = JavaLanguageVersion.of(8) + +java { + toolchain { + languageVersion.set(projectJavaVersion) + } +} + +idea { + module { + inheritOutputDirs = true + downloadJavadoc = true + downloadSources = true + } +} + +if(JavaVersion.current() != JavaVersion.VERSION_1_8) { + throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) +} + +checkPropertyExists("modName") +checkPropertyExists("modId") +checkPropertyExists("modGroup") +checkPropertyExists("autoUpdateBuildScript") +checkPropertyExists("minecraftVersion") +checkPropertyExists("forgeVersion") +checkPropertyExists("replaceGradleTokenInFile") +checkPropertyExists("gradleTokenModId") +checkPropertyExists("gradleTokenModName") +checkPropertyExists("gradleTokenVersion") +checkPropertyExists("gradleTokenGroupName") +checkPropertyExists("apiPackage") +checkPropertyExists("accessTransformersFile") +checkPropertyExists("usesMixins") +checkPropertyExists("mixinPlugin") +checkPropertyExists("mixinsPackage") +checkPropertyExists("coreModClass") +checkPropertyExists("containsMixinsAndOrCoreModOnly") +checkPropertyExists("usesShadowedDependencies") +checkPropertyExists("developmentEnvironmentUserName") + + +String javaSourceDir = "src/main/java/" +String scalaSourceDir = "src/main/scala/" + +String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") +String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") +if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala) +} + +if(apiPackage) { + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) + } +} + +if(accessTransformersFile) { + String targetFile = "src/main/resources/META-INF/" + accessTransformersFile + if(getFile(targetFile).exists() == false) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + } +} + +if(usesMixins.toBoolean()) { + if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) { + throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") + } + + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) + } + + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" + String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" + if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) { + throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava) + } +} + +if(coreModClass) { + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" + String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" + if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) { + throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava) + } +} + +configurations.all { + resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) + + // Make sure GregTech build won't time out + System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String) + System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String) +} + +// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version +'git config core.fileMode false'.execute() +// Pulls version from git tag +try { + version = minecraftVersion + "-" + gitVersion() +} +catch (Exception e) { + throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!"); +} + +group = modGroup +if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { + archivesBaseName = customArchiveBaseName +} +else { + archivesBaseName = modId +} + +minecraft { + version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion + runDir = "run" + + if (replaceGradleTokenInFile) { + replaceIn replaceGradleTokenInFile + if(gradleTokenModId) { + replace gradleTokenModId, modId + } + if(gradleTokenModName) { + replace gradleTokenModName, modName + } + if(gradleTokenVersion) { + replace gradleTokenVersion, versionDetails().lastTag + } + if(gradleTokenGroupName) { + replace gradleTokenGroupName, modGroup + } + } +} + +if(file("addon.gradle").exists()) { + apply from: "addon.gradle" +} + +apply from: 'repositories.gradle' + +configurations { + implementation.extendsFrom(shadowImplementation) +} + repositories { - mavenLocal() - mavenCentral() - /*maven { - name "Tesla" - url 'http://maven.epoxide.xyz' - } maven { - name 'Mobius' - url 'http://mobiusstrip.eu/maven' + name = "Overmind forge repo mirror" + url = "https://gregtech.overminddl1.com/" + } + if(usesMixins.toBoolean()) { + maven { + name = "sponge" + url = "https://repo.spongepowered.org/repository/maven-public" + } + maven { + url = "https://jitpack.io" + } } - maven { - name 'JEI' - url "http://dvs1.progwml6.com/files/maven" - } unused */ -} -configurations { - deployerJars } + dependencies { - deployerJars 'org.apache.maven.wagon:wagon-ftp:2.2' + if(usesMixins.toBoolean()) { + annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3") + annotationProcessor("com.google.guava:guava:24.1.1-jre") + annotationProcessor("com.google.code.gson:gson:2.8.6") + annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT") + // using 0.8 to workaround a issue in 0.7 which fails mixin application + compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") { + // Mixin includes a lot of dependencies that are too up-to-date + exclude module: "launchwrapper" + exclude module: "guava" + exclude module: "gson" + exclude module: "commons-io" + exclude module: "log4j-core" + } + compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev") + } } -subprojects.each { subproject -> evaluationDependsOn( subproject.path ) } +apply from: 'dependencies.gradle' -task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" }) {} +def mixingConfigRefMap = "mixins." + modId + ".refmap.json" +def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap +def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" -task setupCIWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupCIWorkspace" }) {} - -task assembleMC1710(type: Jar, dependsOn: [\ - ':ZenScript:build', - ':MineTweaker3-API:build'] - + projects1710.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-1.7.10-${mineTweakerVersion}-legacy.jar" - - from zipTree(project(":ZenScript").jar.archivePath) - from zipTree(project(':MineTweaker3-API').jar.archivePath) - - for (p in projects1710) { - from zipTree(project(p).jar.archivePath) - } +task generateAssets { + if(usesMixins.toBoolean()) { + getFile("/src/main/resources/mixins." + modId + ".json").text = """{ + "required": true, + "minVersion": "0.7.11", + "package": "${modGroup}.${mixinsPackage}", + "plugin": "${modGroup}.${mixinPlugin}", + "refmap": "${mixingConfigRefMap}", + "target": "@env(DEFAULT)", + "compatibilityLevel": "JAVA_8" } -task assembleDevBase1710(type: Jar, dependsOn: [ - ':ZenScript:build', - ':MineTweaker3-API:build', - ':MineTweaker3-MC1710-Main:build']) { - archiveName="CraftTweaker-Dev-1.7.10-${mineTweakerVersion}-legacy.jar" - - from project(':ZenScript').sourceSets.main.output - from project(':MineTweaker3-API').sourceSets.main.output - from project(':MineTweaker3-MC1710-Main').sourceSets.main.output +""" + } } -task assembleDevFull1710(type: Jar, dependsOn: [ - ':ZenScript:build', - ':MineTweaker3-API:build'] - + projects1710.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Dev-Full-1.7.10-${mineTweakerVersion}-legacy.jar" - - from project(':ZenScript').sourceSets.main.output - from project(':MineTweaker3-API').sourceSets.main.output - - for (p in projects1710) { - from project(p).sourceSets.main.output - } +task relocateShadowJar(type: ConfigureShadowRelocation) { + target = tasks.shadowJar + prefix = modGroup + ".shadow" } -task assembleAll(dependsOn: [ - assembleMC1710, - assembleDevBase1710, - assembleDevFull1710 -]) { +shadowJar { + manifest { + attributes(getManifestAttributes()) + } + + minimize() // This will only allow shading for actually used classes + configurations = [project.configurations.shadowImplementation] + dependsOn(relocateShadowJar) } -configurations { - deployerJars +jar { + manifest { + attributes(getManifestAttributes()) + } + + if(usesShadowedDependencies.toBoolean()) { + dependsOn(shadowJar) + enabled = false + } } +reobf { + if(usesMixins.toBoolean()) { + addExtraSrgFile mixinSrg + } +} +afterEvaluate { + if(usesMixins.toBoolean()) { + tasks.compileJava { + options.compilerArgs += [ + "-AreobfSrgFile=${tasks.reobf.srg}", + "-AoutSrgFile=${mixinSrg}", + "-AoutRefMapFile=${refMap}", + // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code + "-XDenableSunApiLintControl", + "-XDignore.symbol.file" + ] + } + } +} +runClient { + def arguments = [] + if(usesMixins.toBoolean()) { + arguments += [ + "--mods=../build/libs/$modId-${version}.jar", + "--tweakClass org.spongepowered.asm.launch.MixinTweaker" + ] + } + if(developmentEnvironmentUserName) { + arguments += [ + "--username", + developmentEnvironmentUserName + ] + } + + args(arguments) +} + +runServer { + def arguments = [] + + if (usesMixins.toBoolean()) { + arguments += [ + "--mods=../build/libs/$modId-${version}.jar", + "--tweakClass org.spongepowered.asm.launch.MixinTweaker" + ] + } + + args(arguments) +} + +tasks.withType(JavaExec).configureEach { + javaLauncher.set( + javaToolchains.launcherFor { + languageVersion = projectJavaVersion + } + ) +} + +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 "minecraftVersion": project.minecraft.version, + "modVersion": versionDetails().lastTag, + "modId": modId, + "modName": modName + } + + if(usesMixins.toBoolean()) { + from refMap + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } + +def getManifestAttributes() { + def manifestAttributes = [:] + if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) { + manifestAttributes += ["FMLCorePluginContainsFMLMod": true] + } + + if(accessTransformersFile) { + manifestAttributes += ["FMLAT" : accessTransformersFile.toString()] + } + + if(coreModClass) { + manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass] + } + + if(usesMixins.toBoolean()) { + manifestAttributes += [ + "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker", + "MixinConfigs" : "mixins." + modId + ".json", + "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false + ] + } + return manifestAttributes +} + +task sourcesJar(type: Jar) { + from (sourceSets.main.allJava) + from (file("$projectDir/LICENSE")) + getArchiveClassifier().set('sources') +} + +task shadowDevJar(type: ShadowJar) { + from sourceSets.main.output + getArchiveClassifier().set("dev") + + manifest { + attributes(getManifestAttributes()) + } + + minimize() // This will only allow shading for actually used classes + configurations = [project.configurations.shadowImplementation] +} + +task relocateShadowDevJar(type: ConfigureShadowRelocation) { + target = tasks.shadowDevJar + prefix = modGroup + ".shadow" +} + +task circularResolverJar(type: Jar) { + dependsOn(relocateShadowDevJar) + dependsOn(shadowDevJar) + enabled = false +} + +task devJar(type: Jar) { + from sourceSets.main.output + getArchiveClassifier().set("dev") + + manifest { + attributes(getManifestAttributes()) + } + + if(usesShadowedDependencies.toBoolean()) { + dependsOn(circularResolverJar) + enabled = false + } +} + +task apiJar(type: Jar) { + from (sourceSets.main.allJava) { + include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' + } + + from (sourceSets.main.output) { + include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**' + } + + from (sourceSets.main.resources.srcDirs) { + include("LICENSE") + } + + getArchiveClassifier().set('api') +} + +artifacts { + archives sourcesJar + archives devJar + if(apiPackage) { + archives apiJar + } +} + +// Updating +task updateBuildScript { + doLast { + if (performBuildScriptUpdate(projectDir.toString())) return + + print("Build script already up-to-date!") + } +} + +if (isNewBuildScriptVersionAvailable(projectDir.toString())) { + if (autoUpdateBuildScript.toBoolean()) { + performBuildScriptUpdate(projectDir.toString()) + } else { + println("Build script update available! Run 'gradle updateBuildScript'") + } +} + +static URL availableBuildScriptUrl() { + new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle") +} + +boolean performBuildScriptUpdate(String projectDir) { + if (isNewBuildScriptVersionAvailable(projectDir)) { + def buildscriptFile = getFile("build.gradle") + availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } } + print("Build script updated. Please REIMPORT the project or RESTART your IDE!") + return true + } + return false +} + +boolean isNewBuildScriptVersionAvailable(String projectDir) { + Map parameters = ["connectTimeout": 2000, "readTimeout": 2000] + + String currentBuildScript = getFile("build.gradle").getText() + String currentBuildScriptHash = getVersionHash(currentBuildScript) + String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText() + String availableBuildScriptHash = getVersionHash(availableBuildScript) + + boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash + return !isUpToDate +} + +static String getVersionHash(String buildScriptContent) { + String versionLine = buildScriptContent.find("^//version: [a-z0-9]*") + if(versionLine != null) { + return versionLine.split(": ").last() + } + return "" +} + +configure(updateBuildScript) { + group = 'forgegradle' + description = 'Updates the build script to the latest version' +} + +// Helper methods + +def checkPropertyExists(String propertyName) { + if (project.hasProperty(propertyName) == false) { + throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties") + } +} + +def getFile(String relativePath) { + return new File(projectDir, relativePath) +} diff --git a/common.gradle b/common.gradle deleted file mode 100644 index 7ac1475..0000000 --- a/common.gradle +++ /dev/null @@ -1,32 +0,0 @@ -// ----------------------- -// configurable properties -// ----------------------- - -apply from: rootProject.file('configuration.gradle') - -// -- end of configurable properties - -repositories { - mavenLocal() - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - maven { - name = "chickenbones" - url = "http://chickenbones.net/maven/" - } - maven { - name = "gt" - url = "https://gregtech.overminddl1.com/" - } - maven { - name = "jitpack" - url = "https://jitpack.io" - } -} diff --git a/configuration.gradle b/configuration.gradle deleted file mode 100644 index b0956c4..0000000 --- a/configuration.gradle +++ /dev/null @@ -1,32 +0,0 @@ -import javax.tools.ToolProvider - -// ####################### -// ### Global settings ### -// ####################### - -ext.mineTweakerVersion = "3.2.3-GTNH" -if (System.getenv('BUILD_NUMBER') != null) - project.mineTweakerVersion += "."+System.getenv('BUILD_NUMBER') -else { - try { - //ext.mineTweakerVersion += "." + "git rev-parse --abbrev-ref HEAD".execute().text.trim(); - //ext.mineTweakerVersion += "." + "git rev-parse --short HEAD".execute().text.trim(); - } catch (all) {} - logger.lifecycle "No build number detected, setting to ${ext.mineTweakerVersion}" -} - -ext.mineTweakerDebug = "false" -//Make sure JAVA_HOME is set as an environment variable -ext.javaToolsJar = ((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs() - - -// ####################### -// ### 1.7.10 settings ### -// ####################### - -ext.forgeVersion1710 = "1.7.10-10.13.4.1614-1.7.10" -ext.projects1710 = [ - 'MineTweaker3-MC1710-Main', - 'MineTweaker3-MC1710-Mod-IC2', - 'MineTweaker3-MC1710-Mod-NEI' -] diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 0000000..efce6bc --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,7 @@ +// Add your dependencies here + +dependencies { + compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev") + + compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") +} diff --git a/gradle.properties b/gradle.properties index c50355f..a5487d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,64 @@ -org.gradle.daemon=false -org.gradle.parallel=true -org.gradle.configureondemand=true -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError +modName = MineTweaker 3 + +# This is a case-sensitive string to identify your mod. Convention is to use lower case. +modId = MineTweaker3 + +modGroup = minetweaker + +# WHY is there no version field? +# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the +# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/ + +# Will update your build.gradle automatically whenever an update is available +autoUpdateBuildScript = false + +minecraftVersion = 1.7.10 +forgeVersion = 10.13.4.1614 + +# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you +# restart Minecraft in development. Choose this dependent on your mod: +# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name +# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty +developmentEnvironmentUserName = "Developer" + +# Define a source file of your project with: +# public static final String VERSION = "GRADLETOKEN_VERSION"; +# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's +# version in @Mod([...], version = VERSION, [...]) +# Leave these properties empty to skip individual token replacements +replaceGradleTokenInFile = MineTweakerMod.java +gradleTokenModId = +gradleTokenModName = +gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenGroupName = + +# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can +# leave this property empty. +# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api +apiPackage = + +# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/ +# Example value: mymodid_at.cfg +accessTransformersFile = + +# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! +usesMixins = false +# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. +mixinPlugin = +# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +mixinsPackage = +# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! +# This parameter is for legacy compatability only +# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin +coreModClass = +# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class +# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! +containsMixinsAndOrCoreModOnly = false + +# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your +# responsibility check the licence and request permission for distribution, if required. +usesShadowedDependencies = false + +# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older +# projects. New projects should not use this parameter. +customArchiveBaseName = CraftTweaker diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3baa851..5c2d1cf 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 674bdda..3ab0b72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/gradlew b/gradlew index 27309d9..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## ## @@ -28,16 +44,16 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -109,8 +125,8 @@ 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 +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -154,11 +170,19 @@ if $cygwin ; then 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=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 832fdb6..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ 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= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -49,7 +65,6 @@ goto fail @rem Get command-line arguments, handling Windows 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. @@ -60,11 +75,6 @@ set _SKIP=2 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 diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..09bbb51 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +before_install: + - ./gradlew setupCIWorkspace \ No newline at end of file diff --git a/repositories.gradle b/repositories.gradle new file mode 100644 index 0000000..ac9b07c --- /dev/null +++ b/repositories.gradle @@ -0,0 +1,15 @@ +// Add any additional repositories for your dependencies here + +repositories { + maven { + name = "ic2" + url = "http://maven.ic2.player.to/" + metadataSources { + mavenPom() + artifact() + } + } + maven { + url = "https://jitpack.io" + } +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 100bbb0..0000000 --- a/settings.gradle +++ /dev/null @@ -1,24 +0,0 @@ -rootProject.name = 'MineTweaker3' - -// -------------- -// building stuff -// -------------- - -// Find the directories containing a "build.gradle" file in the root directory -// of the project. That is, every directory containing a "build.gradle" will -// be automatically the subproject of this project. -def subDirs = rootDir.listFiles(new FileFilter() { - public boolean accept(File file) { - if (!file.isDirectory()) { - return false - } - if (file.name == 'buildSrc') { - return false - } - return new File(file, 'build.gradle').isFile() - } -}); - -subDirs.each { File dir -> - include dir.name -} \ No newline at end of file diff --git a/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 5787e6a..eb31dc9 100644 --- a/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -50,7 +50,7 @@ import java.util.List; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = "3.1.0") +@Mod(modid = MineTweakerMod.MODID, name = "MineTweaker 3", version = "GRADLETOKEN_VERSION") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.10";