You've already forked Arcturus-Morningstar-Extended
mirror of
https://github.com/duckietm/Arcturus-Morningstar-Extended.git
synced 2026-06-20 07:26:18 +00:00
fix(commands): quiet optional descriptions
This commit is contained in:
@@ -52,6 +52,10 @@ public class TextsManager {
|
|||||||
return this.texts.getProperty(key, defaultValue);
|
return this.texts.getProperty(key, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getValueQuietly(String key, String defaultValue) {
|
||||||
|
return this.texts.getProperty(key, defaultValue);
|
||||||
|
}
|
||||||
|
|
||||||
public boolean getBoolean(String key) {
|
public boolean getBoolean(String key) {
|
||||||
return this.getBoolean(key, false);
|
return this.getBoolean(key, false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class CommandsCommand extends Command {
|
|||||||
|
|
||||||
for (Command c : commands) {
|
for (Command c : commands) {
|
||||||
String textKey = "commands.description." + c.permission;
|
String textKey = "commands.description." + c.permission;
|
||||||
String commandText = Emulator.getTexts().getValue(textKey, "");
|
String commandText = Emulator.getTexts().getValueQuietly(textKey, "");
|
||||||
String commandLine = ":" + c.keys[0];
|
String commandLine = ":" + c.keys[0];
|
||||||
String description = "";
|
String description = "";
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -23,10 +23,10 @@ public class AvailableCommandsComposer extends MessageComposer {
|
|||||||
for (Command cmd : this.commands) {
|
for (Command cmd : this.commands) {
|
||||||
this.response.appendString(cmd.keys[0]);
|
this.response.appendString(cmd.keys[0]);
|
||||||
this.response.appendString(
|
this.response.appendString(
|
||||||
Emulator.getTexts().getValue("commands.description." + cmd.permission, cmd.permission)
|
Emulator.getTexts().getValueQuietly("commands.description." + cmd.permission, cmd.permission)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.response;
|
return this.response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.eu.habbo.core;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
class CommandTextLookupContractTest {
|
||||||
|
private static final Path TEXTS_MANAGER = Path.of("src/main/java/com/eu/habbo/core/TextsManager.java");
|
||||||
|
private static final Path COMMANDS_COMMAND = Path.of("src/main/java/com/eu/habbo/habbohotel/commands/CommandsCommand.java");
|
||||||
|
private static final Path AVAILABLE_COMMANDS_COMPOSER = Path.of(
|
||||||
|
"src/main/java/com/eu/habbo/messages/outgoing/commands/AvailableCommandsComposer.java");
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void textsManagerExposesQuietFallbackLookupForOptionalTexts() throws IOException {
|
||||||
|
String source = Files.readString(TEXTS_MANAGER);
|
||||||
|
|
||||||
|
assertTrue(source.contains("public String getValueQuietly(String key, String defaultValue)"));
|
||||||
|
assertTrue(source.contains("return this.texts.getProperty(key, defaultValue);"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void commandListsUseQuietDescriptionLookups() throws IOException {
|
||||||
|
String commandsCommand = Files.readString(COMMANDS_COMMAND);
|
||||||
|
String availableCommandsComposer = Files.readString(AVAILABLE_COMMANDS_COMPOSER);
|
||||||
|
|
||||||
|
assertTrue(commandsCommand.contains("getValueQuietly(textKey, \"\")"),
|
||||||
|
":commands should not log an error when an optional command description is missing");
|
||||||
|
assertTrue(availableCommandsComposer.contains("getValueQuietly(\"commands.description.\" + cmd.permission, cmd.permission)"),
|
||||||
|
"available commands composer should not log an error when an optional command description is missing");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user