Explorar o código

Use the Lombok log annotation

Lortseam %!s(int64=4) %!d(string=hai) anos
pai
achega
fac0ab0c86

+ 2 - 0
lombok.config

@@ -0,0 +1,2 @@
+config.stopBubbling = true
+lombok.log.fieldName = logger

+ 3 - 4
src/main/java/me/lortseam/completeconfig/CompleteConfig.java

@@ -1,11 +1,10 @@
 package me.lortseam.completeconfig;
 package me.lortseam.completeconfig;
 
 
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import me.lortseam.completeconfig.extensions.clothbasicmath.ClothBasicMathExtension;
 import me.lortseam.completeconfig.extensions.clothbasicmath.ClothBasicMathExtension;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.InvocationTargetException;
@@ -14,9 +13,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
+@Log4j2
 public final class CompleteConfig {
 public final class CompleteConfig {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
     private static final Map<String, CompleteConfigExtension> extensions = new HashMap<>();
     private static final Map<String, CompleteConfigExtension> extensions = new HashMap<>();
 
 
     static {
     static {
@@ -35,7 +34,7 @@ public final class CompleteConfig {
             }
             }
             extensions.put(modID, constructor.newInstance());
             extensions.put(modID, constructor.newInstance());
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            LOGGER.error("[CompleteConfig] Failed to instantiate extension " + modID, e);
+            logger.error("[CompleteConfig] Failed to instantiate extension " + modID, e);
         }
         }
     }
     }
 
 

+ 4 - 6
src/main/java/me/lortseam/completeconfig/data/BoundedEntry.java

@@ -1,16 +1,14 @@
 package me.lortseam.completeconfig.data;
 package me.lortseam.completeconfig.data;
 
 
 import lombok.Getter;
 import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.data.entry.EntryOrigin;
 import me.lortseam.completeconfig.data.entry.EntryOrigin;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 
