From d176f09aa02337a6d57c220ec24fef7d8df1dea6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 30 Aug 2025 14:57:45 +0200 Subject: [PATCH] fancynpcs: Update logger to 0.0.7 --- plugins/fancynpcs/build.gradle.kts | 2 +- .../src/main/java/de/oliver/fancynpcs/FancyNpcs.java | 8 ++------ .../main/java/de/oliver/fancynpcs/NpcManagerImpl.java | 9 ++++----- .../de/oliver/fancynpcs/skins/cache/SkinCacheFile.java | 7 +++---- .../java/de/oliver/fancynpcs/skins/mojang/MojangAPI.java | 4 ++-- .../oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java | 4 ++-- .../fancyvisuals/nametags/store/JsonNametagStore.java | 2 +- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts index 545288b5..e57fa4d7 100644 --- a/plugins/fancynpcs/build.gradle.kts +++ b/plugins/fancynpcs/build.gradle.kts @@ -77,7 +77,7 @@ dependencies { compileOnly("org.lushplugins:ChatColorHandler:6.0.0") implementation("de.oliver.FancyAnalytics:java-sdk:0.0.4") implementation("de.oliver.FancyAnalytics:mc-api:0.1.9") - implementation("de.oliver.FancyAnalytics:logger:0.0.6") + implementation("de.oliver.FancyAnalytics:logger:0.0.7") implementation("org.incendo:cloud-core:2.1.0-SNAPSHOT") implementation("org.incendo:cloud-paper:2.0.0-beta.11") implementation("org.incendo:cloud-annotations:2.1.0-SNAPSHOT") diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java index df3d85f3..63ba1fe7 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java @@ -10,6 +10,7 @@ import de.oliver.fancyanalytics.logger.LogLevel; import de.oliver.fancyanalytics.logger.appender.Appender; import de.oliver.fancyanalytics.logger.appender.ConsoleAppender; import de.oliver.fancyanalytics.logger.appender.JsonAppender; +import de.oliver.fancyanalytics.logger.properties.ThrowableProperty; import de.oliver.fancyanalytics.sdk.events.Event; import de.oliver.fancylib.FancyLib; import de.oliver.fancylib.Metrics; @@ -323,12 +324,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin { npc.spawnForAll(); } } catch (final Throwable thr) { - fancyLogger.error( - "An error occurred while updating '" + npc.getData().getName() + "' NPC." - + System.lineSeparator() + " (1) " + thr.getClass().getName() + ": " + thr.getMessage() - + (thr.getCause() != null ? System.lineSeparator() + " (2) " + thr.getCause().getClass().getName() + ": " + thr.getCause().getMessage() : "") - ); - fancyLogger.error(thr); + fancyLogger.error("An error occurred while updating '" + npc.getData().getName() + "' NPC.", ThrowableProperty.of(thr)); } } }, 30, npcUpdateInterval, TimeUnit.SECONDS); diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java index d45a75f0..ee4dda7f 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java @@ -1,6 +1,7 @@ package de.oliver.fancynpcs; import de.oliver.fancyanalytics.logger.ExtendedFancyLogger; +import de.oliver.fancyanalytics.logger.properties.ThrowableProperty; import de.oliver.fancylib.serverSoftware.ServerSoftware; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; @@ -66,8 +67,7 @@ public class NpcManagerImpl implements NpcManager { try { npcConfig.save(npcConfigFile); } catch (IOException e) { - logger.error("Could not save npc config file"); - logger.error(e); + logger.error("Could not save npc config file", ThrowableProperty.of(e)); } } @@ -129,8 +129,7 @@ public class NpcManagerImpl implements NpcManager { try { npcConfigFile.createNewFile(); } catch (IOException e) { - logger.error("Could not create npc config file"); - logger.error(e); + logger.error("Could not create npc config file", ThrowableProperty.of(e)); return; } } @@ -441,7 +440,7 @@ public class NpcManagerImpl implements NpcManager { this.setLoaded(); } - private void setLoaded(){ + private void setLoaded() { isLoaded = true; new NpcsLoadedEvent().callEvent(); } diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/cache/SkinCacheFile.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/cache/SkinCacheFile.java index 3bd139d5..914c7a40 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/cache/SkinCacheFile.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/cache/SkinCacheFile.java @@ -1,5 +1,6 @@ package de.oliver.fancynpcs.skins.cache; +import de.oliver.fancyanalytics.logger.properties.ThrowableProperty; import de.oliver.fancynpcs.FancyNpcs; import de.oliver.fancynpcs.api.skins.SkinData; import de.oliver.jdb.JDB; @@ -23,8 +24,7 @@ public class SkinCacheFile implements SkinCache { try { skinCacheData = this.storage.get("skins/" + b64ID, SkinCacheData.class); } catch (IOException e) { - FancyNpcs.getInstance().getFancyLogger().error("Failed to load skin cache"); - FancyNpcs.getInstance().getFancyLogger().error(e); + FancyNpcs.getInstance().getFancyLogger().error("Failed to load skin cache", ThrowableProperty.of(e)); } if (skinCacheData == null) { @@ -47,8 +47,7 @@ public class SkinCacheFile implements SkinCache { String b64ID = Base64.getEncoder().encodeToString(skin.getIdentifier().getBytes()); this.storage.set("skins/" + b64ID, skinCacheData); } catch (IOException e) { - FancyNpcs.getInstance().getFancyLogger().error("Failed to save skin cache"); - FancyNpcs.getInstance().getFancyLogger().error(e); + FancyNpcs.getInstance().getFancyLogger().error("Failed to save skin cache", ThrowableProperty.of(e)); } } diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/mojang/MojangAPI.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/mojang/MojangAPI.java index 0043d784..a58875f9 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/mojang/MojangAPI.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/mojang/MojangAPI.java @@ -1,6 +1,7 @@ package de.oliver.fancynpcs.skins.mojang; import com.google.gson.Gson; +import de.oliver.fancyanalytics.logger.properties.ThrowableProperty; import de.oliver.fancynpcs.api.FancyNpcsPlugin; import de.oliver.fancynpcs.api.skins.SkinData; import de.oliver.fancynpcs.skins.mineskin.RatelimitException; @@ -51,8 +52,7 @@ public class MojangAPI { } catch (RatelimitException e) { throw e; // rethrow } catch (Exception e) { - FancyNpcsPlugin.get().getFancyLogger().warn("Failed to fetch skin from Mojang API for " + uuid); - FancyNpcsPlugin.get().getFancyLogger().warn(e); + FancyNpcsPlugin.get().getFancyLogger().warn("Failed to fetch skin from Mojang API for " + uuid, ThrowableProperty.of(e)); return null; } } diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java index 6a93b54a..f2ce0c94 100644 --- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java +++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/skins/uuidcache/UUIDFileCache.java @@ -1,6 +1,7 @@ package de.oliver.fancynpcs.skins.uuidcache; import com.google.gson.Gson; +import de.oliver.fancyanalytics.logger.properties.ThrowableProperty; import de.oliver.fancynpcs.FancyNpcs; import de.oliver.jdb.JDB; @@ -34,8 +35,7 @@ public class UUIDFileCache implements UUIDCache { try { uuids = this.storage.get("uuids", UUIDCacheData[].class); } catch (IOException e) { - FancyNpcs.getInstance().getFancyLogger().error("Failed to load UUID cache"); - FancyNpcs.getInstance().getFancyLogger().error(e); + FancyNpcs.getInstance().getFancyLogger().error("Failed to load UUID cache", ThrowableProperty.of(e)); return; } diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java index 409cc6a1..93c2f7d4 100644 --- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java +++ b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/nametags/store/JsonNametagStore.java @@ -27,7 +27,7 @@ public class JsonNametagStore implements NametagStore { try { jdb.set(context.getName() + "/" + id, nametag); } catch (IOException e) { - FancyVisuals.getFancyLogger().error("Failed to set nametag for id " + id); + FancyVisuals.getFancyLogger().error("Failed to set nametag for id " + id, ThrowableProperty.of(e)); FancyVisuals.getFancyLogger().error(e); } }