From eb95711aadb0066e70440111f93167f6164e6da8 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Fri, 29 Jul 2022 10:23:45 -0700 Subject: WIP Texture support --- src/main/java/gregtech/api/util/GT_Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_Util.java b/src/main/java/gregtech/api/util/GT_Util.java index 46cecfd525..2d1a1e389d 100644 --- a/src/main/java/gregtech/api/util/GT_Util.java +++ b/src/main/java/gregtech/api/util/GT_Util.java @@ -21,7 +21,7 @@ public class GT_Util { public static NBTTagCompound fuseNBT(NBTTagCompound aNBT1, NBTTagCompound aNBT2) { if (aNBT1 == null) return aNBT2 == null ? new NBTTagCompound() : (NBTTagCompound)aNBT2.copy(); - NBTTagCompound rNBT = (NBTTagCompound)aNBT1.copy(); + final NBTTagCompound rNBT = (NBTTagCompound)aNBT1.copy(); if (aNBT2 == null) return rNBT; for (Object tKey : aNBT2.func_150296_c/*getKeySet*/()) if (!rNBT.hasKey(tKey.toString())) rNBT.setTag(tKey.toString(), aNBT2.getTag(tKey.toString())); return rNBT; -- cgit