diff --git a/pom.xml b/pom.xml index e805ab5..80997fa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ optic_fusion1 Kitsune - 1.2.0 + 1.3.0 diff --git a/src/main/java/optic_fusion1/kitsune/tool/impl/FixTool.java b/src/main/java/optic_fusion1/kitsune/tool/impl/FixTool.java index 88abdd0..1ad4bff 100644 --- a/src/main/java/optic_fusion1/kitsune/tool/impl/FixTool.java +++ b/src/main/java/optic_fusion1/kitsune/tool/impl/FixTool.java @@ -27,11 +27,15 @@ public class FixTool extends Tool { public FixTool() { - super("fix", "Attempts to fix .class or .jar files to make them decompilable"); + super("fix", tl("ft_desc")); } @Override public void run(List args) { + if (args.isEmpty()) { + LOGGER.info(tl("not_enough_args") + " " + tl("ft_usage")); + return; + } File input = new File(args.get(0)); if (!checkFileExists(input)) { LOGGER.info(tl("file_does_not_exist", input.toPath())); diff --git a/src/main/java/optic_fusion1/kitsune/tool/impl/IdFetcherTool.java b/src/main/java/optic_fusion1/kitsune/tool/impl/IdFetcherTool.java index 9b67b40..f2839d0 100644 --- a/src/main/java/optic_fusion1/kitsune/tool/impl/IdFetcherTool.java +++ b/src/main/java/optic_fusion1/kitsune/tool/impl/IdFetcherTool.java @@ -20,7 +20,7 @@ public class IdFetcherTool extends Tool { private boolean logInnerFiles; public IdFetcherTool() { - super("idfetcher", "Returns the SHA1 of a file name & any inner classes (.zip, .rar, .jar)"); + super("idfetcher", tl("ift_desc")); VALID_FILE_EXTENSIONS.add("jar"); VALID_FILE_EXTENSIONS.add("zip"); VALID_FILE_EXTENSIONS.add("rar"); @@ -30,7 +30,7 @@ public IdFetcherTool() { @Override public void run(List args) { if (args.isEmpty()) { - LOGGER.info(tl("not_enough_args") + " " + tl("idfetcher_usage")); + LOGGER.info(tl("not_enough_args") + " " + tl("ift_usage")); return; } if (args.contains("--logInnerFiles")) { diff --git a/src/main/java/optic_fusion1/kitsune/tool/impl/NormalizeTool.java b/src/main/java/optic_fusion1/kitsune/tool/impl/NormalizeTool.java index 7c9cfa2..f507e56 100644 --- a/src/main/java/optic_fusion1/kitsune/tool/impl/NormalizeTool.java +++ b/src/main/java/optic_fusion1/kitsune/tool/impl/NormalizeTool.java @@ -12,7 +12,7 @@ public class NormalizeTool extends Tool { private boolean showSha1Hash; public NormalizeTool() { - super("String", "Allows you to normalize strings"); + super("String", tl("nt_desc")); } @Override diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index ce83283..7c74d7b 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -19,6 +19,19 @@ st_usage=Usage: strings |file_path> [--normalize] [--remove st_class_no_methods={0} has no methods. Skipping st_class_no_fields={0} has no fields. Skipping +# FixTool +ft_desc=Attempts to fix .class or .jar files to make them decompilable +ftusage=fix +invalid_extension={0} has an invalid extension. Fixing + +# NormalizeTool +nt_desc=Allows you to normalize strings +nt_usage=normalize [--showSHA1Hash] + +# IdFetcherTool +ift_desc=Returns the SHA1 of a file name & any inner classes (.zip, .rar, .jar) +ift_usage=idfetcher <|all > + # AnalyzeTool at_desc=Analyzes a jar or class file and provides a detailed report at_usage=Usage: analyze > @@ -114,15 +127,6 @@ awtca_screen_cap_taken=Screen Capture Taken awtca_get_default_toolkit=Gets the default Toolkit awtca_get_screen_size=Gets the screen size -# FixTool -invalid_extension={0} has an invalid extension. Fixing - -# NormalizeTool -nt_usage=normalize [--showSHA1Hash] - -# IdFetcherTool -idfetcher_usage=idfetcher <|all > - # Unsorted processing=Processing {0}: writing_to_jar_file=Writing {0} to jar diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index ce83283..7c74d7b 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -19,6 +19,19 @@ st_usage=Usage: strings |file_path> [--normalize] [--remove st_class_no_methods={0} has no methods. Skipping st_class_no_fields={0} has no fields. Skipping +# FixTool +ft_desc=Attempts to fix .class or .jar files to make them decompilable +ftusage=fix +invalid_extension={0} has an invalid extension. Fixing + +# NormalizeTool +nt_desc=Allows you to normalize strings +nt_usage=normalize [--showSHA1Hash] + +# IdFetcherTool +ift_desc=Returns the SHA1 of a file name & any inner classes (.zip, .rar, .jar) +ift_usage=idfetcher <|all > + # AnalyzeTool at_desc=Analyzes a jar or class file and provides a detailed report at_usage=Usage: analyze > @@ -114,15 +127,6 @@ awtca_screen_cap_taken=Screen Capture Taken awtca_get_default_toolkit=Gets the default Toolkit awtca_get_screen_size=Gets the screen size -# FixTool -invalid_extension={0} has an invalid extension. Fixing - -# NormalizeTool -nt_usage=normalize [--showSHA1Hash] - -# IdFetcherTool -idfetcher_usage=idfetcher <|all > - # Unsorted processing=Processing {0}: writing_to_jar_file=Writing {0} to jar