+@Log4j2
 public class BoundedEntry<T extends Number> extends Entry<T> {
 public class BoundedEntry<T extends Number> extends Entry<T> {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
-
     @Getter
     @Getter
     private final T min, max;
     private final T min, max;
     @Getter
     @Getter
@@ -19,10 +17,10 @@ public class BoundedEntry<T extends Number> extends Entry<T> {
     public BoundedEntry(EntryOrigin origin, T min, T max, boolean slider) {
     public BoundedEntry(EntryOrigin origin, T min, T max, boolean slider) {
         super(origin, value -> {
         super(origin, value -> {
             if (new BigDecimal(value.toString()).compareTo(new BigDecimal(min.toString())) < 0) {
             if (new BigDecimal(value.toString()).compareTo(new BigDecimal(min.toString())) < 0) {
-                LOGGER.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value less than minimum bound, setting to minimum now!");
+                logger.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value less than minimum bound, setting to minimum now!");
                 return min;
                 return min;
             } else if (new BigDecimal(value.toString()).compareTo(new BigDecimal(max.toString())) > 0) {
             } else if (new BigDecimal(value.toString()).compareTo(new BigDecimal(max.toString())) > 0) {
-                LOGGER.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value greater than maximum bound, setting to maximum now!");
+                logger.warn("[CompleteConfig] Tried to set value of field " + origin.getField() + " to a value greater than maximum bound, setting to maximum now!");
                 return max;
                 return max;
             }
             }
             return value;
             return value;

+ 3 - 5
src/main/java/me/lortseam/completeconfig/data/CollectionMap.java

@@ -1,14 +1,12 @@
 package me.lortseam.completeconfig.data;
 package me.lortseam.completeconfig.data;
 
 
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 
+@Log4j2
 public class CollectionMap extends ConfigMap<Collection> {
 public class CollectionMap extends ConfigMap<Collection> {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
-
     protected CollectionMap(TranslationIdentifier translation) {
     protected CollectionMap(TranslationIdentifier translation) {
         super(translation);
         super(translation);
     }
     }
@@ -17,7 +15,7 @@ public class CollectionMap extends ConfigMap<Collection> {
         String groupID = group.getGroupID();
         String groupID = group.getGroupID();
         Collection collection = new Collection(translation, group);
         Collection collection = new Collection(translation, group);
         if (collection.getEntries().isEmpty() && collection.getCollections().isEmpty()) {
         if (collection.getEntries().isEmpty() && collection.getCollections().isEmpty()) {
-            LOGGER.warn("[CompleteConfig] Group " + groupID + " is empty!");
+            logger.warn("[CompleteConfig] Group " + groupID + " is empty!");
             return;
             return;
         }
         }
         putUnique(groupID, collection);
         putUnique(groupID, collection);

+ 3 - 5
src/main/java/me/lortseam/completeconfig/data/Config.java

@@ -1,5 +1,6 @@
 package me.lortseam.completeconfig.data;
 package me.lortseam.completeconfig.data;
 
 
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.ConfigHandler;
 import me.lortseam.completeconfig.ConfigHandler;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.api.ConfigGroup;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
 import me.lortseam.completeconfig.data.text.TranslationIdentifier;
@@ -8,8 +9,6 @@ import me.lortseam.completeconfig.io.ConfigSource;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.FabricLoader;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
@@ -56,10 +55,9 @@ public class Config extends CollectionMap {
         source.save(this);
         source.save(this);
     }
     }
 
 
+    @Log4j2
     public final static class Builder {
     public final static class Builder {
 
 
-        private static final Logger LOGGER = LogManager.getLogger();
-
         private final String modID;
         private final String modID;
         private String[] branch = new String[0];
         private String[] branch = new String[0];
         private final List<ConfigGroup> topLevelGroups = new ArrayList<>();
         private final List<ConfigGroup> topLevelGroups = new ArrayList<>();
@@ -114,7 +112,7 @@ public class Config extends CollectionMap {
          */
          */
         public ConfigHandler build() {
         public ConfigHandler build() {
             if (topLevelGroups.isEmpty()) {
             if (topLevelGroups.isEmpty()) {
-                LOGGER.warn("[CompleteConfig] Mod " + modID + " tried to create an empty config!");
+                logger.warn("[CompleteConfig] Mod " + modID + " tried to create an empty config!");
                 return null;
                 return null;
             }
             }
             return new ConfigHandler(new Config(new ConfigSource(modID, branch), topLevelGroups), guiBuilder);
             return new ConfigHandler(new Config(new ConfigSource(modID, branch), topLevelGroups), guiBuilder);

+ 4 - 5
src/main/java/me/lortseam/completeconfig/data/Entry.java

@@ -2,6 +2,7 @@ package me.lortseam.completeconfig.data;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import lombok.Getter;
 import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.CompleteConfig;
 import me.lortseam.completeconfig.CompleteConfig;
 import me.lortseam.completeconfig.api.ConfigEntry;
 import me.lortseam.completeconfig.api.ConfigEntry;
 import me.lortseam.completeconfig.api.ConfigEntryContainer;
 import me.lortseam.completeconfig.api.ConfigEntryContainer;
@@ -14,8 +15,6 @@ import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import net.minecraft.text.Text;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextColor;
 import net.minecraft.text.TextColor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.SerializationException;
 
 
@@ -25,9 +24,9 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import java.util.function.UnaryOperator;
 
 
+@Log4j2
 public class Entry<T> extends EntryBase<T> implements DataPart {
 public class Entry<T> extends EntryBase<T> implements DataPart {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
     private static final List<Transformation> transformations = Lists.newArrayList(
     private static final List<Transformation> transformations = Lists.newArrayList(
             Transformation.ofAnnotation(ConfigEntry.BoundedInteger.class, origin -> {
             Transformation.ofAnnotation(ConfigEntry.BoundedInteger.class, origin -> {
                 ConfigEntry.BoundedInteger bounds = origin.getAnnotation();
                 ConfigEntry.BoundedInteger bounds = origin.getAnnotation();
@@ -212,7 +211,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
             if(value == null) return;
             if(value == null) return;
             setValue(value);
             setValue(value);
         } catch (SerializationException e) {
         } catch (SerializationException e) {
-            LOGGER.error("[CompleteConfig] Failed to apply value to entry!", e);
+            logger.error("[CompleteConfig] Failed to apply value to entry!", e);
         }
         }
     }
     }
 
 
@@ -224,7 +223,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
                 node.comment(comment);
                 node.comment(comment);
             }
             }
         } catch (SerializationException e) {
         } catch (SerializationException e) {
-            LOGGER.error("[CompleteConfig] Failed to fetch value from entry!", e);
+            logger.error("[CompleteConfig] Failed to fetch value from entry!", e);
         }
         }
     }
     }
 
 

+ 4 - 5
src/main/java/me/lortseam/completeconfig/io/ConfigSource.java

@@ -2,13 +2,12 @@ package me.lortseam.completeconfig.io;
 
 
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
 import me.lortseam.completeconfig.CompleteConfig;
 import me.lortseam.completeconfig.CompleteConfig;
 import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.data.Config;
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import me.lortseam.completeconfig.extensions.CompleteConfigExtension;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.FabricLoader;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
@@ -21,10 +20,10 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Objects;
 import java.util.Set;
 import java.util.Set;
 
 
+@Log4j2
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public final class ConfigSource {
 public final class ConfigSource {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
     private static final TypeSerializerCollection GLOBAL_TYPE_SERIALIZERS = TypeSerializerCollection.builder()
     private static final TypeSerializerCollection GLOBAL_TYPE_SERIALIZERS = TypeSerializerCollection.builder()
             .registerExact(TextColorSerializer.INSTANCE)
             .registerExact(TextColorSerializer.INSTANCE)
             .build();
             .build();
@@ -63,7 +62,7 @@ public final class ConfigSource {
             }
             }
             save(config);
             save(config);
         } catch (ConfigurateException e) {
         } catch (ConfigurateException e) {
-            LOGGER.error("[CompleteConfig] Failed to load config from file!", e);
+            logger.error("[CompleteConfig] Failed to load config from file!", e);
         }
         }
     }
     }
 
 
@@ -73,7 +72,7 @@ public final class ConfigSource {
         try {
         try {
             loader.save(root);
             loader.save(root);
         } catch (ConfigurateException e) {
         } catch (ConfigurateException e) {
-            LOGGER.error("[CompleteConfig] Failed to save config to file!", e);
+            logger.error("[CompleteConfig] Failed to save config to file!", e);
         }
         }
     }
     }
 
 

+ 3 - 5
src/main/java/me/lortseam/completeconfig/util/TypeUtils.java

@@ -2,8 +2,7 @@ package me.lortseam.completeconfig.util;
 
 
 import com.google.common.reflect.TypeToken;
 import com.google.common.reflect.TypeToken;
 import io.leangen.geantyref.GenericTypeReflector;
 import io.leangen.geantyref.GenericTypeReflector;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import lombok.extern.log4j.Log4j2;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
@@ -11,10 +10,9 @@ import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Objects;
 
 
+@Log4j2
 public final class TypeUtils {
 public final class TypeUtils {
 
 
-    private static final Logger LOGGER = LogManager.getLogger();
-
     public static Type getFieldType(Field field) {
     public static Type getFieldType(Field field) {
         return GenericTypeReflector.getExactFieldType(field, field.getDeclaringClass());
         return GenericTypeReflector.getExactFieldType(field, field.getDeclaringClass());
     }
     }
@@ -27,7 +25,7 @@ public final class TypeUtils {
         typeSerializerCollections = Arrays.stream(typeSerializerCollections).filter(Objects::nonNull).toArray(TypeSerializerCollection[]::new);
         typeSerializerCollections = Arrays.stream(typeSerializerCollections).filter(Objects::nonNull).toArray(TypeSerializerCollection[]::new);
         switch (typeSerializerCollections.length) {
         switch (typeSerializerCollections.length) {
             case 0:
             case 0:
-                LOGGER.warn("Tried to merge non-existent type serializer collections!");
+                logger.warn("Tried to merge non-existent type serializer collections!");
                 return null;
                 return null;
 
 
             case 1:
             case 1: