From c9cc00624528a21a28b62be82b73d97194888903 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+Oth3r@users.noreply.github.com> Date: Mon, 16 Jun 2025 15:07:37 -0500 Subject: [PATCH] otterlib 0.2 changes --- src/main/java/one/oth3r/sit/file/LangReader.java | 4 ++-- src/main/java/one/oth3r/sit/file/ServerConfig.java | 12 +++--------- src/main/java/one/oth3r/sit/file/SittingConfig.java | 2 +- src/main/java/one/oth3r/sit/utl/Data.java | 5 ++--- src/main/java/one/oth3r/sit/utl/Events.java | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/LangReader.java b/src/main/java/one/oth3r/sit/file/LangReader.java index d9fdaff..d503bfb 100644 --- a/src/main/java/one/oth3r/sit/file/LangReader.java +++ b/src/main/java/one/oth3r/sit/file/LangReader.java @@ -99,8 +99,8 @@ public class LangReader { Reader defaultReader = new InputStreamReader(getInputStream(true), StandardCharsets.UTF_8); defaultLangMap.putAll(new Gson().fromJson(defaultReader, tToken)); } catch (Exception e) { - Data.LOGGER.info("ERROR WITH LANGUAGE FILE - PLEASE REPORT WITH THE ERROR LOG"); - Data.LOGGER.info(e.getMessage()); + Data.LOGGER.error("ERROR WITH LANGUAGE FILE - PLEASE REPORT WITH THE ERROR LOG"); + Data.LOGGER.error(e.getMessage()); } } diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index f4cd25e..842572c 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -1,7 +1,6 @@ package one.oth3r.sit.file; import com.google.gson.Gson; -import com.google.gson.JsonElement; import com.google.gson.JsonSyntaxException; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; @@ -264,13 +263,8 @@ public class ServerConfig implements CustomFile { this.interactionBlocks = newFile.interactionBlocks.stream().map(CustomBlock::new).collect(Collectors.toCollection(ArrayList::new)); } - /** - * updates the file based on the version number of the current instance - * - * @param json - */ @Override - public void update(JsonElement json) { + public void updateInstance() { /// update to 2.1, just a new list, nothing to change /// update to 2.2, new settings, no changes if (version >= 2.0 && version <= 2.1) { @@ -341,7 +335,7 @@ public class ServerConfig implements CustomFile { loadVersion(properties,Double.parseDouble(ver)); } catch (Exception e) { - Data.LOGGER.error("Error loading legacy config file: {}", e.getMessage()); + Data.LOGGER.error("Error loading legacy config file: %s", e.getMessage()); } // delete the old file @@ -503,7 +497,7 @@ public class ServerConfig implements CustomFile { serverConfig.save(); sittingConfig.save(); } catch (Exception e) { - Data.LOGGER.error("Error loading legacy config: {}", e.getMessage()); + Data.LOGGER.error("Error loading legacy config: %s", e.getMessage()); } } } diff --git a/src/main/java/one/oth3r/sit/file/SittingConfig.java b/src/main/java/one/oth3r/sit/file/SittingConfig.java index 38564ce..2e7337b 100644 --- a/src/main/java/one/oth3r/sit/file/SittingConfig.java +++ b/src/main/java/one/oth3r/sit/file/SittingConfig.java @@ -101,7 +101,7 @@ public class SittingConfig implements CustomFile { } @Override - public void update(JsonElement jsonElement) { + public void updateInstance() { } diff --git a/src/main/java/one/oth3r/sit/utl/Data.java b/src/main/java/one/oth3r/sit/utl/Data.java index 8c67fde..5074908 100644 --- a/src/main/java/one/oth3r/sit/utl/Data.java +++ b/src/main/java/one/oth3r/sit/utl/Data.java @@ -4,14 +4,13 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.entity.decoration.DisplayEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import one.oth3r.otterlib.base.OtterLogger; import java.util.HashMap; public class Data { public static final String MOD_ID = "sit-oth3r"; - public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + public static final OtterLogger LOGGER = new OtterLogger(MOD_ID); public static final String CONFIG_DIR = FabricLoader.getInstance().getConfigDir().toFile()+"/sit!/"; diff --git a/src/main/java/one/oth3r/sit/utl/Events.java b/src/main/java/one/oth3r/sit/utl/Events.java index 0b5c5e6..f62ea77 100644 --- a/src/main/java/one/oth3r/sit/utl/Events.java +++ b/src/main/java/one/oth3r/sit/utl/Events.java @@ -192,7 +192,7 @@ public class Events { ParseResults parse = dispatcher.parse("sit", player.getCommandSource()); dispatcher.execute(parse); } catch (CommandSyntaxException e) { - Data.LOGGER.error("Error executing sit command for player {}", player.getName().getString()); + Data.LOGGER.error("Error executing sit command for player %s", player.getName().getString()); } }