From f3bf4e030c13203d928e67bad4ae410e6d9936c4 Mon Sep 17 00:00:00 2001 From: Aurora Date: Thu, 7 Aug 2025 19:15:19 +0100 Subject: [PATCH] Clean up CLI handling --- .../java/org/geysermc/pack/converter/bootstrap/Main.java | 5 +---- .../main/java/org/geysermc/pack/converter/PackConverter.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/Main.java b/bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/Main.java index 4cf8817..3e3bc1b 100644 --- a/bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/Main.java +++ b/bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/Main.java @@ -41,16 +41,13 @@ public class Main { boolean debug = args.contains("--debug") || args.contains("-d"); if (args.contains("nogui")) { - if (!args.contains("--input")) { + if (!args.contains("--input") || args.indexOf("--input") + 1 >= args.size()) { throw new IllegalArgumentException("No input provided."); - } else if (args.indexOf("--input") + 1 >= args.size()) { - throw new IllegalArgumentException("Input specified with no value."); } String inputPath = args.get(args.indexOf("--input") + 1); String outputPath; - String packName; if (args.contains("--output")) { diff --git a/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java b/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java index 121d557..03622da 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java +++ b/converter/src/main/java/org/geysermc/pack/converter/PackConverter.java @@ -139,7 +139,7 @@ public final class PackConverter { * @return the pack name */ public @NotNull String packName() { - if (packName == null || packName.isBlank()) return input.getFileName().toString(); + if (packName == null || packName.isBlank()) return input.getFileName().toString().replaceFirst("[.][^.]+$", ""); return packName; }