1,2, new version with overtime support

Author: phinner

.github/workflows/release.yml

@@ -1,10 +1,6 @@
 name: Release
 
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
+on: workflow_dispatch
 
 jobs:
   build:

.gitignore

@@ -1,5 +1,29 @@
-/.idea/
-/.vscode/
-/.gradle/
-
+## Gradle
+.gradle/
 build/
+
+## Java
+*.class
+hs_err_pid*
+crash-report-*
+
+## Intellij
+.idea/
+*.ipr
+*.iws
+*.iml
+
+## Eclipse
+bin/
+.metadata/
+.settings/
+.classpath
+.project
+.loadpath
+
+## VSCode
+.vscode/
+
+## OS Specific
+.DS_Store
+Thumbs.db

README.md

@@ -1,8 +1,8 @@
-#  DominationPlugin
+# TemplatePlugin
 
-[![Jitpack latest version](https://jitpack.io/v/fr.xpdustry/DominationPlugin.svg)](https://jitpack.io/#fr.xpdustry/DominationPlugin)
-[![Build status](https://github.com/Xpdustry/DominationPlugin/actions/workflows/build.yml/badge.svg?branch=master&event=push)](https://github.com/Xpdustry/DominationPlugin/actions/workflows/build.yml)
-[![Mindustry 5.0 | 6.0](https://img.shields.io/badge/Mindustry-5.0%20%7C%206.0-ffd37f)](https://github.com/Anuken/Mindustry/releases)
+[![Jitpack latest version](https://jitpack.io/v/fr.xpdustry/TemplatePlugin.svg)](https://jitpack.io/#fr.xpdustry/TemplatePlugin)
+[![Build status](https://github.com/Xpdustry/TemplatePlugin/actions/workflows/build.yml/badge.svg?branch=master&event=push)](https://github.com/Xpdustry/TemplatePlugin/actions/workflows/build.yml)
+[![Mindustry 5.0 | 6.0 | 7.0 ](https://img.shields.io/badge/Mindustry-5.0%20%7C%206.0%20%7C%207.0-ffd37f)](https://github.com/Anuken/Mindustry/releases)
 
 ## Description
 
@@ -20,27 +20,9 @@ This template features some cool stuff such as:
 
 ## Tips and nice things to know
 
-- When you use this template, make sure you change the information in `plugin.json`
-  and set the `serverDirectoryPath`, `group` and `mindustryVersion` properties in `build.gradle`.
-  There is also the `rootProject.name` property in `settings.gradle`.
+- When you use this template, make sure to edit `plugin.json` and `gradle.properties`.
 
-- The plugin compiles to java 8 for compatibility reasons,
+- The plugin compiles to java 8 for maximum compatibility,
   but nothing keeps you to change the compiler target or source to a higher jdk.
 
-- For faster testing, I recommend you to add an exit statement at the end of your server startup script such as:
-
-`run_server.bat` 
-```batch
-@echo off
-java -jar server.jar
-exit
-```
-
-`run_server.sh`
-```shell
-#!/usr/bin/env bash
-java -jar server.jar
-exit
-```
-
 Thank you for using this template !

build.gradle

@@ -1,25 +1,14 @@
 import groovy.json.JsonSlurper
-import org.gradle.internal.os.OperatingSystem
+import java.nio.charset.StandardCharsets
 
 
 buildscript{
     ext{
-        // Mindustry API version you want to use
-        mindustryVersion = "v126.2"
-
-        // Junit version for tests outside a server
-        junitVersion = "5.7.2"
-
+        // Properties
+        mindustryVersion = property("props.mindustry-version")
+        serverDirectoryPath = property("props.mindustry-server-directory")
         // Plugin metadata extracted from plugin.json
         metadata = new JsonSlurper().parseText(file("$rootDir/plugin.json").text)
-
-        // A string that points directly to your server.jar directory
-        serverDirectoryPath = null
-
-        // the file:// at the beginning is required if you use windows if you don't want github actions to scream at you
-        if(System.getProperty("user.name") == "Finley"){
-            serverDirectoryPath = "file://C:/Users/Finley/Documents/My Games/Mindustry/Server/mindustry-server-$mindustryVersion"
-        }
     }
 
     repositories{
@@ -40,7 +29,7 @@ plugins{
 }
 
 
-group "fr.xpdustry"
+group property("props.project-group")
 version metadata.version
 
 
@@ -50,56 +39,58 @@ repositories{
 }
 
 dependencies{
+    // Json
+    implementation "com.google.code.gson:gson:2.8.8"
+    testImplementation "com.google.code.gson:gson:2.8.8"
+
     // Mindustry
     compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
     compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion"
 
     // Unit Testing
     testImplementation "com.github.Anuken.Arc:arc-core:$mindustryVersion"
     testImplementation "com.github.Anuken.Mindustry:core:$mindustryVersion"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }
 
 
+java{
+    withSourcesJar()
+}
+
 compileJava{
-    sourceCompatibility = JavaVersion.VERSION_15
-    targetCompatibility = JavaVersion.VERSION_15
-    options.encoding = "UTF-8"
+    sourceCompatibility = JavaVersion.VERSION_16
+    targetCompatibility = JavaVersion.VERSION_16
+    options.encoding = StandardCharsets.UTF_8
 }
 
-java{
-    withSourcesJar()
+test{
+    useJUnitPlatform()
+}
+
+compileTestJava{
+    options.encoding = StandardCharsets.UTF_8
 }
 
+
 jar{
+    archiveBaseName = project.property("props.project-name")
+
     // The following line is required
     from configurations.runtimeClasspath.collect{
         it.isDirectory() ? it : zipTree(it)
     }
 
-    from "plugin.json"
-}
-
-
-compileTestJava{
-    options.encoding = "UTF-8"
-}
-
-test{
-    useJUnitPlatform()
+    from "$rootDir/plugin.json"
 }
 
 
 task moveJar{
     dependsOn jar
 
     doLast{
-        if(serverDirectoryPath == null || serverDirectoryPath.isEmpty()){
-            throw new GradleException("serverDirectoryPath is unset")
-        }
-
         // Deletes all the jar files that begins with the base artifact name
         delete file("$serverDirectoryPath/config/mods").listFiles({
             it.isFile() && it.name.endsWith(".jar") && it.name.startsWith((String) jar.archiveBaseName.get())
@@ -112,41 +103,31 @@ task moveJar{
     }
 }
 
-task runServer{
-    doLast{
-        if(serverDirectoryPath == null || serverDirectoryPath.isEmpty()){
-            throw new GradleException("serverDirectoryPath is unset")
-        }
-
-        exec{
-            OperatingSystem os = OperatingSystem.current()
-
-            workingDir = file(serverDirectoryPath)
-
-            // Open a mindustry server in a new terminal window
-            if(os.isWindows()){
-                commandLine = ["cmd", "/C", "start", "run_server.bat"]
-            }else if(os.isLinux()){
-                commandLine = ["sh", "-c", "./run_server.sh"]
-            }else{
-                throw new GradleException("Unsuported operation, please implement a case for your os")
-            }
-        }
-    }
+task runServer(type: JavaExec){
+    workingDir = serverDirectoryPath
+    classpath = files("$serverDirectoryPath/server.jar")
+    mainClass = "mindustry.server.ServerLauncher"
+    standardInput = System.in
+    args = ["host Veins pvp"]
 }
 
 task deployJar{
     dependsOn moveJar
     dependsOn runServer
 }
 
-// Required if you want to use the Release GitHub action,
-task getArtifactPath{
-    doLast{
-        println jar.archiveFile.get().toString()
+// Makes sure the task are only available if the props.mindustry-server-directory is set correctly
+for(Task serverTask : [moveJar, runServer, deployJar]){
+    serverTask.configure{
+        onlyIf{ file(serverDirectoryPath).exists() }
     }
 }
 
+// Required if you want to use the Release GitHub action
+task getArtifactPath{
+    doLast{ println jar.archiveFile.get().toString() }
+}
+
 
 publishing{
     publications{
@@ -157,7 +138,7 @@ publishing{
                 name = metadata.displayName
                 artifactId = metadata.name
                 description = metadata.description
-                url =  "https://github.com/$metadata.repo"
+                url = "https://github.com/$metadata.repo"
 
                 licenses{
                     license{

gradle.properties

@@ -0,0 +1,9 @@
+# The project name, used as the artifact name
+props.project-name = DominationPlugin
+# Group of the project, usually a domain backwards such as com.google
+props.project-group = fr.xpdustry
+# Version of Mindustry API to use
+props.mindustry-version = v126.2
+# The path to your server.jar directory
+# The file:// at the beginning is required if you use windows if you don't want github actions to scream at you
+props.mindustry-server-directory = file://D:/Games/Mindustry/Builds/mindustry-server-v126.2

plugin.json

@@ -1,9 +1,9 @@
 {
-  "name": "domination-plugin",
+  "name": "xpdustry-domination-plugin",
   "displayName": "Xpdustry DominationPlugin",
   "author": "Phinner",
   "description": "Capture the zones to win!",
-  "version": "1.1",
+  "version": "1.2",
   "minGameVersion": "105",
   "hidden": true,
   "java": true,