diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
index 3584d0b8fa5db079948a86fd1a3490d7f8c8e8b9..2f32f58f6ca6553fc7cb6de778ad85000db74315 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
@@ -336,7 +336,7 @@ public class AvantGarde extends AbstractNpcAI
 			{
 				// No more skills to learn, come back when you level.
 				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
-				sm.addNumber(minlevel);
+				sm.addInt(minlevel);
 				player.sendPacket(sm);
 			}
 			else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
index 029ccf24c53bda1d8a171feb48a3ebc96d30695b..a8a087a0ba73779e1d642874bb5c8bc692034e8d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
@@ -63,7 +63,7 @@ public final class ClanTrader extends AbstractNpcAI
 			player.getClan().addReputationScore(count, true);
 			
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_ADDED_S1S_POINTS_TO_REPUTATION_SCORE);
-			sm.addNumber(count);
+			sm.addInt(count);
 			player.sendPacket(sm);
 			return npc.getId() + "-04.html";
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
index a3d2d2f2f45ea58f23e931a2d62f3021040f3743..2ca4945fa94c41d2ef40a36df7cb14bf4f819f00 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
@@ -127,8 +127,8 @@ public final class PriestOfBlessing extends AbstractNpcAI
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 					sm.addItemName(NEVIT_VOICE);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 				}
 				return null;
@@ -160,8 +160,8 @@ public final class PriestOfBlessing extends AbstractNpcAI
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 					sm.addString("Nevit's Hourglass");
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 				}
 				return null;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 7ed64010292dd65331ee3e3fc370b915797a2d4d..7c33bbe8943f521eae85e00eb78e60c3c009ebf5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -107,8 +107,8 @@ public final class FreyaCelebration extends LongTimeEvent
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 					sm.addItemName(FREYA_POTION);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 				}
 			}
@@ -116,7 +116,7 @@ public final class FreyaCelebration extends LongTimeEvent
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_UNIT_OF_THE_ITEM_S1_REQUIRED);
 				sm.addItemName(Inventory.ADENA_ID);
-				sm.addNumber(1);
+				sm.addInt(1);
 				player.sendPacket(sm);
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 3cc2b0a8b2477e7f22fd9227eb99115a3f1881bf..f4ab9b43b036baccd0af380d3bcde31e66a75ab1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -111,8 +111,8 @@ public final class GiftOfVitality extends LongTimeEvent
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 					sm.addSkillName(23179);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 					htmltext = "4306-notime.htm";
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index e35257e98837d90126921d984293375b833181e4..35c8f12c7e2d36214b8408c643a969a966f5de91 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -80,8 +80,8 @@ public final class LoveYourGatekeeper extends LongTimeEvent
 						final int minutes = (int) ((remainingTime % 3600) / 60);
 						final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 						sm.addItemName(GATEKEEPER_TRANSFORMATION_STICK);
-						sm.addNumber(hours);
-						sm.addNumber(minutes);
+						sm.addInt(hours);
+						sm.addInt(minutes);
 						player.sendPacket(sm);
 					}
 					else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 438b46af167a3b6737f73da9595f8908788d1930..6e6d1a0ab2071fd06e223bfc5fd5288faf973407 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -126,15 +126,15 @@ public final class MasterOfEnchanting extends LongTimeEvent
 				if (hours > 0)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ITEM_PURCHASABLE_IN_S1_HOURS_S2_MINUTES);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 					htmltext = "32599-scroll24.htm";
 				}
 				else if (minutes > 0)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ITEM_PURCHASABLE_IN_S1_MINUTES);
-					sm.addNumber(minutes);
+					sm.addInt(minutes);
 					player.sendPacket(sm);
 					htmltext = "32599-scroll24.htm";
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 1b9c2094f33a336fbf31173169e6b6cd8fee1537..3fb8fdad12a13d770040c3085a4ba31e781e505d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1066,7 +1066,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			player.setKarma(newKarma);
 			// Common character information
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1);
-			sm.addNumber(newKarma);
+			sm.addInt(newKarma);
 			player.sendPacket(sm);
 			// Admin information
 			activeChar.sendMessage("Successfully Changed karma for " + player.getName() + " from (" + oldKarma + ") to (" + newKarma + ").");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
index e42e5ee13c0881a58af9a3046442242135ac2e80..bd5f17ff534d71557fab2f06293ec215499c69ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java
@@ -99,7 +99,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
 		{
 			state++;
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.MONSRACE_RACE_START);
-			sm.addNumber(0);
+			sm.addInt(0);
 			activeChar.sendPacket(sm);
 			PlaySound SRace = new PlaySound(1, "S_Race", 0, 0, 0, 0, 0);
 			activeChar.sendPacket(SRace);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 92657c5447b4015e05b92527162bbe691903de8d..5662152b4693ad0e2a1bb4113ba65d93a647b6d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -197,7 +197,7 @@ public class Festival implements IBypassHandler
 					
 					final boolean isHighestScore = SevenSignsFestival.getInstance().setFinalScore(activeChar, npc.getFestivalOracle(), npc.getFestivalType(), offeringScore);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
