Github actions

.github/workflows/build.yml

@@ -1,12 +1,33 @@
-name: Build
+name: Publish
-on: [push, pull_request]
+on: [push]
 jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: openjdk:14-jdk
+      image: openjdk:15-jdk
       options: --user root
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build --stacktrace
+
+      - name: Generate build number
+        id: buildnumber
+        uses: einaregilsson/build-number@v3
+        with:
+          token: ${{ secrets.github_token }}
+          prefix: ${{ github.ref }}
+
+      - run: ./gradlew build publish --stacktrace
+        env:
+          MAVEN_URL: ${{ secrets.MAVEN_URL }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: build/libs/

.github/workflows/check.yml

@@ -0,0 +1,18 @@
+name: Check
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    container:
+      image: openjdk:15-jdk
+      options: --user root
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+      - run: ./gradlew build --stacktrace
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: build/libs/

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: Release
+on: 
+  workflow_dispatch:
+    inputs:
+      channel:
+        description: 'Release channel'     
+        required: true
+        default: 'release'
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    container:
+      image: openjdk:15-jdk
+      options: --user root
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+
+      - name: Generate build number
+        id: buildnumber
+        uses: einaregilsson/build-number@v3
+        with:
+          token: ${{ secrets.github_token }}
+          prefix: ${{ github.ref }}
+
+      - run: ./gradlew build publish curseforge github --stacktrace
+        env:
+          RELEASE_CHANNEL: ${{ github.event.inputs.channel }}
+          MAVEN_URL: ${{ secrets.MAVEN_URL }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GH_API_KEY }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: build/libs/

Jenkinsfile

@@ -1,23 +0,0 @@
-pipeline {
-   agent any
-   stages {
-
-      stage('Init') {
-         steps {
-            sh "rm -rf build/libs/"
-            sh "chmod +x gradlew"
-         }
-      }
-
-      stage ('Build') {
-         when {
-                branch '1.16'
-         }
-         steps {
-            sh "./gradlew clean build publish curseTools --stacktrace"
-
-            archiveArtifacts artifacts: '**/build/libs/*.jar', fingerprint: true
-         }
-      }
-   }
-}

build.conf

@@ -1,6 +0,0 @@
-minecraftVersion="1.16.3,1.16.4,Fabric"
-name="TechReborn-1.16"
-curseID="233564"
-github-repo="TechReborn/TechReborn"
-child-project="reborncore"
-child-type="requiredLibrary"

build.gradle

@@ -1,28 +1,20 @@
 buildscript {
-	repositories {
-		mavenCentral()
-		maven {
-			name = "Modmuss50"
-			url = "https://maven.modmuss50.me/"
-		}
-		maven {
-			url "https://plugins.gradle.org/m2/"
-		}
-	}
 	dependencies {
-		classpath "net.fabricmc:fabric-loom:0.5-SNAPSHOT"
+		classpath 'org.kohsuke:github-api:1.114'
-		classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
-		classpath 'de.undercouch:gradle-download-task:3.4.3'
 	}
 }
 
-apply plugin: net.fabricmc.loom.LoomGradlePlugin
+plugins {
-apply plugin: 'maven'
+	id 'java'
-apply plugin: 'maven-publish'
+	id 'idea'
-apply plugin: net.minecrell.gradle.licenser.Licenser
+	id 'eclipse'
-apply plugin: 'de.undercouch.download'
+	id 'maven-publish'
-apply plugin: 'idea'
+	id 'signing'
-apply plugin: 'eclipse'
+	id "org.cadixdev.licenser" version "0.5.0"
+	id "fabric-loom" version "0.6-SNAPSHOT"
+	id "com.matthewprenger.cursegradle" version "1.4.0"
+	id "de.undercouch.download" version "4.1.1"
+}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -45,6 +37,9 @@ repositories {
 			includeGroup "curse.maven"
 		}
 	}
