From d7df53fced8115b6443f554362d8bb17383903aa Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 10 Feb 2021 16:24:45 +0100 Subject: [PATCH] rename readAsset function to readAssetResource --- .../java/de/bixilon/minosoft/Minosoft.java | 2 +- .../minosoft/data/assets/AssetsManager.java | 2 +- .../minosoft/data/assets/Resources.java | 2 +- .../minosoft/data/locale/LocaleManager.java | 2 +- .../gui/rendering/shader/ShaderUtil.java | 2 +- .../java/de/bixilon/minosoft/util/Util.java | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index 1cb4f333e..eabaedd31 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -128,7 +128,7 @@ public final class Minosoft { taskWorker.addTask(new Task(progress -> { Log.info("Loading versions.json..."); long mappingStartLoadingTime = System.currentTimeMillis(); - Versions.loadAvailableVersions(Util.readJsonAsset("mapping/versions.json")); + Versions.loadAvailableVersions(Util.readJsonAssetResource("mapping/versions.json")); Log.info(String.format("Loaded %d versions in %dms", Versions.getVersionIdMap().size(), (System.currentTimeMillis() - mappingStartLoadingTime))); Resources.load(); Log.info("Loaded all resources!"); diff --git a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java index a14ed2382..483adf0b0 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java +++ b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java @@ -308,7 +308,7 @@ public class AssetsManager { } public String readStringAsset(String name) throws IOException { - return Util.readFile(new BufferedReader(readAsset(name)), true); + return Util.readReader(new BufferedReader(readAsset(name)), true); } public InputStream readAssetAsStream(String name) throws IOException { diff --git a/src/main/java/de/bixilon/minosoft/data/assets/Resources.java b/src/main/java/de/bixilon/minosoft/data/assets/Resources.java index 4303776ab..e790f9517 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/Resources.java +++ b/src/main/java/de/bixilon/minosoft/data/assets/Resources.java @@ -14,7 +14,7 @@ public class Resources { private static final HashBiMap ASSETS_VERSIONS = HashBiMap.create(); public static void load() throws IOException { - JsonObject json = Util.readJsonAsset("mapping/resources.json"); + JsonObject json = Util.readJsonAssetResource("mapping/resources.json"); JsonObject versions = json.getAsJsonObject("versions"); for (Map.Entry versionEntry : versions.entrySet()) { diff --git a/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java b/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java index a8a8274f0..e041560ea 100644 --- a/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java +++ b/src/main/java/de/bixilon/minosoft/data/locale/LocaleManager.java @@ -48,7 +48,7 @@ public class LocaleManager { } private static Language loadLanguage(String language) throws IOException { - return new Language(language, Util.readJsonAsset(String.format("locale/%s.json", language))); + return new Language(language, Util.readJsonAssetResource(String.format("locale/%s.json", language))); } public static void load(String language) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/ShaderUtil.java b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/ShaderUtil.java index ac021d506..0a7c0a301 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/ShaderUtil.java +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/ShaderUtil.java @@ -19,7 +19,7 @@ public class ShaderUtil { throw new ShaderLoadingException(); } - ARBShaderObjects.glShaderSourceARB(shaderId, Util.readAsset("/rendering/shader/" + shaderPath)); + ARBShaderObjects.glShaderSourceARB(shaderId, Util.readAssetResource("/rendering/shader/" + shaderPath)); ARBShaderObjects.glCompileShaderARB(shaderId); if (ARBShaderObjects.glGetObjectParameteriARB(shaderId, ARBShaderObjects.GL_OBJECT_COMPILE_STATUS_ARB) == GL11.GL_FALSE) { diff --git a/src/main/java/de/bixilon/minosoft/util/Util.java b/src/main/java/de/bixilon/minosoft/util/Util.java index 34be4c8bf..3ffab1c30 100644 --- a/src/main/java/de/bixilon/minosoft/util/Util.java +++ b/src/main/java/de/bixilon/minosoft/util/Util.java @@ -183,14 +183,14 @@ public final class Util { HashMap ret = new HashMap<>(); TarArchiveEntry entry; while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) { - ret.put(entry.getName(), readFile(new BufferedReader(new InputStreamReader(tarArchiveInputStream)), false)); + ret.put(entry.getName(), readReader(new BufferedReader(new InputStreamReader(tarArchiveInputStream)), false)); } tarArchiveInputStream.close(); return ret; } - public static String readFile(BufferedReader reader, boolean closeStream) throws IOException { + public static String readReader(BufferedReader reader, boolean closeStream) throws IOException { StringBuilder stringBuilder = new StringBuilder(); String line; while ((line = reader.readLine()) != null) { @@ -216,18 +216,18 @@ public final class Util { return ret; } - public static JsonObject readJsonAsset(String path) throws IOException { - return readJsonAsset(path, Util.class); + public static JsonObject readJsonAssetResource(String path) throws IOException { + return readJsonAssetResource(path, Util.class); } - public static JsonObject readJsonAsset(String path, Class clazz) throws IOException { - InputStreamReader reader = readAsset(path, clazz); + public static JsonObject readJsonAssetResource(String path, Class clazz) throws IOException { + InputStreamReader reader = readAssetResource(path, clazz); JsonObject json = JsonParser.parseReader(reader).getAsJsonObject(); reader.close(); return json; } - public static InputStreamReader readAsset(String path, Class clazz) { + public static InputStreamReader readAssetResource(String path, Class clazz) { return new InputStreamReader(clazz.getResourceAsStream("/assets/" + path)); } @@ -307,8 +307,8 @@ public final class Util { return result.substring(0, result.indexOf(second)); } - public static String readAsset(String path) throws IOException { - return readFile(new BufferedReader(readAsset(path, Util.class)), true); + public static String readAssetResource(String path) throws IOException { + return readReader(new BufferedReader(readAssetResource(path, Util.class)), true); } public static boolean doesStringContainsUppercaseLetters(String string) {