diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2022-07-29 10:23:45 -0700 |
|---|---|---|
| committer | Jason Mitchell <mitchej+github@gmail.com> | 2022-08-26 07:42:48 -0700 |
| commit | eb95711aadb0066e70440111f93167f6164e6da8 (patch) | |
| tree | 2aeb301130661e382d0f8a02a861ec66c9bc243d /src/main/java/gregtech/api/util | |
| parent | 68619f5c654f8a44f499f79b859a26787d778a18 (diff) | |
| download | GT5-Unofficial-eb95711aadb0066e70440111f93167f6164e6da8.tar.gz GT5-Unofficial-eb95711aadb0066e70440111f93167f6164e6da8.tar.bz2 GT5-Unofficial-eb95711aadb0066e70440111f93167f6164e6da8.zip | |
WIP Texture support
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Util.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |