diff --git a/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java b/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java index 624e1077f..fc913bafe 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java +++ b/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java @@ -220,7 +220,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile { * @return true if energy was transferred */ public boolean charge(ItemStack stack) { - if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false; + if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false; double amount = ElectricItem.manager.charge(stack, energyStored, Math.max(getSinkTier(), getSourceTier()), false, false); @@ -237,7 +237,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile { * @return true if energy was transferred */ public boolean discharge(ItemStack stack, double limit) { - if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false; + if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false; double amount = capacity - energyStored; if (amount <= 0) return false; diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.class b/src/api/java/ic2/api/energy/prefab/BasicSink.class index 32434a7ee..6615ef962 100644 Binary files a/src/api/java/ic2/api/energy/prefab/BasicSink.class and b/src/api/java/ic2/api/energy/prefab/BasicSink.class differ diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java index 1e1614058..46c27d814 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSink.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSink.java @@ -96,18 +96,24 @@ public class BasicSink extends BasicEnergyTile implements IEnergySink { public BasicSink(TileEntity parent, double capacity, int tier) { super(parent, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; } public BasicSink(ILocatable parent, double capacity, int tier) { super(parent, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; } public BasicSink(World world, BlockPos pos, double capacity, int tier) { super(world, pos, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; } @@ -117,6 +123,8 @@ public class BasicSink extends BasicEnergyTile implements IEnergySink { * @param tier IC2 Tier. */ public void setSinkTier(int tier) { + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; } diff --git a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class index d81177d46..8a313fcf6 100644 Binary files a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class and b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class differ diff --git a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java index 3936ca843..88e9939cc 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java @@ -19,6 +19,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy public BasicSinkSource(TileEntity parent, double capacity, int sinkTier, int sourceTier) { super(parent, capacity); + if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier); + if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier); + this.sinkTier = sinkTier; this.sourceTier = sourceTier; double power = EnergyNet.instance.getPowerFromTier(sourceTier); @@ -29,6 +32,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy public BasicSinkSource(ILocatable parent, double capacity, int sinkTier, int sourceTier) { super(parent, capacity); + if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier); + if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier); + this.sinkTier = sinkTier; this.sourceTier = sourceTier; double power = EnergyNet.instance.getPowerFromTier(sourceTier); @@ -39,6 +45,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy public BasicSinkSource(World world, BlockPos pos, double capacity, int sinkTier, int sourceTier) { super(world, pos, capacity); + if (sinkTier < 0) throw new IllegalArgumentException("invalid sink tier: "+sinkTier); + if (sourceTier < 0) throw new IllegalArgumentException("invalid source tier: "+sourceTier); + this.sinkTier = sinkTier; this.sourceTier = sourceTier; double power = EnergyNet.instance.getPowerFromTier(sourceTier); @@ -52,6 +61,8 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy * @param tier IC2 Tier. */ public void setSinkTier(int tier) { + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.sinkTier = tier; } @@ -61,6 +72,8 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy * @param tier IC2 Tier. */ public void setSourceTier(int tier) { + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + double power = EnergyNet.instance.getPowerFromTier(tier); if (getCapacity() < power) setCapacity(power); diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.class b/src/api/java/ic2/api/energy/prefab/BasicSource.class index aec40ce5d..fb1c81ef4 100644 Binary files a/src/api/java/ic2/api/energy/prefab/BasicSource.class and b/src/api/java/ic2/api/energy/prefab/BasicSource.class differ diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java index 9efba8de7..dde127fa6 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java @@ -95,6 +95,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { public BasicSource(TileEntity parent, double capacity, int tier) { super(parent, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; double power = EnergyNet.instance.getPowerFromTier(tier); @@ -104,6 +106,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { public BasicSource(ILocatable parent, double capacity, int tier) { super(parent, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; double power = EnergyNet.instance.getPowerFromTier(tier); @@ -113,6 +117,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { public BasicSource(World world, BlockPos pos, double capacity, int tier) { super(world, pos, capacity); + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + this.tier = tier; double power = EnergyNet.instance.getPowerFromTier(tier); @@ -125,6 +131,8 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { * @param tier1 IC2 Tier. */ public void setSourceTier(int tier) { + if (tier < 0) throw new IllegalArgumentException("invalid tier: "+tier); + double power = EnergyNet.instance.getPowerFromTier(tier); if (getCapacity() < power) setCapacity(power); diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 74fd2764c..e0ae676c7 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -5,8 +5,8 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.computer.IComputerIntegration; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.security.ISecurityTile; -import net.minecraft.block.Block; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -18,7 +18,7 @@ import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID), }) public interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile { diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index f73b72c5d..85b24dad9 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -3,12 +3,10 @@ package mekanism.common.base; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; - -import java.util.EnumSet; - import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.common.integration.ic2.IC2Integration; import net.minecraft.inventory.IInventory; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional.Interface; @@ -17,10 +15,10 @@ import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2") + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = IC2Integration.MODID), + @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = IC2Integration.MODID), + @Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = IC2Integration.MODID), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = IC2Integration.MODID) }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 1db17a590..d1b3c2195 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -16,6 +16,7 @@ import mekanism.common.Resource; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.integration.computer.CCPeripheral; import mekanism.common.integration.computer.OCDriver; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.storagedrawer.StorageDrawerRecipeHandler; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; @@ -48,10 +49,10 @@ public final class MekanismHooks public void hook() { - if(Loader.isModLoaded("CoFHCore")) CoFHCoreLoaded = true; - if(Loader.isModLoaded("IC2")) IC2Loaded = true; - if(Loader.isModLoaded("Railcraft")) RailcraftLoaded = true; - if(Loader.isModLoaded("ThermalExpansion")) TELoaded = true; + if(Loader.isModLoaded("cofhcore")) CoFHCoreLoaded = true; + if(Loader.isModLoaded("ic2")) IC2Loaded = true; + if(Loader.isModLoaded("railcraft")) RailcraftLoaded = true; + if(Loader.isModLoaded("thermalexpansion")) TELoaded = true; if(Loader.isModLoaded("ComputerCraft")) CCLoaded = true; if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true; if(Loader.isModLoaded("tesla")) TeslaLoaded = true; @@ -86,7 +87,7 @@ public final class MekanismHooks } } - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public void hookIC2Recipes() { for(MachineRecipe> entry : Recipes.macerator.getRecipes()) @@ -140,7 +141,7 @@ public final class MekanismHooks } catch(Exception e) {} } - @Method(modid = "OpenComputers") + @Method(modid = "opencomputers") public void loadOCDrivers() { try { diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index a8f61e805..3119d3562 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -2,7 +2,6 @@ package mekanism.common.integration; import ic2.api.recipe.Recipes; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -14,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.MekanismItems; import mekanism.common.Resource; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; @@ -25,7 +25,6 @@ import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.oredict.OreDictionary; @@ -288,7 +287,7 @@ public final class OreDictManager } catch(Exception e) {} } - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public static void addIC2BronzeRecipe() { try { diff --git a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java index a0146caac..f354ef1be 100644 --- a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java +++ b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java @@ -12,7 +12,9 @@ import net.minecraftforge.fml.common.Optional.Method; public class IC2Integration { - @Method(modid = "IC2") + public static final String MODID = "ic2"; + + @Method(modid = IC2Integration.MODID) public static boolean isOutputter(TileEntity tileEntity, EnumFacing side) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -25,7 +27,7 @@ public class IC2Integration return false; } - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -41,7 +43,7 @@ public class IC2Integration return false; } - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public static double emitEnergy(IEnergyWrapper from, TileEntity tileEntity, EnumFacing side, double currentSending) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 2fe310258..9ad6a41a6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -24,6 +24,7 @@ import mekanism.common.base.ITierItem; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -56,7 +57,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID) }) public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem, ITierItem { @@ -324,7 +325,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS } @Override - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public IElectricItemManager getManager(ItemStack itemStack) { return IC2ItemManager.getManager(this); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3cf75f52e..27ae43d59 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -17,7 +17,6 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; -import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; @@ -37,10 +36,10 @@ import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.inventory.InventoryPersonalChest; -import mekanism.common.item.ItemConfigurator.ConfiguratorMode; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; @@ -134,7 +133,7 @@ import cofh.api.energy.IEnergyContainerItem; * */ @InterfaceList({ - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID) }) public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem, IItemNetwork { @@ -780,7 +779,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public IElectricItemManager getManager(ItemStack itemStack) { return IC2ItemManager.getManager(this); diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 301eba34c..6b6614c9b 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.util.ItemDataUtils; @@ -30,7 +31,7 @@ import net.minecraftforge.fml.common.Optional.Method; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID) }) public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { @@ -171,7 +172,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec } @Override - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public IElectricItemManager getManager(ItemStack itemStack) { return IC2ItemManager.getManager(this); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 26d25f2da..4d6045ef9 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; +import mekanism.common.integration.ic2.IC2Integration; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.util.ItemDataUtils; @@ -44,7 +45,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = IC2Integration.MODID) }) public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { @@ -206,7 +207,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - @Method(modid = "IC2") + @Method(modid = IC2Integration.MODID) public IElectricItemManager getManager(ItemStack itemStack) { return IC2ItemManager.getManager(this); diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index ca59d63eb..331bc0b92 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -39,6 +39,11 @@ public class PacketTransmitterUpdate implements IMessageHandler