From 5715a32d2901922503fd850f3a68503fb77467c3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 20 Dec 2017 23:39:49 +1000 Subject: - Disabled some logging. % Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper. --- src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java | 4 ++-- src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util/nbt') 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()); } -- cgit