From a3eccfb23c8566d4942372e480d69deed63ad53b Mon Sep 17 00:00:00 2001 From: Sampsa Date: Thu, 10 Aug 2023 11:33:45 +0300 Subject: [PATCH] Remove PatternHelper --- .../integration/appeng/ConverterPattern.java | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/src/main/scala/li/cil/oc/integration/appeng/ConverterPattern.java b/src/main/scala/li/cil/oc/integration/appeng/ConverterPattern.java index e8234be9a..3bf65d95b 100644 --- a/src/main/scala/li/cil/oc/integration/appeng/ConverterPattern.java +++ b/src/main/scala/li/cil/oc/integration/appeng/ConverterPattern.java @@ -17,44 +17,43 @@ public final class ConverterPattern implements Converter { ItemStack is = (ItemStack) value; try { final NBTTagCompound encodedValue = is.getTagCompound(); - final NBTTagList inTag = encodedValue.getTagList("in", 10); - final NBTTagList outTag = encodedValue.getTagList("out", 10); + if (encodedValue != null) { + final NBTTagList inTag = encodedValue.getTagList("in", 10); + final NBTTagList outTag = encodedValue.getTagList("out", 10); - Map[] inputs = new Map[inTag.tagCount()]; - for (int i = 0; i < inTag.tagCount(); i++) { - inputs[i] = new HashMap<>(); - final NBTTagCompound tag = inTag.getCompoundTagAt(i); - final ItemStack inputItem = Platform.loadItemStackFromNBT(tag); - if (inputItem != null) { - inputs[i].put("name", inputItem.getItem().getItemStackDisplayName(inputItem)); - if (tag.getLong("Cnt") > 0) { - inputs[i].put("count", tag.getLong("Cnt")); - } else { - inputs[i].put("count", inputItem.stackSize); + Map[] inputs = new Map[inTag.tagCount()]; + for (int i = 0; i < inTag.tagCount(); i++) { + inputs[i] = new HashMap<>(); + final NBTTagCompound tag = inTag.getCompoundTagAt(i); + final ItemStack inputItem = Platform.loadItemStackFromNBT(tag); + if (inputItem != null) { + inputs[i].put("name", inputItem.getItem().getItemStackDisplayName(inputItem)); + if (tag.getLong("Cnt") > 0) { + inputs[i].put("count", tag.getLong("Cnt")); + } else { + inputs[i].put("count", inputItem.stackSize); + } } } - } - Map[] results = new Map[outTag.tagCount()]; - for (int i = 0; i < outTag.tagCount(); i++) { - results[i] = new HashMap<>(); - final NBTTagCompound tag = outTag.getCompoundTagAt(i); - final ItemStack outputItem = Platform.loadItemStackFromNBT(tag); - if (outputItem != null) { - results[i].put("name", outputItem.getItem().getItemStackDisplayName(outputItem)); - if (tag.getLong("Cnt") > 0) { - results[i].put("count", tag.getLong("Cnt")); - } else { - results[i].put("count", outputItem.stackSize); + Map[] results = new Map[outTag.tagCount()]; + for (int i = 0; i < outTag.tagCount(); i++) { + results[i] = new HashMap<>(); + final NBTTagCompound tag = outTag.getCompoundTagAt(i); + final ItemStack outputItem = Platform.loadItemStackFromNBT(tag); + if (outputItem != null) { + results[i].put("name", outputItem.getItem().getItemStackDisplayName(outputItem)); + if (tag.getLong("Cnt") > 0) { + results[i].put("count", tag.getLong("Cnt")); + } else { + results[i].put("count", outputItem.stackSize); + } } } + output.put("inputs", inputs); + output.put("outputs", results); + output.put("isCraftable", encodedValue.getBoolean("crafting")); } - output.put("inputs", inputs); - output.put("outputs", results); - - PatternHelper p = new PatternHelper(is, null); - output.put("isCraftable", p.isCraftable()); - } catch (final Throwable ignored) { }