From d6a5bf1d333586c267a5b156eca6b576529fce74 Mon Sep 17 00:00:00 2001
From: isXander <xandersmith2008@gmail.com>
Date: Sun, 27 Nov 2022 18:43:24 +0000
Subject: replacement of ConfigInstance#buildConfig in YetAnotherConfigLib.java
 move some things to main that can be and fix testmod

---
 src/main/java/dev/isxander/yacl/config/ConfigInstance.java  |  2 --
 .../java/dev/isxander/yacl/config/GsonConfigInstance.java   |  5 +++--
 .../java/dev/isxander/yacl/config/NbtConfigInstance.java    | 13 +++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/dev/isxander/yacl/config')

diff --git a/src/main/java/dev/isxander/yacl/config/ConfigInstance.java b/src/main/java/dev/isxander/yacl/config/ConfigInstance.java
index 18733f3..3ceee6d 100644
--- a/src/main/java/dev/isxander/yacl/config/ConfigInstance.java
+++ b/src/main/java/dev/isxander/yacl/config/ConfigInstance.java
@@ -16,8 +16,6 @@ import java.lang.reflect.InvocationTargetException;
  * @param <T> config data type
  */
 public abstract class ConfigInstance<T> {
-    protected final static Logger logger = LoggerFactory.getLogger("YetAnotherConfigLib");
-
     private final Class<T> configClass;
     private final T defaultInstance;
     private T instance;
diff --git a/src/main/java/dev/isxander/yacl/config/GsonConfigInstance.java b/src/main/java/dev/isxander/yacl/config/GsonConfigInstance.java
index 3e075ab..40c2c99 100644
--- a/src/main/java/dev/isxander/yacl/config/GsonConfigInstance.java
+++ b/src/main/java/dev/isxander/yacl/config/GsonConfigInstance.java
@@ -1,6 +1,7 @@
 package dev.isxander.yacl.config;
 
 import com.google.gson.*;
+import dev.isxander.yacl.impl.utils.YACLConstants;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 
@@ -53,7 +54,7 @@ public class GsonConfigInstance<T> extends ConfigInstance<T> {
     @Override
     public void save() {
         try {
-            logger.info("Saving {}...", getConfigClass().getSimpleName());
+            YACLConstants.LOGGER.info("Saving {}...", getConfigClass().getSimpleName());
             Files.writeString(path, gson.toJson(getConfig()), StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
         } catch (IOException e) {
             e.printStackTrace();
@@ -68,7 +69,7 @@ public class GsonConfigInstance<T> extends ConfigInstance<T> {
                 return;
             }
 
-            logger.info("Loading {}...", getConfigClass().getSimpleName());
+            YACLConstants.LOGGER.info("Loading {}...", getConfigClass().getSimpleName());
             setConfig(gson.fromJson(Files.readString(path), getConfigClass()));
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/main/java/dev/isxander/yacl/config/NbtConfigInstance.java b/src/main/java/dev/isxander/yacl/config/NbtConfigInstance.java
index 8f817cb..5749695 100644
--- a/src/main/java/dev/isxander/yacl/config/NbtConfigInstance.java
+++ b/src/main/java/dev/isxander/yacl/config/NbtConfigInstance.java
@@ -1,5 +1,6 @@
 package dev.isxander.yacl.config;
 
+import dev.isxander.yacl.impl.utils.YACLConstants;
 import net.minecraft.nbt.*;
 
 import java.awt.*;
@@ -57,13 +58,13 @@ public class NbtConfigInstance<T> extends ConfigInstance<T> {
 
     @Override
     public void save() {
-        logger.info("Saving {}...", getConfigClass().getSimpleName());
+        YACLConstants.LOGGER.info("Saving {}...", getConfigClass().getSimpleName());
 
         NbtCompound nbt;
         try {
             nbt = (NbtCompound) serializeObject(getConfig(), nbtSerializerHolder, field -> field.isAnnotationPresent(ConfigEntry.class));
         } catch (IllegalAccessException e) {
-            logger.error("Failed to convert '{}' -> NBT", getConfigClass().getName(), e);
+            YACLConstants.LOGGER.error("Failed to convert '{}' -> NBT", getConfigClass().getName(), e);
             return;
         }
 
@@ -76,7 +77,7 @@ public class NbtConfigInstance<T> extends ConfigInstance<T> {
             else
                 NbtIo.write(nbt, new DataOutputStream(fos));
         } catch (IOException e) {
-            logger.error("Failed to write NBT to '{}'", path, e);
+            YACLConstants.LOGGER.error("Failed to write NBT to '{}'", path, e);
         }
     }
 
@@ -87,19 +88,19 @@ public class NbtConfigInstance<T> extends ConfigInstance<T> {
             return;
         }
 
-        logger.info("Loading {}...", getConfigClass().getSimpleName());
+        YACLConstants.LOGGER.info("Loading {}...", getConfigClass().getSimpleName());
         NbtCompound nbt;
         try {
             nbt = compressed ? NbtIo.readCompressed(path.toFile()) : NbtIo.read(path.toFile());
         } catch (IOException e) {
-            logger.error("Failed to read NBT file '{}'", path, e);
+            YACLConstants.LOGGER.error("Failed to read NBT file '{}'", path, e);
             return;
         }
 
         try {
             setConfig(deserializeObject(nbt, getConfigClass(), nbtSerializerHolder, field -> field.isAnnotationPresent(ConfigEntry.class)));
         } catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) {
-            logger.error("Failed to convert NBT -> '{}'", getConfigClass().getName(), e);
+            YACLConstants.LOGGER.error("Failed to convert NBT -> '{}'", getConfigClass().getName(), e);
         }
     }
 
-- 
cgit