Merge branch 'master' into gradle

This commit is contained in:
CocoTheOwner 2021-08-09 23:52:44 +02:00
commit 9b94b9e3fe

View File

@ -36,16 +36,16 @@ plugins {
group 'com.volmit.iris' group 'com.volmit.iris'
version '1.6.7-Experimental' version '1.6.7-Experimental'
def apiVersion = '1.17' def apiVersion = '1.17'
def name = 'Iris' def name = getRootProject().getName()
def main = 'com.volmit.iris.Iris' def main = 'com.volmit.iris.Iris'
// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
// ============================================================== // ==============================================================
registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins') registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins', name)
registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins') registerCustomOutputTask('Psycho', 'D://Dan/MinecraftDevelopment/server/plugins', name)
registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins') registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins', name)
registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins') registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/Development/MCServer/plugins', name)
registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins') registerCustomOutputTask('Strange', 'D://Servers/1.17 Test Server/plugins', name)
// ============================================================== // ==============================================================
def dependsDir = "${buildDir}/libs/dependencies/" as String def dependsDir = "${buildDir}/libs/dependencies/" as String
@ -74,15 +74,15 @@ task release(type: ProGuardTask) {
verbose() verbose()
} }
def registerCustomOutputTask(dname, path) { def registerCustomOutputTask(name, path, plugin) {
tasks.register('build' + dname, Copy) { tasks.register('build' + name, Copy) {
group('development') group('development')
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
dependsOn ':shadowJar' dependsOn ':shadowJar'
from(file('build/libs/' + name + '-' + version + '-all.jar')) from(file('build/libs/' + plugin + '-' + version + '-all.jar'))
into(file(path)) into(file(path))
rename { String fileName -> rename { String fileName ->
fileName.replace(name + '-' + version + '-all.jar', name + ".jar") fileName.replace(plugin + '-' + version + '-all.jar', plugin + ".jar")
} }
} }
} }