From 4c76fbb3e6f32cc2de1cc1c6f7e776b22fe1edcc Mon Sep 17 00:00:00 2001 From: phantamanta44 Date: Sun, 28 Mar 2021 02:18:32 -0500 Subject: [PATCH] Avoid using NBTTagList.tagList, which is only accessible because of a transitive AT --- .../java/gregtech/common/datafix/util/DataFixHelper.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/common/datafix/util/DataFixHelper.java b/src/main/java/gregtech/common/datafix/util/DataFixHelper.java index 083f5e4638..102c80bd5a 100644 --- a/src/main/java/gregtech/common/datafix/util/DataFixHelper.java +++ b/src/main/java/gregtech/common/datafix/util/DataFixHelper.java @@ -7,7 +7,6 @@ import net.minecraftforge.common.util.Constants; import javax.annotation.Nullable; -import java.util.ListIterator; public class DataFixHelper { @@ -31,9 +30,8 @@ public static void rewriteCompoundTags(NBTTagCompound tag, CompoundRewriter rewr } public static void rewriteCompoundTags(NBTTagList tag, CompoundRewriter rewriter) { - ListIterator iter = tag.tagList.listIterator(); - while (iter.hasNext()) { - NBTBase childTag = iter.next(); + for (int i = 0; i < tag.tagCount(); i++) { + NBTBase childTag = tag.get(i); switch (childTag.getId()) { case Constants.NBT.TAG_LIST: rewriteCompoundTags((NBTTagList) childTag, rewriter); @@ -43,7 +41,7 @@ public static void rewriteCompoundTags(NBTTagList tag, CompoundRewriter rewriter rewriteCompoundTags(childTagCompound, rewriter); childTagCompound = rewriter.rewrite(childTagCompound); if (childTagCompound != null) { - iter.set(childTagCompound); + tag.set(i, childTagCompound); } break; }