-					sm.addItemNumber(offeringScore);
+					sm.addLong(offeringScore);
 					activeChar.sendPacket(sm);
 					
 					if (isHighestScore)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index e89554ee947ccd9040584e96b80195d63c48c493..337626f479d72140524682840e40e5f695d02e0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -213,7 +213,7 @@ public class OlympiadManagerLink implements IBypassHandler
 							activeChar.sendPacket(iu);
 							
 							final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
-							sm.addItemNumber(passes);
+							sm.addLong(passes);
 							sm.addItemName(item);
 							activeChar.sendPacket(sm);
 						}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
index 4aee7359d5a61069f205ba4dfd209ff658bdb2f4..edc1441934ed6bc4c20e7467a1a862cedadeb3d6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java
@@ -112,7 +112,7 @@ public final class ConvertItem extends AbstractEffect
 			if (item.getEnchantLevel() > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(item.getEnchantLevel());
+				sm.addInt(item.getEnchantLevel());
 				sm.addItemName(item);
 			}
 			else
@@ -151,7 +151,7 @@ public final class ConvertItem extends AbstractEffect
 		if (newItem.getEnchantLevel() > 0)
 		{
 			msg = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_EQUIPPED);
-			msg.addNumber(newItem.getEnchantLevel());
+			msg.addInt(newItem.getEnchantLevel());
 			msg.addItemName(newItem);
 		}
 		else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
index 24bd6d9b1c41c0a08beb29bf712b65c2ff027c0d..c0d90324253887b833d693b5791da10a20670ef0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java
@@ -69,7 +69,7 @@ public final class CpHeal extends AbstractEffect
 		}
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
index e16c1c6f8b54f85a10c6288460c7098a5ce347e1..c37342e25a66a435d33a575b2418d426c6815972 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java
@@ -72,7 +72,7 @@ public final class CpHealPercent extends AbstractEffect
 		}
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_WILL_BE_RESTORED);
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java
index 3b8c0951ea97311ebd90b1ed40396d1617e88c1d..966951f07ba632dfb769db2260e6758e22229271 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java
@@ -69,7 +69,7 @@ public class GiveRecommendation extends AbstractEffect
 				target.setRecomHave(target.getRecomHave() + recommendationsGiven);
 				
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATIONS);
-				sm.addNumber(recommendationsGiven);
+				sm.addInt(recommendationsGiven);
 				target.sendPacket(sm);
 				target.sendPacket(new UserInfo(target));
 				target.sendPacket(new ExVoteSystemInfo(target));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
index 82dde71654088d661bd3ae7a55e3a2e9638aa174..1eed9f1ad50ca7dbbe9963b2020b98c8f22253c0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java
@@ -142,14 +142,14 @@ public final class Harvesting extends AbstractEffect
 						if (send)
 						{
 							SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
-							smsg.addNumber(total);
+							smsg.addInt(total);
 							smsg.addItemName(cropId);
 							player.sendPacket(smsg);
 							if (player.isInParty())
 							{
 								smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_HARVESTED_S3_S2S);
 								smsg.addString(player.getName());
-								smsg.addNumber(total);
+								smsg.addInt(total);
 								smsg.addItemName(cropId);
 								player.getParty().broadcastToPartyMembers(player, smsg);
 							}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
index 5081f11c654d2d534001f4ccd2b56092e69fd286..a60bf30625dc1ada7823891f69086510b4567dcf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Heal.java
@@ -125,13 +125,13 @@ public final class Heal extends AbstractEffect
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_RESTORED_BY_C1);
 					sm.addString(activeChar.getName());
-					sm.addNumber((int) amount);
+					sm.addInt((int) amount);
 					target.sendPacket(sm);
 				}
 				else
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_RESTORED);
-					sm.addNumber((int) amount);
+					sm.addInt((int) amount);
 					target.sendPacket(sm);
 				}
 			}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
index b19c921382ec01f6847774c5afd0135602d0649c..c604c0ff46ac8b171b5b1ec19c0762bb8b2df2bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java
@@ -80,7 +80,7 @@ public final class HealPercent extends AbstractEffect
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_RESTORED);
 		}
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
index d924921be863e8f7e65ecf3c6733a59b7c41cdd2..58569bfbc1d95ad21c8eaaac6a95f1d66fcedaf2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java
@@ -64,7 +64,7 @@ public final class HpByLevel extends AbstractEffect
 		info.getEffector().setCurrentHp(absorb);
 		// System message
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_RESTORED);
-		sm.addNumber(restored);
+		sm.addInt(restored);
 		info.getEffector().sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
