From 9b0ec6172d07c0841d0d1dfecc99a92a932d829e Mon Sep 17 00:00:00 2001 From: Discreater Date: Sat, 21 Aug 2021 15:03:40 +0800 Subject: [PATCH] fix: use NBTJson (from nei-gtnh) to serialize - close #97 - bump version --- gradle.properties | 2 +- .../jecalculation/data/Controller.java | 8 +- .../jecalculation/utils/Utilities.java | 96 +++---------------- 3 files changed, 18 insertions(+), 88 deletions(-) diff --git a/gradle.properties b/gradle.properties index f061720..7def9f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3G # suppress inspection "UnusedProperty" for whole file mc_version=1.7.10 nei_version=2.1.5-GTNH -proj_version=3.8.0 \ No newline at end of file +proj_version=3.8.1 \ No newline at end of file diff --git a/src/main/java/me/towdium/jecalculation/data/Controller.java b/src/main/java/me/towdium/jecalculation/data/Controller.java index 7524154..230941c 100644 --- a/src/main/java/me/towdium/jecalculation/data/Controller.java +++ b/src/main/java/me/towdium/jecalculation/data/Controller.java @@ -55,8 +55,12 @@ public class Controller { return new ArrayList<>(); Function read = f -> { NBTTagCompound nbt = Utilities.Json.read(f); - JustEnoughCalculation.logger.warn("File " + f.getAbsolutePath() + " contains invalid records."); - return nbt == null ? null : new Recipes(nbt); + if (nbt == null) { + JustEnoughCalculation.logger.warn("File " + f.getAbsolutePath() + " contains invalid records."); + return null; + } else { + return new Recipes(nbt); + } }; return Arrays.stream(fs) .map(i -> new Pair<>(i.getName(), read.apply(i))) diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index 6d10e54..ab418f6 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -107,6 +107,7 @@ public class Utilities { * The icon name should be similar to 'modId:fluidId', then get the modId. * Use the mod id to find in mod list, if not found, use the capitalized mod id to find in mod list; * If still not found, return the capitalized mod id + * * @param fluid fluid * @return mod name */ @@ -124,10 +125,10 @@ public class Utilities { Map indexedModList = Loader.instance().getIndexedModList(); ModContainer modContainer = indexedModList.get(modId); - if(modContainer == null) { - String capitalizedModId =WordUtils.capitalize(modId); + if (modContainer == null) { + String capitalizedModId = WordUtils.capitalize(modId); modContainer = indexedModList.get(capitalizedModId); - if(modContainer == null) { + if (modContainer == null) { return capitalizedModId; } } @@ -136,10 +137,9 @@ public class Utilities { } - private static IIcon getFluidIcon(Fluid fluid) { IIcon icon = fluid.getFlowingIcon(); - if(icon == null) { + if (icon == null) { icon = fluid.getStillIcon(); } return icon; @@ -286,9 +286,9 @@ public class Utilities { } public static List wrap(String s, int width) { - return new TextWrapper() - .wrap(s, ClientUtils.mc().getLanguageManager().getCurrentLanguage().getLanguageCode(), - i -> TextWrapper.renderer.getCharWidth(i), width); + return new TextWrapper().wrap(s, + ClientUtils.mc().getLanguageManager().getCurrentLanguage().getLanguageCode(), + i -> TextWrapper.renderer.getCharWidth(i), width); } static class TextWrapper { @@ -435,79 +435,7 @@ public class Utilities { } public static String write(NBTTagCompound nbt) { - Writer w = new Writer(); - write(nbt, w); - w.enter(); - return w.build(); - } - - private static void write(NBTBase nbt, Writer w) { - if (nbt instanceof NBTTagCompound) { - NBTTagCompound tags = (NBTTagCompound) nbt; - //noinspection unchecked - Set keySet = tags.func_150296_c(); - boolean wrap = keySet.size() > 1; - boolean first = true; - w.sb.append('{'); - if (wrap) - w.indent++; - for (String i : keySet) { - if (first) - first = false; - else - w.sb.append(','); - if (wrap) - w.enter(); - w.sb.append('"'); - w.sb.append(i); - w.sb.append("\": "); - write(tags.getTag(i), w); - } - if (wrap) { - w.indent--; - w.enter(); - } - w.sb.append('}'); - } else if (nbt instanceof NBTTagList) { - NBTTagList tags = (NBTTagList) nbt; - boolean wrap = tags.tagCount() > 1; - boolean first = true; - w.sb.append('['); - if (wrap) - w.indent++; - //noinspection unchecked - for (NBTBase i : (List) tags.tagList) { - if (first) - first = false; - else - w.sb.append(','); - if (wrap) - w.enter(); - write(i, w); - } - if (wrap) { - w.indent--; - w.enter(); - } - w.sb.append(']'); - } else - w.sb.append(nbt); - } - - private static class Writer { - public int indent = 0; - StringBuilder sb = new StringBuilder(); - - public void enter() { - sb.append('\n'); - char[] tmp = new char[4 * indent]; - Arrays.fill(tmp, ' '); - sb.append(tmp); - } - - public String build() { - return sb.toString(); - } + return NBTJson.toJson(nbt); } } @@ -521,9 +449,7 @@ public class Utilities { return new Locale(parts[0], parts[1], parts[2]); } - public static String[] mergeStringArrays(String[] ...arrays){ - return Stream.of(arrays) - .flatMap(Stream::of) - .toArray(String[]::new); + public static String[] mergeStringArrays(String[]... arrays) { + return Stream.of(arrays).flatMap(Stream::of).toArray(String[]::new); } }