externalize log

FalsePattern · FalsePattern · commit f1004e4e7574 · 2022-08-23T21:01:19.000+02:00
diff --git a/src/main/java/com/falsepattern/lib/config/ConfigurationManager.java b/src/main/java/com/falsepattern/lib/config/ConfigurationManager.java
@@ -22,8 +22,8 @@
 
 import com.falsepattern.lib.DeprecationDetails;
 import com.falsepattern.lib.StableAPI;
-import com.falsepattern.lib.internal.FalsePatternLib;
 import com.falsepattern.lib.internal.ReflectionUtil;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.internal.impl.config.ConfigurationManagerImpl;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -111,7 +111,7 @@ public static void saveToFile(boolean validateAndResetInvalid, Class<?>... confi
     @DeprecationDetails(deprecatedSince = "0.10.0")
     @StableAPI.Expose
     public static void registerConfig(Class<?> configClass) throws ConfigException {
-        FalsePatternLib.getLog()
+        Share.LOG
                        .warn("A mod is using the deprecated config registration method! The following exception contains the stacktrace.",
                              new Exception());
         ConfigurationManagerImpl.registerLoadSaveConfig(configClass);
diff --git a/src/main/java/com/falsepattern/lib/config/event/ConfigValidationFailureEvent.java b/src/main/java/com/falsepattern/lib/config/event/ConfigValidationFailureEvent.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.StableAPI;
 import com.falsepattern.lib.config.Config;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.text.FormattedText;
 import com.falsepattern.lib.toasts.GuiToast;
 import com.falsepattern.lib.toasts.SimpleToast;
@@ -123,7 +123,7 @@ public void logWarn() {
         }
         customText(errorString);
         for (val line: errorString.toString().split("\n")) {
-            FalsePatternLib.getLog().error(line);
+            Share.LOG.error(line);
         }
     }
 
diff --git a/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java b/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.DeprecationDetails;
 import com.falsepattern.lib.StableAPI;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.internal.impl.dependencies.DependencyLoaderImpl;
 import lombok.NonNull;
 
@@ -51,7 +51,7 @@ public static void loadLibraries(Library... libraries) {
     @DeprecationDetails(deprecatedSince = "0.10.0")
     @StableAPI.Expose
     public static void loadLibrary(@NonNull String loadingModId, @NonNull String groupId, @NonNull String artifactId, @NonNull Version minVersion, Version maxVersion, @NonNull Version preferredVersion, String regularSuffix, String devSuffix) {
-        FalsePatternLib.getLog()
+        Share.LOG
                        .warn(DependencyLoader.class.getName() +
                              ".loadLibrary is deprecated and will be removed in FalsePatternLib 0.11! Use loadLibraries instead!");
         DependencyLoaderImpl.loadLibrary(loadingModId, groupId, artifactId, minVersion, maxVersion, preferredVersion,
diff --git a/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java b/src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
@@ -22,8 +22,6 @@
 
 import com.falsepattern.lib.internal.proxy.CommonProxy;
 import lombok.Getter;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import net.minecraft.launchwrapper.Launch;
 import cpw.mods.fml.common.Mod;
@@ -48,9 +46,6 @@ public class FalsePatternLib {
     public static final String UPDATE_URL = "https://falsepattern.com/mc/versions.json";
     public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(Tags.MODID);
 
-    @Getter
-    private static final Logger log = LogManager.getLogger(Tags.MODNAME);
-
     @Getter
     private static final boolean developerEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
 
@@ -59,7 +54,7 @@ public class FalsePatternLib {
     private static CommonProxy proxy;
 
     public FalsePatternLib() {
-        log.info("Version " + Tags.VERSION + " initialized!");
+        Share.LOG.info("Version " + Tags.VERSION + " initialized!");
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/com/falsepattern/lib/internal/Share.java b/src/main/java/com/falsepattern/lib/internal/Share.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice, this permission notice and the word "SNEED"
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.lib.internal;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class Share {
+    public static final Logger LOG = LogManager.getLogger(Tags.MODNAME);
+}
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java b/src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java
@@ -26,6 +26,7 @@
 import com.falsepattern.lib.config.event.ConfigSyncEvent;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
 import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.internal.config.LibraryConfig;
 import com.falsepattern.lib.internal.impl.config.net.SyncRequest;
 import com.falsepattern.lib.text.FormattedText;
@@ -182,7 +183,7 @@ public static void sendReply(DataOutput output, List<Class<?>> requestedClasses)
 
     public static void receiveReply(DataInput input) throws IOException {
         if (!AllConfigSyncEvent.postStart()) {
-            FalsePatternLib.getLog().warn("Config synchronization was cancelled by event.");
+            Share.LOG.warn("Config synchronization was cancelled by event.");
         }
         int count = input.readInt();
         for (int i = 0; i < count; i++) {
@@ -191,22 +192,23 @@ public static void receiveReply(DataInput input) throws IOException {
             val opt = serializedNames.keySet().stream().filter((key) -> key.equals(serializedName)).findFirst();
             if (!opt.isPresent()) {
                 input.skipBytes(dataSize);
-                FalsePatternLib.getLog()
+                Share.LOG
                                .warn("Server tried to sync config not registered on our side: " + serializedName);
                 continue;
             }
             val clazz = serializedNames.get(opt.get());
             val config = parsedConfigMap.get(clazz);
             if (!config.sync) {
                 input.skipBytes(dataSize);
-                FalsePatternLib.getLog()
+                Share.LOG
                                .warn("Server tried to sync config without @Synchronize annotation on our side: " +
                                      serializedName);
                 continue;
             }
             if (!ConfigSyncEvent.postStart(clazz)) {
                 input.skipBytes(dataSize);
-                FalsePatternLib.getLog().warn("Config synchronization was cancelled by event for: " + serializedName);
+                Share.LOG.warn(
+                        "Config synchronization was cancelled by event for: " + serializedName);
                 continue;
             }
             val bytes = new byte[dataSize];
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.SneakyThrows;
 
 import net.minecraftforge.common.config.Configuration;
@@ -44,7 +44,7 @@ public BooleanConfigField(Field field, Configuration configuration, String categ
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultBoolean.class))
                                .map(Config.DefaultBoolean::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultBoolean annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanListConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanListConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.ConfigException;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.val;
 
 import net.minecraftforge.common.config.Configuration;
@@ -43,7 +43,7 @@ public BooleanListConfigField(Field field, Configuration configuration, String c
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultBooleanList.class))
                                .map(Config.DefaultBooleanList::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultBooleanList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.SneakyThrows;
 import lombok.val;
 
@@ -50,7 +50,7 @@ public DoubleConfigField(Field field, Configuration configuration, String catego
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultDouble.class))
                                .map(Config.DefaultDouble::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultDouble annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleListConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleListConfigField.java
@@ -23,7 +23,7 @@
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.ConfigException;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.val;
 
 import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public DoubleListConfigField(Field field, Configuration configuration, String ca
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultDoubleList.class))
                                .map(Config.DefaultDoubleList::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultDoubleList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/EnumConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/EnumConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import lombok.SneakyThrows;
@@ -61,7 +61,7 @@ public EnumConfigField(Field field, Configuration configuration, String category
                                                                     "Default value \"" + defName +
                                                                     "\" was not found in enum " + enumClass.getName())))
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultEnum annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
@@ -103,7 +103,7 @@ public static String receiveString(DataInput input, int maxLength, String fieldN
 
     private T getEnumByName(String name) {
         if (!enumNameMap.containsKey(name)) {
-            FalsePatternLib.getLog()
+            Share.LOG
                            .warn("Invalid value " + name + " for enum configuration field " + field.getName() +
                                  " of type " + enumClass.getName() + " in config class " +
                                  field.getDeclaringClass().getName() + "! Using default value of " +
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/FloatConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/FloatConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.util.MathUtil;
 import lombok.SneakyThrows;
 import lombok.val;
@@ -47,7 +47,7 @@ public class FloatConfigField extends AConfigField<Float> {
 
     public FloatConfigField(Field field, Configuration configuration, String category) {
         super(field, configuration, category, Property.Type.STRING);
-        FalsePatternLib.getLog()
+        Share.LOG
                        .warn("Warning: float configuration properties are DEPRECATED! Use doubles instead!\n" +
                              "Field name: " + field.getName() + ", location: " + field.getDeclaringClass().getName());
         primitive = field.getType().isPrimitive();
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.SneakyThrows;
 import lombok.val;
 
@@ -50,7 +50,7 @@ public IntConfigField(Field field, Configuration configuration, String category)
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultInt.class))
                                .map(Config.DefaultInt::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultInt annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntListConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntListConfigField.java
@@ -23,7 +23,7 @@
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.ConfigException;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.val;
 
 import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public IntListConfigField(Field field, Configuration configuration, String categ
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultIntList.class))
                                .map(Config.DefaultIntList::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultIntList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.SneakyThrows;
 import lombok.val;
 
@@ -49,7 +49,7 @@ public StringConfigField(Field field, Configuration configuration, String catego
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultString.class))
                                .map(Config.DefaultString::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultDouble annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringListConfigField.java b/src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringListConfigField.java
@@ -22,7 +22,7 @@
 
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.config.ConfigException;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.val;
 
 import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public StringListConfigField(Field field, Configuration configuration, String ca
         defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultStringList.class))
                                .map(Config.DefaultStringList::value)
                                .orElseGet(() -> {
-                                   FalsePatternLib.getLog()
+                                   Share.LOG
                                                   .warn("The field " + field.getName() + " in class " +
                                                         field.getDeclaringClass().getName() +
                                                         " has no DefaultStringList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncReplyHandler.java b/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncReplyHandler.java
@@ -20,7 +20,7 @@
  */
 package com.falsepattern.lib.internal.impl.config.net;
 
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -40,7 +40,7 @@ public IMessage onMessage(SyncReply message, MessageContext ctx) {
         try {
             message.receive();
         } catch (IOException e) {
-            FalsePatternLib.getLog().error("Failed to sync config", e);
+            Share.LOG.error("Failed to sync config", e);
         }
         return null;
     }
diff --git a/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java b/src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java
@@ -21,6 +21,7 @@
 package com.falsepattern.lib.internal.impl.config.net;
 
 import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.Share;
 import lombok.val;
 
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
@@ -45,7 +46,7 @@ public IMessage onMessage(SyncRequest message, MessageContext ctx) {
             FalsePatternLib.NETWORK.sendTo(reply, ctx.getServerHandler().playerEntity);
             return null;
         } catch (IOException e) {
-            FalsePatternLib.getLog().error("Failed to sync config", e);
+            Share.LOG.error("Failed to sync config", e);
             return null;
         }
     }
diff --git a/src/main/java/com/falsepattern/lib/internal/proxy/ClientProxy.java b/src/main/java/com/falsepattern/lib/internal/proxy/ClientProxy.java
diff --git a/src/main/java/com/falsepattern/lib/internal/proxy/CommonProxy.java b/src/main/java/com/falsepattern/lib/internal/proxy/CommonProxy.java

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`import com.falsepattern.lib.StableAPI;`
`24`	`24`	`import com.falsepattern.lib.config.Config;`
`25`		`-import com.falsepattern.lib.internal.FalsePatternLib;`
	`25`	`+import com.falsepattern.lib.internal.Share;`
`26`	`26`	`import com.falsepattern.lib.text.FormattedText;`
`27`	`27`	`import com.falsepattern.lib.toasts.GuiToast;`
`28`	`28`	`import com.falsepattern.lib.toasts.SimpleToast;`
`@@ -123,7 +123,7 @@ public void logWarn() {`
`123`	`123`	`}`
`124`	`124`	`customText(errorString);`
`125`	`125`	`for (val line: errorString.toString().split("\n")) {`
`126`		`- FalsePatternLib.getLog().error(line);`
	`126`	`+ Share.LOG.error(line);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`