From 94f362ddae264d9386b5ff1f624d741bc0eec47d Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 21 May 2023 21:17:25 +0200 Subject: [PATCH 1/2] Add Gradle Plugin --- build.gradle | 169 +----------------------------------------------- settings.gradle | 9 +++ 2 files changed, 10 insertions(+), 168 deletions(-) diff --git a/build.gradle b/build.gradle index 7cdd1cd..2eee47f 100644 --- a/build.gradle +++ b/build.gradle @@ -34,31 +34,12 @@ plugins { id 'application' id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'de.steamwar.gradle' version 'RELEASE' } group 'de.steamwar' version '' -Properties steamwarProperties = new Properties() -if (file("steamwar.properties").exists()) { - steamwarProperties.load(file("steamwar.properties").newDataInputStream()) -} - -ext { - buildName = 'RealTime' - artifactName = 'realtime' - - uberJarName = "${buildName}-all.jar" - jarName = "${artifactName}.jar" - libs = "${buildDir}/libs" - - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - operatingSystem = "windows" - } else { - operatingSystem = "unix" - } -} - compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 @@ -93,152 +74,4 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' -} - -task buildProject { - description 'Build this project' - group "Steamwar" - - dependsOn build -} - -task finalizeProject { - description 'Finalize this project' - group "Steamwar" - - doLast { - if ("${buildDir}" == null) { - return - } - delete fileTree("${libs}").matching { - exclude("${uberJarName}") - } - file(libs + "/" + uberJarName).renameTo(file(libs + "/" + jarName)) - } -} -build.finalizedBy(finalizeProject) - -if (steamwarProperties.containsKey("hostname")) { - String hostname = steamwarProperties.get("hostname") - String uploadPath = steamwarProperties.getOrDefault("uploadPath", "~") - - String server = steamwarProperties.getOrDefault("server", "DevBungee") - String serverStartFlags = steamwarProperties.getOrDefault("serverStartFlags", "") - - task uploadProject { - description 'Upload this project' - group "Steamwar" - - doLast { - await(shell("scp ${libs}/${jarName} ${hostname}:${uploadPath}/${server}/plugins")) - if (steamwarProperties.getOrDefault("directStart", "false") == "false" && !answer("Start ${server} server?")) { - return - } - serverStart(server, serverStartFlags, hostname) - } - } - uploadProject.dependsOn(buildProject) - - task startDevServer { - description 'Start the DevBungee' - group "Steamwar" - - doLast { - serverStart(server, serverStartFlags, hostname) - } - } -} - -private def await(Process proc) { - def out = new StringBuilder() - def err = new StringBuilder() - proc.waitForProcessOutput(out, err) - return [out, err, proc.exitValue()] -} - -private def shell(String command) { - if (operatingSystem == "unix") { - return ['bash', '-c', command].execute() - } else { - return ["cmd", "/c", command].execute() - } -} - -private def serverStart(String serverName, String serverFlags, String hostname) { - def proc = shell("ssh -t ${hostname} \"./mc ${serverFlags} ${serverName}\"") - - Set strings = new HashSet<>() - File file = new File("${projectDir}/ignoredlog"); - if (file.exists()) { - new BufferedReader(new InputStreamReader(new FileInputStream(file))).readLines().forEach({ s -> - strings.add(s) - }) - } - - Thread outputThread = new Thread({ - Reader reader = proc.getInputStream().newReader(); - Writer writer = System.out.newWriter(); - try { - while (proc.alive) { - String s = reader.readLine() - if (s == null) { - return - } - if (strings.stream().anyMatch({check -> s.contains(check)})) { - continue - } - writer.write(s + "\n") - writer.flush() - } - } catch (IOException e) { - // Ignored - } - }) - outputThread.setName("${serverName} - OutputThread") - outputThread.start() - - Writer writer - Thread inputThread = new Thread({ - Reader reader = System.in.newReader() - writer = proc.getOutputStream().newWriter() - try { - while (proc.alive) { - String s = reader.readLine() - writer.write(s + "\n") - writer.flush() - } - } catch (IOException e) { - // Ignored - } - }) - inputThread.setName("${serverName} - InputThread") - inputThread.start() - - gradle.buildFinished { buildResult -> - if (!proc.alive) { - return - } - writer = proc.getOutputStream().newWriter() - writer.write("stop\n") - writer.flush() - awaitClose(proc, outputThread, inputThread) - } - awaitClose(proc, outputThread, inputThread) -}; - -private static def awaitClose(Process proc, Thread outputThread, Thread inputThread) { - while (proc.alive) { - Thread.sleep(10) - } - proc.closeStreams() - outputThread.interrupt() - inputThread.interrupt() -} - -private def answer(String question) { - while (System.in.available() > 0) System.in.read() - println(question) - boolean valid = "Yy".contains(((char) System.in.read()).toString()) - while (System.in.available() > 0) System.in.read() - return valid } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 63c053d..d7f97a1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,4 +17,13 @@ * along with this program. If not, see . */ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + url 'https://steamwar.de/maven/' + } + } +} + rootProject.name = 'RealTime' \ No newline at end of file -- 2.39.5 From f01ce328e7cf97bc85a8e231c8df0398ede32625 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 21 May 2023 21:17:49 +0200 Subject: [PATCH 2/2] Add Gradle Plugin --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2eee47f..1add72d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,10 +17,6 @@ * along with this program. If not, see . */ - - -import org.apache.tools.ant.taskdefs.condition.Os - plugins { // Adding the base plugin fixes the following gradle warnings in IntelliJ: // -- 2.39.5