Add gitlab workflow and refactor gradle stuff for better artifacts

Author: Michael Ruf

.github/workflows/build.yml

@@ -0,0 +1,63 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '*'
+
+env:
+  # For any reason, specifying this in the modrinth step does not work?
+  # But it is also well documented here, so this should be ok to do
+  MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check tag condition
+        if: startsWith(github.ref, 'refs/tags/')
+        run: echo "Ref is a tag"
+
+      - name: Check out project
+        if: success()
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        if: success()
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'microsoft'
+
+      - name: Setup Gradle
+        if: success()
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4.2
+
+      - name: Build fabric-mod
+        if: success()
+        run: gradle :fabric-mod:remapJar
+
+      - name: Build velocity-plugin
+        if: success()
+        run: gradle :velocity-plugin:shadowJar
+
+      - name: Release on GitHub
+        if: success() && startsWith(github.ref, 'refs/tags/') # Failsafe check again
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            **/libs/proxy-command-*.jar
+            README.md
+            CHANGELOG.md
+            LICENSE
+          body_path: CHANGELOG.md
+          draft: false
+          prerelease: false
+          fail_on_unmatched_files: true
+
+      - name: Upload fabric-mod to modrinth
+        if: success()
+        run: gradle :fabric-mod:modrinth

CHANGELOG.md

@@ -0,0 +1 @@
+Initial project creation

README.md

@@ -31,10 +31,15 @@ For example, you can teleport all players to a different server with a command b
 execute as @a run proxycommand "server SERVERNAME"
 ```
 
+## Changelog
+
+Changelog per release cycle can be found [here](https://github.com/michiruf/MCProxyCommand/blob/master/CHANGELOG.md).
+This changelog information from one release to the next one.
+
 
 ## License
 
-[MIT License](https://github.com/michiruf/MCAllayFollowAlways/blob/master/LICENSE)
+[MIT License](https://github.com/michiruf/MCProxyCommand/blob/master/LICENSE)
 
 
 ## Additional reading (for devs)

build.gradle

@@ -1,7 +1,7 @@
 allprojects {
-    // Got from https://github.com/PaperMC/Velocity/blob/dev/3.0.0/build.gradle
     ext {
         getCurrentShortRevision = {
+            // Got from https://github.com/PaperMC/Velocity/blob/dev/3.0.0/build.gradle
             new ByteArrayOutputStream().withStream { os ->
                 exec {
                     executable = "git"
@@ -11,5 +11,30 @@ allprojects {
                 return os.toString().trim().substring(0, 8)
             }
         }
+
+        getLatestTag = {
+            new ByteArrayOutputStream().withStream { os ->
+                exec {
+                    executable = "git"
+                    args = ["describe", "--tags", "--abbrev=0"]
+                    standardOutput = os
+                }
+                return os.toString().trim()
+            }
+        }
+
+        getCurrentCommitCount = {
+            new ByteArrayOutputStream().withStream { os ->
+                exec {
+                    executable = "git"
+                    args = ["rev-list", "--all", "--count"]
+                    standardOutput = os
+                }
+                return os.toString().trim()
+            }
+        }
     }
+
+    project.version = "${project.ext.getLatestTag()}-${project.ext.getCurrentCommitCount()}-${project.ext.getCurrentShortRevision()}"
+    project.group = 'michiruf'
 }

common/build.gradle

@@ -2,5 +2,27 @@ plugins {
     id 'java'
 }
 
-version = project.mod_version
-group = project.maven_group
+dependencies {
+}
+
+def targetJavaVersion = 17
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+        it.options.release = targetJavaVersion
+    }
+}
+
+java {
+    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+    }
+    archivesBaseName = "$rootProject.name-common"
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+}

fabric-mod/build.gradle

@@ -3,20 +3,25 @@ plugins {
     id 'com.modrinth.minotaur' version '2.+'
 }
 
-version = project.mod_version
-group = project.maven_group
+// Fabric Properties. Check these on https://modmuss50.me/fabric.html
+def minecraft_version='1.19.2'
+def yarn_mappings='1.19.2+build.28'
+def loader_version='0.14.11'
+def fabric_version='0.68.0+1.19.2'
 
 repositories {
+    // NOTE This should currently be not needed, but to fiddle around with this dependency issue
+    //      we keep this for now
     maven {
         url = 'https://api.modrinth.com/maven'
     }
 }
 
 dependencies {
     // To change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    minecraft "com.mojang:minecraft:${minecraft_version}"
+    mappings "net.fabricmc:yarn:${yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${loader_version}"
 
     // Fabric API
     // It took 2 days to find out, that the dependency mods use or require the deprecated api of fabric,
@@ -33,8 +38,8 @@ dependencies {
     //modImplementation "maven.modrinth:fabric-api:${project.fabric_version}"
     // But if we do this, then the code for this project does not know fabric-api, so we just declare them
     // as compile time
-    modCompileOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modCompileOnly "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+    modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+    modCompileOnly "net.fabricmc.fabric-api:fabric-api-deprecated:${fabric_version}"
 
     // NOTE To work with the problems above, place these mods inside the mods folder
     // List of mods:
@@ -55,12 +60,13 @@ dependencies {
     // Error got because Identifier is null
 
     implementation project(':common')
+    include project(':common')
 }
 
 modrinth {
-    projectId = 'proxycommand'
+    projectId = 'proxy-command'
     versionNumber = project.version
-    versionType = 'alpha'
+    versionType = project.version.contains('SNAPSHOT') ? 'alpha' : 'release'
     gameVersions = ['1.19.2']
     loaders = ['fabric']
     dependencies {
@@ -74,7 +80,7 @@ modrinth {
     // Use the environment variable `$MODRINTH_TOKEN` for the token
     // token = 'mySecretToken'
 }
-
+tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
 
 processResources {
     inputs.property 'version', project.version
@@ -102,17 +108,11 @@ java {
     if (JavaVersion.current() < javaVersion) {
         toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
     }
-    archivesBaseName = project.archives_base_name
+    archivesBaseName = "$rootProject.name-fabric"
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
 
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.archives_base_name}" }
-    }
-}
-
 tasks.runServer.workingDir = 'run'

fabric-mod/run/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sun Dec 18 05:46:05 CET 2022
+#Sun Dec 18 20:55:10 CET 2022
 enable-jmx-monitoring=false
 rcon.port=25575
 level-seed=1248939201

fabric-mod/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "proxycommand",
+  "id": "proxy-command",
   "version": "${version}",
   "name": "ProxyCommand",
   "description": "",

gradle.properties

@@ -1,14 +1,2 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.28
-loader_version=0.14.11
-# Mod Properties
-mod_version=1.0-SNAPSHOT
-maven_group=michiruf
-archives_base_name=proxycommand
-# Dependencies
-# check this on https://modmuss50.me/fabric.html
-fabric_version=0.68.0+1.19.2

settings.gradle

@@ -8,7 +8,7 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'proxycommand'
+rootProject.name = 'proxy-command'
 include 'common'
 include 'fabric-mod'
 include 'velocity-plugin'