Skip to content

Commit 53245e2

Browse files
authored
Merge pull request #3 from EraTiem-Network/next
v1.0.0.alpha1
2 parents 4e22bfe + 0acf802 commit 53245e2

File tree

5 files changed

+105
-105
lines changed

5 files changed

+105
-105
lines changed

build.gradle.kts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ subprojects {
2727

2828
dependencies {
2929
val tools: Project? = findProject(":tools")
30-
if (tools != null && tools != project) implementation(project(":tools"))
30+
if (tools != null && tools != project) implementation(project(path = ":tools", configuration = "shadow"))
3131

3232
compileOnly(rootProject.libs.kotlin.gradleplugin)
3333
compileOnly(rootProject.libs.kotlin.stdlib)
@@ -121,17 +121,15 @@ subprojects {
121121
}
122122
}
123123

124-
fun getAsYamlList(commaSeparatedList: Any?): String {
124+
fun getAsYamlList(commaSeparatedList: Any?): String =
125125
if (commaSeparatedList is String && commaSeparatedList.isNotBlank()) {
126-
return commaSeparatedList
126+
commaSeparatedList
127127
.replace(" ", "")
128128
.split(",")
129129
.stream()
130130
.map { "\n - $it" }
131131
.collect(Collectors.joining())
132-
}
133-
return ""
134-
}
132+
} else ""
135133

136134
repositories {
137135
bitBuildArtifactory()

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
2-
kotlin = "1.8.20"
2+
kotlin = "1.8.21"
33
shadow = "8.1.1"
4-
run = "2.0.1"
4+
run = "2.1.0"
55

66
# Minecraft Software
77
spigot = "1.19.4-R0.1-SNAPSHOT"

gradle/module-resources/folia.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
plugins {
2-
// alias(libs.plugins.run.paper)
2+
alias(libs.plugins.run.paper)
33
}
44

55
dependencies {
66
compileOnly(libs.minecraft.server.folia)
77
}
88

9-
//tasks.runServer {
10-
// minecraftVersion("1.19.4")
11-
//}
9+
tasks {
10+
runPaper.folia.registerTask {
11+
minecraftVersion("1.19.4")
12+
}
13+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew.bat

Lines changed: 92 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)