Merge pull request #15 from gorilla-devs/untagged-java-runtime

Untagged java runtime as fallback

daedalus/src/minecraft.rs

@@ -92,21 +92,27 @@ pub enum MinecraftJavaProfile {
  MinecraftJavaExe,
  /// Java 21
  JavaRuntimeDelta,
+ #[serde(untagged)]
+ /// Unknown
+ Unknown(String),
 }
 
 impl MinecraftJavaProfile {
  /// Converts the version type to a string
- pub fn as_str(&self) -> &'static str {
+ pub fn as_str(&self) -> Result<&'static str, Error> {
  match self {
- MinecraftJavaProfile::JreLegacy => "jre-legacy",
- MinecraftJavaProfile::JavaRuntimeAlpha => "java-runtime-alpha",
- MinecraftJavaProfile::JavaRuntimeBeta => "java-runtime-beta",
- MinecraftJavaProfile::JavaRuntimeGamma => "java-runtime-gamma",
+ MinecraftJavaProfile::JreLegacy => Ok("jre-legacy"),
+ MinecraftJavaProfile::JavaRuntimeAlpha => Ok("java-runtime-alpha"),
+ MinecraftJavaProfile::JavaRuntimeBeta => Ok("java-runtime-beta"),
+ MinecraftJavaProfile::JavaRuntimeGamma => Ok("java-runtime-gamma"),
  MinecraftJavaProfile::JavaRuntimeGammaSnapshot => {
- "java-runtime-gamma-snapshot"
+ Ok("java-runtime-gamma-snapshot")
+ }
+ MinecraftJavaProfile::JavaRuntimeDelta => Ok("java-runtime-delta"),
+ MinecraftJavaProfile::MinecraftJavaExe => Ok("minecraft-java-exe"),
+ MinecraftJavaProfile::Unknown(value) => {
+ Err(Error::InvalidMinecraftJavaProfile(value.to_string()))
  }
- MinecraftJavaProfile::JavaRuntimeDelta => "java-runtime-delta",
- MinecraftJavaProfile::MinecraftJavaExe => "minecraft-java-exe",
  }
  }
 }

daedalus_client/src/minecraft.rs

@@ -546,7 +546,7 @@ pub async fn retrieve_data(
  &*java_version.component,
  ) {
  Ok(java_version) => Some(JavaVersion {
- component: java_version.as_str().to_string(),
+ component: java_version.as_str().expect("MinecraftJavaProfile::try_from is not handling unknown variant as error").to_string(),
  major_version: 0,
  }),
  Err(err) => {
@@ -569,6 +569,7 @@ pub async fn retrieve_data(
  Some(JavaVersion {
  component: MinecraftJavaProfile::JreLegacy
  .as_str()
+ .unwrap()
  .to_string(),
  major_version: 0,
  })