Moved buff and skillmod objects

src/protocol/swg/objectControllerObjects/BuffBuilderChangeMessage.java

@@ -6,7 +6,7 @@ import java.util.Vector;
 import org.apache.mina.core.buffer.IoBuffer;
 
 import protocol.swg.ObjControllerMessage;
-import resources.objects.BuffItem;
+import resources.buffs.BuffItem;
 
 public class BuffBuilderChangeMessage extends ObjControllerObject {
 

src/protocol/swg/objectControllerObjects/BuffBuilderEndMessage.java

@@ -27,7 +27,7 @@ import java.util.Vector;
 import org.apache.mina.core.buffer.IoBuffer;
 
 import protocol.swg.ObjControllerMessage;
-import resources.objects.BuffItem;
+import resources.buffs.BuffItem;
 
 public class BuffBuilderEndMessage extends ObjControllerObject {
 

src/resources/buffs/Buff.java

@@ -19,7 +19,7 @@
  * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
  * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
  ******************************************************************************/
-package resources.objects;
+package resources.buffs;
 
 import java.nio.ByteOrder;
 import java.util.concurrent.Executors;
@@ -31,6 +31,7 @@ import main.NGECore;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.buffer.SimpleBufferAllocator;
 
+import resources.objects.IDelta;
 import resources.objects.creature.CreatureObject;
 
 import com.sleepycat.persist.model.NotPersistent;

src/resources/buffs/BuffItem.java

@@ -19,7 +19,7 @@
  * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine.
  * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
  ******************************************************************************/
-package resources.objects;
+package resources.buffs;
 
 import com.sleepycat.persist.model.Persistent;
 

src/resources/buffs/DamageOverTime.java

@@ -19,7 +19,7 @@
  * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
  * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
  ******************************************************************************/
-package resources.objects;
+package resources.buffs;
 
 import java.util.concurrent.ScheduledFuture;
 

src/resources/objects/creature/CreatureMessageBuilder.java

@@ -22,7 +22,6 @@
 package resources.objects.creature;
 
 import java.nio.ByteOrder;
-
 import java.util.Map.Entry;
 
 import org.apache.mina.core.buffer.IoBuffer;
@@ -30,13 +29,13 @@ import org.apache.mina.core.buffer.IoBuffer;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.resources.common.CRC;
-import resources.objects.Buff;
+import resources.buffs.Buff;
 import resources.objects.ObjectMessageBuilder;
-import resources.objects.SkillMod;
 import engine.resources.objects.SWGObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
 import resources.objects.weapon.WeaponObject;
+import resources.skills.SkillMod;
 
 @Persistent
 public class CreatureMessageBuilder extends ObjectMessageBuilder {

src/resources/objects/creature/CreatureObject.java

@@ -49,13 +49,12 @@ import com.sleepycat.persist.model.NotPersistent;
 
 import main.NGECore;
 import engine.clients.Client;
+import resources.buffs.Buff;
+import resources.buffs.DamageOverTime;
 import resources.common.Cooldown;
 import resources.common.OutOfBand;
-import resources.objects.Buff;
-import resources.objects.DamageOverTime;
 import resources.objects.SWGList;
 import resources.objects.SWGMap;
-import resources.objects.SkillMod;
 import engine.resources.common.CRC;
 import engine.resources.objects.IPersistent;
 import engine.resources.objects.MissionCriticalObject;
@@ -65,6 +64,7 @@ import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
+import resources.skills.SkillMod;
 import services.command.BaseSWGCommand;
 
 @Entity(version=9)

src/resources/skills/SkillMod.java

@@ -19,10 +19,12 @@
  * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
  * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
  ******************************************************************************/
-package resources.objects;
+package resources.skills;
 
 import org.apache.mina.core.buffer.IoBuffer;
 
+import resources.objects.Delta;
+
 import com.sleepycat.persist.model.Persistent;
 
 @Persistent(version=0)

src/services/BuffService.java

@@ -31,9 +31,9 @@ import java.util.concurrent.TimeUnit;
 import org.python.core.Py;
 import org.python.core.PyObject;
 
+import resources.buffs.Buff;
+import resources.buffs.DamageOverTime;
 import resources.common.FileUtilities;
-import resources.objects.Buff;
-import resources.objects.DamageOverTime;
 import resources.objects.creature.CreatureObject;
 import resources.objects.group.GroupObject;
 import resources.objects.player.PlayerObject;

src/services/EntertainmentService.java

@@ -20,6 +20,7 @@ import protocol.swg.ObjControllerMessage;
 import protocol.swg.objectControllerObjects.BuffBuilderChangeMessage;
 import protocol.swg.objectControllerObjects.BuffBuilderEndMessage;
 import protocol.swg.objectControllerObjects.ImageDesignMessage;
+import resources.buffs.BuffItem;
 import resources.common.BuffBuilder;
 import resources.common.IDAttribute;
 import resources.common.MathUtilities;
@@ -29,11 +30,10 @@ import resources.common.Performance;
 import resources.common.PerformanceEffect;
 import resources.common.RGB;
 import resources.datatables.Posture;
-import resources.objects.BuffItem;
-import resources.objects.SkillMod;
 import resources.objects.creature.CreatureObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
+import resources.skills.SkillMod;
 import resources.visitors.IDManagerVisitor;
 import services.sui.SUIService.InputBoxType;
 import services.sui.SUIWindow;

src/services/GroupService.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import resources.objects.Buff;
+import resources.buffs.Buff;
 import resources.objects.creature.CreatureObject;
 import resources.objects.group.GroupObject;
 import services.chat.ChatRoom;

src/services/PlayerService.java

@@ -58,6 +58,7 @@ import protocol.swg.ShowHelmet;
 import protocol.swg.objectControllerObjects.ChangeRoleIconChoice;
 import protocol.swg.objectControllerObjects.ShowFlyText;
 import protocol.swg.objectControllerObjects.ShowLootBox;
+import resources.buffs.Buff;
 import resources.common.FileUtilities;
 import resources.common.ObjControllerOpcodes;
 import resources.common.Opcodes;
@@ -70,7 +71,6 @@ import resources.datatables.DisplayType;
 import resources.datatables.PlayerFlags;
 import resources.datatables.Professions;
 import resources.guild.Guild;
-import resources.objects.Buff;
 import resources.objects.building.BuildingObject;
 import resources.objects.cell.CellObject;
 import resources.objects.creature.CreatureObject;

src/services/SkillModService.java

@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import resources.common.FileUtilities;
-import resources.objects.SkillMod;
 import resources.objects.creature.CreatureObject;
+import resources.skills.SkillMod;
 import main.NGECore;
 import engine.clientdata.ClientFileManager;
 import engine.clientdata.visitors.DatatableVisitor;

src/services/combat/CombatService.java

@@ -40,13 +40,13 @@ import protocol.swg.objectControllerObjects.CombatAction;
 import protocol.swg.objectControllerObjects.CombatSpam;
 import protocol.swg.objectControllerObjects.CommandEnqueueRemove;
 import protocol.swg.objectControllerObjects.StartTask;
+import resources.buffs.Buff;
+import resources.buffs.DamageOverTime;
 import resources.common.FileUtilities;
 import resources.datatables.Options;
 import resources.datatables.Elemental;
 import resources.datatables.Posture;
 import resources.datatables.WeaponType;
-import resources.objects.Buff;
-import resources.objects.DamageOverTime;
 import resources.objects.creature.CreatureObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;