From 68fc21b28249bd5a906f415e05f12b0aa53d8afa Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Thu, 16 Oct 2014 19:48:18 +0200 Subject: [PATCH 1/2] Updated build.gradle to use latest NEI Reduced the used tags in TE --- build.gradle | 2 +- build.properties | 4 ++-- .../thermalexpansion/ThermalExpansionModule.java | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 7dfc10d..1613f06 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.6_dev1_1.7.10" +version = "1.5.6_dev3_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" diff --git a/build.properties b/build.properties index 07a2c03..464ecf5 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ mc_version=1.7.10 forge_version=10.13.0.1187 ccl_version=1.1.1.104 -ccc_version=1.0.3.26 -nei_version=1.0.3.56 +ccc_version=1.0.3.+ +nei_version=1.0.3.+ mod_version=1.0 waila_version=1.5.2a diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 808dca0..1a6edc0 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -33,7 +33,7 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyHandler); - ModuleRegistrar.instance().registerSyncedNBTKey("*", IEnergyHandler); + ModuleRegistrar.instance().registerSyncedNBTKey("Energy", IEnergyHandler); } catch (Exception e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e); @@ -45,7 +45,8 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energycell"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEnergyCell); + ModuleRegistrar.instance().registerSyncedNBTKey("Recv", TileEnergyCell); + ModuleRegistrar.instance().registerSyncedNBTKey("Send", TileEnergyCell); } catch (Exception e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e); @@ -63,7 +64,7 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank); - ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTank); + ModuleRegistrar.instance().registerSyncedNBTKey("Amount", TileTank); } catch (Exception e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e); @@ -88,7 +89,8 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.owner"); ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); - ModuleRegistrar.instance().registerSyncedNBTKey("*", ISecureTile); + ModuleRegistrar.instance().registerSyncedNBTKey("Owner", ISecureTile); + ModuleRegistrar.instance().registerSyncedNBTKey("Access", ISecureTile); } catch (Exception e){ Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e); From 3ae11044fd502e2c7d3552ab6c46a11ba0535d9d Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sat, 13 Dec 2014 17:38:41 +0100 Subject: [PATCH 2/2] Removed debug msg for nbt sync. --- build.gradle | 2 +- src/main/java/mcp/mobius/waila/utils/NBTUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1613f06..32e504e 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.6_dev3_1.7.10" +version = "1.5.6_dev4_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" diff --git a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java index e5736b8..d875388 100644 --- a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java +++ b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java @@ -30,7 +30,7 @@ public class NBTUtil { return deepTag.getTag(i); } } else { - Waila.log.log(Level.WARN, "Leaf " + key + " not found."); + //Waila.log.log(Level.WARN, "Leaf " + key + " not found."); return null; } }