Improve custom logger

Offender27 · Dec 22, 2020 · b520b1d · b520b1d
1 parent d5e1597
commit b520b1d
Show file tree

Hide file tree

Showing 35 changed files with 280 additions and 1,088 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,7 +84,6 @@ minecraft {
     client {
       workingDirectory project.file('run')
 
-//      property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
       property 'forge.logging.console.level', 'info'
       property 'forgehax.logging.level', 'debug'
 

diff --git a/src/main/java/dev/fiki/forgehax/api/ImageUtils.java b/src/main/java/dev/fiki/forgehax/api/ImageUtils.java
@@ -1,6 +1,7 @@
 package dev.fiki.forgehax.api;
 
 import dev.fiki.forgehax.main.Common;
+import lombok.extern.log4j.Log4j2;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -10,8 +11,9 @@
 /**
  * Created by Babbaj on 11/7/2017.
  */
+@Log4j2
 public class ImageUtils implements Common {
-  
+
   public static BufferedImage createResizedCopy(
       Image originalImage, int scaledWidth, int scaledHeight, boolean preserveAlpha) {
     int imageType = preserveAlpha ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
@@ -24,24 +26,24 @@ public static BufferedImage createResizedCopy(
     g.dispose();
     return scaledBI;
   }
-  
+
   public static BufferedImage getImageFromUrl(String link) {
     BufferedImage image = null;
     try {
       URL url = new URL(link);
       image = ImageIO.read(url);
     } catch (Exception e) {
-      Common.getLogger().error("Failed to download Image");
+      log.error("Failed to download Image");
     }
     return image;
   }
-  
+
   public static int[][] imageToArray(BufferedImage imageIn) {
     int width = imageIn.getWidth();
     int height = imageIn.getHeight();
-    
+
     int[][] data = new int[height][width]; // array of rows
-    
+
     for (int i = 0; i < height; i++) {
       for (int j = 0; j < width; j++) {
         data[i][j] = imageIn.getRGB(i, j);

diff --git a/src/main/java/dev/fiki/forgehax/api/classloader/AbstractClassLoader.java b/src/main/java/dev/fiki/forgehax/api/classloader/AbstractClassLoader.java
@@ -1,5 +1,7 @@
 package dev.fiki.forgehax.api.classloader;
 
+import lombok.extern.log4j.Log4j2;
+
 import javax.annotation.Nullable;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -11,11 +13,11 @@
 import java.util.stream.Collectors;
 
 import static dev.fiki.forgehax.main.Common.getLauncherClassLoader;
-import static dev.fiki.forgehax.main.Common.getLogger;
 
 /**
  * Created on 2/13/2018 by fr1kin
  */
+@Log4j2
 public abstract class AbstractClassLoader<E> {
 
   protected AbstractClassLoader() {
@@ -76,8 +78,8 @@ protected E create(Class<? extends E> clazz) {
         | IllegalAccessException
         | InvocationTargetException
         | NoSuchMethodException e) {
-      getLogger().error("Failed to create new instance of {}", clazz.getSimpleName());
-      getLogger().error(e, e);
+      log.error("Failed to create new instance of {}", clazz.getSimpleName());
+      log.error(e, e);
       return null;
     }
   }

diff --git a/src/main/java/dev/fiki/forgehax/api/classloader/ClassLoaderHelper.java b/src/main/java/dev/fiki/forgehax/api/classloader/ClassLoaderHelper.java
@@ -4,6 +4,7 @@
 import dev.fiki.forgehax.api.Streamables;
 import dev.fiki.forgehax.main.ForgeHax;
 import lombok.SneakyThrows;
+import lombok.extern.log4j.Log4j2;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import org.objectweb.asm.Type;
@@ -27,8 +28,8 @@
 import java.util.stream.Collectors;
 
 import static dev.fiki.forgehax.api.FileHelper.*;
-import static dev.fiki.forgehax.main.Common.getLogger;
 
+@Log4j2
 public class ClassLoaderHelper {
   private static Class<?> MODJAR_URLCONNECTION_CLASS;
 
@@ -199,7 +200,7 @@ public static List<Path> getClassesInPackage(final ClassLoader classLoader,
 
     final URLConnection connection = url.openConnection();
 
-    getLogger().debug("Connecting to jar using {}", connection.getClass());
+    log.debug("Connecting to jar using {}", connection.getClass());
 
     if (isFMLConnection(connection)) {
       final ModFile modFile = getModFileInModJar(connection);

diff --git a/src/main/java/dev/fiki/forgehax/api/cmd/ICommand.java b/src/main/java/dev/fiki/forgehax/api/cmd/ICommand.java
@@ -9,7 +9,7 @@
 import dev.fiki.forgehax.api.cmd.listener.ICommandListener;
 import dev.fiki.forgehax.api.cmd.listener.IListenable;
 import dev.fiki.forgehax.api.serialization.IJsonSerializable;
-import dev.fiki.forgehax.main.Common;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import javax.annotation.Nullable;
@@ -146,7 +146,7 @@ default Path getConfigDirectory() {
   }
 
   default Logger getLog() {
-    return Common.getLogger();
+    return LogManager.getLogger(getClass());
   }
 
   class MissingConfigurationDirectoryException extends RuntimeException {

diff --git a/src/main/java/dev/fiki/forgehax/api/draw/font/BasicFontRenderer.java b/src/main/java/dev/fiki/forgehax/api/draw/font/BasicFontRenderer.java