Sfoglia il codice sorgente

BETA: Moving some interfaces to the new package.

Zoey76 12 anni fa
parent
commit
3521ea9ea2

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -23,9 +23,9 @@ import java.util.Map;
 import javolution.util.FastMap;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.IL2Procedure;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.util.L2FastMap;
 import com.l2jserver.util.L2HashMap;

+ 1 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;

+ 1 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceSkillList.java

@@ -29,6 +29,7 @@ import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.effects.L2Effect;
+import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;

+ 1 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2CommandChannel.java

@@ -25,6 +25,7 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
 import com.l2jserver.gameserver.network.serverpackets.ExCloseMPCC;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -58,7 +58,6 @@ import com.l2jserver.gameserver.instancemanager.TownManager;
 import com.l2jserver.gameserver.model.ChanceSkillList;
 import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.FusionSkill;
-import com.l2jserver.gameserver.model.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.L2AccessLevel;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Object;
@@ -86,6 +85,7 @@ import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.items.L2Item;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2Effect.java

@@ -28,10 +28,10 @@ import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.ChanceCondition;
-import com.l2jserver.gameserver.model.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.funcs.Func;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -45,7 +45,6 @@ import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.MapRegionManager;
-import com.l2jserver.gameserver.model.IL2Procedure;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
@@ -59,6 +58,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;

+ 3 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/IChanceSkillTrigger.java → L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IChanceSkillTrigger.java

@@ -16,7 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.model;
+package com.l2jserver.gameserver.model.interfaces;
+
+import com.l2jserver.gameserver.model.ChanceCondition;
 
 /**
  * This interface provides method to handle triggered skills from other objects.<br>

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/IL2EntryProcedure.java → L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IL2EntryProcedure.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.model;
+package com.l2jserver.gameserver.model.interfaces;
 
 /**
  * @author UnAfraid

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/IL2Procedure.java → L2J_Server_BETA/java/com/l2jserver/gameserver/model/interfaces/IL2Procedure.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.gameserver.model;
+package com.l2jserver.gameserver.model.interfaces;
 
 /**
  * Interface for procedures with one Object parameter.

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -46,7 +46,6 @@ import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
-import com.l2jserver.gameserver.model.IL2Procedure;
 import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
@@ -62,6 +61,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -35,7 +35,6 @@ import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.handler.TargetHandler;
 import com.l2jserver.gameserver.model.ChanceCondition;
-import com.l2jserver.gameserver.model.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.L2ExtractableProductItem;
 import com.l2jserver.gameserver.model.L2ExtractableSkill;
 import com.l2jserver.gameserver.model.L2Object;
@@ -54,6 +53,7 @@ import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.interfaces.IChanceSkillTrigger;
 import com.l2jserver.gameserver.model.items.L2Armor;
 import com.l2jserver.gameserver.model.items.type.L2ArmorType;
 import com.l2jserver.gameserver.model.skills.funcs.Func;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/util/L2ArrayList.java

@@ -21,7 +21,7 @@ package com.l2jserver.util;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.l2jserver.gameserver.model.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 
 /**
  * A custom version of ArrayList: Extension for iterating without using temporary collection<br>

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/util/L2FastList.java

@@ -22,7 +22,7 @@ import java.util.Collection;
 
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.model.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 
 /**
  * A custom version of FastList with extension for iterating without using temporary collection<br>

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/util/L2FastMap.java

@@ -22,8 +22,8 @@ import java.util.Map;
 
 import javolution.util.FastMap;
 
-import com.l2jserver.gameserver.model.IL2EntryProcedure;
-import com.l2jserver.gameserver.model.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IL2EntryProcedure;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 
 /**
  * A custom version of FastMap with extension for iterating without using temporary collection<br>

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/util/L2HashMap.java

@@ -21,8 +21,8 @@ package com.l2jserver.util;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.model.IL2EntryProcedure;
-import com.l2jserver.gameserver.model.IL2Procedure;
+import com.l2jserver.gameserver.model.interfaces.IL2EntryProcedure;
+import com.l2jserver.gameserver.model.interfaces.IL2Procedure;
 
 /**
  * A custom version of HashMap: Extension for iterating without using temporary collection<br>