+	maven {
+		url "https://maven.shedaniel.me/"
+	}
 	maven {
 		url = "https://jitpack.io"
 		content {
@@ -79,14 +74,14 @@ configurations.all {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:1.16.4"
+	minecraft "com.mojang:minecraft:1.16.5"
-	mappings "net.fabricmc:yarn:1.16.4+build.6:v2"
+	mappings "net.fabricmc:yarn:1.16.5+build.4:v2"
-	modImplementation "net.fabricmc:fabric-loader:0.10.8"
+	modImplementation "net.fabricmc:fabric-loader:0.11.1"
 
 	//Fabric api
-	modImplementation "net.fabricmc.fabric-api:fabric-api:0.28.3+1.16"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:0.30.0+1.16"
 
-	optionalDependency ("me.shedaniel:RoughlyEnoughItems:5.8.9")
+	optionalDependency "me.shedaniel:RoughlyEnoughItems:5.8.9"
 	disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.7')
 
 	def rcVersion = 'RebornCore:RebornCore-1.16:+'
@@ -98,11 +93,6 @@ dependencies {
 	modApi 'teamreborn:energy:0.1.1'
 
     optionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT"
-
-	modRuntime "curse.maven:applied-energistics-2:3117933"
-	modRuntime "alexiil.mc.lib:libblockattributes-core:0.8.0"
-	modRuntime "alexiil.mc.lib:libblockattributes-items:0.8.0"
-	modRuntime "alexiil.mc.lib:libblockattributes-fluids:0.8.0"
 }
 
 def optionalDependency(String dep) {
@@ -126,13 +116,16 @@ def disabledOptionalDependency(String dep) {
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
+	filesMatching("fabric.mod.json") {
-		include "fabric.mod.json"
 		expand "version": project.version
 	}
+}
 
-	from(sourceSets.main.resources.srcDirs) {
+tasks.withType(JavaCompile).configureEach {
-		exclude "fabric.mod.json"
+	it.options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isJava9Compatible()) {
+		it.options.release = 8
 	}
 }
 
@@ -149,10 +142,10 @@ jar {
 //Triggers crowdin to export the latest translations
 task crowdinExport() {
 	onlyIf {
-		project.hasProperty('crowdinKey')
+		ENV.CROWDIN_KEY
 	}
 	doLast{
-		def apiKey = project.crowdinKey
+		def apiKey = ENV.CROWDIN_KEY
 		def projectId = 'techreborn'
 		def response = new URL(sprintf('https://api.crowdin.com/api/project/%1$s/export?key=%2$s', [projectId, apiKey])).text
 		def metadata = new XmlParser().parseText(response)
@@ -222,19 +215,28 @@ publishing {
 		}
 	}
 	repositories {
-		maven {
+		if (ENV.MAVEN_URL) {
-			url "http://mavenupload.modmuss50.me/"
+			maven {
-			if (project.hasProperty('mavenPass')) {
+				url ENV.MAVEN_URL
 				credentials {
-					username 'buildslave'
+					username ENV.MAVEN_USERNAME
-					password project.getProperty('mavenPass')
+					password ENV.MAVEN_PASSWORD
 				}
 			}
 		}
 	}
 }
 
-// apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
+if (ENV.SIGNING_KEY) {
+	signing {
+		useInMemoryPgpKeys(ENV.SIGNING_KEY, ENV.SIGNING_PASSWORD)
+
+		sign publishing.publications.maven
+		sign remapJar
+	}
+
+	task signAll(dependsOn: [signMavenPublication, signRemapJar, remapJar])
+}
 
 import com.google.gson.JsonArray
 import groovy.util.XmlSlurper
@@ -242,36 +244,66 @@ import org.apache.commons.io.FileUtils
 
 import java.util.function.Consumer
 
-task curseTools {
+curseforge {
+	if (ENV.CURSEFORGE_API_KEY) {
+		apiKey = ENV.CURSEFORGE_API_KEY
+	}
+
+	project {
+		id = "233564"
+		changelog = "A changelog can be found at https://github.com/TechReborn/TechReborn"
+		releaseType = ENV.RELEASE_CHANNEL ?: "release"
+		addGameVersion "1.16.5"
+		addGameVersion "Fabric"
+
+		mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
+		relations {
+			requiredDependency 'reborncore'
+		}
+
+		afterEvaluate {
+			uploadTask.dependsOn("remapJar")
+		}
+	}
+
+	options {
+		forgeGradleIntegration = false
+	}
+}
+
+def getBranch() {
+	def ENV = System.getenv()
+	if (ENV.GITHUB_REF) {
+		def branch = ENV.GITHUB_REF
+		return branch.substring(branch.lastIndexOf("/") + 1)
+	}
+
+	return "unknown"
+}
+
+import org.kohsuke.github.GHReleaseBuilder
+import org.kohsuke.github.GitHub
+
+task github(dependsOn: remapJar) {
+	onlyIf {
+		ENV.GITHUB_TOKEN
+	}
+
 	doLast {
-		def cacheFiles = new File(".gradle/curseTools")
+		def github = GitHub.connectUsingOAuth(ENV.GITHUB_TOKEN as String)
-		if (!cacheFiles.exists()) {
+		def repository = github.getRepository(ENV.GITHUB_REPOSITORY)
-			cacheFiles.mkdirs()
-		}
 
-		def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")
+		def releaseBuilder = new GHReleaseBuilder(repository, version as String)
+		releaseBuilder.name("${archivesBaseName}-${version}")
+		releaseBuilder.body("A changelog can be found at https://github.com/TechReborn/TechReborn")
+		releaseBuilder.commitish(getBranch())
 
-		logger.lifecycle(":downloading curseTools metadata")
+		def ghRelease = releaseBuilder.create()
-		FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata)
+		ghRelease.uploadAsset(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"), "application/java-archive");
-
-		def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata))
-		def curseToolsVersion = metadata.versioning.release
-
-		def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar")
-
-		logger.lifecycle(":downloading CurseTools")
-		FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools)
-
-		logger.lifecycle(":launching CurseTools")
-		ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) {
-			arg(value: remapJar.archivePath.getAbsolutePath())
-		}
 	}
 }
 
 // Generate recipe JSON for similar recipes
-import java.util.regex.Pattern
-
 task compileRecipes {
 	def jsonSlurper = new JsonSlurper()
 	def recipePath = "build/resources/main/data/techreborn/recipes"
@@ -300,3 +332,23 @@ task compileRecipes {
 		}
     }
 }
+
+// A task to ensure that the version being released has not already been released.
+task checkVersion {
+	doFirst {
+		def xml = new URL("https://maven.modmuss50.me/TechReborn/TechReborn-1.16/maven-metadata.xml").text
+		def metadata = new XmlSlurper().parseText(xml)
+		def versions = metadata.versioning.versions.version*.text();
+		if (versions.contains(version)) {
+			throw new RuntimeException("${version} has already been released!")
+		}
+	}
+}
+
+if (ENV.SIGNING_KEY) {
+	publish.dependsOn signAll
+}
+
+github.mustRunAfter checkVersion
+publish.mustRunAfter checkVersion
+project.tasks.curseforge.mustRunAfter checkVersion

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+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
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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" "$@"

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
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -1 +1,11 @@
+pluginManagement {
+	repositories {
+		maven {
+			url = "https://maven.fabricmc.net"
+			name = "FabricMC"
+		}
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = "TechReborn-1.16"