From 07ba96cc0efa5ed9be6f28db9d7493f578d1415e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 25 Jan 2020 12:12:57 +0000 Subject: [PATCH] Moved ItemTable in datatables package. --- .../dist/game/data/scripts/ai/others/EvaBox.java | 2 +- .../scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java | 2 +- .../scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 4 ++-- .../java/org/l2jmobius/gameserver/TradeController.java | 2 +- .../l2jmobius/gameserver/datatables/{xml => }/ItemTable.java | 2 +- .../l2jmobius/gameserver/datatables/sql/TradeListTable.java | 2 +- .../handler/admincommandhandlers/AdminCTFEngine.java | 2 +- .../handler/admincommandhandlers/AdminCreateItem.java | 2 +- .../gameserver/handler/admincommandhandlers/AdminEditNpc.java | 2 +- .../gameserver/handler/admincommandhandlers/AdminReload.java | 2 +- .../gameserver/handler/itemhandlers/ExtractableItems.java | 2 +- .../l2jmobius/gameserver/handler/itemhandlers/Potions.java | 2 +- .../gameserver/handler/voicedcommandhandlers/CTFCmd.java | 2 +- .../gameserver/handler/voicedcommandhandlers/DMCmd.java | 2 +- .../gameserver/handler/voicedcommandhandlers/TvTCmd.java | 2 +- .../gameserver/instancemanager/ChristmasManager.java | 2 +- .../instancemanager/FishingChampionshipManager.java | 2 +- .../java/org/l2jmobius/gameserver/model/CombatFlag.java | 2 +- .../java/org/l2jmobius/gameserver/model/Inventory.java | 2 +- .../java/org/l2jmobius/gameserver/model/ItemContainer.java | 2 +- .../java/org/l2jmobius/gameserver/model/Manor.java | 2 +- .../java/org/l2jmobius/gameserver/model/Party.java | 2 +- .../java/org/l2jmobius/gameserver/model/TradeList.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/instance/ClassMasterInstance.java | 2 +- .../gameserver/model/actor/instance/ManorManagerInstance.java | 2 +- .../gameserver/model/actor/instance/NpcInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/templates/PlayerTemplate.java | 2 +- .../java/org/l2jmobius/gameserver/model/entity/Rebirth.java | 2 +- .../java/org/l2jmobius/gameserver/model/entity/event/CTF.java | 2 +- .../java/org/l2jmobius/gameserver/model/entity/event/DM.java | 2 +- .../java/org/l2jmobius/gameserver/model/entity/event/TvT.java | 2 +- .../java/org/l2jmobius/gameserver/model/entity/event/VIP.java | 2 +- .../gameserver/model/items/instance/ItemInstance.java | 2 +- .../org/l2jmobius/gameserver/model/multisell/Multisell.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 2 +- .../gameserver/network/clientpackets/MultiSellChoose.java | 2 +- .../gameserver/network/clientpackets/RequestBuyItem.java | 2 +- .../gameserver/network/clientpackets/RequestBuyProcure.java | 2 +- .../gameserver/network/clientpackets/RequestBuySeed.java | 2 +- .../network/clientpackets/RequestProcureCropList.java | 2 +- .../gameserver/network/clientpackets/RequestWearItem.java | 2 +- .../gameserver/network/serverpackets/MultiSellList.java | 2 +- .../java/org/l2jmobius/gameserver/script/EngineInterface.java | 2 +- .../java/org/l2jmobius/telnet/GameStatusThread.java | 2 +- 47 files changed, 48 insertions(+), 48 deletions(-) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/{xml => }/ItemTable.java (99%) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java index 3968732ddd..e76c2788af 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java index 226f388ce5..c54305d1b3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java @@ -19,7 +19,7 @@ package quests.Q234_FatesWhisper; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index c055947c9b..f71edd0196 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index e029cdf2af..0effa9c621 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.cache.CrestCache; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.datatables.HeroSkillTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.NobleSkillTable; import org.l2jmobius.gameserver.datatables.OfflineTradeTable; import org.l2jmobius.gameserver.datatables.SchemeBufferTable; @@ -73,7 +74,6 @@ import org.l2jmobius.gameserver.datatables.xml.DoorData; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; import org.l2jmobius.gameserver.datatables.xml.FenceData; import org.l2jmobius.gameserver.datatables.xml.FishData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.datatables.xml.ZoneData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.AdminCommandHandler; @@ -423,7 +423,7 @@ public class GameServer } catch (NullPointerException e) { - LOGGER.info("There is errors in your Door.csv file. Update door.csv"); + LOGGER.info("There are errors in Doors.xml file, or missing doors."); } Util.printSection("Scripts"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java index 9d0a81002a..83c33de30f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java @@ -32,7 +32,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/ItemTable.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/ItemTable.java index e16fa48910..6b96232b95 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/ItemTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/ItemTable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.datatables.xml; +package org.l2jmobius.gameserver.datatables; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/TradeListTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/TradeListTable.java index fac1d19f28..85f865e4f5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/TradeListTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/TradeListTable.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java index 3358965ec3..21252fc1a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java index f0c75afeea..2b9d49dcad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.StringTokenizer; import java.util.logging.Logger; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 5d3f2f6a2b..17c152b3c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java index 19dbebc9c0..ec37911416 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminReload.java @@ -22,11 +22,11 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.csv.NpcWalkerRoutesTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.DatatablesManager; import org.l2jmobius.gameserver.instancemanager.Manager; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java index 6da13dbf9c..c64d586f50 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java @@ -20,8 +20,8 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.csv.ExtractableItemsData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableItem; import org.l2jmobius.gameserver.model.ExtractableProductItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java index 90a10e4b27..e46f8409c8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -25,8 +25,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Effect.EffectType; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java index 093e0aa87c..989fa0042e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.handler.voicedcommandhandlers; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.event.CTF; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java index 3b7e274716..cc825c2c24 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.handler.voicedcommandhandlers; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.event.DM; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java index 0acae0ea37..de7ca9116f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/TvTCmd.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.handler.voicedcommandhandlers; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.event.TvT; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java index 1bc42e419d..9a73bbb753 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java @@ -23,9 +23,9 @@ import java.util.concurrent.Future; import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index bc13cba060..9c73d2b714 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index 9d75d647b0..7676419bf6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java index d3fd1f5f1d..a90a222ed6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java @@ -23,9 +23,9 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.ArmorSetsTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Armor; import org.l2jmobius.gameserver.model.items.EtcItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java index dbf87a53b6..4fb5303f42 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemContainer.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java index 57983a7eb3..a91dff0c95 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Manor.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.items.Item; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java index f82e3989d2..79c34c68db 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java @@ -25,7 +25,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 57b921ad86..c7972a506b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.OfflineTradeTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c1c0e42795..81c01c57ad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.FortSiegeGuardAI; import org.l2jmobius.gameserver.ai.SiegeGuardAI; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.DropCategory; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java index 857bc9ea7d..ba93b30994 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.Config; import org.l2jmobius.gameserver.ai.CtrlIntention; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java index 373bce62c5..7ed3ebb571 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManagerInstance.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 4a993b9cb2..4a8dbf20a5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -25,12 +25,12 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.MobGroupTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.sql.HelperBuffTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CustomNpcInstanceManager; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f22a23fce8..519ca92501 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -54,6 +54,7 @@ import org.l2jmobius.gameserver.cache.WarehouseCacheManager; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.datatables.HeroSkillTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.NobleSkillTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.csv.HennaTable; @@ -66,7 +67,6 @@ import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import org.l2jmobius.gameserver.datatables.xml.AdminData; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; import org.l2jmobius.gameserver.datatables.xml.FishData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IItemHandler; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 9971304ccc..8a90ca4c0b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatsSet; import org.l2jmobius.gameserver.model.base.ClassId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java index c579cf4683..1038b05931 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java @@ -24,9 +24,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index 0f59688566..0fa70329f4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -27,10 +27,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Inventory; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java index b377d7cb1e..660a2e597f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -27,10 +27,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index 8f1cf510e8..65066d3e39 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -27,11 +27,11 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.xml.DoorData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java index 9c55fdf2c3..78b7f17ff6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java @@ -27,9 +27,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index df10b3e1a3..6d145d5ceb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -28,7 +28,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.Augmentation; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java index 695d8f2ef3..8b84f1dc06 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Armor; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e328a4559e..8e3edf76c0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -23,12 +23,12 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.GameServer; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.CharNameTable; import org.l2jmobius.gameserver.datatables.sql.CharTemplateTable; import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.ShortCut; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 2408c0ad9e..b53b96f54d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.PlayerInventory; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 9c3faebf1b..a398487465 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.TradeController; import org.l2jmobius.gameserver.cache.HtmCache; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.CastleChamberlainInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java index e4c0b28291..05264ed575 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.Manor; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 0b766e8b2d..150f297002 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 4471ea8ab6..f1338e7a21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index cd87c5315a..80ad2852c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.TradeController; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.MercManagerInstance; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 50ee6b0927..faf059b9ff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EngineInterface.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EngineInterface.java index ca0f4312d1..8e0ecb3403 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EngineInterface.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EngineInterface.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.script; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.RecipeController; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.datatables.sql.CharNameTable; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SkillTreeTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.entity.Announcements; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java index 039d5049d1..7e53497184 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java @@ -51,12 +51,12 @@ import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.Shutdown; import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.sql.TeleportLocationTable; import org.l2jmobius.gameserver.datatables.xml.AdminData; -import org.l2jmobius.gameserver.datatables.xml.ItemTable; import org.l2jmobius.gameserver.datatables.xml.ZoneData; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.instancemanager.Manager;