diff --git a/src/resources/common/Forager.java b/src/resources/common/Forager.java index e0445f29..6e27a207 100644 --- a/src/resources/common/Forager.java +++ b/src/resources/common/Forager.java @@ -32,10 +32,10 @@ import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; import main.NGECore; import resources.datatables.Options; +import resources.loot.LootGroup; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; import resources.objects.group.GroupObject; -import resources.objects.loot.LootGroup; import resources.objects.tangible.TangibleObject; import services.ai.AIActor; diff --git a/src/resources/objects/loot/LootDrop.java b/src/resources/loot/LootDrop.java similarity index 98% rename from src/resources/objects/loot/LootDrop.java rename to src/resources/loot/LootDrop.java index 371c1727..efd455ba 100644 --- a/src/resources/objects/loot/LootDrop.java +++ b/src/resources/loot/LootDrop.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.loot; +package resources.loot; import java.util.ArrayList; import java.util.List; diff --git a/src/resources/objects/loot/LootGroup.java b/src/resources/loot/LootGroup.java similarity index 98% rename from src/resources/objects/loot/LootGroup.java rename to src/resources/loot/LootGroup.java index 1c626c05..8666014d 100644 --- a/src/resources/objects/loot/LootGroup.java +++ b/src/resources/loot/LootGroup.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.loot; +package resources.loot; import com.sleepycat.persist.model.Persistent; diff --git a/src/resources/objects/loot/LootPool.java b/src/resources/loot/LootPool.java similarity index 97% rename from src/resources/objects/loot/LootPool.java rename to src/resources/loot/LootPool.java index 2e74cf8b..83576a16 100644 --- a/src/resources/objects/loot/LootPool.java +++ b/src/resources/loot/LootPool.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.loot; +package resources.loot; /** * @author Charon diff --git a/src/resources/objects/loot/LootRollSession.java b/src/resources/loot/LootRollSession.java similarity index 99% rename from src/resources/objects/loot/LootRollSession.java rename to src/resources/loot/LootRollSession.java index 884346ba..e79951fe 100644 --- a/src/resources/objects/loot/LootRollSession.java +++ b/src/resources/loot/LootRollSession.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.loot; +package resources.loot; import java.util.ArrayList; import java.util.List; diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index d11c3644..a06dfcaf 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -40,8 +40,8 @@ import protocol.swg.objectControllerObjects.ShowFlyText; import resources.common.OutOfBand; import resources.common.RGB; import resources.datatables.Options; +import resources.loot.LootGroup; import resources.objects.creature.CreatureObject; -import resources.objects.loot.LootGroup; import resources.visitors.IDManagerVisitor; import com.sleepycat.persist.model.NotPersistent; diff --git a/src/services/LootService.java b/src/services/LootService.java index 1105e13c..97d45a46 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -35,11 +35,12 @@ import java.util.List; import java.util.Map; import java.util.Random; import java.util.Vector; + import protocol.swg.PlayClientEffectObjectTransformMessage; +import resources.loot.LootGroup; +import resources.loot.LootRollSession; import resources.objects.creature.CreatureObject; import resources.objects.group.GroupObject; -import resources.objects.loot.LootGroup; -import resources.objects.loot.LootRollSession; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; import main.NGECore; diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java index 546fc3d2..309577cc 100644 --- a/src/services/sui/SUIService.java +++ b/src/services/sui/SUIService.java @@ -46,9 +46,9 @@ import resources.common.FileUtilities; import resources.common.ObjControllerOpcodes; import resources.common.Opcodes; import resources.common.RadialOptions; +import resources.loot.LootRollSession; import resources.objects.creature.CreatureObject; import resources.objects.harvester.HarvesterObject; -import resources.objects.loot.LootRollSession; import services.sui.SUIWindow.SUICallback; import services.sui.SUIWindow.Trigger; import engine.clients.Client;