Move org.apollo.game.model.def to org.apollo.fs.def.

src/org/apollo/fs/decoder/GameObjectDecoder.java

@@ -10,12 +10,12 @@ import java.util.function.Predicate;
 
 import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.decoder.MapFileDecoder.MapDefinition;
+import org.apollo.fs.def.ObjectDefinition;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
 import org.apollo.game.model.area.Region;
 import org.apollo.game.model.area.RegionRepository;
 import org.apollo.game.model.area.collision.CollisionMatrix;
-import org.apollo.game.model.def.ObjectDefinition;
 import org.apollo.game.model.entity.obj.GameObject;
 import org.apollo.game.model.entity.obj.ObjectType;
 import org.apollo.game.model.entity.obj.StaticGameObject;

src/org/apollo/fs/decoder/ItemDefinitionDecoder.java

@@ -5,7 +5,7 @@ import java.nio.ByteBuffer;
 
 import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.archive.Archive;
-import org.apollo.game.model.def.ItemDefinition;
+import org.apollo.fs.def.ItemDefinition;
 import org.apollo.util.BufferUtil;
 
 /**

src/org/apollo/fs/decoder/NpcDefinitionDecoder.java

@@ -6,7 +6,7 @@ import java.util.Arrays;
 
 import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.archive.Archive;
-import org.apollo.game.model.def.NpcDefinition;
+import org.apollo.fs.def.NpcDefinition;
 import org.apollo.util.BufferUtil;
 
 /**

src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java

@@ -5,7 +5,7 @@ import java.nio.ByteBuffer;
 
 import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.archive.Archive;
-import org.apollo.game.model.def.ObjectDefinition;
+import org.apollo.fs.def.ObjectDefinition;
 import org.apollo.util.BufferUtil;
 
 /**

src/org/apollo/fs/def/EquipmentDefinition.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model.def;
+package org.apollo.fs.def;
 
 import java.util.HashMap;
 import java.util.Map;

src/org/apollo/fs/def/ItemDefinition.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model.def;
+package org.apollo.fs.def;
 
 import org.apollo.game.model.Item;
 

src/org/apollo/fs/def/NpcDefinition.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model.def;
+package org.apollo.fs.def;
 
 import org.apollo.game.model.entity.Npc;
 

src/org/apollo/fs/def/ObjectDefinition.java

@@ -1,4 +1,4 @@
-package org.apollo.game.model.def;
+package org.apollo.fs.def;
 
 import org.apollo.game.model.entity.obj.GameObject;
 

src/org/apollo/fs/def/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Contains definition classes which contain information about types of items, NPCs, etc.
  */
-package org.apollo.game.model.def;
+package org.apollo.fs.def;

src/org/apollo/game/message/handler/EquipItemHandler.java

@@ -1,10 +1,10 @@
 package org.apollo.game.message.handler;
 
+import org.apollo.fs.def.EquipmentDefinition;
 import org.apollo.game.message.MessageHandler;
 import org.apollo.game.message.impl.ItemOptionMessage;
 import org.apollo.game.model.Item;
 import org.apollo.game.model.World;
-import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.entity.EquipmentConstants;
 import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.entity.Skill;

src/org/apollo/game/message/handler/NpcActionVerificationHandler.java

@@ -1,9 +1,9 @@
 package org.apollo.game.message.handler;
 
+import org.apollo.fs.def.NpcDefinition;
 import org.apollo.game.message.MessageHandler;
 import org.apollo.game.message.impl.NpcActionMessage;
 import org.apollo.game.model.World;
-import org.apollo.game.model.def.NpcDefinition;
 import org.apollo.game.model.entity.Npc;
 import org.apollo.game.model.entity.Player;
 import org.apollo.util.MobRepository;

src/org/apollo/game/message/handler/ObjectActionVerificationHandler.java

@@ -3,12 +3,12 @@ package org.apollo.game.message.handler;
 import java.util.List;
 import java.util.Set;
 
+import org.apollo.fs.def.ObjectDefinition;
 import org.apollo.game.message.MessageHandler;
 import org.apollo.game.message.impl.ObjectActionMessage;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
 import org.apollo.game.model.area.Region;
-import org.apollo.game.model.def.ObjectDefinition;
 import org.apollo.game.model.entity.EntityType;
 import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.entity.obj.GameObject;

src/org/apollo/game/model/Item.java

@@ -1,6 +1,6 @@
 package org.apollo.game.model;
 
-import org.apollo.game.model.def.ItemDefinition;
+import org.apollo.fs.def.ItemDefinition;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;

src/org/apollo/game/model/World.java

@@ -14,13 +14,13 @@ import org.apollo.fs.decoder.GameObjectDecoder;
 import org.apollo.fs.decoder.ItemDefinitionDecoder;
 import org.apollo.fs.decoder.NpcDefinitionDecoder;
 import org.apollo.fs.decoder.ObjectDefinitionDecoder;
