Tweak error messages when annotations are enabled

misode · Jan 25, 2024 · 5adb26c · 5adb26c
1 parent 10704c3
commit 5adb26c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ minecraft_version=1.20.4
 loader_version=0.15.0
 
 # Mod Properties
-mod_version=1.6.0-beta2
+mod_version=1.6.0-beta3
 maven_group=io.github.misode
 archives_base_name=packtest
 

diff --git a/src/main/java/io/github/misode/packtest/LoadDiagnostics.java b/src/main/java/io/github/misode/packtest/LoadDiagnostics.java
@@ -14,7 +14,7 @@ public static void error(Logger logger, String resource, String id, String messa
         if (PackTest.isAnnotationsEnabled()) {
             annotation = "\n::error title=Failed to load " + resource + " " + id + "::" + message;
         }
-        logger.info(PackTest.wrapError("Failed to load {} {} - {}") + annotation, resource, id, message);
+        logger.info(PackTest.wrapError("Failed to load {} {}" + (PackTest.isAnnotationsEnabled() ? "" : " - {}")) + annotation, resource, id, message);
     }
 
     public static List<Diagnostic> loadErrors() {

diff --git a/src/main/java/io/github/misode/packtest/mixin/LogTestReporterMixin.java b/src/main/java/io/github/misode/packtest/mixin/LogTestReporterMixin.java
@@ -32,14 +32,14 @@ private void onTestFailed(GameTestInfo info, CallbackInfo ci) {
             String lineNumber = info.getError() instanceof LineNumberException err
                     ? " on line " + err.getLineNumber()
                     : "";
-            String annotation = "";
-            if (PackTest.isAnnotationsEnabled() && info.isRequired()) {
-                annotation = "\n::error title=Test " + info.getTestName() + " failed" + lineNumber + "!::" + Util.describeError(info.getError());
-            }
             if (info.isRequired()) {
-                LOGGER.error(PackTest.wrapError("{} failed{}! {}") + annotation, info.getTestName(), lineNumber, Util.describeError(info.getError()));
+                String annotation = "";
+                if (PackTest.isAnnotationsEnabled()) {
+                    annotation = "\n::error title=Test " + info.getTestName() + " failed" + lineNumber + "!::" + Util.describeError(info.getError());
+                }
+                LOGGER.error(PackTest.wrapError("{} failed{}!" + (PackTest.isAnnotationsEnabled() ? "" : " {}")) + annotation, info.getTestName(), lineNumber, Util.describeError(info.getError()));
             } else {
-                LOGGER.warn(PackTest.wrapWarning("(optional) {} failed{}! {}") + annotation, info.getTestName(), lineNumber, Util.describeError(info.getError()));
+                LOGGER.warn(PackTest.wrapWarning("(optional) {} failed{}! {}"), info.getTestName(), lineNumber, Util.describeError(info.getError()));
             }
             ci.cancel();
         }