From 19e7ea2f72b107b63dd267f3936136d788651a70 Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Wed, 3 Apr 2024 21:01:13 +0500 Subject: [PATCH] fix: use logger instead of System.out Signed-off-by: Octol1ttle --- .../forge/handlers/DataHandler.java | 24 ++++++++++++++----- .../handlers/SplatcraftCommonHandler.java | 3 ++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/splatcraft/forge/handlers/DataHandler.java b/src/main/java/net/splatcraft/forge/handlers/DataHandler.java index 1ceef9a0e..9b39ee53f 100644 --- a/src/main/java/net/splatcraft/forge/handlers/DataHandler.java +++ b/src/main/java/net/splatcraft/forge/handlers/DataHandler.java @@ -4,6 +4,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mojang.serialization.JsonOps; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.stream.StreamSupport; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; @@ -15,15 +23,19 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.splatcraft.forge.Splatcraft; -import net.splatcraft.forge.items.weapons.settings.*; +import net.splatcraft.forge.items.weapons.settings.AbstractWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.BlasterWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.ChargerWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.DualieWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.RollerWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.ShooterWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.SlosherWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.SplatlingWeaponSettings; +import net.splatcraft.forge.items.weapons.settings.SubWeaponSettings; import net.splatcraft.forge.network.SplatcraftPacketHandler; import net.splatcraft.forge.network.s2c.UpdateWeaponSettingsPacket; import net.splatcraft.forge.registries.SplatcraftInkColors; -import java.lang.reflect.InvocationTargetException; -import java.util.*; -import java.util.stream.StreamSupport; - @Mod.EventBusSubscriber public class DataHandler { @@ -168,7 +180,7 @@ protected void apply(Map resourceList, ResourceMa return; AbstractWeaponSettings settings = SETTING_TYPES.get(type).getConstructor(String.class).newInstance(key.toString()); - settings.getCodec().parse(JsonOps.INSTANCE, json).resultOrPartial(msg -> System.out.println("Failed to load weapon settings for " + key + ": " + msg)).ifPresent( + settings.getCodec().parse(JsonOps.INSTANCE, json).resultOrPartial(msg -> Splatcraft.LOGGER.error("Failed to load weapon settings for %s: %s".formatted(key, msg))).ifPresent( settings::castAndDeserialize ); diff --git a/src/main/java/net/splatcraft/forge/handlers/SplatcraftCommonHandler.java b/src/main/java/net/splatcraft/forge/handlers/SplatcraftCommonHandler.java index 58eeb257e..839c67092 100644 --- a/src/main/java/net/splatcraft/forge/handlers/SplatcraftCommonHandler.java +++ b/src/main/java/net/splatcraft/forge/handlers/SplatcraftCommonHandler.java @@ -40,6 +40,7 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.splatcraft.forge.Splatcraft; import net.splatcraft.forge.SplatcraftConfig; import net.splatcraft.forge.blocks.IColoredBlock; import net.splatcraft.forge.client.layer.PlayerInkColoredSkinLayer; @@ -259,7 +260,7 @@ public static void onClientLogIn(ClientPlayerNetworkEvent.LoggedInEvent event) { try { SplatcraftPacketHandler.sendToServer(new SendPlayerOverlayPacket(player.getUUID(), file)); } catch (IOException e) { - e.printStackTrace(System.out); + Splatcraft.LOGGER.error("Could not send player overlay packet", e); } } }