+import org.apollo.fs.def.EquipmentDefinition;
+import org.apollo.fs.def.ItemDefinition;
+import org.apollo.fs.def.NpcDefinition;
+import org.apollo.fs.def.ObjectDefinition;
 import org.apollo.game.command.CommandDispatcher;
 import org.apollo.game.model.area.Region;
 import org.apollo.game.model.area.RegionRepository;
-import org.apollo.game.model.def.EquipmentDefinition;
-import org.apollo.game.model.def.ItemDefinition;
-import org.apollo.game.model.def.NpcDefinition;
-import org.apollo.game.model.def.ObjectDefinition;
 import org.apollo.game.model.entity.Entity;
 import org.apollo.game.model.entity.EntityType;
 import org.apollo.game.model.entity.Npc;

src/org/apollo/game/model/entity/Mob.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.apollo.fs.def.NpcDefinition;
 import org.apollo.game.action.Action;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Direction;
@@ -15,7 +16,6 @@ import org.apollo.game.model.area.EntityUpdateType;
 import org.apollo.game.model.area.Region;
 import org.apollo.game.model.area.RegionRepository;
 import org.apollo.game.model.area.update.UpdateOperation;
-import org.apollo.game.model.def.NpcDefinition;
 import org.apollo.game.model.entity.attr.Attribute;
 import org.apollo.game.model.entity.attr.AttributeMap;
 import org.apollo.game.model.event.impl.MobPositionUpdateEvent;

src/org/apollo/game/model/entity/Npc.java

@@ -2,9 +2,9 @@ package org.apollo.game.model.entity;
 
 import java.util.Optional;
 
+import org.apollo.fs.def.NpcDefinition;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
-import org.apollo.game.model.def.NpcDefinition;
 import org.apollo.game.sync.block.SynchronizationBlock;
 
 import com.google.common.base.MoreObjects;

src/org/apollo/game/model/entity/obj/GameObject.java

@@ -1,11 +1,11 @@
 package org.apollo.game.model.entity.obj;
 
+import org.apollo.fs.def.ObjectDefinition;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
 import org.apollo.game.model.area.EntityUpdateType;
 import org.apollo.game.model.area.Region;
 import org.apollo.game.model.area.update.ObjectUpdateOperation;
-import org.apollo.game.model.def.ObjectDefinition;
 import org.apollo.game.model.entity.Entity;
 import org.apollo.game.model.entity.Player;
 

src/org/apollo/game/model/inter/bank/BankUtils.java

@@ -1,7 +1,7 @@
 package org.apollo.game.model.inter.bank;
 
+import org.apollo.fs.def.ItemDefinition;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.def.ItemDefinition;
 import org.apollo.game.model.entity.Player;
 import org.apollo.game.model.inv.Inventory;
 

src/org/apollo/game/model/inv/Inventory.java

@@ -5,8 +5,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
+import org.apollo.fs.def.ItemDefinition;
 import org.apollo.game.model.Item;
-import org.apollo.game.model.def.ItemDefinition;
 
 import com.google.common.base.Preconditions;
 

src/org/apollo/io/EquipmentDefinitionParser.java

@@ -4,7 +4,7 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apollo.game.model.def.EquipmentDefinition;
+import org.apollo.fs.def.EquipmentDefinition;
 
 /**
  * A class that parses the {@code data/equipment-[release].dat} file to create an array of {@link EquipmentDefinition}s.

src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java

@@ -1,5 +1,6 @@
 package org.apollo.net.release.r317;
 
+import org.apollo.fs.def.EquipmentDefinition;
 import org.apollo.game.message.impl.PlayerSynchronizationMessage;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Appearance;
@@ -7,7 +8,6 @@ import org.apollo.game.model.Direction;
 import org.apollo.game.model.Graphic;
 import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
-import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.entity.EquipmentConstants;
 import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.game.model.inv.Inventory;

src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java

@@ -1,5 +1,6 @@
 package org.apollo.net.release.r377;
 
+import org.apollo.fs.def.EquipmentDefinition;
 import org.apollo.game.message.impl.PlayerSynchronizationMessage;
 import org.apollo.game.model.Animation;
 import org.apollo.game.model.Appearance;
@@ -7,7 +8,6 @@ import org.apollo.game.model.Direction;
 import org.apollo.game.model.Graphic;
 import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
-import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.entity.EquipmentConstants;
 import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.game.model.inv.Inventory;

src/org/apollo/tools/EquipmentUpdater.java

@@ -7,7 +7,7 @@ import java.nio.file.Paths;
 
 import org.apollo.fs.IndexedFileSystem;
 import org.apollo.fs.decoder.ItemDefinitionDecoder;
-import org.apollo.game.model.def.ItemDefinition;
+import org.apollo.fs.def.ItemDefinition;
 
 import com.google.common.base.Preconditions;