eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix daedalus (#5064)

Browse Source 
* Support default-user-jvm arguments type

* Use this branch's container

* Allow no rules in Ruled argument variant

* Run main
This commit is contained in:
François-Xavier Talbot
2026-01-07 20:43:47 -05:00
committed by GitHub
parent 14d227a1a3
commit a1d9268d00
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/daedalus/src/minecraft.rs
View File

@@ -454,6 +454,7 @@ pub enum Argument {
/// An argument which is only applied if certain conditions are met /// An argument which is only applied if certain conditions are met
Ruled { Ruled {
/// The rules deciding whether the argument(s) is used or not /// The rules deciding whether the argument(s) is used or not
#[serde(default)]
rules: Vec<Rule>, rules: Vec<Rule>,
/// The container of the argument(s) that should be applied accordingly /// The container of the argument(s) that should be applied accordingly
value: ArgumentValue, value: ArgumentValue,
@@ -461,13 +462,15 @@ pub enum Argument {
} }
#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash, Clone, Copy)] #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash, Clone, Copy)]
#[serde(rename_all = "snake_case")] #[serde(rename_all = "kebab-case")]
/// The type of argument /// The type of argument
pub enum ArgumentType { pub enum ArgumentType {
/// The argument is passed to the game /// The argument is passed to the game
Game, Game,
/// The argument is passed to the JVM /// The argument is passed to the JVM
Jvm, Jvm,
/// Passed to JVM as well. Includes default arguments to the GC.
DefaultUserJvm,
} }
#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash)] #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Hash)]