From dde387cc3ef1c859fd0191d2d6ebb209d53593b6 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 7 Aug 2024 12:49:51 -0500 Subject: [PATCH] make the resources folder match the new mod id --- src/main/java/one/oth3r/sit/file/LangReader.java | 4 ++-- .../resources/assets/{sit => sit-oth3r}/icon.png | Bin .../assets/{sit => sit-oth3r}/lang/en_us.json | 1 + src/main/resources/fabric.mod.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename src/main/resources/assets/{sit => sit-oth3r}/icon.png (100%) rename src/main/resources/assets/{sit => sit-oth3r}/lang/en_us.json (99%) diff --git a/src/main/java/one/oth3r/sit/file/LangReader.java b/src/main/java/one/oth3r/sit/file/LangReader.java index 8178341..bcafcb2 100644 --- a/src/main/java/one/oth3r/sit/file/LangReader.java +++ b/src/main/java/one/oth3r/sit/file/LangReader.java @@ -80,12 +80,12 @@ public class LangReader { public static void loadLanguageFile() { ClassLoader classLoader = Sit.class.getClassLoader(); try { - InputStream inputStream = classLoader.getResourceAsStream("assets/sit/lang/"+ FileData.getServerConfig().getLang() +".json"); + InputStream inputStream = classLoader.getResourceAsStream("assets/sit-oth3r/lang/" + FileData.getServerConfig().getLang() +".json"); // if the input stream is null, the language file wasn't found if (inputStream == null) { // try loading the default language file - inputStream = classLoader.getResourceAsStream("assets/sit/lang/"+ new ServerConfig().getLang() +".json"); + inputStream = classLoader.getResourceAsStream("assets/sit-oth3r/lang/" + new ServerConfig().getLang() +".json"); Data.LOGGER.error("COULDN'T LOAD THE LANGUAGE FILE. RESETTING TO en_us."); } diff --git a/src/main/resources/assets/sit/icon.png b/src/main/resources/assets/sit-oth3r/icon.png similarity index 100% rename from src/main/resources/assets/sit/icon.png rename to src/main/resources/assets/sit-oth3r/icon.png diff --git a/src/main/resources/assets/sit/lang/en_us.json b/src/main/resources/assets/sit-oth3r/lang/en_us.json similarity index 99% rename from src/main/resources/assets/sit/lang/en_us.json rename to src/main/resources/assets/sit-oth3r/lang/en_us.json index 2804c19..df90d2c 100644 --- a/src/main/resources/assets/sit/lang/en_us.json +++ b/src/main/resources/assets/sit-oth3r/lang/en_us.json @@ -54,4 +54,5 @@ "key.toggle": "Toggle Sitting", "key.sit": "Sit" + } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 74f101f..27d4636 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "sources": "https://github.com/Oth3r/Sit" }, "license": "LGPL-3.0-only", - "icon": "assets/sit/icon.png", + "icon": "assets/sit-oth3r/icon.png", "environment": "*", "entrypoints": { "main": [