diff --git a/.gitignore b/.gitignore index f1f222f..6039124 100644 --- a/.gitignore +++ b/.gitignore @@ -50,5 +50,10 @@ gradle-app.setting # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar +# Avoid ignoring this two files. 1.7 version of minecraft - save in the repo for testing purpose. +# This is old version so better to be safe and commit this file +!spigot-1.7.10-SNAPSHOT-b1657.jar +!Thermos-1.7.10-1614-server.jar + # Cache of project .gradletasknamecache \ No newline at end of file diff --git a/build.gradle b/build.gradle index bb68177..f2988b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'fabric-loom' version '1.1-SNAPSHOT' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' + id "de.undercouch.download" version "5.6.0" id 'java' } @@ -20,7 +21,7 @@ def getWorkingBranch() { return "-" + gitBranch } -subprojects { +subprojects { subProject -> apply plugin: 'java' apply plugin: 'java-library' apply plugin: 'maven-publish' diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 75dfe25..fee2340 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -33,4 +33,63 @@ shadowJar { relocate 'org.slf4j', 'com.mineaurion.aurionchat.lib.slf4j' relocate 'net.kyori.adventure', 'com.mineaurion.aurionchat.lib.adventure' relocate 'net.kyori.event', 'com.mineaurion.aurionchat.lib.eventbus' +} + + +def urls = [ + [ + url: "https://download.getbukkit.org/spigot/spigot-1.20.4.jar", + folder: 'spigot-1.20', + ], + [ + url: "https://github.com/IzzelAliz/Arclight/releases/download/Trials%2F1.0.5/arclight-forge-1.20.1-1.0.5.jar", + folder: "arclight" + ] +] + +task downloadServerJar{ + urls.forEach {server -> + download.run { + src server.url + dest "${projectDir}/run/" + server.folder + "/server.jar" + } + copy { + from "${projectDir}/libs/start.sh" + into "${projectDir}/run/" + server.folder + } + copy { + from "${projectDir}/libs/start.bat" + into "${projectDir}/run/" + server.folder + } + } +} + +def localServerJar = [ + [ + file: "${projectDir}/libs/spigot-1.7.10-SNAPSHOT-b1657.jar", + folder: "spigot-1.7" + ], + [ + file: "${projectDir}/libs/Thermos-1.7.10-1614-server.jar", + folder: "thermos-1.7" + ] +] + +task copyLocalServerJar { + dependsOn downloadServerJar + localServerJar.forEach { server -> + copy { + from server.file + into "${projectDir}/run/" + server.folder + rename { "server.jar" } + } + copy { + from "${projectDir}/libs/start.sh" + into "${projectDir}/run/" + server.folder + } + copy { + from "${projectDir}/libs/start.bat" + into "${projectDir}/run/" + server.folder + } + } } \ No newline at end of file diff --git a/bukkit/libs/Thermos-1.7.10-1614-server.jar b/bukkit/libs/Thermos-1.7.10-1614-server.jar new file mode 100644 index 0000000..85e4890 Binary files /dev/null and b/bukkit/libs/Thermos-1.7.10-1614-server.jar differ diff --git a/bukkit/libs/spigot-1.7.10-SNAPSHOT-b1657.jar b/bukkit/libs/spigot-1.7.10-SNAPSHOT-b1657.jar new file mode 100644 index 0000000..ca1ea23 Binary files /dev/null and b/bukkit/libs/spigot-1.7.10-SNAPSHOT-b1657.jar differ diff --git a/bukkit/libs/start.bat b/bukkit/libs/start.bat new file mode 100644 index 0000000..b571621 --- /dev/null +++ b/bukkit/libs/start.bat @@ -0,0 +1 @@ +java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar server.jar \ No newline at end of file diff --git a/bukkit/libs/start.sh b/bukkit/libs/start.sh new file mode 100755 index 0000000..58047ce --- /dev/null +++ b/bukkit/libs/start.sh @@ -0,0 +1,2 @@ +#!/bin/sh +java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar server.jar \ No newline at end of file