diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
| commit | ecf908e98ccee72a713091e8ab547e35a41d7436 (patch) | |
| tree | f0dade1481aa02fd0ac4fcf8a672cc7a761a0547 /src/Java/gtPlusPlus/core/util/nbt | |
| parent | b9fe3352840abe0846834cefd578895ec6f5e520 (diff) | |
| parent | fa5de3584ce7bc97ce6f32b31f6062b5b6e89e75 (diff) | |
| download | GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.gz GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.bz2 GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.zip | |
> Why does Git make me do these? arghhh...
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/material/ALLOY.java
# src/Java/gtPlusPlus/core/material/ELEMENT.java
# src/Java/gtPlusPlus/core/material/Material.java
# src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/nbt')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java | 4 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java index 5d9da4da1e..2e8e29c372 100644 --- a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java +++ b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.nbt; import baubles.api.BaubleType; import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.array.Pair; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -115,7 +115,7 @@ public class ModularArmourUtils { } public static void setBaubleType(ItemStack aStack, BT aMod) { - Utils.LOG_INFO("Changing bauble type."); + Logger.INFO("Changing bauble type."); NBTTagCompound tNBT = NBTUtils.getNBT(aStack); if (aMod != null) { tNBT.setInteger("mBaubleType", aMod.getID()); diff --git a/src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java b/src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java index 31d00efc94..58d47eb0fa 100644 --- a/src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java +++ b/src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java @@ -7,7 +7,7 @@ import java.util.Map; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.util.Utils; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.entity.Entity; @@ -210,11 +210,11 @@ public class NBTUtils { Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); if (mInternalMap != null) { for (Map.Entry<?, ?> e : mInternalMap.entrySet()) { - Utils.LOG_INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue()); + Logger.INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue()); } return true; } else { - Utils.LOG_INFO("Data map reflected from NBTTagCompound was not valid."); + Logger.INFO("Data map reflected from NBTTagCompound was not valid."); return false; } } @@ -408,7 +408,7 @@ public class NBTUtils { Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); if (mInternalMap != null) { for (Map.Entry<?, ?> e : mInternalMap.entrySet()) { - Utils.LOG_INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue().toString()); + Logger.INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue().toString()); if (e.getValue().getClass() == String.class){ createStringTagCompound(aStack, "mEntityTag", (String) e.getKey(), (String) e.getValue()); } |