diff --git a/src/org/apollo/game/command/CommandListener.java b/src/org/apollo/game/command/CommandListener.java index 8c8f5e4f..2343e7fa 100644 --- a/src/org/apollo/game/command/CommandListener.java +++ b/src/org/apollo/game/command/CommandListener.java @@ -1,7 +1,7 @@ package org.apollo.game.command; import org.apollo.game.model.entity.Player; -import org.apollo.game.model.settings.PrivilegeLevel; +import org.apollo.game.model.entity.setting.PrivilegeLevel; /** * An interface which should be implemented to listen to {@link Command}s. diff --git a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java b/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java index 6282076a..f3cdd6dc 100644 --- a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java +++ b/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java @@ -5,7 +5,7 @@ import org.apollo.game.event.handler.EventHandlerContext; import org.apollo.game.event.impl.PlayerDesignEvent; import org.apollo.game.model.Appearance; import org.apollo.game.model.entity.Player; -import org.apollo.game.model.settings.Gender; +import org.apollo.game.model.entity.setting.Gender; /** * An {@link EventHandler} that verifies {@link PlayerDesignEvent}s. diff --git a/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java b/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java index 84fa5587..b0572eb0 100644 --- a/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java +++ b/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java @@ -1,7 +1,7 @@ package org.apollo.game.event.impl; import org.apollo.game.event.Event; -import org.apollo.game.model.settings.PrivilegeLevel; +import org.apollo.game.model.entity.setting.PrivilegeLevel; /** * An {@link Event} sent to the client that forwards a private message. diff --git a/src/org/apollo/game/event/impl/FriendServerStatusEvent.java b/src/org/apollo/game/event/impl/FriendServerStatusEvent.java index 9f4be339..1f814428 100644 --- a/src/org/apollo/game/event/impl/FriendServerStatusEvent.java +++ b/src/org/apollo/game/event/impl/FriendServerStatusEvent.java @@ -1,7 +1,7 @@ package org.apollo.game.event.impl; import org.apollo.game.event.Event; -import org.apollo.game.model.settings.ServerStatus; +import org.apollo.game.model.entity.setting.ServerStatus; /** * An {@link Event} sent to the client to update the friend server status. diff --git a/src/org/apollo/game/event/impl/PrivacyOptionEvent.java b/src/org/apollo/game/event/impl/PrivacyOptionEvent.java index 93ca6e72..331a7c28 100644 --- a/src/org/apollo/game/event/impl/PrivacyOptionEvent.java +++ b/src/org/apollo/game/event/impl/PrivacyOptionEvent.java @@ -1,7 +1,7 @@ package org.apollo.game.event.impl; import org.apollo.game.event.Event; -import org.apollo.game.model.settings.PrivacyState; +import org.apollo.game.model.entity.setting.PrivacyState; /** * An {@link Event} sent both by and to the client to update the public chat, private (friend) chat, and trade chat diff --git a/src/org/apollo/game/model/Appearance.java b/src/org/apollo/game/model/Appearance.java index 7df7bdb6..a3c61bbd 100644 --- a/src/org/apollo/game/model/Appearance.java +++ b/src/org/apollo/game/model/Appearance.java @@ -1,6 +1,6 @@ package org.apollo.game.model; -import org.apollo.game.model.settings.Gender; +import org.apollo.game.model.entity.setting.Gender; /** * Represents the appearance of a player. diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java index a491a648..c933b767 100644 --- a/src/org/apollo/game/model/entity/Player.java +++ b/src/org/apollo/game/model/entity/Player.java @@ -18,6 +18,9 @@ import org.apollo.game.event.impl.UpdateRunEnergyEvent; import org.apollo.game.model.Appearance; import org.apollo.game.model.Position; import org.apollo.game.model.World; +import org.apollo.game.model.entity.setting.PrivacyState; +import org.apollo.game.model.entity.setting.PrivilegeLevel; +import org.apollo.game.model.entity.setting.ScreenBrightness; import org.apollo.game.model.inter.InterfaceConstants; import org.apollo.game.model.inter.InterfaceListener; import org.apollo.game.model.inter.InterfaceSet; @@ -30,9 +33,6 @@ import org.apollo.game.model.inv.InventoryConstants; import org.apollo.game.model.inv.InventoryListener; import org.apollo.game.model.inv.SynchronizationInventoryListener; import org.apollo.game.model.inv.Inventory.StackMode; -import org.apollo.game.model.settings.PrivacyState; -import org.apollo.game.model.settings.PrivilegeLevel; -import org.apollo.game.model.settings.ScreenBrightness; import org.apollo.game.model.skill.LevelUpSkillListener; import org.apollo.game.model.skill.SynchronizationSkillListener; import org.apollo.game.sync.block.SynchronizationBlock; diff --git a/src/org/apollo/game/model/settings/Gender.java b/src/org/apollo/game/model/entity/setting/Gender.java similarity index 91% rename from src/org/apollo/game/model/settings/Gender.java rename to src/org/apollo/game/model/entity/setting/Gender.java index c81b28a8..ed711489 100644 --- a/src/org/apollo/game/model/settings/Gender.java +++ b/src/org/apollo/game/model/entity/setting/Gender.java @@ -1,4 +1,4 @@ -package org.apollo.game.model.settings; +package org.apollo.game.model.entity.setting; /** * An enumeration containing the two genders (male and female). This enumeration relies on the ordering of the elements diff --git a/src/org/apollo/game/model/settings/PrivacyState.java b/src/org/apollo/game/model/entity/setting/PrivacyState.java similarity index 98% rename from src/org/apollo/game/model/settings/PrivacyState.java rename to src/org/apollo/game/model/entity/setting/PrivacyState.java index 66384c82..549e8f1e 100644 --- a/src/org/apollo/game/model/settings/PrivacyState.java +++ b/src/org/apollo/game/model/entity/setting/PrivacyState.java @@ -1,4 +1,4 @@ -package org.apollo.game.model.settings; +package org.apollo.game.model.entity.setting; /** * An enumeration representing the different privacy states for public, private and trade chat. This enumeration relies diff --git a/src/org/apollo/game/model/settings/PrivilegeLevel.java b/src/org/apollo/game/model/entity/setting/PrivilegeLevel.java similarity index 96% rename from src/org/apollo/game/model/settings/PrivilegeLevel.java rename to src/org/apollo/game/model/entity/setting/PrivilegeLevel.java index cc0c498a..111052bf 100644 --- a/src/org/apollo/game/model/settings/PrivilegeLevel.java +++ b/src/org/apollo/game/model/entity/setting/PrivilegeLevel.java @@ -1,4 +1,4 @@ -package org.apollo.game.model.settings; +package org.apollo.game.model.entity.setting; /** * An enumeration with the different privilege levels a player can have. This enumeration relies on the ordering of the diff --git a/src/org/apollo/game/model/settings/ScreenBrightness.java b/src/org/apollo/game/model/entity/setting/ScreenBrightness.java similarity index 96% rename from src/org/apollo/game/model/settings/ScreenBrightness.java rename to src/org/apollo/game/model/entity/setting/ScreenBrightness.java index 7f0c0aa1..85eac4ed 100644 --- a/src/org/apollo/game/model/settings/ScreenBrightness.java +++ b/src/org/apollo/game/model/entity/setting/ScreenBrightness.java @@ -1,4 +1,4 @@ -package org.apollo.game.model.settings; +package org.apollo.game.model.entity.setting; /** * An enumeration representing the brightness of a player's screen. This enumeration relies on the ordering of the diff --git a/src/org/apollo/game/model/settings/ServerStatus.java b/src/org/apollo/game/model/entity/setting/ServerStatus.java similarity index 96% rename from src/org/apollo/game/model/settings/ServerStatus.java rename to src/org/apollo/game/model/entity/setting/ServerStatus.java index aa705084..79bf0b64 100644 --- a/src/org/apollo/game/model/settings/ServerStatus.java +++ b/src/org/apollo/game/model/entity/setting/ServerStatus.java @@ -1,4 +1,4 @@ -package org.apollo.game.model.settings; +package org.apollo.game.model.entity.setting; /** * Represents the status of the friend server. This enumeration relies on the ordering of the elements within, which diff --git a/src/org/apollo/game/model/settings/package-info.java b/src/org/apollo/game/model/entity/setting/package-info.java similarity index 60% rename from src/org/apollo/game/model/settings/package-info.java rename to src/org/apollo/game/model/entity/setting/package-info.java index 2875efd3..db35d20a 100644 --- a/src/org/apollo/game/model/settings/package-info.java +++ b/src/org/apollo/game/model/entity/setting/package-info.java @@ -1,4 +1,4 @@ /** * Contains player setting or customisation-related classes. */ -package org.apollo.game.model.settings; \ No newline at end of file +package org.apollo.game.model.entity.setting; \ No newline at end of file diff --git a/src/org/apollo/game/sync/block/ChatBlock.java b/src/org/apollo/game/sync/block/ChatBlock.java index 68e2edbf..c6c58217 100644 --- a/src/org/apollo/game/sync/block/ChatBlock.java +++ b/src/org/apollo/game/sync/block/ChatBlock.java @@ -1,7 +1,7 @@ package org.apollo.game.sync.block; import org.apollo.game.event.impl.ChatEvent; -import org.apollo.game.model.settings.PrivilegeLevel; +import org.apollo.game.model.entity.setting.PrivilegeLevel; /** * The chat {@link SynchronizationBlock}. Only players can utilise this block. diff --git a/src/org/apollo/io/player/impl/BinaryPlayerLoader.java b/src/org/apollo/io/player/impl/BinaryPlayerLoader.java index 1f9b198a..5d45437c 100644 --- a/src/org/apollo/io/player/impl/BinaryPlayerLoader.java +++ b/src/org/apollo/io/player/impl/BinaryPlayerLoader.java @@ -13,11 +13,11 @@ import org.apollo.game.model.Position; import org.apollo.game.model.entity.Player; import org.apollo.game.model.entity.Skill; import org.apollo.game.model.entity.SkillSet; +import org.apollo.game.model.entity.setting.Gender; +import org.apollo.game.model.entity.setting.PrivacyState; +import org.apollo.game.model.entity.setting.PrivilegeLevel; +import org.apollo.game.model.entity.setting.ScreenBrightness; import org.apollo.game.model.inv.Inventory; -import org.apollo.game.model.settings.Gender; -import org.apollo.game.model.settings.PrivacyState; -import org.apollo.game.model.settings.PrivilegeLevel; -import org.apollo.game.model.settings.ScreenBrightness; import org.apollo.io.player.PlayerLoader; import org.apollo.io.player.PlayerLoaderResponse; import org.apollo.net.codec.login.LoginConstants; diff --git a/src/org/apollo/io/player/impl/DummyPlayerLoader.java b/src/org/apollo/io/player/impl/DummyPlayerLoader.java index ed51b0c5..b43c0383 100644 --- a/src/org/apollo/io/player/impl/DummyPlayerLoader.java +++ b/src/org/apollo/io/player/impl/DummyPlayerLoader.java @@ -2,7 +2,7 @@ package org.apollo.io.player.impl; import org.apollo.game.model.Position; import org.apollo.game.model.entity.Player; -import org.apollo.game.model.settings.PrivilegeLevel; +import org.apollo.game.model.entity.setting.PrivilegeLevel; import org.apollo.io.player.PlayerLoader; import org.apollo.io.player.PlayerLoaderResponse; import org.apollo.net.codec.login.LoginConstants; diff --git a/src/org/apollo/net/ApolloHandler.java b/src/org/apollo/net/ApolloHandler.java index 94f596a1..416027f2 100644 --- a/src/org/apollo/net/ApolloHandler.java +++ b/src/org/apollo/net/ApolloHandler.java @@ -1,8 +1,8 @@ package org.apollo.net; import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandler.Sharable; +import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.http.HttpRequest; @@ -18,7 +18,7 @@ import org.apollo.net.session.Session; import org.apollo.net.session.UpdateSession; /** - * An implementation of {@link SimpleChannelUpstreamHandler} which handles incoming upstream events from Netty. + * An implementation of {@link ChannelInboundHandlerAdapter} which handles incoming upstream events from Netty. * * @author Graham */ diff --git a/src/org/apollo/net/HttpChannelInitializer.java b/src/org/apollo/net/HttpChannelInitializer.java index aea62b6f..fd153cfc 100644 --- a/src/org/apollo/net/HttpChannelInitializer.java +++ b/src/org/apollo/net/HttpChannelInitializer.java @@ -9,7 +9,7 @@ import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.timeout.IdleStateHandler; /** - * A {@link ChannelPipelineFactory} for the HTTP protocol. + * A {@link ChannelInitializer} for the HTTP protocol. * * @author Graham */ diff --git a/src/org/apollo/net/JagGrabChannelInitializer.java b/src/org/apollo/net/JagGrabChannelInitializer.java index 09a1dfc6..3e477107 100644 --- a/src/org/apollo/net/JagGrabChannelInitializer.java +++ b/src/org/apollo/net/JagGrabChannelInitializer.java @@ -15,7 +15,7 @@ import org.apollo.net.codec.jaggrab.JagGrabRequestDecoder; import org.apollo.net.codec.jaggrab.JagGrabResponseEncoder; /** - * A {@link ChannelPipelineFactory} for the JAGGRAB protocol. + * A {@link ChannelInitializer} for the JAGGRAB protocol. * * @author Graham */ diff --git a/src/org/apollo/net/ServiceChannelInitializer.java b/src/org/apollo/net/ServiceChannelInitializer.java index 51436050..78058490 100644 --- a/src/org/apollo/net/ServiceChannelInitializer.java +++ b/src/org/apollo/net/ServiceChannelInitializer.java @@ -8,7 +8,7 @@ import io.netty.handler.timeout.IdleStateHandler; import org.apollo.net.codec.handshake.HandshakeDecoder; /** - * A {@link ChannelPipelineFactory} which creates {@link ChannelPipeline}s for the service pipeline. + * A {@link ChannelInitializer} for the service pipeline. * * @author Graham */ diff --git a/src/org/apollo/net/codec/game/GameEventDecoder.java b/src/org/apollo/net/codec/game/GameEventDecoder.java index 41504f25..643f1eb2 100644 --- a/src/org/apollo/net/codec/game/GameEventDecoder.java +++ b/src/org/apollo/net/codec/game/GameEventDecoder.java @@ -10,7 +10,7 @@ import org.apollo.net.release.EventDecoder; import org.apollo.net.release.Release; /** - * A {@link OneToOneDecoder} that decodes {@link GamePacket}s into {@link Event}s. + * A {@link MessageToMessageDecoder} that decodes {@link GamePacket}s into {@link Event}s. * * @author Graham */ diff --git a/src/org/apollo/net/codec/game/GameEventEncoder.java b/src/org/apollo/net/codec/game/GameEventEncoder.java index 86d2e223..aa1e58d1 100644 --- a/src/org/apollo/net/codec/game/GameEventEncoder.java +++ b/src/org/apollo/net/codec/game/GameEventEncoder.java @@ -10,7 +10,7 @@ import org.apollo.net.release.EventEncoder; import org.apollo.net.release.Release; /** - * A {@link OneToOneEncoder} which encodes {@link Event}s into {@link GamePacket}s. + * A {@link MessageToMessageEncoder} which encodes {@link Event}s into {@link GamePacket}s. * * @author Graham */ diff --git a/src/org/apollo/net/codec/game/GamePacketEncoder.java b/src/org/apollo/net/codec/game/GamePacketEncoder.java index e893b71c..6b51bf6d 100644 --- a/src/org/apollo/net/codec/game/GamePacketEncoder.java +++ b/src/org/apollo/net/codec/game/GamePacketEncoder.java @@ -12,7 +12,7 @@ import net.burtleburtle.bob.rand.IsaacRandom; import org.apollo.net.meta.PacketType; /** - * A {@link OneToOneEncoder} which encodes in-game packets. + * A {@link MessageToMessageEncoder} which encodes in-game packets. * * @author Graham */ diff --git a/src/org/apollo/net/codec/handshake/HandshakeDecoder.java b/src/org/apollo/net/codec/handshake/HandshakeDecoder.java index e4b7e3e1..c122494b 100644 --- a/src/org/apollo/net/codec/handshake/HandshakeDecoder.java +++ b/src/org/apollo/net/codec/handshake/HandshakeDecoder.java @@ -12,8 +12,8 @@ import org.apollo.net.codec.update.UpdateDecoder; import org.apollo.net.codec.update.UpdateEncoder; /** - * A {@link FrameDecoder} which decodes the handshake and makes changes to the pipeline as appropriate for the selected - * service. + * A {@link ByteToMessageDecoder} which decodes the handshake and makes changes to the pipeline as appropriate for the + * selected service. * * @author Graham */ diff --git a/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java b/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java index 838b6506..8fe2053e 100644 --- a/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java +++ b/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java @@ -6,7 +6,7 @@ import io.netty.handler.codec.MessageToMessageDecoder; import java.util.List; /** - * A {@link OneToOneDecoder} for the JAGGRAB protocol. + * A {@link MessageToMessageDecoder} for the JAGGRAB protocol. * * @author Graham */ diff --git a/src/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java b/src/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java index 73b31162..f59e02ad 100644 --- a/src/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java +++ b/src/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java @@ -6,7 +6,7 @@ import io.netty.handler.codec.MessageToMessageEncoder; import java.util.List; /** - * A {@link OneToOneEncoder} for the JAGGRAB protocol. + * A {@link MessageToMessageEncoder} for the JAGGRAB protocol. * * @author Graham */ diff --git a/src/org/apollo/net/codec/login/LoginEncoder.java b/src/org/apollo/net/codec/login/LoginEncoder.java index b930c9cc..a1b607c7 100644 --- a/src/org/apollo/net/codec/login/LoginEncoder.java +++ b/src/org/apollo/net/codec/login/LoginEncoder.java @@ -7,7 +7,7 @@ import io.netty.handler.codec.MessageToMessageEncoder; import java.util.List; /** - * A class which encodes login response messages. + * A {@link MessageToMessageEncoder} which encodes login response messages. * * @author Graham */ diff --git a/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java b/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java index f1b4572e..8c161a50 100644 --- a/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java +++ b/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java @@ -2,7 +2,7 @@ package org.apollo.net.release.r317; import org.apollo.game.event.impl.PlayerDesignEvent; import org.apollo.game.model.Appearance; -import org.apollo.game.model.settings.Gender; +import org.apollo.game.model.entity.setting.Gender; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; diff --git a/src/org/apollo/net/release/r317/PlayerSynchronizationEventEncoder.java b/src/org/apollo/net/release/r317/PlayerSynchronizationEventEncoder.java index 96e4ede0..11abd3fa 100644 --- a/src/org/apollo/net/release/r317/PlayerSynchronizationEventEncoder.java +++ b/src/org/apollo/net/release/r317/PlayerSynchronizationEventEncoder.java @@ -9,8 +9,8 @@ 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; -import org.apollo.game.model.settings.Gender; import org.apollo.game.sync.block.AnimationBlock; import org.apollo.game.sync.block.AppearanceBlock; import org.apollo.game.sync.block.ChatBlock; diff --git a/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java b/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java index 3d2637f9..0d264feb 100644 --- a/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java +++ b/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java @@ -2,7 +2,7 @@ package org.apollo.net.release.r377; import org.apollo.game.event.impl.PlayerDesignEvent; import org.apollo.game.model.Appearance; -import org.apollo.game.model.settings.Gender; +import org.apollo.game.model.entity.setting.Gender; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; diff --git a/src/org/apollo/net/release/r377/PlayerSynchronizationEventEncoder.java b/src/org/apollo/net/release/r377/PlayerSynchronizationEventEncoder.java index 99f1865e..989f48e3 100644 --- a/src/org/apollo/net/release/r377/PlayerSynchronizationEventEncoder.java +++ b/src/org/apollo/net/release/r377/PlayerSynchronizationEventEncoder.java @@ -9,8 +9,8 @@ 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; -import org.apollo.game.model.settings.Gender; import org.apollo.game.sync.block.AnimationBlock; import org.apollo.game.sync.block.AppearanceBlock; import org.apollo.game.sync.block.ChatBlock;