💫 Improve errors, partial impl of capabilities

allay-mc · May 9, 2024 · d15f239 · d15f239
1 parent 2c5e1a6
commit d15f239
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -6,7 +6,7 @@ use std::{collections::HashMap, path::PathBuf};
 
 use crate::{
     localization::{Language, LanguageGroups, OptionallyLocalized},
-    manifest::BaseGameVersion,
+    manifest::{BaseGameVersion, Capabilities},
 };
 use serde::Deserialize;
 
@@ -71,6 +71,10 @@ pub struct Config {
     #[serde(rename = "WT")]
     #[serde(default)]
     pub wt: WT,
+
+    /// Section containing optional features that can be enabled in Minecraft.
+    #[serde(default)]
+    pub capabilities: Option<Capabilities>,
 }
 
 impl Config {

diff --git a/src/manifest.rs b/src/manifest.rs
@@ -138,7 +138,7 @@ impl Manifest {
                 Pack::Skin => None,
                 Pack::WorldTemplate => None,
             },
-            capabilities: None, // TODO
+            capabilities: project.config.capabilities, // FIXME: doesn't work; TODO: does this apply for all pack kinds?
             metadata: Some(Metadata {
                 authors: project.config.project.authors,
                 license: project.config.project.license,
@@ -289,12 +289,13 @@ pub enum Language {
     derive(schemars::JsonSchema),
     schemars(deny_unknown_fields)
 )]
+#[serde(rename_all(deserialize = "kebab-case"))]
 pub struct Capabilities {
     /// The pack can add, remove, or modify chemistry behavior.
     pub chemistry: bool,
 
     /// Indicates that this pack contains extensions for editing.
-    #[serde(rename = "editorExtension")]
+    #[serde(rename(serialize = "editorExtension"))]
     pub editor_extension: bool,
 
     /// The pack can use HTML files to create custom UI, as well as use

diff --git a/src/plugin.rs b/src/plugin.rs
@@ -40,7 +40,10 @@ impl From<&config::Plugin> for ExecutablePlugin {
                 };
                 match &value.args {
                     config::PluginArgs::Options(options) => {
-                        args.push(serde_json::to_string(&options).expect("TODO"));
+                        args.push(
+                            serde_json::to_string(&options)
+                                .expect("failed to transform TOML to JSON"),
+                        );
                     }
                     config::PluginArgs::Args(a) => args.extend(a.to_vec()),
                 };
@@ -65,10 +68,11 @@ impl Plugin for ExecutablePlugin {
         let mut cmd = Command::new(&self.program);
         let cmd = cmd.args(&self.args).envs(env_vars);
         let output = cmd.output()?;
+        let name = self.name().unwrap_or("<unnamed>".to_string());
         if output.status.success() {
-            log::info!("Successfully run plugin {}", "TODO");
+            log::info!("Successfully run plugin {}", &name);
         } else {
-            log::error!("Plugin {} did not run successful", "TODO");
+            log::error!("Plugin {} did not run successful", &name);
         }
         Ok(output.stdout)
     }