upstream/FalsePatternLib
2
0 Fork 0
mirror of https://github.com/FalsePattern/FalsePatternLib.git synced 2026-11-15 11:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

externalize log

Browse Source
This commit is contained in:
FalsePattern committed 2022-08-23 21:01:19 +02:00
1 parent d902e8eb78
commit f1004e4e75
20 files changed
+78 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/falsepattern/lib/config/ConfigurationManager.java
+2 -2
View File
@@ -22,8 +22,8 @@ package com.falsepattern.lib.config;
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 class ConfigurationManager {
@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);
src/main/java/com/falsepattern/lib/config/event/ConfigValidationFailureEvent.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.config.event;
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 class ConfigValidationFailureEvent extends Event {
}
customText(errorString);
for (val line: errorString.toString().split("\n")) {
FalsePatternLib.getLog().error(line);
Share.LOG.error(line);
}
}
src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.dependencies;
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 class DependencyLoader {
@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,
src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java
+1 -6
View File
@@ -22,8 +22,6 @@ package com.falsepattern.lib.internal;
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
src/main/java/com/falsepattern/lib/internal/Share.java
+32
View File
@@ -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);
}
src/main/java/com/falsepattern/lib/internal/impl/config/ConfigurationManagerImpl.java
+6 -4
View File
@@ -26,6 +26,7 @@ import com.falsepattern.lib.config.event.AllConfigSyncEvent;
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 class ConfigurationManagerImpl {
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,7 +192,7 @@ public class ConfigurationManagerImpl {
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;
}
@@ -199,14 +200,15 @@ public class ConfigurationManagerImpl {
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];
src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class BooleanConfigField extends AConfigField<Boolean> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/BooleanListConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class BooleanListConfigField extends AListConfigField<boolean[]> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class DoubleConfigField extends AConfigField<Double> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/DoubleListConfigField.java
+2 -2
View File
@@ -23,7 +23,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class DoubleListConfigField extends AListConfigField<double[]> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/EnumConfigField.java
+3 -3
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class EnumConfigField<T extends Enum<T>> extends AConfigField<T> {
"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 class EnumConfigField<T extends Enum<T>> extends AConfigField<T> {
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 " +
src/main/java/com/falsepattern/lib/internal/impl/config/fields/FloatConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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();
src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class IntConfigField extends AConfigField<Integer> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/IntListConfigField.java
+2 -2
View File
@@ -23,7 +23,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class IntListConfigField extends AListConfigField<int[]> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class StringConfigField extends AConfigField<String> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/fields/StringListConfigField.java
+2 -2
View File
@@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.impl.config.fields;
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 class StringListConfigField extends AListConfigField<String[]> {
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!");
src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncReplyHandler.java
+2 -2
View File
@@ -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 class SyncReplyHandler implements IMessageHandler<SyncReply, IMessage> {
try {
message.receive();
} catch (IOException e) {
FalsePatternLib.getLog().error("Failed to sync config", e);
Share.LOG.error("Failed to sync config", e);
}
return null;
}
src/main/java/com/falsepattern/lib/internal/impl/config/net/SyncRequestHandler.java
+2 -1
View File
@@ -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 class SyncRequestHandler implements IMessageHandler<SyncRequest, IMessage
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;
}
}
src/main/java/com/falsepattern/lib/internal/proxy/ClientProxy.java
+2 -5
View File
@@ -20,11 +20,8 @@
*/
package com.falsepattern.lib.internal.proxy;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
import com.falsepattern.lib.internal.FalsePatternLib;
import com.falsepattern.lib.internal.Share;
import com.falsepattern.lib.internal.Tags;
import com.falsepattern.lib.internal.config.ToastConfig;
import com.falsepattern.lib.internal.impl.toast.GuiToastImpl;
import com.falsepattern.lib.updates.UpdateChecker;
import lombok.val;
@@ -84,7 +81,7 @@ public class ClientProxy extends CommonProxy {
}
chatFuture = null;
} catch (Exception ex) {
FalsePatternLib.getLog().warn(ex);
Share.LOG.warn(ex);
}
}
}
src/main/java/com/falsepattern/lib/internal/proxy/CommonProxy.java
+6 -7
View File
@@ -20,9 +20,8 @@
*/
package com.falsepattern.lib.internal.proxy;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
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.ConfigSyncEventHandler;
import com.falsepattern.lib.internal.impl.config.ConfigurationManagerImpl;
@@ -58,22 +57,22 @@ public class CommonProxy {
public void preInit(FMLPreInitializationEvent e) {
ConfigurationManagerImpl.registerBus();
if (LibraryConfig.ENABLE_UPDATE_CHECKER) {
FalsePatternLib.getLog().info("Launching asynchronous update check.");
Share.LOG.info("Launching asynchronous update check.");
updatesFuture = UpdateChecker.fetchUpdatesAsync(FalsePatternLib.UPDATE_URL).thenApplyAsync(updates -> {
if (updates == null) {
updates = Collections.emptyList();
}
if (updates.isEmpty()) {
FalsePatternLib.getLog().info("No updates found.");
Share.LOG.info("No updates found.");
} else {
FalsePatternLib.getLog().info("Found {} updates.", updates.size());
Share.LOG.info("Found {} updates.", updates.size());
for (val update : updates) {
update.log(FalsePatternLib.getLog());
update.log(Share.LOG);
}
}
return updates;
}).exceptionally(ex -> {
FalsePatternLib.getLog().error("Failed to check for updates!", ex);
Share.LOG.error("Failed to check for updates!", ex);
return Collections.emptyList();
});
} else {