Skip to content

Commit ee86c72

Browse files
authored
Use commit as development version
Switch from using a int to a String of the version commit hash.
2 parents 315b1d7 + acd8b68 commit ee86c72

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ plugins {
66
id "org.jetbrains.kotlin.jvm" version "2.1.0"
77
}
88

9-
version = project.mod_version
9+
version = "${project.mod_version}-${getCheckedOutGitCommitHash()}"
1010
group = project.maven_group
1111

1212
base {
1313
archivesName = project.archives_base_name
1414
}
1515

16+
static def getCheckedOutGitCommitHash() {
17+
'git rev-parse --verify --short HEAD'.execute().text.trim()
18+
}
19+
1620
repositories {
1721
maven { url = "https://maven.terraformersmc.com/" }
1822
maven { url "https://maven.isxander.dev/releases" }

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ yacl_version=3.6.2+1.21.4-fabric
1414
modmenu_version=13.0.1
1515

1616
# Mod Properties
17-
mod_version=1.0-dev-1
17+
mod_version=1.0
1818
maven_group=btw.mixces
1919
archives_base_name=animatium

src/main/kotlin/btw/mixces/animatium/AnimatiumClient.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
1313
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
1414
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry
1515
import net.fabricmc.loader.api.FabricLoader
16+
import net.fabricmc.loader.api.ModContainer
1617
import java.io.File
1718
import java.util.Optional
1819

@@ -33,9 +34,17 @@ class AnimatiumClient : ClientModInitializer {
3334
shouldReloadOverlayTexture = true
3435
}
3536

37+
val modContainer: ModContainer = FabricLoader.getInstance().getModContainer("animatium").orElseThrow {
38+
RuntimeException(
39+
"Mod not found"
40+
)
41+
}
42+
3643
// Info
37-
const val VERSION = 1.0
38-
val DEVELOPMENT_VERSION: Optional<Int> = Optional.ofNullable(1)
44+
val VERSION_FULL = modContainer.metadata.version.friendlyString.split("-")
45+
46+
val VERSION = VERSION_FULL[0].toDouble()
47+
val DEVELOPMENT_VERSION: Optional<String> = Optional.ofNullable(VERSION_FULL[1])
3948

4049
@JvmStatic
4150
fun getInfoPayload(): AnimatiumInfoPayloadPacket {

src/main/kotlin/btw/mixces/animatium/packet/AnimatiumInfoPayloadPacket.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload
55
import net.minecraft.resources.ResourceLocation
66
import java.util.Optional
77

8-
class AnimatiumInfoPayloadPacket(val version: Double, val developmentVersion: Optional<Int>) :
8+
class AnimatiumInfoPayloadPacket(val version: Double, val developmentVersion: Optional<String>) :
99
CustomPacketPayload {
1010
companion object {
1111
val CODEC = CustomPacketPayload.codec(AnimatiumInfoPayloadPacket::write, null)
@@ -14,8 +14,8 @@ class AnimatiumInfoPayloadPacket(val version: Double, val developmentVersion: Op
1414

1515
private fun write(buffer: FriendlyByteBuf) {
1616
buffer.writeDouble(version)
17-
buffer.writeOptional<Int>(developmentVersion) { buf, value ->
18-
buf.writeShort(value)
17+
buffer.writeOptional<String>(developmentVersion) { buf, value ->
18+
buf.writeUtf(value)
1919
}
2020
}
2121

0 commit comments

Comments
 (0)