index fcc583f6bb4bf8e258a255f2bdc695928fcb3a52..e0513fcf8c427acabaa48138aa26b7f537248661 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java
@@ -91,14 +91,14 @@ public final class MagicalAttackMp extends AbstractEffect
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_DRAINED_BY_C1);
 			sm.addCharName(activeChar);
-			sm.addNumber((int) mp);
+			sm.addInt((int) mp);
 			target.sendPacket(sm);
 		}
 		
 		if (activeChar.isPlayer())
 		{
 			SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOUR_OPPONENTS_MP_WAS_REDUCED_BY_S1);
-			sm2.addNumber((int) mp);
+			sm2.addInt((int) mp);
 			activeChar.sendPacket(sm2);
 		}
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
index 11da3f3c244fd902a8e4300883f21a82dba1c4e2..2c444f7a99de85e53fea4250f983181040625391 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java
@@ -83,7 +83,7 @@ public final class ManaHeal extends AbstractEffect
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_RESTORED);
 		}
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
index 7e0e4ee2c729d944da1c944d784c6644146edfb0..94fbeebcc69c37a706019f5b0421bf3c1ab14967 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java
@@ -123,7 +123,7 @@ public final class ManaHealByLevel extends AbstractEffect
 		{
 			sm.addCharName(info.getEffector());
 		}
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
index 4d1f3bf98399e026fc5e7150c7fef1d8a9955b92..fd0ca82b43b62a15b0c602c0dfa1996333fb3efd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java
@@ -80,7 +80,7 @@ public final class ManaHealPercent extends AbstractEffect
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MP_RESTORED);
 		}
-		sm.addNumber((int) amount);
+		sm.addInt((int) amount);
 		target.sendPacket(sm);
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 74b31c6a8738827fa8dfbe73593685ddc6bc7e0d..9196949536b688c1bb5a3d80898064ba238c089e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -185,8 +185,8 @@ public class ItemSkillsTemplate implements IItemHandler
 					{
 						sm.addSkillName(skill);
 					}
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
@@ -199,7 +199,7 @@ public class ItemSkillsTemplate implements IItemHandler
 					{
 						sm.addSkillName(skill);
 					}
-					sm.addNumber(minutes);
+					sm.addInt(minutes);
 				}
 				else
 				{
@@ -213,7 +213,7 @@ public class ItemSkillsTemplate implements IItemHandler
 						sm.addSkillName(skill);
 					}
 				}
-				sm.addNumber(seconds);
+				sm.addInt(seconds);
 				playable.sendPacket(sm);
 			}
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
index 7e6888267d128091d6ca7cfbb67a82db15959ccf..bd38b15db343b84a2d013cf67ecf316bd6e7c361 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Recipes.java
@@ -91,7 +91,7 @@ public class Recipes implements IItemHandler
 		if (recipeLimit)
 		{
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER);
-			sm.addNumber(rp.isDwarvenRecipe() ? activeChar.getDwarfRecipeLimit() : activeChar.getCommonRecipeLimit());
+			sm.addInt(rp.isDwarvenRecipe() ? activeChar.getDwarfRecipeLimit() : activeChar.getCommonRecipeLimit());
 			activeChar.sendPacket(sm);
 			return false;
 		}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
index 140299efb1eafb5d24ef3f0879cec535d8e17674..d9b2717efe7994cac8ad1de24b042efb8fd1ff8d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java
@@ -60,7 +60,7 @@ public class RollingDice implements IItemHandler
 		
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ROLLED_S2);
 		sm.addString(activeChar.getName());
-		sm.addNumber(number);
+		sm.addInt(number);
 		
 		activeChar.sendPacket(sm);
 		if (activeChar.isInsideZone(ZoneId.PEACE))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
index 6f9d63eb27db18428d6f3d7fe3f94285a1c36d99..24ba533a858cb24731dcad0693a90fdf77b9abe6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/PlayerHandler.java
@@ -96,7 +96,7 @@ public class PlayerHandler implements ITelnetHandler
 					player.sendPacket(iu);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
 					sm.addItemName(itemId);
-					sm.addItemNumber(amount);
+					sm.addLong(amount);
 					player.sendPacket(sm);
 					_print.println("ok");
 					GMAudit.auditGMAction("Telnet Admin", "Give Item", player.getName(), "item: " + itemId + " amount: " + amount);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
