Improved logging

3arthqu4ke · Jul 31, 2024 · 60d2356 · 60d2356
1 parent 6031f18
commit 60d2356
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/files/AutoConfiguration.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/files/AutoConfiguration.java
@@ -43,8 +43,7 @@ public static void runAutoConfiguration(FileManager fileManager) {
                     }
                 }
             } catch (IOException e) {
-                log.error(e.getMessage());
-                e.printStackTrace();
+                log.error(e);
             }
         }
     }

diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/files/ConfigService.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/files/ConfigService.java
@@ -59,8 +59,7 @@ private void load(File file, int id, List<Config> configs) {
         try {
             configs.add(load(file, id));
         } catch (IOException e) {
-            log.warning("Couldn't read '" + file.getAbsolutePath() + "'");
-            e.printStackTrace();
+            log.warn("Couldn't read '" + file.getAbsolutePath() + "'", e);
         }
     }
 

diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/InMemoryLauncher.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/InMemoryLauncher.java
@@ -62,7 +62,7 @@ public void launch() throws IOException, LaunchException, AuthException {
                 main.setAccessible(true);
                 main.invoke(null, (Object) gameArgs.toArray(new String[0]));
             } catch (InvocationTargetException e) {
-                e.printStackTrace();
+                log.error(e);
             } catch (Exception e) {
                 throw new LaunchException("Failed to launch game", e);
             }

diff --git a/headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/redirections/LwjglRedirections.java b/headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/redirections/LwjglRedirections.java
@@ -51,6 +51,7 @@ public static void register(RedirectionManager manager) {
                     field.setAccessible(true);
                     field.set(obj, true);
                 } catch (ReflectiveOperationException e) {
+                    //noinspection CallToPrintStackTrace
                     e.printStackTrace();
                 }
 

diff --git a/headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/redirections/ObjectRedirection.java b/headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/redirections/ObjectRedirection.java
@@ -43,6 +43,7 @@ public Object invoke(Object obj, String d, Class<?> type, Object... args) {
             constructor.setAccessible(true);
             return constructor.newInstance();
         } catch (SecurityException | ReflectiveOperationException e) {
+            //noinspection CallToPrintStackTrace
             e.printStackTrace();
             return null;
         }

diff --git a/headlessmc-runtime/src/main/java/me/earth/headlessmc/runtime/commands/FieldCommand.java b/headlessmc-runtime/src/main/java/me/earth/headlessmc/runtime/commands/FieldCommand.java
@@ -1,5 +1,6 @@
 package me.earth.headlessmc.runtime.commands;
 
+import lombok.CustomLog;
 import me.earth.headlessmc.api.command.CommandException;
 import me.earth.headlessmc.command.CommandUtil;
 import me.earth.headlessmc.command.ParseUtil;
@@ -8,6 +9,7 @@
 
 import java.lang.reflect.Field;
 
+@CustomLog
 public class FieldCommand extends AbstractReflectionCommand {
     public FieldCommand(Runtime ctx) {
         super(ctx, "field", "Gets/sets a field.");
@@ -45,7 +47,7 @@ protected void execute(Object obj, int address, String... args)
                 ctx.getVm().set(value, target);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e);
         }
     }
 

diff --git a/headlessmc-runtime/src/main/java/me/earth/headlessmc/runtime/commands/NewCommand.java b/headlessmc-runtime/src/main/java/me/earth/headlessmc/runtime/commands/NewCommand.java
@@ -1,5 +1,6 @@
 package me.earth.headlessmc.runtime.commands;
 
+import lombok.CustomLog;
 import lombok.val;
 import me.earth.headlessmc.api.command.CommandException;
 import me.earth.headlessmc.command.ParseUtil;
@@ -11,6 +12,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+@CustomLog
 public class NewCommand extends AbstractReflectionCommand {
     public NewCommand(Runtime ctx) {
         super(ctx, "new", "Creates a new object.");
@@ -81,7 +83,7 @@ protected void execute(Object o, int address, String... args)
             Object value = ctr.newInstance(arguments);
             ctx.getVm().set(value, target);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e);
         }
     }