aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2021-12-24 18:49:07 +0000
committerBass <tudurap.com@gmail.com>2021-12-24 18:49:24 +0000
commit062fb04b02b9291741fdc4e79441e07cedee8796 (patch)
tree3457194883409c4d901e9663106b18cef99062cd
parent345a893545884f343c9b480dd6e2c0e5fb5663f8 (diff)
downloadGT5-Unofficial-062fb04b02b9291741fdc4e79441e07cedee8796.tar.gz
GT5-Unofficial-062fb04b02b9291741fdc4e79441e07cedee8796.tar.bz2
GT5-Unofficial-062fb04b02b9291741fdc4e79441e07cedee8796.zip
Merge pull request #19 from GTNewHorizons/unified-build-script
GTNewHorizons/TecTech/pull/19 Update buildscript Unify build script
-rw-r--r--.github/scripts/test-no-error-reports.sh27
-rw-r--r--.github/workflows/build-and-test.yml45
-rw-r--r--.github/workflows/release-tags.yml61
-rw-r--r--.gitignore62
-rw-r--r--.gitmodules3
-rw-r--r--build.gradle562
-rw-r--r--build.gradle.kts292
-rw-r--r--dependencies.gradle43
-rw-r--r--dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar (renamed from libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar)bin988221 -> 988221 bytes
-rw-r--r--draw_io_graph.pngbin0 -> 113460 bytes
-rw-r--r--gradle.properties70
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin54417 -> 55616 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--gradlew22
-rw-r--r--gradlew.bat18
-rw-r--r--jitpack.yml2
-rw-r--r--libs/CoFHCore-[1.7.10]3.1.4-329-dev.jarbin1213993 -> 0 bytes
-rw-r--r--libs/GT-PlusPlus-1.7.0-prerelease-8-final.jarbin4458558 -> 0 bytes
-rw-r--r--real.gradle.properties20
-rw-r--r--repositories.gradle26
-rw-r--r--src/main/resources/mcmod.info8
21 files changed, 894 insertions, 369 deletions
diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
new file mode 100644
index 0000000000..e3876606d5
--- /dev/null
+++ b/.github/scripts/test-no-error-reports.sh
@@ -0,0 +1,27 @@
+if [[ -d "run/crash-reports" ]]; then
+ echo "Crash reports detected:"
+ cat $directory/*
+ exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" server.log; then
+ echo "Fatal errors detected:"
+ cat server.log
+ exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
+ echo "Server force stopped:"
+ cat server.log
+ exit 1
+fi
+
+if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
+ echo "Server didn't finish startup:"
+ cat server.log
+ exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000000..08df9fe89f
--- /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.5 minutes
+ run: |
+ mkdir run
+ echo "eula=true" > run/eula.txt
+ timeout 90 ./gradlew runServer | tee --append server.log || true
+
+ - name: Test no errors reported during server run
+ run: |
+ chmod +x .github/scripts/test-no-error-reports.sh
+ .github/scripts/test-no-error-reports.sh
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
new file mode 100644
index 0000000000..96d37f7d9a
--- /dev/null
+++ b/.github/workflows/release-tags.yml
@@ -0,0 +1,61 @@
+# 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
+
+ - name: Set repository owner and name
+ run: |
+ echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
+ echo "REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+ - name: Publish package
+ run: ./gradlew publish
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ ARTIFACT_GROUP_ID: com.github.${{ env.REPOSITORY_OWNER }}
+ ARTIFACT_ID: "${{ env.REPOSITORY_NAME }}"
+ ARTIFACT_VERSION: "${{ env.RELEASE_VERSION }}"
+ REPOSITORY_NAME: "${{ env.REPOSITORY_NAME }}"
+ REPOSITORY_OWNER: "${{ env.REPOSITORY_OWNER }}"
+
diff --git a/.gitignore b/.gitignore
index 3d66b81105..558ad12d27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,28 @@
-.gradle/
-run/
-.settings/
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
.classpath
.project
-bin/
-out/
-libs/gregtech*
-CREDITS-fml.txt
-LICENSE-fml.txt
-MinecraftForge-Credits.txt
-MinecraftForge-License.txt
-CoreMod.iml
-CoreMod.ipr
-CoreMod.iws
-Idea.bat
-SetupDevWorkspaces.bat
+/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
-*.bat
-.idea/workspace.xml
-*.db
-*.log
-.idea/
-\.directory
-asm/
-config/
-saves/
-usernamecache.json
-PlayerCache.dat
-GregTech.cfg
-options.txt
-GregTech.lang
-mods/
-classes/
-logs/
-libs/AsieLib-1.7.10-0.4.9-deobf.jar
-libs/Computronics-1.7.10-1.6.6-deobf.jar
-libs/Galacticraft-API-1.7-3.0.12.504.jar
-libs/GTNewHorizonsCoreMod-1.7.10-1.6.10.jar
-libs/MicdoodleCore-1.7-3.0.12.504.jar
-libs/worldedit-forge-mc1.7.10-6.1.1-dist.jar
-eclipse/
+src/main/resources/mixins.*.json
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 58eebb4aa5..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "AVRcore"]
- path = AVRcore
- url = https://github.com/Technus/AVRcore
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..2ec9a2ebac
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,562 @@
+//version: be36e1399d5622c152db7c530c48e17cde0ce1bb
+/*
+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 {
+ maven {
+ 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.GTNewHorizons: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: '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 {
+ 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"
+ }
+ }
+}
+
+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")
+ }
+}
+
+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"
+}
+
+"""
+ }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+ target = tasks.shadowJar
+ prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+ manifest {
+ attributes(getManifestAttributes())
+ }
+
+ minimize() // This will only allow shading for actually used classes
+ configurations = [project.configurations.shadowImplementation]
+ dependsOn(relocateShadowJar)
+}
+
+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
+ }
+}
+
+// publishing
+publishing {
+ publications {
+ maven(MavenPublication) {
+ artifact source: jar
+ artifact source: sourcesJar, classifier: "src"
+ artifact source: devJar, classifier: "dev"
+ if (apiPackage) {
+ archives 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
+ }
+ }
+
+ 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"
+ }
+ }
+ }
+}
+
+// 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/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 29a4f8b6de..0000000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,292 +0,0 @@
-import net.minecraftforge.gradle.user.UserExtension
-import java.io.FileInputStream
-import java.util.*
-import java.io.*
-
-buildscript {
- repositories {
- mavenCentral()
- maven("https://gregtech.overminddl1.com/")
- maven("https://jitpack.io")
-
- }
- dependencies {
- classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT"){
- isChanging = true
- }
- }
-}
-
-plugins {
- idea
- java
- signing
-}
-
-apply(plugin = "forge")
-
-//Downloads Javadocs and sources by default
-idea {
- module {
- this.isDownloadJavadoc = true
- this.isDownloadSources = true
- }
-}
-
-//Set Java to version 1.8
-java {
- this.sourceCompatibility = JavaVersion.VERSION_1_8
- this.targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-//Set standard encoding
-tasks.withType<JavaCompile> {
- options.encoding = "UTF-8"
-}
-
-//Add extra sources here
-sourceSets.getByName("main") {
- java.srcDir("src/main/java")
- java.srcDir("AVRcore/src")
-}
-
-//Load Minecraft Version
-val Project.minecraft: UserExtension
- get() = extensions.getByName<UserExtension>("minecraft")
-
-//TODO Delete this! This exists to load the configs from the real properties file, which is needed for Jenkins to build
-//Gradle will load gradle.properties from it's home, it's install, and the project folder. Clearly whoever setup the
-//Jenkins jar signing needs to be reminded of this!
-val prop = Properties()
-prop.load(FileInputStream("real.gradle.properties"))
-val propSign = Properties()
-propSign.load(FileInputStream("gradle.properties"))
-
-//TODO Delete
-val projectVersion: String = prop.getProperty("projectVersion")
-//TODO Uncomment
-//val projectVersion: String by project
-
-//Generates a hash for each new commit to differentiate versions
-var commitHash = Runtime
- .getRuntime()
- .exec("git rev-parse --short HEAD")
- .let { process ->
- process.waitFor()
- val output = process.inputStream.use {
- it.bufferedReader().use(BufferedReader::readText)
- }
- process.destroy()
- output.trim()
- }
-
-minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
-version = "$projectVersion-$commitHash"
-group = "com.github.technus"
-
-//Minecraft Block
-configure<UserExtension> {
- //Replaces version inside the mod
- this.includes.addAll(
- arrayOf(
- "Reference.java"
- )
- )
- this.replacements.putAll(
- mapOf(
- Pair("GRADLETOKEN_VERSION", project.version)
- )
- )
-
- //This is sometimes called 'eclipse' instead
- this.runDir = "run"
-}
-
-repositories {
- mavenLocal()
- maven("https://gregtech.overminddl1.com/") { this.name = "GT6Maven" }
- maven("http://maven.ic2.player.to/") { this.name = "ic2" }
- maven("http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/") { this.name = "UsrvDE/GTNH" }
- ivy {
- this.name = "gtnh_download_source_underscores"
- this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]")
- }
- ivy {
- this.name = "gtnh_download_source"
- this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
- }
- ivy {
- this.name = "BuildCraft"
- this.artifactPattern("http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision](-[classifier]).[ext]")
- }
- maven("http://maven.cil.li/") { this.name = "OpenComputers" }
- maven("http://default.mobiusstrip.eu/maven") { this.name = "Jabba" }
- maven("http://chickenbones.net/maven/") { this.name = "CodeChicken" }
- maven("http://www.ryanliptak.com/maven/") { this.name = "appleCore" }
- maven("https://jitpack.io")
-}
-
-dependencies {
- //Local Libraries
- compile(fileTree("libs") { this.include("*.jar") })
-
- //TODO Uncomment
- //Versions from properties
- //val ic2Version: String by project
- //val gt5uVersion: String by project
- //val yamcoreVersion: String by project
- //val opencomputersVersion: String by project
- //val computercraftVersion: String by project
- //val baublesVersion: String by project
- //val thaumcraftVersion: String by project
- //val codechickenlibVersion: String by project
- //val codechickencoreVersion: String by project
- //val neiVersion: String by project
- //val wailaVersion: String by project
- //val galacticraftVersion: String by project
- //val galacticGregVersion: String by project
- //val buildcraftVersion: String by project
- //val forestryVersion: String by project
- //val enderioVersion: String by project
- //val enderCoreVersion: String by project
-
- //TODO Delete
- val ic2Version: String = prop.getProperty("ic2Version")
- val gt5uVersion: String = prop.getProperty("gt5uVersion")
- val yamcoreVersion: String = prop.getProperty("yamcoreVersion")
- val opencomputersVersion: String = prop.getProperty("opencomputersVersion")
- val computercraftVersion: String = prop.getProperty("computercraftVersion")
- val baublesVersion: String = prop.getProperty("baublesVersion")
- val thaumcraftVersion: String = prop.getProperty("thaumcraftVersion")
- val codechickenlibVersion: String = prop.getProperty("codechickenlibVersion")
- val codechickencoreVersion: String = prop.getProperty("codechickencoreVersion")
- val neiVersion: String = prop.getProperty("neiVersion")
- val wailaVersion: String = prop.getProperty("wailaVersion")
- val galacticraftVersion: String = prop.getProperty("galacticraftVersion")
- val galacticGregVersion: String = prop.getProperty("galacticGregVersion")
- val buildcraftVersion: String = prop.getProperty("buildcraftVersion")
- val forestryVersion: String = prop.getProperty("forestryVersion")
- val enderioVersion: String = prop.getProperty("enderioVersion")
- val enderCoreVersion: String = prop.getProperty("enderCoreVersion")
-
- //Hard Dependencies
- compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev")
- compile("com.github.GTNewHorizons:StructureLib:1.0.9:deobf")
- compile("com.github.GTNewHorizons:GT5-Unofficial:$gt5uVersion:dev"){
- exclude("net.industrial-craft", "industrialcraft-2")
- isChanging = true
- }
- compile("eu.usrv:YAMCore:$yamcoreVersion:deobf")
-
- //Compile Dependencies
- compileOnly("li.cil.oc:OpenComputers:$opencomputersVersion:dev")
- compileOnly("dan200.computercraft:ComputerCraft:$computercraftVersion")
- compile("com.azanor.baubles:Baubles:$baublesVersion:deobf")
- compile("thaumcraft:Thaumcraft:$thaumcraftVersion:dev")
- compile("codechicken:CodeChickenLib:$codechickenlibVersion:dev")
- compile("codechicken:CodeChickenCore:$codechickencoreVersion:dev")
- compile("codechicken:NotEnoughItems:$neiVersion:dev")
-
- //Optional Libraries for Testing
- runtimeOnly("mcp.mobius.waila:Waila:$wailaVersion")
-
- //runtimeOnly("micdoodle8.mods:MicdoodleCore:$galacticraftVersion:Dev")
- //runtimeOnly("micdoodle8.mods:GalacticraftCore:$galacticraftVersion:Dev")
- //runtimeOnly("micdoodle8.mods:Galacticraft-Planets:$galacticraftVersion:Dev")
- //runtimeOnly("com.github.GTNewHorizons:GalacticGregGT5:$galacticGregVersion")
- //runtimeOnly("com.mod-buildcraft:buildcraft:$buildcraftVersion:dev")
- //runtimeOnly("net.sengir.forestry:forestry_1.7.10:$forestryVersion:dev")
- //runtimeOnly("com.enderio.core:EnderCore:$enderCoreVersion:dev")
- //runtimeOnly("com.enderio:EnderIO:$enderioVersion:dev"){
- // exclude("com.enderio.core", "EnderCore")
- // exclude("mcp.mobius.waila", "Waila")
- //}
-
- configurations.all {
- resolutionStrategy.cacheDynamicVersionsFor(30, "seconds")
- }
-}
-
-
-
-
-tasks.withType<Jar> {
- //Mark as outdated if versions change
- this.inputs.properties += "version" to project.version
- this.inputs.properties += "mcversion" to project.minecraft.version
- this.archiveBaseName.set("TecTech-${project.minecraft.version}")
-
- //Replace versions in mcmod.info
- this.filesMatching("/mcmod.info") {
- this.expand(
- mapOf(
- "version" to project.version,
- "mcversion" to project.minecraft.version
- )
- )
- }
-}
-
-//Load AVRcore
-val submodulesUpdate by tasks.creating(Exec::class) {
- this.description = "Updates (and inits) git submodules"
- this.group = "Build Setup"
- this.commandLine("git", "submodule", "update", "--init", "--recursive", "--remote")
-}
-tasks.named("setupCIWorkspace") {
- dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDevWorkspace") {
- dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDecompWorkspace") {
- dependsOn(":submodulesUpdate")
-}
-tasks.named("compileJava") {
- dependsOn(":submodulesUpdate")
-}
-tasks.named("sourceMainJava") {
- dependsOn(":submodulesUpdate")
-}
-
-tasks.jar {
- //Needed for access transformer which allows nerfing hardness of blocks
- this.manifest.attributes(
- mapOf(
- Pair("FMLAT", "tectech_at.cfg")
- )
- )
-}
-
-val sourcesJar by tasks.creating(Jar::class) {
- this.from(sourceSets.main.get().allSource)
- this.archiveClassifier.set("sources")
-}
-
-val devJar by tasks.creating(Jar::class) {
- this.from(sourceSets.main.get().output)
- this.archiveClassifier.set("dev")
-}
-
-artifacts {
- this.archives(sourcesJar)
- this.archives(devJar)
-}
-
-tasks.register("signJar") {
- dependsOn("reobf")
-}
-
-//TODO Fix, but technically it was never fully implemented
-//signing {
-// sign(tasks["jar"])
-//}
-//
-//tasks.named("signJar") {
-// allprojects {
-// extra["signing.keyId"] = propSign.getProperty("keyStoreAlias")
-// extra["signing.secretKeyRingFile"] = propSign.getProperty("keyStore")
-// extra["signing.password"] = propSign.getProperty("keyStorePass")
-// }
-// dependsOn(":reobf")
-//}
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000000..6d229574c1
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,43 @@
+// Add your dependencies here
+
+dependencies {
+ shadowImplementation("com.github.GTNewHorizons:AVRcore:add-build-script-SNAPSHOT")
+
+ compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev")
+ compile("com.github.GTNewHorizons:Yamcl:master-SNAPSHOT:dev")
+
+ /*compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev") { // Transitive by GT5-Unofficial
+ transitive = false
+ }
+ compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev") { // Transitive by GT5-Unofficial
+ transitive = false
+ }
+ compile("com.github.GTNewHorizons:StructureLib:master-SNAPSHOT:dev") { // Transitive by GT5-Unofficial
+ transitive = false
+ }
+ compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { // Transitive by GT5-Unofficial
+ transitive = false
+ }*/
+
+ compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
+ transitive = false
+ }
+ compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") {
+ transitive = false
+ }
+
+ compileOnly("dan200.computercraft:ComputerCraft:1.75") {
+ transitive = false
+ }
+ compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
+ transitive = false
+ }
+ compileOnly("curse.maven:cofh-core-69162:2388751") {
+ transitive = false
+ }
+ compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
+ transitive = false
+ }
+
+ compileOnly files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
+}
diff --git a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
index e854bf7df9..e854bf7df9 100644
--- a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
+++ b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
Binary files differ
diff --git a/draw_io_graph.png b/draw_io_graph.png
new file mode 100644
index 0000000000..241c41d604
--- /dev/null
+++ b/draw_io_graph.png
Binary files differ
diff --git a/gradle.properties b/gradle.properties
index 7fc32d532c..3d49d30e98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,64 @@
-#Dummy File, replaced in Jenkins
-systemProp.org.gradle.internal.http.connectionTimeout=120000
-systemProp.org.gradle.internal.http.socketTimeout=120000
-keyStoreAlias=w
-keyStore=w
-keyStorePass=w
+modName = TecTech - Tec Technology!
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = tectech
+
+modGroup = com.github.technus.tectech
+
+# 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 = Reference.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 = tectech_at.cfg
+
+# 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 = true
+
+# 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 = TecTech
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec..5c2d1cf016 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8e..3ab0b725ef 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-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d517..83f2acfdc3 100644
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
#!/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.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ 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"
@@ -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"`
diff --git a/gradlew.bat b/gradlew.bat
index f9553162f1..9618d8d960 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
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000000..09bbb514fc
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+before_install:
+ - ./gradlew setupCIWorkspace \ No newline at end of file
diff --git a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar b/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
deleted file mode 100644
index 7a53464d53..0000000000
--- a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
+++ /dev/null
Binary files differ
diff --git a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar b/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
deleted file mode 100644
index 181475fc38..0000000000
--- a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
+++ /dev/null
Binary files differ
diff --git a/real.gradle.properties b/real.gradle.properties
deleted file mode 100644
index 5cf1722acc..0000000000
--- a/real.gradle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-systemProp.org.gradle.internal.http.connectionTimeout=120000
-systemProp.org.gradle.internal.http.socketTimeout=120000
-projectVersion=4.10.8
-ic2Version=2.2.828-experimental
-gt5uVersion=experimental-SNAPSHOT
-yamcoreVersion=1.7.10-0.5.79
-opencomputersVersion=MC1.7.10-1.7.5.1291
-computercraftVersion=1.75
-baublesVersion=1.7.10-1.0.1.10
-thaumcraftVersion=1.7.10-4.2.3.5
-codechickenlibVersion=1.7.10-1.1.3.140
-codechickencoreVersion=1.7.10-1.0.7.47
-neiVersion=1.7.10-1.0.5.120
-wailaVersion=1.5.10_1.7.10
-galacticraftVersion=1.7-3.0.12.504
-galacticGregVersion=master-SNAPSHOT
-buildcraftVersion=7.1.23
-forestryVersion=4.4.0.0
-enderioVersion=1.7.10-2.3.0.429_beta
-enderCoreVersion=1.7.10-0.2.0.39_beta
diff --git a/repositories.gradle b/repositories.gradle
new file mode 100644
index 0000000000..130197c8aa
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,26 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+ maven {
+ name "OpenComputers Repo"
+ url = "http://maven.cil.li/"
+ }
+ maven {
+ name = "sponge"
+ url = "https://repo.spongepowered.org/repository/maven-public"
+ }
+ maven {
+ name = "ic2"
+ url = "http://maven.ic2.player.to/"
+ metadataSources {
+ mavenPom()
+ artifact()
+ }
+ }
+ maven {
+ url "https://cursemaven.com"
+ }
+ maven {
+ url = "https://jitpack.io"
+ }
+}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index f7fc68f278..21ecee23f8 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
[
{
- "modid": "tectech",
- "name": "TecTech",
+ "modid": "${modId}",
+ "name": "${modName}",
"description": "TecTech - Tec Technology Interdimensional! Replace UUMatter with something overly complicated and annoying! (GT5u Addon)",
- "version": "${version}",
- "mcversion": "${mcversion}",
+ "version": "${modVersion}",
+ "mcversion": "${minecraftVersion}",
"url": "",
"updateUrl": "",
"authorList": ["_Technus_"],