index 954ef861af9c2a14500b281fbb6a107966f990c3..3ac0b1bfec993f548a52f2cbe0ed3f16fe536415 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java
@@ -78,8 +78,8 @@ public class InstanceZone implements IUserCommandHandler
 					int minutes = (int) ((remainingTime % 3600) / 60);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
 					sm.addInstanceName(instanceId);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 					activeChar.sendPacket(sm);
 				}
 				else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
index 7d3c9f2a5b2f0be219c5d84f7812b0283a41f65f..a6893ac06fe4d128077678ab203e2ab867a6a529 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Loc.java
@@ -57,9 +57,9 @@ public class Loc implements IUserCommandHandler
 			sm = SystemMessage.getSystemMessage(region);
 			if (sm.getSystemMessageId().getParamCount() == 3)
 			{
-				sm.addNumber(activeChar.getX());
-				sm.addNumber(activeChar.getY());
-				sm.addNumber(activeChar.getZ());
+				sm.addInt(activeChar.getX());
+				sm.addInt(activeChar.getY());
+				sm.addInt(activeChar.getZ());
 			}
 		}
 		else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
index f3fd5a50d1ab44f3c01d2b293231611f0706ba40..998a27fd10d4c6ea5e77440fae5647a71ca17d4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java
@@ -65,17 +65,17 @@ public class OlympiadStat implements IUserCommandHandler
 		}
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CURRENT_RECORD_FOR_THIS_OLYMPIAD_SESSION_IS_S1_MATCHES_S2_WINS_S3_DEFEATS_YOU_HAVE_EARNED_S4_OLYMPIAD_POINTS);
-		sm.addNumber(Olympiad.getInstance().getCompetitionDone(nobleObjId));
-		sm.addNumber(Olympiad.getInstance().getCompetitionWon(nobleObjId));
-		sm.addNumber(Olympiad.getInstance().getCompetitionLost(nobleObjId));
-		sm.addNumber(Olympiad.getInstance().getNoblePoints(nobleObjId));
+		sm.addInt(Olympiad.getInstance().getCompetitionDone(nobleObjId));
+		sm.addInt(Olympiad.getInstance().getCompetitionWon(nobleObjId));
+		sm.addInt(Olympiad.getInstance().getCompetitionLost(nobleObjId));
+		sm.addInt(Olympiad.getInstance().getNoblePoints(nobleObjId));
 		activeChar.sendPacket(sm);
 		
 		final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_S1_MATCHES_REMAINING_THAT_YOU_CAN_PARTECIPATE_IN_THIS_WEEK_S2_CLASSED_S3_NON_CLASSED_S4_TEAM);
-		sm2.addNumber(Olympiad.getInstance().getRemainingWeeklyMatches(nobleObjId));
-		sm2.addNumber(Olympiad.getInstance().getRemainingWeeklyMatchesClassed(nobleObjId));
-		sm2.addNumber(Olympiad.getInstance().getRemainingWeeklyMatchesNonClassed(nobleObjId));
-		sm2.addNumber(Olympiad.getInstance().getRemainingWeeklyMatchesTeam(nobleObjId));
+		sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatches(nobleObjId));
+		sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatchesClassed(nobleObjId));
+		sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatchesNonClassed(nobleObjId));
+		sm2.addInt(Olympiad.getInstance().getRemainingWeeklyMatchesTeam(nobleObjId));
 		activeChar.sendPacket(sm2);
 		return true;
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index ebe231f30c867bf3fb89672c60246d64a88deeaf..f070c96dee43711757904903d969629c22a7cc74 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -191,7 +191,7 @@ public class Q00508_AClansReputation extends Quest
 						st.takeItems(REWARD_POINTS.get(raid).get(1), -1);
 						final int rep = REWARD_POINTS.get(raid).get(2);
 						clan.addReputationScore(rep, true);
-						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(rep));
+						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addInt(rep));
 						clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 					}
 					else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 02e552edca8f34c726dbfc57e877dac14992f935..14e284b0239a51367409d21991a27728b4c600c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -178,7 +178,7 @@ public class Q00509_AClansFame extends Quest
 						st.takeItems(REWARD_POINTS.get(raid).get(1), -1);
 						final int rep = REWARD_POINTS.get(raid).get(2);
 						clan.addReputationScore(rep, true);
-						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(rep));
+						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addInt(rep));
 						clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 					}
 					else
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 9fca55a823a5a6907e784d5d2cf2f25d23c23d79..8c42d95bfa9f2233eca25bbf6f9de538ce692792 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -140,7 +140,7 @@ public class Q00510_AClansPrestige extends Quest
 					st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1);
 					st.takeItems(TYRANNOSAURUS_CLAW, -1);
 					clan.addReputationScore(reward, true);
-					player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addNumber(reward));
+					player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addInt(reward));
 					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 					htmltext = "31331-7.html";
 				}