Skip to content

Commit

Permalink
fix: comment out useless ll cmd overload
Browse files Browse the repository at this point in the history
  • Loading branch information
Dofes committed Jan 31, 2024
1 parent 94f17f8 commit 55bd833
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 103 deletions.
203 changes: 102 additions & 101 deletions src/ll/core/tweak/BuiltinCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,111 +408,112 @@ class LLCommand : public Command {
);

// ll settings
registry.addEnum<Operation>(
"Operation_Settings",
{
{"settings", Operation::Settings}
}
);
registry.addEnum<LLSettingsOperation>(
"SettingsOperation",
{
{"get", LLSettingsOperation::Get },
{"set", LLSettingsOperation::Set },
{"delete", LLSettingsOperation::Delete},
{"reload", LLSettingsOperation::Reload},
{"save", LLSettingsOperation::Save },
{"list", LLSettingsOperation::List }
}
);
registry.registerOverload<LLCommand>(
"ll",
CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
&LLCommand::operation,
"Operation",
"Operation_Settings"
)
.addOptions(CommandParameterOption::EnumAutocompleteExpansion),
CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
&LLCommand::settingsOperation,
"SettingsOperation",
"SettingsOperation"
)
.addOptions(CommandParameterOption::EnumAutocompleteExpansion),
CommandParameterData::makeOptional(&LLCommand::key, "JsonPointer", &LLCommand::hasKeySet),
CommandParameterData::makeOptional(&LLCommand::value, "Value", &LLCommand::hasValueSet)
);
// registry.addEnum<Operation>(
// "Operation_Settings",
// {
// {"settings", Operation::Settings}
// }
// );
// registry.addEnum<LLSettingsOperation>(
// "SettingsOperation",
// {
// {"get", LLSettingsOperation::Get },
// {"set", LLSettingsOperation::Set },
// {"delete", LLSettingsOperation::Delete},
// {"reload", LLSettingsOperation::Reload},
// {"save", LLSettingsOperation::Save },
// {"list", LLSettingsOperation::List }
// }
// );
// registry.registerOverload<LLCommand>(
// "ll",
// CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
// &LLCommand::operation,
// "Operation",
// "Operation_Settings"
// )
// .addOptions(CommandParameterOption::EnumAutocompleteExpansion),
// CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
// &LLCommand::settingsOperation,
// "SettingsOperation",
// "SettingsOperation"
// )
// .addOptions(CommandParameterOption::EnumAutocompleteExpansion),
// CommandParameterData::makeOptional(&LLCommand::key, "JsonPointer", &LLCommand::hasKeySet),
// CommandParameterData::makeOptional(&LLCommand::value, "Value", &LLCommand::hasValueSet)
// );

// ll load
registry.addEnum<Operation>(
"Operation_FreeFilePath",
{
{"load", Operation::Load},
}
);
registry.registerOverload<LLCommand>(
"ll",
CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
&LLCommand::operation,
"Operation",
"Operation_FreeFilePath"
)
.addOptions(CommandParameterOption::EnumAutocompleteExpansion),
CommandParameterData::makeMandatory<CommandParameterDataType::Basic>(
&LLCommand::pluginNameToDoOperation,
"pluginPath",
nullptr,
&LLCommand::hasPluginNameSet
)
);
// registry.addEnum<Operation>(
// "Operation_FreeFilePath",
// {
// {"load", Operation::Load},
// }
// );
// registry.registerOverload<LLCommand>(
// "ll",
// CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
// &LLCommand::operation,
// "Operation",
// "Operation_FreeFilePath"
// )
// .addOptions(CommandParameterOption::EnumAutocompleteExpansion),
// CommandParameterData::makeMandatory<CommandParameterDataType::Basic>(
// &LLCommand::pluginNameToDoOperation,
// "pluginPath",
// nullptr,
// &LLCommand::hasPluginNameSet
// )
// );

// ll unload
registry.addEnum<Operation>(
"Operation_MustPluginName",
{
{"unload", Operation::Unload},
}
);
registry.registerOverload<LLCommand>(
"ll",
CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
&LLCommand::operation,
"Operation",
"Operation_MustPluginName"
)
.addOptions(CommandParameterOption::EnumAutocompleteExpansion),
CommandParameterData::makeMandatory<CommandParameterDataType::SoftEnum>(
(std::string LLCommand::*)&LLCommand::pluginNameToDoOperation,
"pluginName",
"PluginName",
&LLCommand::hasPluginNameSet
)
);

// ll list & reload
registry.addEnum<Operation>(
"Operation_OptionalPluginName",
{
{"list", Operation::List },
{"plugins", Operation::List },
{"reload", Operation::Reload},
}
);
registry.registerOverload<LLCommand>(
"ll",
CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
&LLCommand::operation,
"Operation",
"Operation_OptionalPluginName"
)
.addOptions(CommandParameterOption::EnumAutocompleteExpansion),
CommandParameterData::makeOptional<CommandParameterDataType::SoftEnum>(
(std::string LLCommand::*)&LLCommand::pluginNameToDoOperation,
"pluginName",
"PluginName",
&LLCommand::hasPluginNameSet
)
);
// registry.addEnum<Operation>(
// "Operation_MustPluginName",
// {
// {"unload", Operation::Unload},
// }
// );
// registry.registerOverload<LLCommand>(
// "ll",
// CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
// &LLCommand::operation,
// "Operation",
// "Operation_MustPluginName"
// )

// .addOptions(CommandParameterOption::EnumAutocompleteExpansion),
// CommandParameterData::makeMandatory<CommandParameterDataType::SoftEnum>(
// (std::string LLCommand::*)&LLCommand::pluginNameToDoOperation,
// "pluginName",
// "PluginName",
// &LLCommand::hasPluginNameSet
// )
// );

// // ll list & reload
// registry.addEnum<Operation>(
// "Operation_OptionalPluginName",
// {
// {"list", Operation::List },
// {"plugins", Operation::List },
// {"reload", Operation::Reload},
// }
// );
// registry.registerOverload<LLCommand>(
// "ll",
// CommandParameterData::makeMandatory<CommandParameterDataType::Enum>(
// &LLCommand::operation,
// "Operation",
// "Operation_OptionalPluginName"
// )
// .addOptions(CommandParameterOption::EnumAutocompleteExpansion),
// CommandParameterData::makeOptional<CommandParameterDataType::SoftEnum>(
// &LLCommand::pluginNameToDoOperation,
// "pluginName",
// "PluginName",
// &LLCommand::hasPluginNameSet
// )
// );
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/mc/server/commands/CommandParameterOption.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "mc/_HeaderOutputPredefine.h"

enum class CommandParameterOption : schar {
enum class CommandParameterOption : uchar {
None = 0,
EnumAutocompleteExpansion = 1 << 0,
HasSemanticConstraint = 1 << 1,
Expand Down
2 changes: 1 addition & 1 deletion src/mc/server/commands/CommandPermissionLevel.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "mc/_HeaderOutputPredefine.h"

enum class CommandPermissionLevel : schar {
enum class CommandPermissionLevel : uchar {
Any = 0x0,
GameDirectors = 0x1,
Admin = 0x2,
Expand Down

0 comments on commit 55bd833

Please sign in to comment.