From d2d2dc64db54affb46cd2f43ed4d2f79f4ba7cd3 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 9 Aug 2021 23:01:57 +0200 Subject: [PATCH 1/6] Easier to yoink the build.gradle --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 16ac7cfc4..26ac9bf7f 100644 --- a/build.gradle +++ b/build.gradle @@ -72,15 +72,15 @@ task release(type: proguard.gradle.ProGuardTask) { verbose() } -def registerCustomOutputTask(name, path) { - tasks.register('build' + name, Copy) { +def registerCustomOutputTask(dname, path) { + tasks.register('build' + dname, Copy) { group('development') outputs.upToDateWhen { false } dependsOn ':shadowJar' from(file('build/libs/Iris-' + version + '-all.jar')) into(file(path)) rename { String fileName -> - fileName.replace('Iris-' + version + '-all.jar', "Iris.jar") + fileName.replace(name + '-' + version + '-all.jar', name + ".jar") } } } @@ -90,10 +90,10 @@ file(jar.archiveFile.get().getAsFile().getParentFile().getParentFile().getParent processResources { filesMatching('**/plugin.yml') { expand( - 'name': name.toString(), - 'version': version.toString(), - 'main': main.toString(), - 'apiversion': apiVersion.toString() + 'name': name.toString(), + 'version': version.toString(), + 'main': main.toString(), + 'apiversion': apiVersion.toString() ) } } From f2b4d6f829e2209f078364ea39ea875cb771960a Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 9 Aug 2021 23:06:35 +0200 Subject: [PATCH 2/6] ok intellij if you so demand (still works) --- build.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 26ac9bf7f..a818cd0eb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import proguard.gradle.ProGuardTask + /* * Iris is a World Generator for Minecraft Bukkit Servers * Copyright (c) 2021 Arcane Arts (Volmit Software) @@ -39,14 +41,14 @@ def main = 'com.volmit.iris.Iris' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== -registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); -registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'); -registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins'); -registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins'); -registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins'); +registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins') +registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins') +registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins') +registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins') +registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins') // ============================================================== -def dependsDir = "${buildDir}/libs/dependencies/" +def dependsDir = "${buildDir}/libs/dependencies/" as String task copyDepends(type: Copy) { dependsOn(":shadowJar") @@ -55,7 +57,7 @@ task copyDepends(type: Copy) { into "${dependsDir}" } -task release(type: proguard.gradle.ProGuardTask) { +task release(type: ProGuardTask) { dependsOn(":copyDepends") group('proguard') configuration 'proguard.pro' From b596f38ab5ea0a87a45bcffe97e094102bf8f768 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 9 Aug 2021 23:26:01 +0200 Subject: [PATCH 3/6] Forgot one --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a818cd0eb..0462c89f9 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ def registerCustomOutputTask(dname, path) { group('development') outputs.upToDateWhen { false } dependsOn ':shadowJar' - from(file('build/libs/Iris-' + version + '-all.jar')) + from(file('build/libs/' + name + '-' + version + '-all.jar')) into(file(path)) rename { String fileName -> fileName.replace(name + '-' + version + '-all.jar', name + ".jar") From a781bcb7f4afd4667050b5afdba4e305364ba453 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 9 Aug 2021 23:52:20 +0200 Subject: [PATCH 4/6] Simplify conversion & less error-prone settings.gradle name is now used over user-definable one --- build.gradle | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 16ac7cfc4..dbc11bbfe 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import proguard.gradle.ProGuardTask + /* * Iris is a World Generator for Minecraft Bukkit Servers * Copyright (c) 2021 Arcane Arts (Volmit Software) @@ -34,19 +36,19 @@ plugins { group 'com.volmit.iris' version '1.6.7-Experimental' def apiVersion = '1.17' -def name = 'Iris' +def name = getRootProject().getName() def main = 'com.volmit.iris.Iris' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== -registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); -registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins'); -registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins'); -registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins'); -registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins'); +registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins', name) +registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins', name) +registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins', name) +registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins', name) +registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name) // ============================================================== -def dependsDir = "${buildDir}/libs/dependencies/" +def dependsDir = "${buildDir}/libs/dependencies/" as String task copyDepends(type: Copy) { dependsOn(":shadowJar") @@ -55,7 +57,7 @@ task copyDepends(type: Copy) { into "${dependsDir}" } -task release(type: proguard.gradle.ProGuardTask) { +task release(type: ProGuardTask) { dependsOn(":copyDepends") group('proguard') configuration 'proguard.pro' @@ -72,15 +74,15 @@ task release(type: proguard.gradle.ProGuardTask) { verbose() } -def registerCustomOutputTask(name, path) { +def registerCustomOutputTask(name, path, plugin) { tasks.register('build' + name, Copy) { group('development') outputs.upToDateWhen { false } dependsOn ':shadowJar' - from(file('build/libs/Iris-' + version + '-all.jar')) + from(file('build/libs/' + plugin + '-' + version + '-all.jar')) into(file(path)) rename { String fileName -> - fileName.replace('Iris-' + version + '-all.jar', "Iris.jar") + fileName.replace(plugin + '-' + version + '-all.jar', plugin + ".jar") } } } From 984f2669b83f7c3e6ed09e0006e459b8e19ed2f3 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 9 Aug 2021 23:54:05 +0200 Subject: [PATCH 5/6] Docs --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 64038db28..584cd3437 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ plugins { group 'com.volmit.iris' version '1.6.7-Experimental' def apiVersion = '1.17' -def name = getRootProject().getName() +def name = getRootProject().getName() // See settings.gradle def main = 'com.volmit.iris.Iris' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED From ece7a443fe6f770a5f973d126b5f79f1030a8222 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Tue, 10 Aug 2021 00:11:58 +0200 Subject: [PATCH 6/6] another doc --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 584cd3437..12e48320b 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,7 @@ version '1.6.7-Experimental' def apiVersion = '1.17' def name = getRootProject().getName() // See settings.gradle def main = 'com.volmit.iris.Iris' +// You need to also set command usage, aliases and description in src/main/resources/plugin.yml // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ==============================================================