Merge branch '1.20.1/dev' into 1.21.1/dev

This commit is contained in:
Jozufozu 2025-02-27 21:05:10 -08:00
commit 33e986a50c
3 changed files with 7 additions and 4 deletions

View file

@ -48,7 +48,8 @@ dependencies {
modImplementation "dev.engine-room.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version}" modImplementation "dev.engine-room.flywheel:flywheel-fabric-${minecraft_version}:${flywheel_version}"
} }
``` ```
`${flywheel_version}` gets replaced by the version of Flywheel you want to use, eg. `1.0.0-beta`
`${flywheel_version}` gets replaced by the version of Flywheel you want to use, eg. `1.0.0`
`${minecraft_version}` gets replaced by the version of Minecraft you're on, eg. `1.21.1` `${minecraft_version}` gets replaced by the version of Minecraft you're on, eg. `1.21.1`

View file

@ -87,6 +87,7 @@ jarSets {
addToAssemble() addToAssemble()
publishWithRemappedSources { publishWithRemappedSources {
artifactId = "vanillin-common-intermediary-${property("artifact_minecraft_version")}" artifactId = "vanillin-common-intermediary-${property("artifact_minecraft_version")}"
version = property("vanillin_version") as String
groupId = property("vanillin_group") as String groupId = property("vanillin_group") as String
} }
@ -107,6 +108,7 @@ jarSets {
publishWithRawSources { publishWithRawSources {
artifactId = "vanillin-common-mojmap-${property("artifact_minecraft_version")}" artifactId = "vanillin-common-mojmap-${property("artifact_minecraft_version")}"
version = property("vanillin_version") as String
groupId = property("vanillin_group") as String groupId = property("vanillin_group") as String
} }
} }

View file

@ -8,7 +8,7 @@ mod_homepage = https://github.com/Engine-Room/Flywheel
# Flywheel metadata # Flywheel metadata
flywheel_id=flywheel flywheel_id=flywheel
flywheel_name=Flywheel flywheel_name=Flywheel
flywheel_version=1.0.0-beta flywheel_version=1.0.0
flywheel_description=An overhauled entity and block entity rendering API. flywheel_description=An overhauled entity and block entity rendering API.
# Vanillin metadata # Vanillin metadata
vanillin_id=vanillin vanillin_id=vanillin
@ -16,8 +16,8 @@ vanillin_name=Vanillin
vanillin_version=1.0.0-beta vanillin_version=1.0.0-beta
vanillin_description=Instanced rendering for entities and block entities via Flywheel. vanillin_description=Instanced rendering for entities and block entities via Flywheel.
# Vanillin dependencies # Vanillin dependencies
flywheel_maven_version_range=[1.0.0-beta,2.0) flywheel_maven_version_range=[1.0.0,2.0)
flywheel_semver_version_range=>=1.0.0-beta <2.0.0 flywheel_semver_version_range=>=1.0.0 <2.0.0
# Mod dependency declarations # Mod dependency declarations
minecraft_semver_version_range = >=1.21.1 <1.21.2 minecraft_semver_version_range = >=1.21.1 <1.21.2