跟进新版本Java版本判定

增加部分数据类型序列化
Steve-xmh · Apr 9, 2024 · b4de07e · b4de07e
1 parent 6e8bfc6
commit b4de07e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/scl-core/src/semver.rs b/scl-core/src/semver.rs
@@ -54,7 +54,18 @@ impl MinecraftVersion {
     /// 目前检测到 1.17+ 的正式版本都会返回 16，其余的返回 8
     pub fn required_java_version(&self) -> u8 {
         if let Self::Release(mayor, minor, _) = *self {
-            if mayor >= 1 && minor >= 17 {
+            if mayor >= 1 && minor >= 21 {
+                21
+            } else if mayor >= 1 && minor >= 17 {
+                16
+            } else {
+                8
+            }
+        } else if let Self::Snapshot(year, week, num) = *self {
+            // https://www.minecraft.net/zh-hans/article/minecraft-snapshot-24w14a
+            if year >= 24 && week >= 14 && num >= 'a' {
+                21
+            } else if year >= 21 && week >= 8 {
                 16
             } else {
                 8

diff --git a/scl-core/src/version/mod.rs b/scl-core/src/version/mod.rs
@@ -11,6 +11,8 @@ use self::structs::VersionInfo;
 use crate::prelude::*;
 
 /// 一个游戏版本的信息
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct Version {
     /// 版本名称，通常和其文件夹同名
     pub name: String,
@@ -96,7 +98,8 @@ pub async fn get_avaliable_versions(
 }
 
 /// 版本类型
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub enum VersionType {
     /// 纯净版本
     Vanilla,