Skip to content

Commit 734120b

Browse files
committed
Release 1.2.2, fix bungeecord
1 parent 7e627d1 commit 734120b

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = "org.bxteam"
9-
version = "1.2.1"
9+
version = "1.2.2"
1010
description = "Gradle plugin for running Minecraft server instances in your IDE"
1111

1212
repositories {

plugin/src/main/kotlin/org/bxteam/runserver/ServerType.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ enum class ServerType(val loaderName: String, val proxy: Boolean) {
2121
/**
2222
* Used to download a Jar from a `ServerType`.
2323
*
24-
* @param mcVersion The Minecraft server version.
24+
* @param serverVersion The server version.
2525
* @param directory The directory in which it will be saved in.
2626
*/
27-
fun downloadJar(mcVersion: String, directory: File) =
27+
fun downloadJar(serverVersion: String, directory: File) =
2828
when(this) {
29-
SPIGOT -> DownloadLib.spigot(directory, mcVersion)
30-
PAPER -> DownloadLib.paper(directory, mcVersion)
31-
PUFFERFISH -> DownloadLib.pufferfish(directory, mcVersion)
32-
PURPUR -> DownloadLib.purpur(directory, mcVersion)
33-
CANVAS -> DownloadLib.canvas(directory, mcVersion)
34-
DIVINEMC -> DownloadLib.divinemc(directory, mcVersion)
35-
LEAF -> DownloadLib.leaf(directory, mcVersion)
36-
LEAVES -> DownloadLib.leaves(directory, mcVersion)
37-
BUNGEECORD -> DownloadLib.bungeecord(directory)
38-
VELOCITY -> DownloadLib.velocity(directory, mcVersion)
39-
VELOCITY_CTD -> DownloadLib.velocityCtd(directory, mcVersion)
40-
WATERFALL -> DownloadLib.waterfall(directory, mcVersion)
29+
SPIGOT -> DownloadLib.spigot(directory, serverVersion)
30+
PAPER -> DownloadLib.paper(directory, serverVersion)
31+
PUFFERFISH -> DownloadLib.pufferfish(directory, serverVersion)
32+
PURPUR -> DownloadLib.purpur(directory, serverVersion)
33+
CANVAS -> DownloadLib.canvas(directory, serverVersion)
34+
DIVINEMC -> DownloadLib.divinemc(directory, serverVersion)
35+
LEAF -> DownloadLib.leaf(directory, serverVersion)
36+
LEAVES -> DownloadLib.leaves(directory, serverVersion)
37+
BUNGEECORD -> DownloadLib.bungeecord(directory, serverVersion)
38+
VELOCITY -> DownloadLib.velocity(directory, serverVersion)
39+
VELOCITY_CTD -> DownloadLib.velocityCtd(directory, serverVersion)
40+
WATERFALL -> DownloadLib.waterfall(directory, serverVersion)
4141
}
4242

4343
/**

plugin/src/main/kotlin/org/bxteam/runserver/lib/DownloadLib.kt

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,116 +14,116 @@ object DownloadLib {
1414
* This method is used to download Spigot.
1515
*
1616
* @param folder The folder to download the jar to
17-
* @param minecraftVersion The minecraft version target
17+
* @param serverVersion The minecraft version target
1818
*/
19-
fun spigot(folder: File, minecraftVersion: String) =
20-
downloadFromMcJarsApi(folder, "SPIGOT", minecraftVersion)
19+
fun spigot(folder: File, serverVersion: String) =
20+
downloadFromMcJarsApi(folder, "SPIGOT", serverVersion)
2121

2222
/**
2323
* This method is used to download PaperMC.
2424
*
2525
* @param folder The folder to download the jar to
26-
* @param minecraftVersion The minecraft version target
26+
* @param serverVersion The minecraft version target
2727
*/
28-
fun paper(folder: File, minecraftVersion: String) =
29-
downloadFromMcJarsApi(folder, "PAPER", minecraftVersion)
28+
fun paper(folder: File, serverVersion: String) =
29+
downloadFromMcJarsApi(folder, "PAPER", serverVersion)
3030

3131
/**
3232
* This method is used to download Pufferfish.
3333
*
3434
* @param folder The folder to download the jar to
35-
* @param minecraftVersion The minecraft version target
35+
* @param serverVersion The minecraft version target
3636
*/
37-
fun pufferfish(folder: File, minecraftVersion: String): DownloadResult =
38-
downloadFromMcJarsApi(folder, "PUFFERFISH", minecraftVersion)
37+
fun pufferfish(folder: File, serverVersion: String): DownloadResult =
38+
downloadFromMcJarsApi(folder, "PUFFERFISH", serverVersion)
3939

4040
/**
4141
* This method is used to download Purpur.
4242
*
4343
* @param folder The folder to download the jar to
44-
* @param minecraftVersion The minecraft version target
44+
* @param serverVersion The minecraft version target
4545
*/
46-
fun purpur(folder: File, minecraftVersion: String): DownloadResult =
47-
downloadFromMcJarsApi(folder, "PURPUR", minecraftVersion)
46+
fun purpur(folder: File, serverVersion: String): DownloadResult =
47+
downloadFromMcJarsApi(folder, "PURPUR", serverVersion)
4848

4949
/**
5050
* This method is used to download Canvas.
5151
*
5252
* @param folder The folder to download the jar to
53-
* @param minecraftVersion The minecraft version target
53+
* @param serverVersion The minecraft version target
5454
*/
55-
fun canvas(folder: File, minecraftVersion: String): DownloadResult =
56-
downloadFromMcJarsApi(folder, "CANVAS", minecraftVersion)
55+
fun canvas(folder: File, serverVersion: String): DownloadResult =
56+
downloadFromMcJarsApi(folder, "CANVAS", serverVersion)
5757

5858
/**
5959
* This method is used to download DivineMC.
6060
*
6161
* @param folder The folder to download the jar to
62-
* @param minecraftVersion The minecraft version target
62+
* @param serverVersion The minecraft version target
6363
*/
64-
fun divinemc(folder: File, minecraftVersion: String): DownloadResult =
65-
downloadFromMcJarsApi(folder, "DIVINEMC", minecraftVersion)
64+
fun divinemc(folder: File, serverVersion: String): DownloadResult =
65+
downloadFromMcJarsApi(folder, "DIVINEMC", serverVersion)
6666

6767
/**
6868
* This method is used to download Leaf.
6969
*
7070
* @param folder The folder to download the jar to
71-
* @param minecraftVersion The minecraft version target
71+
* @param serverVersion The minecraft version target
7272
*/
73-
fun leaf(folder: File, minecraftVersion: String): DownloadResult =
74-
downloadFromMcJarsApi(folder, "LEAF", minecraftVersion)
73+
fun leaf(folder: File, serverVersion: String): DownloadResult =
74+
downloadFromMcJarsApi(folder, "LEAF", serverVersion)
7575

7676
/**
7777
* This method is used to download Leaves.
7878
*
7979
* @param folder The folder to download the jar to
80-
* @param minecraftVersion The minecraft version target
80+
* @param serverVersion The minecraft version target
8181
*/
82-
fun leaves(folder: File, minecraftVersion: String): DownloadResult =
83-
downloadFromMcJarsApi(folder, "LEAVES", minecraftVersion)
82+
fun leaves(folder: File, serverVersion: String): DownloadResult =
83+
downloadFromMcJarsApi(folder, "LEAVES", serverVersion)
8484

8585
/**
8686
* This method is used to download Bungeecord proxy.
8787
*
8888
* @param folder The folder to download the jar to
8989
*/
90-
fun bungeecord(folder: File): DownloadResult =
91-
downloadFromMcJarsApi(folder, "BUNGEECORD", "latest")
90+
fun bungeecord(folder: File, serverVersion: String): DownloadResult =
91+
downloadFromMcJarsApi(folder, "BUNGEECORD", serverVersion)
9292

9393
/**
9494
* This method is used to download Velocity proxy.
9595
*
9696
* @param folder The folder to download the jar to
97-
* @param minecraftVersion The minecraft version target
97+
* @param serverVersion The minecraft version target
9898
*/
99-
fun velocity(folder: File, minecraftVersion: String) =
100-
downloadFromMcJarsApi(folder, "VELOCITY", minecraftVersion)
99+
fun velocity(folder: File, serverVersion: String) =
100+
downloadFromMcJarsApi(folder, "VELOCITY", serverVersion)
101101

102102
/**
103103
* This method is used to download Velocity-CTD proxy.
104104
*
105105
* @param folder The folder to download the jar to
106-
* @param minecraftVersion The minecraft version target
106+
* @param serverVersion The minecraft version target
107107
*/
108-
fun velocityCtd(folder: File, minecraftVersion: String) =
109-
downloadFromMcJarsApi(folder, "VELOCITY_CTD", minecraftVersion)
108+
fun velocityCtd(folder: File, serverVersion: String) =
109+
downloadFromMcJarsApi(folder, "VELOCITY_CTD", serverVersion)
110110

111111
/**
112112
* This method is used to download Waterfall proxy.
113113
*
114114
* @param folder The folder to download the jar to
115-
* @param minecraftVersion The minecraft version target
115+
* @param serverVersion The minecraft version target
116116
*/
117-
fun waterfall(folder: File, minecraftVersion: String) =
118-
downloadFromMcJarsApi(folder, "WATERFALL", minecraftVersion)
117+
fun waterfall(folder: File, serverVersion: String) =
118+
downloadFromMcJarsApi(folder, "WATERFALL", serverVersion)
119119

120120
/**
121121
* This method is used to download file from the McJars API.
122122
*/
123-
private fun downloadFromMcJarsApi(folder: File, type: String, minecraftVersion: String): DownloadResult {
124-
logger.lifecycle("Fetching ${type.lowercase()} builds for version $minecraftVersion...")
123+
private fun downloadFromMcJarsApi(folder: File, type: String, serverVersion: String): DownloadResult {
124+
logger.lifecycle("Fetching ${type.lowercase()} builds for version $serverVersion...")
125125
try {
126-
val url = URI("$MCJARS_API_BASE/builds/$type/$minecraftVersion")
126+
val url = URI("$MCJARS_API_BASE/builds/$type/$serverVersion")
127127
val response = JsonParser.parseString(url.toURL().readText()).asJsonObject
128128

129129
if (!response.get("success").asBoolean) {
@@ -140,8 +140,8 @@ object DownloadLib {
140140
val jarUrl = latestBuild.get("jarUrl").asString
141141
val outputFileName = type.lowercase() + ".jar"
142142

143-
logger.lifecycle("Latest build for $minecraftVersion is $buildNumber.")
144-
logger.lifecycle("Downloading $type $minecraftVersion build $buildNumber...")
143+
logger.lifecycle("Latest build for $serverVersion is $buildNumber.")
144+
logger.lifecycle("Downloading $type $serverVersion build $buildNumber...")
145145

146146
val result = downloadFile(folder, jarUrl, outputFileName)
147147
if (result.resultType == DownloadResultType.SUCCESS) {
@@ -154,13 +154,13 @@ object DownloadLib {
154154
}
155155

156156
/**
157-
* This method is used to download a file from an url.
157+
* This method is used to download a file from a url.
158158
*/
159159
fun downloadFile(folder: File, downloadURL: String, name: String): DownloadResult =
160160
downloadFile(folder, URI(downloadURL), name)
161161

162162
/**
163-
* This method is used to download a file from an url.
163+
* This method is used to download a file from a url.
164164
*/
165165
private fun downloadFile(folder: File, downloadURL: URI, name: String): DownloadResult {
166166
val file = File(folder, name)

0 commit comments

Comments
 (0)