Skip to content

Commit f1004e4

Browse files
FalsePatternFalsePattern
committed
externalize log
1 parent d902e8e commit f1004e4

20 files changed

+78
-52
lines changed

‎src/main/java/com/falsepattern/lib/config/ConfigurationManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import com.falsepattern.lib.DeprecationDetails;
2424
import com.falsepattern.lib.StableAPI;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
2625
import com.falsepattern.lib.internal.ReflectionUtil;
26+
import com.falsepattern.lib.internal.Share;
2727
import com.falsepattern.lib.internal.impl.config.ConfigurationManagerImpl;
2828
import lombok.AccessLevel;
2929
import lombok.NoArgsConstructor;
@@ -111,7 +111,7 @@ public static void saveToFile(boolean validateAndResetInvalid, Class<?>... confi
111111
@DeprecationDetails(deprecatedSince = "0.10.0")
112112
@StableAPI.Expose
113113
public static void registerConfig(Class<?> configClass) throws ConfigException {
114-
FalsePatternLib.getLog()
114+
Share.LOG
115115
.warn("A mod is using the deprecated config registration method! The following exception contains the stacktrace.",
116116
new Exception());
117117
ConfigurationManagerImpl.registerLoadSaveConfig(configClass);

‎src/main/java/com/falsepattern/lib/config/event/ConfigValidationFailureEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.StableAPI;
2424
import com.falsepattern.lib.config.Config;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import com.falsepattern.lib.text.FormattedText;
2727
import com.falsepattern.lib.toasts.GuiToast;
2828
import com.falsepattern.lib.toasts.SimpleToast;
@@ -123,7 +123,7 @@ public void logWarn() {
123123
}
124124
customText(errorString);
125125
for (val line: errorString.toString().split("\n")) {
126-
FalsePatternLib.getLog().error(line);
126+
Share.LOG.error(line);
127127
}
128128
}
129129

‎src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.DeprecationDetails;
2424
import com.falsepattern.lib.StableAPI;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import com.falsepattern.lib.internal.impl.dependencies.DependencyLoaderImpl;
2727
import lombok.NonNull;
2828

@@ -51,7 +51,7 @@ public static void loadLibraries(Library... libraries) {
5151
@DeprecationDetails(deprecatedSince = "0.10.0")
5252
@StableAPI.Expose
5353
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) {
54-
FalsePatternLib.getLog()
54+
Share.LOG
5555
.warn(DependencyLoader.class.getName() +
5656
".loadLibrary is deprecated and will be removed in FalsePatternLib 0.11! Use loadLibraries instead!");
5757
DependencyLoaderImpl.loadLibrary(loadingModId, groupId, artifactId, minVersion, maxVersion, preferredVersion,

‎src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
import com.falsepattern.lib.internal.proxy.CommonProxy;
2424
import lombok.Getter;
25-
import org.apache.logging.log4j.LogManager;
26-
import org.apache.logging.log4j.Logger;
2725

2826
import net.minecraft.launchwrapper.Launch;
2927
import cpw.mods.fml.common.Mod;
@@ -48,9 +46,6 @@ public class FalsePatternLib {
4846
public static final String UPDATE_URL = "https://falsepattern.com/mc/versions.json";
4947
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(Tags.MODID);
5048

51-
@Getter
52-
private static final Logger log = LogManager.getLogger(Tags.MODNAME);
53-
5449
@Getter
5550
private static final boolean developerEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
5651

@@ -59,7 +54,7 @@ public class FalsePatternLib {
5954
private static CommonProxy proxy;
6055

6156
public FalsePatternLib() {
62-
log.info("Version " + Tags.VERSION + " initialized!");
57+
Share.LOG.info("Version " + Tags.VERSION + " initialized!");
6358
}
6459

6560
@Mod.EventHandler

‎src/main/java/com/falsepattern/lib/internal/Share.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright (C) 2022 FalsePattern
3+
* All Rights Reserved
4+
*
5+
* The above copyright notice, this permission notice and the word "SNEED"
6+
* shall be included in all copies or substantial portions of the Software.
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Lesser General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Lesser General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*/
21+
22+
package com.falsepattern.lib.internal;
23+
24+
import lombok.AccessLevel;
25+
import lombok.NoArgsConstructor;
26+
import org.apache.logging.log4j.LogManager;
27+
import org.apache.logging.log4j.Logger;
28+
29+
@NoArgsConstructor(access = AccessLevel.PRIVATE)
30+
public final class Share {
31+
public static final Logger LOG = LogManager.getLogger(Tags.MODNAME);
32+
}

‎src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.falsepattern.lib.config.event.ConfigSyncEvent;
2727
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
2828
import com.falsepattern.lib.internal.FalsePatternLib;
29+
import com.falsepattern.lib.internal.Share;
2930
import com.falsepattern.lib.internal.config.LibraryConfig;
3031
import com.falsepattern.lib.internal.impl.config.net.SyncRequest;
3132
import com.falsepattern.lib.text.FormattedText;
@@ -182,7 +183,7 @@ public static void sendReply(DataOutput output, List<Class<?>> requestedClasses)
182183

183184
public static void receiveReply(DataInput input) throws IOException {
184185
if (!AllConfigSyncEvent.postStart()) {
185-
FalsePatternLib.getLog().warn("Config synchronization was cancelled by event.");
186+
Share.LOG.warn("Config synchronization was cancelled by event.");
186187
}
187188
int count = input.readInt();
188189
for (int i = 0; i < count; i++) {
@@ -191,22 +192,23 @@ public static void receiveReply(DataInput input) throws IOException {
191192
val opt = serializedNames.keySet().stream().filter((key) -> key.equals(serializedName)).findFirst();
192193
if (!opt.isPresent()) {
193194
input.skipBytes(dataSize);
194-
FalsePatternLib.getLog()
195+
Share.LOG
195196
.warn("Server tried to sync config not registered on our side: " + serializedName);
196197
continue;
197198
}
198199
val clazz = serializedNames.get(opt.get());
199200
val config = parsedConfigMap.get(clazz);
200201
if (!config.sync) {
201202
input.skipBytes(dataSize);
202-
FalsePatternLib.getLog()
203+
Share.LOG
203204
.warn("Server tried to sync config without @Synchronize annotation on our side: " +
204205
serializedName);
205206
continue;
206207
}
207208
if (!ConfigSyncEvent.postStart(clazz)) {
208209
input.skipBytes(dataSize);
209-
FalsePatternLib.getLog().warn("Config synchronization was cancelled by event for: " + serializedName);
210+
Share.LOG.warn(
211+
"Config synchronization was cancelled by event for: " + serializedName);
210212
continue;
211213
}
212214
val bytes = new byte[dataSize];

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.SneakyThrows;
2727

2828
import net.minecraftforge.common.config.Configuration;
@@ -44,7 +44,7 @@ public BooleanConfigField(Field field, Configuration configuration, String categ
4444
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultBoolean.class))
4545
.map(Config.DefaultBoolean::value)
4646
.orElseGet(() -> {
47-
FalsePatternLib.getLog()
47+
Share.LOG
4848
.warn("The field " + field.getName() + " in class " +
4949
field.getDeclaringClass().getName() +
5050
" has no DefaultBoolean annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanListConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.ConfigException;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.val;
2727

2828
import net.minecraftforge.common.config.Configuration;
@@ -43,7 +43,7 @@ public BooleanListConfigField(Field field, Configuration configuration, String c
4343
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultBooleanList.class))
4444
.map(Config.DefaultBooleanList::value)
4545
.orElseGet(() -> {
46-
FalsePatternLib.getLog()
46+
Share.LOG
4747
.warn("The field " + field.getName() + " in class " +
4848
field.getDeclaringClass().getName() +
4949
" has no DefaultBooleanList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.SneakyThrows;
2727
import lombok.val;
2828

@@ -50,7 +50,7 @@ public DoubleConfigField(Field field, Configuration configuration, String catego
5050
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultDouble.class))
5151
.map(Config.DefaultDouble::value)
5252
.orElseGet(() -> {
53-
FalsePatternLib.getLog()
53+
Share.LOG
5454
.warn("The field " + field.getName() + " in class " +
5555
field.getDeclaringClass().getName() +
5656
" has no DefaultDouble annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleListConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.ConfigException;
2525
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
26-
import com.falsepattern.lib.internal.FalsePatternLib;
26+
import com.falsepattern.lib.internal.Share;
2727
import lombok.val;
2828

2929
import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public DoubleListConfigField(Field field, Configuration configuration, String ca
4949
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultDoubleList.class))
5050
.map(Config.DefaultDoubleList::value)
5151
.orElseGet(() -> {
52-
FalsePatternLib.getLog()
52+
Share.LOG
5353
.warn("The field " + field.getName() + " in class " +
5454
field.getDeclaringClass().getName() +
5555
" has no DefaultDoubleList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/EnumConfigField.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import com.google.common.collect.BiMap;
2727
import com.google.common.collect.HashBiMap;
2828
import lombok.SneakyThrows;
@@ -61,7 +61,7 @@ public EnumConfigField(Field field, Configuration configuration, String category
6161
"Default value \"" + defName +
6262
"\" was not found in enum " + enumClass.getName())))
6363
.orElseGet(() -> {
64-
FalsePatternLib.getLog()
64+
Share.LOG
6565
.warn("The field " + field.getName() + " in class " +
6666
field.getDeclaringClass().getName() +
6767
" 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
103103

104104
private T getEnumByName(String name) {
105105
if (!enumNameMap.containsKey(name)) {
106-
FalsePatternLib.getLog()
106+
Share.LOG
107107
.warn("Invalid value " + name + " for enum configuration field " + field.getName() +
108108
" of type " + enumClass.getName() + " in config class " +
109109
field.getDeclaringClass().getName() + "! Using default value of " +

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/FloatConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import com.falsepattern.lib.util.MathUtil;
2727
import lombok.SneakyThrows;
2828
import lombok.val;
@@ -47,7 +47,7 @@ public class FloatConfigField extends AConfigField<Float> {
4747

4848
public FloatConfigField(Field field, Configuration configuration, String category) {
4949
super(field, configuration, category, Property.Type.STRING);
50-
FalsePatternLib.getLog()
50+
Share.LOG
5151
.warn("Warning: float configuration properties are DEPRECATED! Use doubles instead!\n" +
5252
"Field name: " + field.getName() + ", location: " + field.getDeclaringClass().getName());
5353
primitive = field.getType().isPrimitive();

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.SneakyThrows;
2727
import lombok.val;
2828

@@ -50,7 +50,7 @@ public IntConfigField(Field field, Configuration configuration, String category)
5050
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultInt.class))
5151
.map(Config.DefaultInt::value)
5252
.orElseGet(() -> {
53-
FalsePatternLib.getLog()
53+
Share.LOG
5454
.warn("The field " + field.getName() + " in class " +
5555
field.getDeclaringClass().getName() +
5656
" has no DefaultInt annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntListConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.ConfigException;
2525
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
26-
import com.falsepattern.lib.internal.FalsePatternLib;
26+
import com.falsepattern.lib.internal.Share;
2727
import lombok.val;
2828

2929
import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public IntListConfigField(Field field, Configuration configuration, String categ
4949
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultIntList.class))
5050
.map(Config.DefaultIntList::value)
5151
.orElseGet(() -> {
52-
FalsePatternLib.getLog()
52+
Share.LOG
5353
.warn("The field " + field.getName() + " in class " +
5454
field.getDeclaringClass().getName() +
5555
" has no DefaultIntList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.SneakyThrows;
2727
import lombok.val;
2828

@@ -49,7 +49,7 @@ public StringConfigField(Field field, Configuration configuration, String catego
4949
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultString.class))
5050
.map(Config.DefaultString::value)
5151
.orElseGet(() -> {
52-
FalsePatternLib.getLog()
52+
Share.LOG
5353
.warn("The field " + field.getName() + " in class " +
5454
field.getDeclaringClass().getName() +
5555
" has no DefaultDouble annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringListConfigField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.falsepattern.lib.config.Config;
2424
import com.falsepattern.lib.config.ConfigException;
25-
import com.falsepattern.lib.internal.FalsePatternLib;
25+
import com.falsepattern.lib.internal.Share;
2626
import lombok.val;
2727

2828
import net.minecraftforge.common.config.Configuration;
@@ -49,7 +49,7 @@ public StringListConfigField(Field field, Configuration configuration, String ca
4949
defaultValue = Optional.ofNullable(field.getAnnotation(Config.DefaultStringList.class))
5050
.map(Config.DefaultStringList::value)
5151
.orElseGet(() -> {
52-
FalsePatternLib.getLog()
52+
Share.LOG
5353
.warn("The field " + field.getName() + " in class " +
5454
field.getDeclaringClass().getName() +
5555
" has no DefaultStringList annotation!\nThis will be a crash in FalsePatternLib 0.11, update your code!");

‎src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncReplyHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
package com.falsepattern.lib.internal.impl.config.net;
2222

23-
import com.falsepattern.lib.internal.FalsePatternLib;
23+
import com.falsepattern.lib.internal.Share;
2424

2525
import cpw.mods.fml.common.network.simpleimpl.IMessage;
2626
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -40,7 +40,7 @@ public IMessage onMessage(SyncReply message, MessageContext ctx) {
4040
try {
4141
message.receive();
4242
} catch (IOException e) {
43-
FalsePatternLib.getLog().error("Failed to sync config", e);
43+
Share.LOG.error("Failed to sync config", e);
4444
}
4545
return null;
4646
}

‎src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package com.falsepattern.lib.internal.impl.config.net;
2222

2323
import com.falsepattern.lib.internal.FalsePatternLib;
24+
import com.falsepattern.lib.internal.Share;
2425
import lombok.val;
2526

2627
import cpw.mods.fml.common.network.simpleimpl.IMessage;
@@ -45,7 +46,7 @@ public IMessage onMessage(SyncRequest message, MessageContext ctx) {
4546
FalsePatternLib.NETWORK.sendTo(reply, ctx.getServerHandler().playerEntity);
4647
return null;
4748
} catch (IOException e) {
48-
FalsePatternLib.getLog().error("Failed to sync config", e);
49+
Share.LOG.error("Failed to sync config", e);
4950
return null;
5051
}
5152
}

0 commit comments

Comments
 (0)