From 5372b9f0de6b7b3f59e736b752d0999ce6000387 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Thu, 8 Aug 2024 17:59:40 +0200 Subject: [PATCH] 1.21.1 --- build.gradle | 12 ++++++++++-- gradle.properties | 9 ++++++--- .../fixes/data/ResourcePackHeaderDiff.java | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index eea0d955..274ae121 100644 --- a/build.gradle +++ b/build.gradle @@ -100,12 +100,20 @@ processResources { expand( "version": project.version, "description": project.description, - "implVersion": "git-${project.name}-${project.version}:${project.latestCommitHash()}", - "mcVersion": project.minecraft_version + "implVersion": "git-${project.name}-${project.version}:${latestCommitHash()}", + "mcVersion": mcVersion() ) } } +String mcVersion() { + if (project.supported_versions.isEmpty()) { + return project.minecraft_version + } else { + return project.supported_versions + } +} + String latestCommitHash() { def stdout = new ByteArrayOutputStream() exec { diff --git a/gradle.properties b/gradle.properties index 0d4e7f0c..87310394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,10 @@ maven_version=3.4.4-SNAPSHOT maven_description=Fabric mod to connect to EVERY Minecraft server version (Release, Beta, Alpha, Classic, Snapshots, Bedrock) with QoL fixes to the gameplay # Minecraft/Fabric -minecraft_version=1.21 -yarn_version=1.21+build.9 +minecraft_version=1.21.1 +yarn_version=1.21.1+build.1 loader_version=0.15.11 -fabric_api_version=0.102.0+1.21 +fabric_api_version=0.102.0+1.21.1 + +# empty for minecraft version above +supported_versions=>=1.21 <=1.21.1 \ No newline at end of file diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java index cff0b154..9729105d 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java @@ -39,7 +39,7 @@ public class ResourcePackHeaderDiff { private final static Map GAME_VERSION_DIFF = new HashMap<>(); static { - registerVersion(ProtocolVersion.v1_21, 34, "1.21"); + registerVersion(ProtocolVersion.v1_21, 34, "1.21.1"); registerVersion(ProtocolVersion.v1_20_5, 32, "1.20.6"); registerVersion(ProtocolVersion.v1_20_3, 22, "1.20.4"); registerVersion(ProtocolVersion.v1_20_2, 18, "1.20.2");