From 1c6f8426f1783d03ea5ff8fb9f685397f9bc0c85 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 29 Jan 2024 10:32:02 +0100 Subject: [PATCH] Log the error by default, instead check suppression config --- .../viaversion/api/debug/DebugHandler.java | 14 ++++++++++++++ .../rewriter/BlockItemPacketRewriter1_20_3.java | 4 +--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/debug/DebugHandler.java b/api/src/main/java/com/viaversion/viaversion/api/debug/DebugHandler.java index 7b6b936fe..30e1b1032 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/debug/DebugHandler.java +++ b/api/src/main/java/com/viaversion/viaversion/api/debug/DebugHandler.java @@ -23,9 +23,11 @@ package com.viaversion.viaversion.api.debug; import com.google.common.annotations.Beta; +import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.protocol.packet.Direction; import com.viaversion.viaversion.api.protocol.packet.PacketType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import java.util.logging.Level; @Beta public interface DebugHandler { @@ -102,4 +104,16 @@ public interface DebugHandler { addPacketTypeToLog(packetType); } } + + /** + * Logs an error if debug mode is enabled or error suppression is disabled. + * + * @param error error message + * @param t thrown exception + */ + default void error(final String error, final Throwable t) { + if (!Via.getConfig().isSuppressConversionWarnings() || enabled()) { + Via.getPlatform().getLogger().log(Level.SEVERE, error, t); + } + } } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java index 92d345a7b..025a26403 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/rewriter/BlockItemPacketRewriter1_20_3.java @@ -165,9 +165,7 @@ public final class BlockItemPacketRewriter1_20_3 extends ItemRewriter