Skip to content

Commit 89d95b8

Browse files
committed
Small code cleanup
1 parent 49bd64a commit 89d95b8

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/main/java/net/raphimc/viaproxy/ViaProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public static void injectedMain(final String injectionMethod, final String[] arg
233233
viaProxyConfigFile = new File(ViaProxy.getCwd(), "viaproxy.yml");
234234
}
235235
final boolean firstStart = !viaProxyConfigFile.exists();
236-
if (!useUI && useCLI) {
236+
if (useCLI) {
237237
CONFIG = ViaProxyCLIConfig.create(viaProxyConfigFile);
238238
} else {
239239
CONFIG = ViaProxyConfig.create(viaProxyConfigFile);

src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyCLIConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class ViaProxyCLIConfig extends ViaProxyConfig {
4343

4444
@Option("help")
4545
private boolean help = false;
46+
4647
@Option("list-versions")
4748
private boolean listVersions = false;
4849

@@ -57,11 +58,11 @@ public static ViaProxyCLIConfig create(final File configFile) {
5758
}
5859

5960
public void loadFromArguments(final String[] args) {
60-
CLIConfigLoader<ViaProxyCLIConfig> cliConfigLoader = new CLIConfigLoader<>(this.configContext);
61+
final CLIConfigLoader<ViaProxyCLIConfig> cliConfigLoader = new CLIConfigLoader<>(this.configContext);
6162
try {
6263
// ViaProxy.EVENT_MANAGER.call(new PreOptionsParseEvent(optionParser));
6364

64-
List<UnknownOption> unknownOptions = cliConfigLoader.loadCLIOptions(args, true);
65+
final List<UnknownOption> unknownOptions = cliConfigLoader.loadCLIOptions(args, true);
6566
if (this.help) {
6667
throw new HelpRequestedException();
6768
} else if (this.listVersions) {
@@ -87,8 +88,7 @@ public void loadFromArguments(final String[] args) {
8788
} catch (HelpRequestedException ignored) {
8889
}
8990

90-
String help = cliConfigLoader.buildCLIHelp(HelpOptions.DEFAULT/*.withShowDepends(false).withShowDescription(false).withSort(true).withShowBooleanType(false).withQuoteStrings(true)*/);
91-
Logger.SYSOUT.println(help);
91+
cliConfigLoader.printCLIHelp(Logger.SYSOUT, HelpOptions.DEFAULT/*.withShowDepends(false).withShowDescription(false).withSort(true).withShowBooleanType(false).withQuoteStrings(true)*/);
9292
Logger.LOGGER.info("For a more detailed description of the options, please refer to the viaproxy.yml file.");
9393
System.exit(1);
9494
}

0 commit comments

Comments
 (0)