chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI: Don't require plugin options that have default values

Browse Source
This commit is contained in:
Katy Coe
2020-12-25 22:24:52 +01:00
parent 9d49d063be
commit db4432061c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Il2CppInspector.CLI/PluginOptions.cs
View File

@@ -83,6 +83,10 @@ namespace Il2CppInspector.CLI
var optionType = option.GetType().GetProperty("Value").PropertyType; var optionType = option.GetType().GetProperty("Value").PropertyType;
var optionValue = option.Value; var optionValue = option.Value;
// We won't set the Required flag if there is a default option
var optionEmpty = (optionType.IsValueType && optionValue == Activator.CreateInstance(optionType))
|| optionValue == null;
// Hex numbers are strings that will be validated later // Hex numbers are strings that will be validated later
if (option is IPluginOptionNumber n && n.Style == PluginOptionNumberStyle.Hex) { if (option is IPluginOptionNumber n && n.Style == PluginOptionNumberStyle.Hex) {
optionType = typeof(string); optionType = typeof(string);
@@ -108,7 +112,7 @@ namespace Il2CppInspector.CLI
new object[] { option.Name.Length == 1? (object) option.Name[0] : option.Name }, new object[] { option.Name.Length == 1? (object) option.Name[0] : option.Name },
new PropertyInfo[] { optHelpPropInfo, optDefaultInfo, optRequiredInfo }, new PropertyInfo[] { optHelpPropInfo, optDefaultInfo, optRequiredInfo },
// Booleans are always optional // Booleans are always optional
new object[] { option.Description, optionValue, option.Value is bool? false : option.Required }); new object[] { option.Description, optionValue, option.Value is bool? false : option.Required && optionEmpty });
pluginOptionProperty.SetCustomAttribute(attBuilder); pluginOptionProperty.SetCustomAttribute(attBuilder);
} }
return pluginOptionClass.CreateTypeInfo().AsType(); return pluginOptionClass.CreateTypeInfo().AsType();