diff --git a/build.gradle b/build.gradle index 8d223af..0db51ca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,174 +1,588 @@ - +//version: 8fa7883b6196c1765266f4e6ddf3118d5043aafb +/* +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() -// maven { -// name = "forge" -// url = "https://files.minecraftforge.net/maven" -// } maven { - name = "gt" - url = "https://gregtech.overminddl1.com/" + name = "forge" + 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.GT-IMPACT:ForgeGradle:1.2.4' } } +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") + id("maven-publish") +} -apply plugin: 'scala' apply plugin: 'forge' -apply plugin: 'idea' -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +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") + -ext.buildProps = file "build.properties" +String javaSourceDir = "src/main/java/" +String scalaSourceDir = "src/main/scala/" -version = "NIGHTLY" -if (System.getenv("BUILD_NUMBER") != null) { - version = "${System.getenv("BUILD_NUMBER")}" +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 (System.getenv("DRONE_BUILD_NUMBER") != null) { - version = "${System.getenv("DRONE_BUILD_NUMBER")}" + +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) + } } -buildProps.withReader { - def prop = new Properties() - prop.load(it) - ext.config = new ConfigSlurper().parse prop +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) + } } -version = "${config.version.extracells}-impact" -group = "extracells" -archivesBaseName = "ExtraCells" +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) + } -def actualVersion = version + 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) + } +} -logger.lifecycle "$archivesBaseName-$version" -logger.lifecycle "" + version +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 = "${config.version.minecraft}-${config.version.forge}-${config.version.minecraft}" - runDir = "../../MinecraftDebug/run_client" + 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) // TODO: remove after all uses are refactored + implementation.extendsFrom(shadowCompile) + implementation.extendsFrom(shadeCompile) } repositories { maven { - name 'Mobius Repo' - url "http://mobiusstrip.eu/maven" + name = "Overmind forge repo mirror" + url = "https://gregtech.overminddl1.com/" } - maven { - name 'CB Repo' - url "http://chickenbones.net/maven/" + if(usesMixins.toBoolean()) { + maven { + name = "sponge" + url = "https://repo.spongepowered.org/repository/maven-public" + } + maven { + url = "https://jitpack.io" + } } - - maven { - name 'Open Computers' - url "http://maven.cil.li/" - } +} - maven { - name = "Forestry and IC2 repo" - url = "http://maven.ic2.player.to/" +dependencies { + 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") } +} - maven { - name = 'IGW' - url = "http://maven.k-4u.nl/" +apply from: 'dependencies.gradle' + +def mixingConfigRefMap = "mixins." + modId + ".refmap.json" +def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap +def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" + +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" +} + +""" } +} - ivy { - name "BuildCraft" - artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" +task relocateShadowJar(type: ConfigureShadowRelocation) { + target = tasks.shadowJar + prefix = modGroup + ".shadow" +} + +shadowJar { + project.configurations.shadeCompile.each { dep -> + from(project.zipTree(dep)) { + exclude 'META-INF', 'META-INF/**' + } } - - maven { - name 'GT6 Maven' - url "https://gregtech.overminddl1.com/" - } - maven { - name 'GTNH Maven' - url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" - } - ivy { - artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]" - } - ivy { - artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" + manifest { + attributes(getManifestAttributes()) } + + minimize() // This will only allow shading for actually used classes + configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] + dependsOn(relocateShadowJar) } -configurations { - provided - embedded - compile.extendsFrom embedded +jar { + project.configurations.shadeCompile.each { dep -> + from(project.zipTree(dep)) { + exclude 'META-INF', 'META-INF/**' + } + } + + manifest { + attributes(getManifestAttributes()) + } + + if(usesShadowedDependencies.toBoolean()) { + dependsOn(shadowJar) + enabled = false + } } +reobf { + if(usesMixins.toBoolean()) { + addExtraSrgFile mixinSrg + } +} -dependencies { - provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' - compile ("mcp.mobius.waila:Waila:${config.version.waila}"){ - transitive = false - } - compile "codechicken:CodeChickenLib:${config.version.minecraft}-${config.version.ccl}:dev" - compile "codechicken:CodeChickenCore:${config.version.minecraft}-${config.version.ccc}:dev" - compile "codechicken:NotEnoughItems:${config.version.minecraft}-${config.version.nei}:dev" - compile "igwmod:IGW-Mod-${config.version.minecraft}:${config.version.igw}:userdev" - compile name: "buildcraft", version: "${config.version.bc}", classifier: "dev", ext: 'jar' - // compile name: 'WirelessCraftingTerminal', version: config.version.wc, ext: 'jar' +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" + ] + } + } } -processResources { - from(sourceSets.main.resources.srcDirs) { - include '**/*.lang' - include '**/*.info' - include '**/*.properties' +runClient { + def arguments = [] - expand 'version': project.version, 'mcversion': project.minecraft.version + if(usesMixins.toBoolean()) { + arguments += [ + "--mods=../build/libs/$modId-${version}.jar", + "--tweakClass org.spongepowered.asm.launch.MixinTweaker" + ] } - from(sourceSets.main.resources.srcDirs) { - include '**/*.lang' - include '**/*.info' - include '**/*.properties' + 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] + } - expand 'version': "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}", 'mcversion': project.minecraft.version + 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 deobfJar(type: Jar) { +task shadowDevJar(type: ShadowJar) { + project.configurations.shadeCompile.each { dep -> + from(project.zipTree(dep)) { + exclude 'META-INF', 'META-INF/**' + } + } + from sourceSets.main.output - from sourceSets.main.scala - from sourceSets.main.java - appendix = 'deobf' + getArchiveClassifier().set("dev") + + manifest { + attributes(getManifestAttributes()) + } + + minimize() // This will only allow shading for actually used classes + configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile] +} + +task relocateShadowDevJar(type: ConfigureShadowRelocation) { + target = tasks.shadowDevJar + prefix = modGroup + ".shadow" +} + +task circularResolverJar(type: Jar) { + dependsOn(relocateShadowDevJar) + dependsOn(shadowDevJar) + enabled = false +} + +task devJar(type: Jar) { + project.configurations.shadeCompile.each { dep -> + from(project.zipTree(dep)) { + exclude 'META-INF', 'META-INF/**' + } + } + + 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 deobfJar + archives sourcesJar + archives devJar + if(apiPackage) { + archives apiJar + } } -def getBuildNumber() { - if (System.getenv("BUILD_NUMBER") != null) { - return "${System.getenv("BUILD_NUMBER")}" +// publishing +publishing { + publications { + maven(MavenPublication) { + artifact source: jar + artifact source: sourcesJar, classifier: "src" + artifact source: devJar, classifier: "dev" + if (apiPackage) { + artifact source: apiJar, classifier: "api" + } + + groupId = System.getenv("ARTIFACT_GROUP_ID") ?: group + artifactId = System.getenv("ARTIFACT_ID") ?: project.name + version = System.getenv("ARTIFACT_VERSION") ?: project.version + } } - else if (System.getenv("DRONE_BUILD_NUMBER") != null) { - return "${System.getenv("DRONE_BUILD_NUMBER")}" + + repositories { + maven { + String owner = System.getenv("REPOSITORY_OWNER") ?: "Unknown" + String repositoryName = System.getenv("REPOSITORY_NAME") ?: "Unknown" + String githubRepositoryUrl = "https://maven.pkg.github.com/$owner/$repositoryName" + name = "GitHubPackages" + url = githubRepositoryUrl + credentials { + username = System.getenv("GITHUB_ACTOR") ?: "NONE" + password = System.getenv("GITHUB_TOKEN") ?: "NONE" + } + } } - return "NIGHTLY" } -idea { - module { - outputDir = file('build/classes/main') +// 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) +} \ No newline at end of file diff --git a/build.properties b/build.properties index bb6f39c..f35a529 100644 --- a/build.properties +++ b/build.properties @@ -1,27 +1 @@ -systemProp.file.encoding=utf-8 -dir.development=./ -dir.mcp=${dir.development}forge/mcp -version.minecraft=1.7.10 -version.forge=10.13.4.1614 -version.mod.major=2 -version.mod.minor=4 -version.mod.revis=4 -version.ae=rv3-beta-22 -version.oc=MC1.7.10-1.7.4.1265 -version.bc=7.1.14 -version.waila=1.5.10_1.7.10 -version.ccl=1.1.3.140 -version.ccc=1.0.7.+ -version.nei=1.0.5.+ -version.igw=1.1.3-18 -version.wc=1.7.10-rv3-1.8.7.4-bigbass-1 -cf.wc=2307/524 -gregtech.version=5.09.23 -ic2.version=2.2.821-experimental -thaumicenergistics.version=1.0.0.1 -cofhlib.cf=2230/207 -cofhlib.version=[1.7.10]1.2.1-185 -cofhcore.cf=2246/697 -cofhcore.version=[1.7.10]3.1.4-329-dev - version.extracells=rv2-23 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4e35a1..3ab0b72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Jul 02 15:54:47 CDT 2014 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-4.4.1-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..f1b0b5b 100644 --- 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. +# ############################################################################## ## @@ -6,20 +22,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null 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='"-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 @@ -30,6 +64,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +75,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=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. @@ -77,20 +92,18 @@ if [ -n "$JAVA_HOME" ] ; then 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 +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -110,10 +123,11 @@ 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"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +168,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 "$@") + +# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..15e3d84 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 @@ -8,14 +24,14 @@ @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 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="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +62,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@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 @@ -87,4 +97,4 @@ exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file diff --git a/libs/Baubles-1.7.10-1.0.1.10.jar b/libs/Baubles-1.7.10-1.0.1.10.jar deleted file mode 100644 index 40f2308..0000000 Binary files a/libs/Baubles-1.7.10-1.0.1.10.jar and /dev/null differ diff --git a/libs/ForgeMultipart-1.7.10-1.2.0.347-universal.jar b/libs/ForgeMultipart-1.7.10-1.2.0.347-universal.jar deleted file mode 100644 index 890f567..0000000 Binary files a/libs/ForgeMultipart-1.7.10-1.2.0.347-universal.jar and /dev/null differ diff --git a/libs/Mekanism-1.7.10-9.1.0.281.jar b/libs/Mekanism-1.7.10-9.1.0.281.jar deleted file mode 100644 index 8afa722..0000000 Binary files a/libs/Mekanism-1.7.10-9.1.0.281.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-1.0.5.120-universal.jar b/libs/NotEnoughItems-1.7.10-1.0.5.120-universal.jar deleted file mode 100644 index 5efa527..0000000 Binary files a/libs/NotEnoughItems-1.7.10-1.0.5.120-universal.jar and /dev/null differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.5.7-impact+7411ac04a-dev.jar b/libs/OpenComputers-MC1.7.10-1.7.5.7-impact+7411ac04a-dev.jar deleted file mode 100644 index 564d9be..0000000 Binary files a/libs/OpenComputers-MC1.7.10-1.7.5.7-impact+7411ac04a-dev.jar and /dev/null differ diff --git a/libs/Thaumcraft-1.7.10-4.2.3.5.jar b/libs/Thaumcraft-1.7.10-4.2.3.5.jar deleted file mode 100644 index 0007a22..0000000 Binary files a/libs/Thaumcraft-1.7.10-4.2.3.5.jar and /dev/null differ diff --git a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.4-bigbass-1.jar b/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.4-bigbass-1.jar deleted file mode 100644 index adb66cb..0000000 Binary files a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.4-bigbass-1.jar and /dev/null differ diff --git a/libs/appliedenergistics2-rv3-33-impact-dev.jar b/libs/appliedenergistics2-rv3-33-impact-dev.jar deleted file mode 100644 index 91465d1..0000000 Binary files a/libs/appliedenergistics2-rv3-33-impact-dev.jar and /dev/null differ diff --git a/libs/bdlib-1.9.4.109-mc1.7.10.jar b/libs/bdlib-1.9.4.109-mc1.7.10.jar deleted file mode 100644 index b794855..0000000 Binary files a/libs/bdlib-1.9.4.109-mc1.7.10.jar and /dev/null differ diff --git a/libs/p455w0rdslib-1.7.10-1.0.4.jar b/libs/p455w0rdslib-1.7.10-1.0.4.jar deleted file mode 100644 index 20a5109..0000000 Binary files a/libs/p455w0rdslib-1.7.10-1.0.4.jar and /dev/null differ diff --git a/libs/thaumicenergistics-1.1.3.0.jar b/libs/thaumicenergistics-1.1.3.0.jar deleted file mode 100644 index 391ccb0..0000000 Binary files a/libs/thaumicenergistics-1.1.3.0.jar and /dev/null differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index b5fdcbf..7df5f85 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,10 +1,10 @@ [ { - "modid": "extracells", - "name": "Extra Cells 2", + "modid": "${modId}", + "name": "${modName}", "description": "Adds new ME Storage Cells and some other cool stuff to AE 2.", - "version": "${version}", - "mcversion": "${mcversion}", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1289077-ae-add-on-m3gas-extracells-2-1-x-2-2-x", "updateUrl": "", "authorList": ["M3gaFr3ak", "DrummerMC"], @@ -13,4 +13,4 @@ "screenshots": [], "dependencies": ["Applied Energistics 2"] } -] +] \ No newline at end of file diff --git a/src/main/scala/extracells/Extracells.scala b/src/main/scala/extracells/Extracells.scala index f16b0b9..feafef2 100644 --- a/src/main/scala/extracells/Extracells.scala +++ b/src/main/scala/extracells/Extracells.scala @@ -20,7 +20,13 @@ import net.minecraft.item.ItemStack import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.config.Configuration -@Mod(modid = "extracells", name = "Extra Cells", modLanguage = "scala", dependencies = "after:LogisticsPipes|Main;after:Waila;required-after:appliedenergistics2") +@Mod( + modid = "extracells", + name = "Extra Cells", + version = "GRADLETOKEN_VERSION", + modLanguage = "scala", + dependencies = "after:LogisticsPipes|Main;after:Waila;required-after:appliedenergistics2" +) object Extracells { diff --git a/src/main/scala/extracells/block/BlockCertusTank.java b/src/main/scala/extracells/block/BlockCertusTank.java index a4abc34..cc6c26d 100644 --- a/src/main/scala/extracells/block/BlockCertusTank.java +++ b/src/main/scala/extracells/block/BlockCertusTank.java @@ -2,6 +2,7 @@ import appeng.api.implementations.items.IAEWrench; import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.common.Optional; import extracells.network.ChannelHandler; import extracells.registries.BlockEnum; import extracells.render.RenderHandler; @@ -24,6 +25,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.Loader; +@Optional.Interface(iface = "gregtech.api.items.GT_MetaGenerated_Tool", modid = "gregtech") public class BlockCertusTank extends BlockEC { IIcon breakIcon; @@ -114,6 +116,17 @@ public String getUnlocalizedName() { public boolean isOpaqueCube() { return false; } + + @Optional.Method(modid = "gregtech") + public boolean gtWrench(ItemStack current, World worldObj, int x, int y, int z, EntityPlayer entityplayer) { + if (current.getItem() instanceof GT_MetaGenerated_Tool && ((GT_MetaGenerated_Tool) current.getItem()).canWrench(entityplayer, x, y, z)) { + dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z)); + worldObj.setBlockToAir(x, y, z); + ((GT_MetaGenerated_Tool) current.getItem()).wrenchUsed(entityplayer, x, y, z); + return true; + } + return false; + } @Override public boolean onBlockActivated(World worldObj, int x, int y, int z, @@ -123,36 +136,22 @@ public boolean onBlockActivated(World worldObj, int x, int y, int z, if (entityplayer.isSneaking() && current != null) { try { - if (current.getItem() instanceof IToolWrench - && ((IToolWrench) current.getItem()).canWrench( - entityplayer, x, y, z)) { - dropBlockAsItem(worldObj, x, y, z, - getDropWithNBT(worldObj, x, y, z)); + if (current.getItem() instanceof IToolWrench && ((IToolWrench) current.getItem()).canWrench(entityplayer, x, y, z)) { + dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z)); worldObj.setBlockToAir(x, y, z); - ((IToolWrench) current.getItem()).wrenchUsed(entityplayer, - x, y, z); + ((IToolWrench) current.getItem()).wrenchUsed(entityplayer, x, y, z); return true; } } catch (Throwable e) { // No IToolWrench } - if (current.getItem() instanceof IAEWrench - && ((IAEWrench) current.getItem()).canWrench(current, - entityplayer, x, y, z)) { - dropBlockAsItem(worldObj, x, y, z, - getDropWithNBT(worldObj, x, y, z)); + if (current.getItem() instanceof IAEWrench && ((IAEWrench) current.getItem()).canWrench(current, entityplayer, x, y, z)) { + dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z)); worldObj.setBlockToAir(x, y, z); return true; } try { - if (current.getItem() instanceof GT_MetaGenerated_Tool - && ((GT_MetaGenerated_Tool) current.getItem()).canWrench( - entityplayer, x, y, z)) { - dropBlockAsItem(worldObj, x, y, z, - getDropWithNBT(worldObj, x, y, z)); - worldObj.setBlockToAir(x, y, z); - ((GT_MetaGenerated_Tool) current.getItem()).wrenchUsed(entityplayer, - x, y, z); + if (gtWrench(current, worldObj, x, y, z, entityplayer)) { return true; } } catch (Throwable e) {