From 902a203861d40008ec3f5a1b0dce7649a72aa95e Mon Sep 17 00:00:00 2001 From: Major- Date: Mon, 25 May 2015 15:37:07 +0100 Subject: [PATCH] Move org.apollo.game.model.def to org.apollo.fs.def. --- src/org/apollo/fs/decoder/GameObjectDecoder.java | 2 +- src/org/apollo/fs/decoder/ItemDefinitionDecoder.java | 2 +- src/org/apollo/fs/decoder/NpcDefinitionDecoder.java | 2 +- src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java | 2 +- .../{game/model => fs}/def/EquipmentDefinition.java | 2 +- src/org/apollo/{game/model => fs}/def/ItemDefinition.java | 2 +- src/org/apollo/{game/model => fs}/def/NpcDefinition.java | 2 +- .../apollo/{game/model => fs}/def/ObjectDefinition.java | 2 +- src/org/apollo/{game/model => fs}/def/package-info.java | 2 +- src/org/apollo/game/message/handler/EquipItemHandler.java | 2 +- .../message/handler/NpcActionVerificationHandler.java | 2 +- .../message/handler/ObjectActionVerificationHandler.java | 2 +- src/org/apollo/game/model/Item.java | 2 +- src/org/apollo/game/model/World.java | 8 ++++---- src/org/apollo/game/model/entity/Mob.java | 2 +- src/org/apollo/game/model/entity/Npc.java | 2 +- src/org/apollo/game/model/entity/obj/GameObject.java | 2 +- src/org/apollo/game/model/inter/bank/BankUtils.java | 2 +- src/org/apollo/game/model/inv/Inventory.java | 2 +- src/org/apollo/io/EquipmentDefinitionParser.java | 2 +- .../release/r317/PlayerSynchronizationMessageEncoder.java | 2 +- .../release/r377/PlayerSynchronizationMessageEncoder.java | 2 +- src/org/apollo/tools/EquipmentUpdater.java | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) rename src/org/apollo/{game/model => fs}/def/EquipmentDefinition.java (99%) rename src/org/apollo/{game/model => fs}/def/ItemDefinition.java (99%) rename src/org/apollo/{game/model => fs}/def/NpcDefinition.java (99%) rename src/org/apollo/{game/model => fs}/def/ObjectDefinition.java (99%) rename src/org/apollo/{game/model => fs}/def/package-info.java (74%) diff --git a/src/org/apollo/fs/decoder/GameObjectDecoder.java b/src/org/apollo/fs/decoder/GameObjectDecoder.java index fbb3583f..2c1a14c7 100644 --- a/src/org/apollo/fs/decoder/GameObjectDecoder.java +++ b/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; diff --git a/src/org/apollo/fs/decoder/ItemDefinitionDecoder.java b/src/org/apollo/fs/decoder/ItemDefinitionDecoder.java index 7596e74d..7b49969e 100644 --- a/src/org/apollo/fs/decoder/ItemDefinitionDecoder.java +++ b/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; /** diff --git a/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java b/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java index c7244b04..cb6f5290 100644 --- a/src/org/apollo/fs/decoder/NpcDefinitionDecoder.java +++ b/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; /** diff --git a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java b/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java index fe231040..3c1e354b 100644 --- a/src/org/apollo/fs/decoder/ObjectDefinitionDecoder.java +++ b/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; /** diff --git a/src/org/apollo/game/model/def/EquipmentDefinition.java b/src/org/apollo/fs/def/EquipmentDefinition.java similarity index 99% rename from src/org/apollo/game/model/def/EquipmentDefinition.java rename to src/org/apollo/fs/def/EquipmentDefinition.java index 914782dd..398cf326 100644 --- a/src/org/apollo/game/model/def/EquipmentDefinition.java +++ b/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; diff --git a/src/org/apollo/game/model/def/ItemDefinition.java b/src/org/apollo/fs/def/ItemDefinition.java similarity index 99% rename from src/org/apollo/game/model/def/ItemDefinition.java rename to src/org/apollo/fs/def/ItemDefinition.java index 015e1279..194b6957 100644 --- a/src/org/apollo/game/model/def/ItemDefinition.java +++ b/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; diff --git a/src/org/apollo/game/model/def/NpcDefinition.java b/src/org/apollo/fs/def/NpcDefinition.java similarity index 99% rename from src/org/apollo/game/model/def/NpcDefinition.java rename to src/org/apollo/fs/def/NpcDefinition.java index ea9047cd..5cac63b6 100644 --- a/src/org/apollo/game/model/def/NpcDefinition.java +++ b/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; diff --git a/src/org/apollo/game/model/def/ObjectDefinition.java b/src/org/apollo/fs/def/ObjectDefinition.java similarity index 99% rename from src/org/apollo/game/model/def/ObjectDefinition.java rename to src/org/apollo/fs/def/ObjectDefinition.java index 2c770023..1516bc43 100644 --- a/src/org/apollo/game/model/def/ObjectDefinition.java +++ b/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; diff --git a/src/org/apollo/game/model/def/package-info.java b/src/org/apollo/fs/def/package-info.java similarity index 74% rename from src/org/apollo/game/model/def/package-info.java rename to src/org/apollo/fs/def/package-info.java index 56c13bf9..812bfb86 100644 --- a/src/org/apollo/game/model/def/package-info.java +++ b/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; \ No newline at end of file +package org.apollo.fs.def; \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/EquipItemHandler.java b/src/org/apollo/game/message/handler/EquipItemHandler.java index c7d3e81e..7c2ad63e 100644 --- a/src/org/apollo/game/message/handler/EquipItemHandler.java +++ b/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; diff --git a/src/org/apollo/game/message/handler/NpcActionVerificationHandler.java b/src/org/apollo/game/message/handler/NpcActionVerificationHandler.java index f2109e1a..1b711432 100644 --- a/src/org/apollo/game/message/handler/NpcActionVerificationHandler.java +++ b/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; diff --git a/src/org/apollo/game/message/handler/ObjectActionVerificationHandler.java b/src/org/apollo/game/message/handler/ObjectActionVerificationHandler.java index 5b6a09a0..b699e7bc 100644 --- a/src/org/apollo/game/message/handler/ObjectActionVerificationHandler.java +++ b/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; diff --git a/src/org/apollo/game/model/Item.java b/src/org/apollo/game/model/Item.java index 5ecd7506..6c2db4b2 100644 --- a/src/org/apollo/game/model/Item.java +++ b/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; diff --git a/src/org/apollo/game/model/World.java b/src/org/apollo/game/model/World.java index e9976dbb..541812fc 100644 --- a/src/org/apollo/game/model/World.java +++ b/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; diff --git a/src/org/apollo/game/model/entity/Mob.java b/src/org/apollo/game/model/entity/Mob.java index 6beb6851..4a8770cd 100644 --- a/src/org/apollo/game/model/entity/Mob.java +++ b/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; diff --git a/src/org/apollo/game/model/entity/Npc.java b/src/org/apollo/game/model/entity/Npc.java index 640ae52f..8dea7975 100644 --- a/src/org/apollo/game/model/entity/Npc.java +++ b/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; diff --git a/src/org/apollo/game/model/entity/obj/GameObject.java b/src/org/apollo/game/model/entity/obj/GameObject.java index f824ebfd..586a4e50 100644 --- a/src/org/apollo/game/model/entity/obj/GameObject.java +++ b/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; diff --git a/src/org/apollo/game/model/inter/bank/BankUtils.java b/src/org/apollo/game/model/inter/bank/BankUtils.java index 534ff843..709fb0c7 100644 --- a/src/org/apollo/game/model/inter/bank/BankUtils.java +++ b/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; diff --git a/src/org/apollo/game/model/inv/Inventory.java b/src/org/apollo/game/model/inv/Inventory.java index 6fa3d71c..a69a0f68 100644 --- a/src/org/apollo/game/model/inv/Inventory.java +++ b/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; diff --git a/src/org/apollo/io/EquipmentDefinitionParser.java b/src/org/apollo/io/EquipmentDefinitionParser.java index ca6638a7..81740a11 100644 --- a/src/org/apollo/io/EquipmentDefinitionParser.java +++ b/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. diff --git a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java index 4e9cf4d1..e8a7e0f5 100644 --- a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java +++ b/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; diff --git a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java index bb6e9077..985a3d84 100644 --- a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java +++ b/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; diff --git a/src/org/apollo/tools/EquipmentUpdater.java b/src/org/apollo/tools/EquipmentUpdater.java index 621eaf44..5402da1b 100644 --- a/src/org/apollo/tools/EquipmentUpdater.java +++ b/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;