Skip to content

Commit 1050005

Browse files
committed
Add version details to toString impl
1 parent f212844 commit 1050005

File tree

2 files changed

+39
-7
lines changed

2 files changed

+39
-7
lines changed

src/main/kotlin/dev/deftu/gradle/utils/version/MinecraftReleaseVersion.kt

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,45 @@ class MinecraftReleaseVersion private constructor(
188188
}
189189

190190
override fun toString(): String {
191-
return "$major.$minor" + if (patch != 0) ".$patch" else ""
191+
// return "$major.$minor" + if (patch != 0) ".$patch" else ""
192+
return buildString {
193+
append(major).append('.').append(minor)
194+
if (patch != 0) {
195+
append('.').append(patch)
196+
}
197+
198+
if (classifier != null) {
199+
var spacedRevision = false
200+
201+
when (classifier) {
202+
Classifier.PRE_RELEASE -> {
203+
when (rawClassifier) {
204+
"pre" -> {
205+
append('-').append("pre")
206+
}
207+
208+
"Pre-Release" -> {
209+
spacedRevision = true
210+
append(' ').append("Pre-Release")
211+
}
212+
}
213+
}
214+
215+
else -> {
216+
append('-').append(classifier!!.identifier.first())
217+
revision?.let(::append)
218+
}
219+
}
220+
221+
if (revision != null) {
222+
if (spacedRevision) {
223+
append(' ')
224+
}
225+
226+
append(revision)
227+
}
228+
}
229+
}
192230
}
193231

194232
}

src/main/kotlin/dev/deftu/gradle/utils/version/MinecraftVersion.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,21 @@ import java.io.Serializable
77
import java.time.OffsetDateTime
88

99
sealed interface MinecraftVersion<T : MinecraftVersion<T>> : Comparable<MinecraftVersion<*>>, Serializable {
10-
1110
companion object {
12-
1311
@JvmStatic
1412
fun getRawVersion(project: Project): String {
1513
return project.propertyOr("minecraft.version", project.name, prefix = "")
1614
}
17-
1815
}
1916

2017
object Unknown : MinecraftVersion<Unknown> {
21-
2218
override val releaseTime: OffsetDateTime = OffsetDateTime.MIN
2319

2420
override val preprocessorKey: Int = 0
2521

2622
override fun compareTo(other: MinecraftVersion<*>): Int {
2723
return 0
2824
}
29-
3025
}
3126

3227
val releaseTime: OffsetDateTime
@@ -48,5 +43,4 @@ sealed interface MinecraftVersion<T : MinecraftVersion<T>> : Comparable<Minecraf
4843
fun isOlderThan(other: T): Boolean {
4944
return compareTo(other) < 0
5045
}
51-
5246
}

0 commit comments

Comments
 (0)