From 1f0c609dc07afc495892eff17ba59e6e054547f5 Mon Sep 17 00:00:00 2001 From: altrisi Date: Tue, 22 Feb 2022 01:35:56 +0100 Subject: [PATCH] Remove log4j as much as possible (#1334) --- build.gradle | 1 + src/main/java/carpet/CarpetSettings.java | 7 ++++--- src/main/java/carpet/mixins/ServerPlayerMixin.java | 4 ++-- src/main/java/carpet/script/CarpetScriptServer.java | 6 +++--- src/main/java/carpet/script/ScriptHost.java | 7 +++---- src/main/java/carpet/script/api/Auxiliary.java | 9 ++++++--- src/main/java/carpet/script/argument/FileArgument.java | 6 +++--- src/main/java/carpet/script/value/Value.java | 2 +- src/main/java/carpet/utils/Messenger.java | 6 +++--- 9 files changed, 26 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 6ae82bf9..3cee6dc7 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ group = project.maven_group loom { accessWidenerPath = file("src/main/resources/carpet.accesswidener") + runtimeOnlyLog4j = false // Can be turned on after TriConsumer is no longer present in public API } dependencies { diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 980e4ff3..211461ab 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -22,8 +22,9 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Iterator; import java.util.Locale; @@ -45,7 +46,7 @@ import static carpet.settings.RuleCategory.CLIENT; public class CarpetSettings { public static final String carpetVersion = "1.4.63+v220220"; - public static final Logger LOG = LogManager.getLogger("carpet"); + public static final Logger LOG = LoggerFactory.getLogger("carpet"); public static ThreadLocal skipGenerationChecks = ThreadLocal.withInitial(() -> false); public static ThreadLocal impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false); public static int runPermissionLevel = 2; diff --git a/src/main/java/carpet/mixins/ServerPlayerMixin.java b/src/main/java/carpet/mixins/ServerPlayerMixin.java index 5900c7b8..d5448ec0 100644 --- a/src/main/java/carpet/mixins/ServerPlayerMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerMixin.java @@ -43,11 +43,11 @@ public abstract class ServerPlayerMixin implements ServerPlayerEntityInterface } catch (StackOverflowError soe) { - CarpetSettings.LOG.fatal("Caused stack overflow when performing player action", soe); + CarpetSettings.LOG.error("Caused stack overflow when performing player action", soe); } catch (Throwable exc) { - CarpetSettings.LOG.fatal("Error executing player tasks", exc); + CarpetSettings.LOG.error("Error executing player tasks", exc); } } } diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java index dc5d3c8b..6dc71d43 100644 --- a/src/main/java/carpet/script/CarpetScriptServer.java +++ b/src/main/java/carpet/script/CarpetScriptServer.java @@ -34,8 +34,8 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.storage.LevelResource; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.file.FileVisitOption; @@ -57,7 +57,7 @@ import java.util.stream.Collectors; public class CarpetScriptServer { //make static for now, but will change that later: - public static final Logger LOG = LogManager.getLogger("scarpet"); + public static final Logger LOG = LoggerFactory.getLogger("Scarpet"); public final MinecraftServer server; public CarpetScriptHost globalHost; public Map modules; diff --git a/src/main/java/carpet/script/ScriptHost.java b/src/main/java/carpet/script/ScriptHost.java index 56216c72..976172a7 100644 --- a/src/main/java/carpet/script/ScriptHost.java +++ b/src/main/java/carpet/script/ScriptHost.java @@ -4,13 +4,12 @@ import carpet.script.bundled.Module; import carpet.script.exception.ExpressionException; import carpet.script.exception.IntegrityException; import carpet.script.exception.InternalExpressionException; -import carpet.script.language.Arithmetic; import carpet.script.value.FunctionValue; import carpet.script.value.Value; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.HashSet; @@ -440,7 +439,7 @@ public abstract class ScriptHost errorSnooper=null; } - public static final Logger DEPRECATION_LOG = LogManager.getLogger("Scarpet Deprecation Warnings"); + public static final Logger DEPRECATION_LOG = LoggerFactory.getLogger("Scarpet Deprecation Warnings"); public boolean issueDeprecation(String feature) { diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index 3dbd2bc1..433ade10 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -830,11 +830,14 @@ public class Auxiliary { String level = lv.get(0).getString().toLowerCase(Locale.ROOT); res = lv.get(1); switch(level){ - case "error": CarpetScriptServer.LOG.error(res.getString()); break; - case "warn": CarpetScriptServer.LOG.warn(res.getString()); break; case "debug": CarpetScriptServer.LOG.debug(res.getString()); break; - case "fatal": CarpetScriptServer.LOG.fatal(res.getString()); break; + case "warn": CarpetScriptServer.LOG.warn(res.getString()); break; case "info": CarpetScriptServer.LOG.info(res.getString()); break; + case "fatal": + // Somehow issue deprecation + case "error": + CarpetScriptServer.LOG.error(res.getString()); + break; default: throw new InternalExpressionException("Unknown log level for 'logger': "+level); } } diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index 930c121e..c273dd22 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -379,9 +379,9 @@ public class FileArgument } catch (IOException secondIO) { - CarpetScriptServer.LOG.warn("IOException when trying to read nbt file, something may have gone wrong with the fs",e); - CarpetScriptServer.LOG.catching(ioException); - CarpetScriptServer.LOG.catching(secondIO); + CarpetScriptServer.LOG.warn("IOException when trying to read nbt file, something may have gone wrong with the fs", e); + CarpetScriptServer.LOG.warn("", ioException); + CarpetScriptServer.LOG.warn("", secondIO); throw new ThrowStatement("Not a valid NBT tag in "+path.toString(), Throwables.NBT_ERROR); } } diff --git a/src/main/java/carpet/script/value/Value.java b/src/main/java/carpet/script/value/Value.java index c28edd07..ccf26643 100644 --- a/src/main/java/carpet/script/value/Value.java +++ b/src/main/java/carpet/script/value/Value.java @@ -43,7 +43,7 @@ public abstract class Value implements Comparable, Cloneable catch (CloneNotSupportedException e) { // should not happen - CarpetSettings.LOG.catching(e); + CarpetSettings.LOG.error("Failed to clone variable", e); throw new InternalExpressionException("Variable of type "+getTypeString()+" is not cloneable. Tell gnembon about it, this shoudn't happen"); } copy.boundVariable = var; diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java index a216d96f..4352b72c 100644 --- a/src/main/java/carpet/utils/Messenger.java +++ b/src/main/java/carpet/utils/Messenger.java @@ -15,8 +15,8 @@ import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -28,7 +28,7 @@ import java.util.regex.Pattern; public class Messenger { - public static final Logger LOG = LogManager.getLogger("Messaging System"); + public static final Logger LOG = LoggerFactory.getLogger("Messaging System"); private static final Pattern colorExtract = Pattern.compile("#([0-9a-fA-F]{6})"); public enum CarpetFormatting