Fix #191 by switching chat command Usage to FText.

#332 revealed that UE will preserve data in BP assets when making this switch BP commands auto-update but C++ needs switching to LOCTEXT/NSLOCTEXT
satisfactorymodding · Jan 24, 2025 · 04218de · 04218de
1 parent 7c4aa22
commit 04218de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Mods/SML/Source/SML/Private/Command/ChatCommandInstance.cpp b/Mods/SML/Source/SML/Private/Command/ChatCommandInstance.cpp
@@ -17,5 +17,5 @@ void AChatCommandInstance::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>&
 }
 
 void AChatCommandInstance::PrintCommandUsage(UCommandSender* Player) const {
-	Player->SendChatMessage(FString::Printf(TEXT("Usage: %s"), *Usage), FLinearColor::Red);
+	Player->SendChatMessage(FString::Printf(TEXT("Usage: %s"), *Usage.ToString()), FLinearColor::Red);
 }
diff --git a/Mods/SML/Source/SML/Private/Command/SMLCommands/HelpCommandInstance.cpp b/Mods/SML/Source/SML/Private/Command/SMLCommands/HelpCommandInstance.cpp
@@ -4,7 +4,7 @@
 
 AHelpCommandInstance::AHelpCommandInstance() {
 	CommandName = TEXT("help");
-	Usage = TEXT("/help - Command help");
+	Usage = NSLOCTEXT("SML", "ChatCommand.Help.Usage", "/help - Command help");
 	Aliases.Add(TEXT("?"));
 }
 
@@ -18,12 +18,12 @@ EExecutionStatus AHelpCommandInstance::ExecuteCommand_Implementation(UCommandSen
 			Sender->SendChatMessage(FString(TEXT("Command not found: ")) += TargetCommandName, FLinearColor::Red);
 			return EExecutionStatus::BAD_ARGUMENTS;
 		}
-		Sender->SendChatMessage(CommandEntry->Usage);
+		Sender->SendChatMessage(CommandEntry->Usage.ToString());
 		return EExecutionStatus::COMPLETED;
 	}
 	Sender->SendChatMessage(TEXT("Command List:"));
 	for (const AChatCommandInstance* CommandEntry : CommandSubsystem->GetRegisteredCommands()) {
-		Sender->SendChatMessage(CommandEntry->Usage);
+		Sender->SendChatMessage(CommandEntry->Usage.ToString());
 	}
 	return EExecutionStatus::COMPLETED;
 }
diff --git a/Mods/SML/Source/SML/Private/Command/SMLCommands/InfoCommandInstance.cpp b/Mods/SML/Source/SML/Private/Command/SMLCommands/InfoCommandInstance.cpp
@@ -7,7 +7,7 @@
 
  AInfoCommandInstance::AInfoCommandInstance() {
 	CommandName = TEXT("info");
-	Usage = TEXT("/info - Information about the modded environment");
+	Usage = NSLOCTEXT("SML", "ChatCommand.Info.Usage", "/info - Information about the modded environment");
 	Aliases.Add(TEXT("version"));
 }
 

diff --git a/Mods/SML/Source/SML/Private/Command/SMLCommands/PlayerListCommandInstance.cpp b/Mods/SML/Source/SML/Private/Command/SMLCommands/PlayerListCommandInstance.cpp
@@ -6,7 +6,7 @@
 
 APlayerListCommandInstance::APlayerListCommandInstance() {
 	CommandName = TEXT("list");
-	Usage = TEXT("/list - List players online");
+	Usage = NSLOCTEXT("SML", "ChatCommand.List.Usage", "/list - List players online");
 	Aliases.Add(TEXT("players"));
 }
 

diff --git a/Mods/SML/Source/SML/Public/Command/ChatCommandInstance.h b/Mods/SML/Source/SML/Public/Command/ChatCommandInstance.h
@@ -68,7 +68,7 @@ class SML_API AChatCommandInstance : public AInfo {
 	 * give <username> <item> [amount] [extra_data]
 	 */
 	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly)
-	FString Usage;
+	FText Usage;
 
 	void GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLifetimeProps) const override;