diff --git a/data/events.xml b/data/events.xml deleted file mode 100644 index 8f3b3d9d..00000000 --- a/data/events.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - org.apollo.game.event.impl.PlayerDesignEvent - - org.apollo.game.event.handler.impl.PlayerDesignVerificationHandler - org.apollo.game.event.handler.impl.PlayerDesignEventHandler - - - - org.apollo.game.event.impl.WalkEvent - - org.apollo.game.event.handler.impl.WalkEventHandler - - - - org.apollo.game.event.impl.ChatEvent - - org.apollo.game.event.handler.impl.ChatVerificationHandler - org.apollo.game.event.handler.impl.ChatEventHandler - - - - org.apollo.game.event.impl.ButtonEvent - - org.apollo.game.event.handler.impl.DialogueButtonHandler - org.apollo.game.event.handler.impl.BankButtonEventHandler - - - - org.apollo.game.event.impl.DialogueContinueEvent - - org.apollo.game.event.handler.impl.DialogueContinueEventHandler - - - - org.apollo.game.event.impl.CommandEvent - - org.apollo.game.event.handler.impl.CommandEventHandler - - - - org.apollo.game.event.impl.SwitchItemEvent - - org.apollo.game.event.handler.impl.SwitchItemEventHandler - - - - org.apollo.game.event.impl.ItemOptionEvent - - org.apollo.game.event.handler.impl.ItemVerificationHandler - org.apollo.game.event.handler.impl.EquipEventHandler - - - - org.apollo.game.event.impl.ItemActionEvent - - org.apollo.game.event.handler.impl.ItemVerificationHandler - org.apollo.game.event.handler.impl.RemoveEventHandler - org.apollo.game.event.handler.impl.BankEventHandler - - - - org.apollo.game.event.impl.ItemOnObjectEvent - - org.apollo.game.event.handler.impl.ItemOnObjectVerificationHandler - - - - org.apollo.game.event.impl.ClosedInterfaceEvent - - org.apollo.game.event.handler.impl.ClosedInterfaceEventHandler - - - - org.apollo.game.event.impl.EnteredAmountEvent - - org.apollo.game.event.handler.impl.EnteredAmountEventHandler - - - - org.apollo.game.event.impl.ItemOnItemEvent - - org.apollo.game.event.handler.impl.ItemVerificationHandler - org.apollo.game.event.handler.impl.ItemOnItemVerificationHandler - - - - org.apollo.game.event.impl.MagicOnItemEvent - - org.apollo.game.event.handler.impl.ItemVerificationHandler - - - - org.apollo.game.event.impl.NpcActionEvent - - org.apollo.game.event.handler.impl.NpcActionVerificationHandler - - - - org.apollo.game.event.impl.ObjectActionEvent - - org.apollo.game.event.handler.impl.ObjectActionVerificationHandler - - - \ No newline at end of file diff --git a/data/messages.xml b/data/messages.xml new file mode 100644 index 00000000..ddf444dd --- /dev/null +++ b/data/messages.xml @@ -0,0 +1,105 @@ + + + org.apollo.game.message.impl.PlayerDesignMessage + + org.apollo.game.message.handler.impl.PlayerDesignVerificationHandler + org.apollo.game.message.handler.impl.PlayerDesignMessageHandler + + + + org.apollo.game.message.impl.WalkMessage + + org.apollo.game.message.handler.impl.WalkMessageHandler + + + + org.apollo.game.message.impl.ChatMessage + + org.apollo.game.message.handler.impl.ChatVerificationHandler + org.apollo.game.message.handler.impl.ChatMessageHandler + + + + org.apollo.game.message.impl.ButtonMessage + + org.apollo.game.message.handler.impl.DialogueButtonHandler + org.apollo.game.message.handler.impl.BankButtonMessageHandler + + + + org.apollo.game.message.impl.DialogueContinueMessage + + org.apollo.game.message.handler.impl.DialogueContinueMessageHandler + + + + org.apollo.game.message.impl.CommandMessage + + org.apollo.game.message.handler.impl.CommandMessageHandler + + + + org.apollo.game.message.impl.SwitchItemMessage + + org.apollo.game.message.handler.impl.SwitchItemMessageHandler + + + + org.apollo.game.message.impl.ItemOptionMessage + + org.apollo.game.message.handler.impl.ItemVerificationHandler + org.apollo.game.message.handler.impl.EquipItemHandler + + + + org.apollo.game.message.impl.ItemActionMessage + + org.apollo.game.message.handler.impl.ItemVerificationHandler + org.apollo.game.message.handler.impl.RemoveEquippedItemHandler + org.apollo.game.message.handler.impl.BankMessageHandler + + + + org.apollo.game.message.impl.ItemOnObjectMessage + + org.apollo.game.message.handler.impl.ItemOnObjectVerificationHandler + + + + org.apollo.game.message.impl.ClosedInterfaceMessage + + org.apollo.game.message.handler.impl.ClosedInterfaceMessageHandler + + + + org.apollo.game.message.impl.EnteredAmountMessage + + org.apollo.game.message.handler.impl.EnteredAmountMessageHandler + + + + org.apollo.game.message.impl.ItemOnItemMessage + + org.apollo.game.message.handler.impl.ItemVerificationHandler + org.apollo.game.message.handler.impl.ItemOnItemVerificationHandler + + + + org.apollo.game.message.impl.MagicOnItemMessage + + org.apollo.game.message.handler.impl.ItemVerificationHandler + + + + org.apollo.game.message.impl.NpcActionMessage + + org.apollo.game.message.handler.impl.NpcActionVerificationHandler + + + + org.apollo.game.message.impl.ObjectActionMessage + + org.apollo.game.message.handler.impl.ObjectActionVerificationHandler + + + \ No newline at end of file diff --git a/data/plugins/areas/actions.rb b/data/plugins/areas/actions.rb index 37610f06..316c63e6 100644 --- a/data/plugins/areas/actions.rb +++ b/data/plugins/areas/actions.rb @@ -1,6 +1,6 @@ require 'java' -java_import 'org.apollo.game.event.impl.DisplayCrossbonesEvent' +java_import 'org.apollo.game.message.impl.DisplayCrossbonesMessage' java_import 'org.apollo.game.model.entity.Player' AREA_ACTIONS = {} @@ -56,12 +56,12 @@ end area_action :wilderness do on_entry do |player| - player.send(DisplayCrossbonesEvent.new(true)) + player.send(DisplayCrossbonesMessage.new(true)) player.in_wilderness = true end on_exit do |player| - player.send(DisplayCrossbonesEvent.new(false)) + player.send(DisplayCrossbonesMessage.new(false)) player.in_wilderness = false end diff --git a/data/plugins/bank/bank.rb b/data/plugins/bank/bank.rb index c1d1e177..5f23e044 100644 --- a/data/plugins/bank/bank.rb +++ b/data/plugins/bank/bank.rb @@ -29,16 +29,16 @@ class BankAction < DistancedAction end end -# Intercepts the object action event -on :event, :second_object_action do |ctx, player, event| - if event.id == BANK_BOOTH_ID - player.start_action(BankAction.new(player, event.position)) +# Intercepts the object action message +on :message, :second_object_action do |ctx, player, message| + if message.id == BANK_BOOTH_ID + player.start_action(BankAction.new(player, message.position)) ctx.break_handler_chain end end -on :event, :second_npc_action do |ctx, player, event| - npc = $world.npc_repository.get(event.index) +on :message, :second_npc_action do |ctx, player, message| + npc = $world.npc_repository.get(message.index) if BANKER_NPCS.include?(npc.id) player.start_action(BankAction.new(player, npc.position)) ctx.break_handler_chain diff --git a/data/plugins/bootstrap.rb b/data/plugins/bootstrap.rb index 0c08c153..b0e4a12f 100644 --- a/data/plugins/bootstrap.rb +++ b/data/plugins/bootstrap.rb @@ -15,7 +15,7 @@ require 'java' java_import 'org.apollo.game.command.CommandListener' -java_import 'org.apollo.game.event.handler.EventHandler' +java_import 'org.apollo.game.message.handler.MessageHandler' java_import 'org.apollo.game.login.LoginListener' java_import 'org.apollo.game.login.LogoutListener' java_import 'org.apollo.game.model.World' @@ -77,18 +77,18 @@ class ProcLogoutListener end end -# An EventHandler which executes a Proc object with three arguments: the chain -# context, the player and the event. -class ProcEventHandler < EventHandler +# An MessageHandler which executes a Proc object with three arguments: the chain +# context, the player and the message. +class ProcMessageHandler < MessageHandler def initialize(block, option) super() # required (with brackets!), see http://jira.codehaus.org/browse/JRUBY-679 @block = block @option = option end - def handle(ctx, player, event) - if (@option == 0 || @option == event.option) - @block.call(ctx, player, event) + def handle(ctx, player, message) + if (@option == 0 || @option == message.option) + @block.call(ctx, player, message) end end end @@ -127,11 +127,11 @@ def schedule(*args, &block) end end -# Defines some sort of action to take upon an event. The following types of -# event are currently valid: +# Defines some sort of action to take upon an message. The following types of +# message are currently valid: # # * :command -# * :event +# * :message # * :button # * :login # * :logout @@ -140,19 +140,19 @@ end # minimum rights level to use it). The minimum rights level defaults to # STANDARD. The block should have two arguments: player and command. # -# An event takes no arguments. The block should have three arguments: the chain -# context, the player and the event object. +# An message takes no arguments. The block should have three arguments: the chain +# context, the player and the message object. # # A button takes one argument (the id). The block should have one argument: the # player who clicked the button. def on(type, *args, &block) case type when :command then on_command(args, block) - when :event then on_event(args, block) + when :message then on_message(args, block) when :button then on_button(args, block) when :login then on_login(block) when :logout then on_logout(block) - else raise 'Unknown event type.' + else raise 'Unknown message type.' end end @@ -162,39 +162,39 @@ def on_button(args, proc) id = args[0].to_i - on :event, :button do |ctx, player, event| - proc.call(player) if event.widget_id == id + on :message, :button do |ctx, player, message| + proc.call(player) if message.widget_id == id end end -# Defines an action to be taken upon an event. -# The event can either be a symbol with the lower-case underscored class name, or the class itself. -def on_event(args, proc) - raise 'Event must have one or two arguments.' unless (1..2).include?(args.length) +# Defines an action to be taken upon an message. +# The message can either be a symbol with the lower-case underscored class name, or the class itself. +def on_message(args, proc) + raise 'Message must have one or two arguments.' unless (1..2).include?(args.length) numbers = [ 'first', 'second', 'third', 'fourth', 'fifth' ] - event = args[0]; option = 0 + message = args[0]; option = 0 numbers.each_index do |index| number = numbers[index] - if event.to_s.start_with?(number) + if message.to_s.start_with?(number) option = index + 1 - event = event[number.length + 1, event.length].to_sym + message = message[number.length + 1, message.length].to_sym break end end - if event.is_a?(Symbol) - class_name = event.to_s.camelize.concat('Event') - event = Java::JavaClass.for_name("org.apollo.game.event.impl.#{class_name}") + if message.is_a?(Symbol) + class_name = message.to_s.camelize.concat('Message') + message = Java::JavaClass.for_name("org.apollo.game.message.impl.#{class_name}") end - $ctx.add_last_event_handler(event, ProcEventHandler.new(proc, option)) + $ctx.add_last_message_handler(message, ProcMessageHandler.new(proc, option)) end # Defines an action to be taken upon a command. def on_command(args, proc) - raise 'Command event must have one or two arguments.' unless (1..2).include?(args.length) + raise 'Command message must have one or two arguments.' unless (1..2).include?(args.length) rights = args.length == 2 ? args[1] : RIGHTS_STANDARD $ctx.add_command_listener(args[0].to_s, ProcCommandListener.new(rights, proc)) diff --git a/data/plugins/chat/privacy/privacy.rb b/data/plugins/chat/privacy/privacy.rb index c6984f33..4de03b8b 100644 --- a/data/plugins/chat/privacy/privacy.rb +++ b/data/plugins/chat/privacy/privacy.rb @@ -1,12 +1,12 @@ require 'java' java_import 'org.apollo.game.model.setting.PrivacyState' -java_import 'org.apollo.game.event.impl.SendFriendEvent' +java_import 'org.apollo.game.message.impl.SendFriendMessage' -on :event, :privacy_option do |ctx, player, event| - player.chat_privacy = event.chat_privacy - player.friend_privacy = event.friend_privacy - player.trade_privacy = event.trade_privacy +on :message, :privacy_option do |ctx, player, message| + player.chat_privacy = message.chat_privacy + player.friend_privacy = message.friend_privacy + player.trade_privacy = message.trade_privacy - update_friends(player, event.friend_privacy == PrivacyState::OFF ? 0 : player.world_id) + update_friends(player, message.friend_privacy == PrivacyState::OFF ? 0 : player.world_id) end \ No newline at end of file diff --git a/data/plugins/chat/private-messaging/friend.rb b/data/plugins/chat/private-messaging/friend.rb index 0ed2bffc..6a68fa80 100644 --- a/data/plugins/chat/private-messaging/friend.rb +++ b/data/plugins/chat/private-messaging/friend.rb @@ -1,48 +1,48 @@ require 'java' -java_import 'org.apollo.game.event.impl.FriendServerStatusEvent' -java_import 'org.apollo.game.event.impl.SendFriendEvent' +java_import 'org.apollo.game.message.impl.FriendServerStatusMessage' +java_import 'org.apollo.game.message.impl.SendFriendMessage' java_import 'org.apollo.game.model.World' java_import 'org.apollo.game.model.setting.ServerStatus' java_import 'org.apollo.game.model.setting.PrivacyState' java_import 'org.apollo.game.model.entity.Player' -# Processes an add friend event, updating the logged-in status of the player (and the person they added) if necessary. -on :event, :add_friend do |ctx, player, event| - friend_username = event.username +# Processes an add friend message, updating the logged-in status of the player (and the person they added) if necessary. +on :message, :add_friend do |ctx, player, message| + friend_username = message.username player_username = player.username player.add_friend(friend_username) friend = $world.get_player(friend_username) if friend == nil # the friend the player added is offline - player.send(SendFriendEvent.new(friend_username, 0)) + player.send(SendFriendMessage.new(friend_username, 0)) elsif friend.friends_with(player_username) # new friend already has the player added - friend.send(SendFriendEvent.new(player_username, player.world_id)) unless player.friend_privacy == PrivacyState::OFF # player's private chat state is not off, so notify the friend + friend.send(SendFriendMessage.new(player_username, player.world_id)) unless player.friend_privacy == PrivacyState::OFF # player's private chat state is not off, so notify the friend - player.send(SendFriendEvent.new(friend_username, friend.world_id)) unless friend.friend_privacy == PrivacyState::OFF # new friend's private chat state is not off, so notify the player + player.send(SendFriendMessage.new(friend_username, friend.world_id)) unless friend.friend_privacy == PrivacyState::OFF # new friend's private chat state is not off, so notify the player elsif friend.friend_privacy == PrivacyState::ON # new friend doesn't have the player added but their private chat state is on - player.send(SendFriendEvent.new(friend_username, friend.world_id)) # so we can let the player know what world they're on + player.send(SendFriendMessage.new(friend_username, friend.world_id)) # so we can let the player know what world they're on end end -# Processes a remove friend event, updating the logged-in status of the player if necessary. -on :event, :remove_friend do |ctx, player, event| - friend_username = event.username +# Processes a remove friend message, updating the logged-in status of the player if necessary. +on :message, :remove_friend do |ctx, player, message| + friend_username = message.username player_username = player.username player.remove_friend(friend_username) if ($world.is_player_online(friend_username)) friend = $world.get_player(friend_username) - friend.send(SendFriendEvent.new(player_username, 0)) if (friend.friends_with(player_username) && player.friend_privacy != PrivacyState::ON) + friend.send(SendFriendMessage.new(player_username, 0)) if (friend.friends_with(player_username) && player.friend_privacy != PrivacyState::ON) end end # Update the friend server status and send the friend/ignore lists of the player logging in. on :login do |player| - player.send(FriendServerStatusEvent.new(ServerStatus::CONNECTING)) - player.send(IgnoreListEvent.new(player.ignored_usernames)) if player.ignored_usernames.size > 0 + player.send(FriendServerStatusMessage.new(ServerStatus::CONNECTING)) + player.send(IgnoreListMessage.new(player.ignored_usernames)) if player.ignored_usernames.size > 0 username = player.username world = $world @@ -52,10 +52,10 @@ on :login do |player| friend = world.get_player(friend_username) friend_world_id = (friend == nil || !viewable?(friend, username)) ? 0 : friend.world_id - player.send(SendFriendEvent.new(friend_username, friend_world_id)) + player.send(SendFriendMessage.new(friend_username, friend_world_id)) end - player.send(FriendServerStatusEvent.new(ServerStatus::ONLINE)) + player.send(FriendServerStatusMessage.new(ServerStatus::ONLINE)) update_friends(player, player.world_id) end @@ -78,7 +78,7 @@ def update_friends(player, world=0) next if (!other.friends_with(username) || other == player) world = viewable?(player, other.username) ? world : 0 - other.send(SendFriendEvent.new(username, world)) + other.send(SendFriendMessage.new(username, world)) end end diff --git a/data/plugins/chat/private-messaging/ignore.rb b/data/plugins/chat/private-messaging/ignore.rb index 119f3783..212df8d3 100644 --- a/data/plugins/chat/private-messaging/ignore.rb +++ b/data/plugins/chat/private-messaging/ignore.rb @@ -1,9 +1,9 @@ -on :event, :add_ignore do |ctx, player, event| - username = event.username +on :message, :add_ignore do |ctx, player, message| + username = message.username player.add_ignore(username) end -on :event, :remove_ignore do |ctx, player, event| - username = event.username +on :message, :remove_ignore do |ctx, player, message| + username = message.username player.remove_ignore(username) end \ No newline at end of file diff --git a/data/plugins/chat/private-messaging/messaging.rb b/data/plugins/chat/private-messaging/messaging.rb index 50e42f4d..5773212d 100644 --- a/data/plugins/chat/private-messaging/messaging.rb +++ b/data/plugins/chat/private-messaging/messaging.rb @@ -1,12 +1,12 @@ require 'java' -java_import 'org.apollo.game.event.impl.ForwardPrivateMessageEvent' +java_import 'org.apollo.game.message.impl.ForwardPrivateChatMessage' java_import 'org.apollo.game.model.World' java_import 'org.apollo.game.model.setting.PrivacyState' -on :event, :private_message do |ctx, player, event| - friend = $world.get_player(event.username) - friend.send(ForwardPrivateMessageEvent.new(player.username, player.privilege_level, event.compressed_message)) if interaction_permitted(player, friend) +on :message, :private_message do |ctx, player, message| + friend = $world.get_player(message.username) + friend.send(ForwardPrivateChatMessage.new(player.username, player.privilege_level, message.compressed_message)) if interaction_permitted(player, friend) end # Checks if the sender is permitted to interact with the friend they have added: diff --git a/data/plugins/cmd/animate/animate.rb b/data/plugins/cmd/animate/animate.rb index b3dc5e24..890a3d89 100644 --- a/data/plugins/cmd/animate/animate.rb +++ b/data/plugins/cmd/animate/animate.rb @@ -22,6 +22,5 @@ on :command, :graphic, RIGHTS_MOD do |player, command| return end - player.send(DisplayCrossbonesEvent.new(true )) player.play_graphic(Graphic.new(args[0].to_i)) end \ No newline at end of file diff --git a/data/plugins/cmd/messaging/filter.rb b/data/plugins/cmd/messaging/filter.rb index 951e80ac..ddeacc96 100644 --- a/data/plugins/cmd/messaging/filter.rb +++ b/data/plugins/cmd/messaging/filter.rb @@ -1,8 +1,5 @@ require 'java' -java_import 'org.apollo.game.event.impl.ForwardPrivateMessageEvent' -java_import 'org.apollo.game.model.World' - on :command, :filter do |player, command| player.send_message('Your message filter is now ' + (player.toggle_message_filter ? 'enabled.' : 'disabled.')) end \ No newline at end of file diff --git a/data/plugins/consumables/consumable.rb b/data/plugins/consumables/consumable.rb index 56275417..6d171d96 100644 --- a/data/plugins/consumables/consumable.rb +++ b/data/plugins/consumables/consumable.rb @@ -53,11 +53,11 @@ class ConsumeAction < Action end -# Intercepts the first item option event and consumes the consumable, if necessary. -on :event, :first_item_option do |ctx, player, event| - consumable = CONSUMABLES[event.id] +# Intercepts the first item option message and consumes the consumable, if necessary. +on :message, :first_item_option do |ctx, player, message| + consumable = CONSUMABLES[message.id] unless consumable == nil - player.start_action(ConsumeAction.new(player, event.slot, consumable)) + player.start_action(ConsumeAction.new(player, message.slot, consumable)) ctx.break_handler_chain end end \ No newline at end of file diff --git a/data/plugins/dialogue/dialogue.rb b/data/plugins/dialogue/dialogue.rb deleted file mode 100644 index e8a09f24..00000000 --- a/data/plugins/dialogue/dialogue.rb +++ /dev/null @@ -1,16 +0,0 @@ - -# Intercepts the first npc action event. -on :event, :npc_action do |ctx, player, event| - if (event.option == 1) - # TODO check if player is not in pvp area - - end -end - -def dialogue(name, &block) - -end - -dialogue :banker_introduction do - # -end \ No newline at end of file diff --git a/data/plugins/dummy/dummy.rb b/data/plugins/dummy/dummy.rb index ec91f5c5..f0158b73 100644 --- a/data/plugins/dummy/dummy.rb +++ b/data/plugins/dummy/dummy.rb @@ -45,8 +45,8 @@ class DummyAction < DistancedAction end end -on :event, :second_object_action do |ctx, player, event| - if (event.id == DUMMY_ID) - player.start_action(DummyAction.new(player, event.position)) +on :message, :second_object_action do |ctx, player, message| + if (message.id == DUMMY_ID) + player.start_action(DummyAction.new(player, message.position)) end end \ No newline at end of file diff --git a/data/plugins/emote-tab/emote-tab.rb b/data/plugins/emote-tab/emote-tab.rb index 12ed5231..30c4286f 100644 --- a/data/plugins/emote-tab/emote-tab.rb +++ b/data/plugins/emote-tab/emote-tab.rb @@ -11,9 +11,9 @@ ANIMATIONS = { 666 => Animation::GLASS_WALL, 168 => Animation::YES, 13383 => Animation::GOBLIN_BOW } -# Intercept the ButtonEvent -on :event, :button do |ctx, player, event| - anim = ANIMATIONS[event.widget_id] +# Intercept the button message. +on :message, :button do |ctx, player, message| + anim = ANIMATIONS[message.widget_id] unless anim == nil player.play_animation(anim) ctx.break_handler_chain diff --git a/data/plugins/skill/herblore/herb.rb b/data/plugins/skill/herblore/herb.rb index 0f01fb49..09e5c929 100644 --- a/data/plugins/skill/herblore/herb.rb +++ b/data/plugins/skill/herblore/herb.rb @@ -65,7 +65,7 @@ class HerbIdentificationAction < Action end end -# Appends a herb to the InventoryItemEvent interception. +# Appends a herb to the InventoryItemMessage interception. def append_herb(item_id, unidentified, level, experience) herb = Herb.new(item_id, unidentified, level, experience) append_herblore_item(herb, unidentified) diff --git a/data/plugins/skill/herblore/herblore.rb b/data/plugins/skill/herblore/herblore.rb index 6b7d474d..d47c0cdc 100644 --- a/data/plugins/skill/herblore/herblore.rb +++ b/data/plugins/skill/herblore/herblore.rb @@ -3,7 +3,7 @@ require 'java' -java_import 'org.apollo.game.event.impl.SetWidgetItemModelEvent' +java_import 'org.apollo.game.message.impl.SetWidgetItemModelMessage' java_import 'org.apollo.game.model.entity.Skill' HERBLORE_DIALOGUE = 4429 @@ -25,15 +25,15 @@ module HerbloreMethod end end -# The ItemOnItemEvent handler for all Herblore-related functions. -on :event, :item_on_item do |ctx, player, event| - primary = event.id - secondary = event.target_id +# The ItemOnItemMessage handler for all Herblore-related functions. +on :message, :item_on_item do |ctx, player, message| + primary = message.id + secondary = message.target_id hash = HERBLORE_ITEM_ON_ITEM[primary] if hash == nil - secondary = event.id - primary = event.target_id + secondary = message.id + primary = message.target_id hash = HERBLORE_ITEM_ON_ITEM[primary] end @@ -46,19 +46,19 @@ on :event, :item_on_item do |ctx, player, event| end end -# The ItemOptionEvent handler for all Herblore-related functions. -on :event, :first_item_option do |ctx, player, event| - id = event.id +# The ItemOptionMessage handler for all Herblore-related functions. +on :message, :first_item_option do |ctx, player, message| + id = message.id method = HERBLORE_ITEM[id] if method != nil - method.invoke(player, id, event.slot) + method.invoke(player, id, message.slot) ctx.break_handler_chain end method = DRINK_ITEM[id] if method != nil - method.invoke(player, id, event.slot) + method.invoke(player, id, message.slot) ctx.break_handler_chain end end @@ -83,7 +83,7 @@ def check_slot(player, slot, id, amount = 1) end # Utility method for checking if a player's Herblore (maximum) level is at a required height. Also informs the player if this is not the case with use of the action -# variable, like so: "You need a Herblore level of at least #{required.to_s} to #{action}." +# variable, like so: "You need a Herblore level of at least #{required.to_s} to #{action}." def check_skill(player, required, action) if required > player.skill_set.skill(HERBLORE_SKILL_ID).current_level player.send_message("You need a Herblore level of at least #{required} to #{action}.") @@ -94,6 +94,6 @@ end # Opens a 'make' dialogue for the specified player, displaying the specified item. Optionally, a listener can be used for the dialogue. def open_dialogue(player, item, listener = nil) - player.send(SetWidgetItemModelEvent.new(1746, item, 170)) + player.send(SetWidgetItemModelMessage.new(1746, item, 170)) player.interface_set.open_dialogue(listener, HERBLORE_DIALOGUE) end \ No newline at end of file diff --git a/data/plugins/skill/herblore/ingredient.rb b/data/plugins/skill/herblore/ingredient.rb index 2b01f792..c25c4438 100644 --- a/data/plugins/skill/herblore/ingredient.rb +++ b/data/plugins/skill/herblore/ingredient.rb @@ -223,11 +223,11 @@ class GrindingAction < Action end end -# Appends a grinded ingredient to the ItemOnItemEvent handler interception. +# Appends a ground ingredient to the ItemOnItemMessage handler interception. def append_ground(id, raw) - grinded = GroundIngredient.new(id, raw) - append_herblore_item(grinded, PESTLE_MORTAR, raw) - return grinded + ground = GroundIngredient.new(id, raw) + append_herblore_item(ground, PESTLE_MORTAR, raw) + return ground end # Normal ingredients diff --git a/data/plugins/skill/herblore/potion.rb b/data/plugins/skill/herblore/potion.rb index ac368b32..1603f0a1 100644 --- a/data/plugins/skill/herblore/potion.rb +++ b/data/plugins/skill/herblore/potion.rb @@ -310,14 +310,14 @@ class FinishedMixingAction < MixingAction end end -# Appends a finished potion to the ItemOnItemEvent handling interception. +# Appends a finished potion to the ItemOnItemMessage handling interception. def append_finished_potion(item, unfinished, ingredient, level, experience) potion = FinishedPotion.new(item, [ unfinished, ingredient ], level, experience) append_herblore_item(potion, unfinished.item_id, ingredient.item_id) return potion end -# Appends an unfinished potion to the ItemOnItemEvent handling interception. +# Appends an unfinished potion to the ItemOnItemMessage handling interception. def append_unfinished_potion(item, herb, level) potion = UnfinishedPotion.new(item, herb, level) append_herblore_item(potion, herb.item_id, WATER_VIAL_ID) diff --git a/data/plugins/skill/magic/magic.rb b/data/plugins/skill/magic/magic.rb index 68b9619b..0a08b5a6 100644 --- a/data/plugins/skill/magic/magic.rb +++ b/data/plugins/skill/magic/magic.rb @@ -1,11 +1,11 @@ require 'java' java_import 'org.apollo.game.action.Action' -java_import 'org.apollo.game.event.impl.DisplayTabInterfaceEvent' +java_import 'org.apollo.game.message.impl.DisplayTabInterfaceMessage' java_import 'org.apollo.game.model.entity.EquipmentConstants' java_import 'org.apollo.game.model.entity.Skill' -DISPLAY_SPELLBOOK = DisplayTabInterfaceEvent.new(6) +DISPLAY_SPELLBOOK = DisplayTabInterfaceMessage.new(6) class Spell attr_reader :level, :elements, :experience @@ -119,31 +119,31 @@ class ItemSpellAction < SpellAction end -# Intercepts the magic on item event. -on :event, :magic_on_item do |ctx, player, event| - spell = event.spell_id +# Intercepts the magic on item message. +on :message, :magic_on_item do |ctx, player, message| + spell = message.spell_id alch = ALCHEMY_SPELLS[spell] if alch != nil - slot = event.slot + slot = message.slot item = player.inventory.get(slot) player.start_action(AlchemyAction.new(player, alch, slot, item)) ctx.break_handler_chain return end - ench = ENCHANT_SPELLS[event.id] + ench = ENCHANT_SPELLS[message.id] if ench != nil and ench.button == spell - slot = event.slot + slot = message.slot item = player.inventory.get(slot) player.start_action(EnchantAction.new(player, ench, slot, item, ENCHANT_ITEMS[item.id])) ctx.break_handler_chain end end -# Intercepts the button event -on :event, :button do |ctx, player, event| - button = event.widget_id +# Intercepts the button message +on :message, :button do |ctx, player, message| + button = message.widget_id tele = TELEPORT_SPELLS[button] if tele != nil diff --git a/data/plugins/skill/mining/mining.rb b/data/plugins/skill/mining/mining.rb index 425f57c9..41a12b4b 100644 --- a/data/plugins/skill/mining/mining.rb +++ b/data/plugins/skill/mining/mining.rb @@ -141,18 +141,18 @@ class ProspectingAction < DistancedAction end end -on :event, :first_object_action do |ctx, mob, event| - ore = ORES[event.id] +on :message, :first_object_action do |ctx, mob, message| + ore = ORES[message.id] if ore != nil - mob.start_action(MiningAction.new(mob, event.position, ore)) + mob.start_action(MiningAction.new(mob, message.position, ore)) end end -on :event, :second_object_action do |ctx, mob, event| - ore = ORES[event.id] +on :message, :second_object_action do |ctx, mob, message| + ore = ORES[message.id] if ore != nil - mob.start_action(ProspectingAction.new(mob, event.position, ore)) - elsif EXPIRED_ORES[event.id] != nil - mob.start_action(ExpiredProspectingAction.new(mob, event.position)) + mob.start_action(ProspectingAction.new(mob, message.position, ore)) + elsif EXPIRED_ORES[message.id] != nil + mob.start_action(ExpiredProspectingAction.new(mob, message.position)) end end \ No newline at end of file diff --git a/data/plugins/skill/prayer/bury.rb b/data/plugins/skill/prayer/bury.rb index 1f27c1e1..a60eeab4 100644 --- a/data/plugins/skill/prayer/bury.rb +++ b/data/plugins/skill/prayer/bury.rb @@ -42,11 +42,11 @@ class BuryBoneAction < Action end -# Intercepts the first item option event, -on :event, :first_item_option do |ctx, player, event| - bone = BONES[event.id] +# Intercepts the first item option message, +on :message, :first_item_option do |ctx, player, message| + bone = BONES[message.id] unless bone == nil - player.start_action(BuryBoneAction.new(player, event.slot, bone)) + player.start_action(BuryBoneAction.new(player, message.slot, bone)) ctx.break_handler_chain end end diff --git a/data/plugins/skill/runecraft/altar.rb b/data/plugins/skill/runecraft/altar.rb index cd09d378..d88d4a74 100644 --- a/data/plugins/skill/runecraft/altar.rb +++ b/data/plugins/skill/runecraft/altar.rb @@ -23,19 +23,19 @@ class Altar end -# Intercepts the item on object event. -on :event, :item_on_object do |ctx, player, event| - talisman = TALISMANS[event.id]; altar = ENTRANCE_ALTARS[event.object_id] +# Intercepts the item on object message. +on :message, :item_on_object do |ctx, player, message| + talisman = TALISMANS[message.id]; altar = ENTRANCE_ALTARS[message.object_id] if (talisman != nil && altar != nil) - player.start_action(TeleportAction.new(player, event.position, 2, altar.entrance_position)) + player.start_action(TeleportAction.new(player, message.position, 2, altar.entrance_position)) ctx.break_handler_chain end end -# Intercepts the first object action event. -on :event, :object_action do |ctx, player, event| - if (event.option == 1) - object_id = event.id +# Intercepts the first object action message. +on :message, :object_action do |ctx, player, message| + if (message.option == 1) + object_id = message.id if (altar = PORTALS[object_id]) != nil # Get the altar associated with this exit portal. player.start_action(TeleportAction.new(player, altar.entrance_position, 1, altar.exit_position)) ctx.break_handler_chain diff --git a/data/plugins/skill/runecraft/talisman.rb b/data/plugins/skill/runecraft/talisman.rb index 91b4e455..13efe474 100644 --- a/data/plugins/skill/runecraft/talisman.rb +++ b/data/plugins/skill/runecraft/talisman.rb @@ -29,9 +29,9 @@ def append_talisman(hash) TALISMANS[id] = Talisman.new(altar_position) end -# Intercepts the item option event. -on :event, :fourth_item_option do |ctx, player, event| - talisman = TALISMANS[event.id] +# Intercepts the item option message. +on :message, :fourth_item_option do |ctx, player, message| + talisman = TALISMANS[message.id] if (talisman != nil) player.send_message(talisman.get_message(player.position)) ctx.break_handler_chain diff --git a/data/plugins/skill/runecraft/tiara.rb b/data/plugins/skill/runecraft/tiara.rb index 5ce4fb41..02df9dbd 100644 --- a/data/plugins/skill/runecraft/tiara.rb +++ b/data/plugins/skill/runecraft/tiara.rb @@ -1,6 +1,6 @@ require 'java' -java_import 'org.apollo.game.event.impl.ConfigEvent' +java_import 'org.apollo.game.message.impl.ConfigMessage' java_import 'org.apollo.game.model.entity.EquipmentConstants' java_import 'org.apollo.game.action.DistancedAction' @@ -26,13 +26,13 @@ class Tiara end def send_config(player) - player.send(ConfigEvent.new(CHANGE_ALTAR_OBJECT_CONFIG, 1 << @bitshift)) + player.send(ConfigMessage.new(CHANGE_ALTAR_OBJECT_CONFIG, 1 << @bitshift)) end end private def send_empty_config(player) - player.send(ConfigEvent.new(CHANGE_ALTAR_OBJECT_CONFIG, 0)) + player.send(ConfigMessage.new(CHANGE_ALTAR_OBJECT_CONFIG, 0)) end # Appends a tiara to the list. @@ -43,7 +43,7 @@ def append_tiara(hash) TIARAS_BY_TALISMAN[talisman] = TIARAS_BY_ID[tiara_id] = TIARAS_BY_ALTAR[altar] = Tiara.new(tiara_id, altar, talisman, bitshift, experience) end -#Set the config upon login +# Set the config upon login on :login do |player| hat = player.equipment.get(EquipmentConstants::HAT) if hat != nil @@ -56,45 +56,45 @@ on :login do |player| send_empty_config(player) end -#Accesses the altar with 1 click when wielding the correct tiara. -on :event, :second_object_action do |ctx, player, event| - object_id = event.id +# Access the altar with 1 click when wielding the correct tiara. +on :message, :second_object_action do |ctx, player, message| + object_id = message.id tiara = TIARAS_BY_ALTAR[object_id] if (tiara != nil) hat = player.equipment.get(EquipmentConstants::HAT) if (hat != nil && hat.id == tiara.tiara_id) altar = ENTRANCE_ALTARS[tiara.altar] if (altar != nil) - player.start_action(TeleportAction.new(player, event.position, 2, altar.entrance_position)) + player.start_action(TeleportAction.new(player, message.position, 2, altar.entrance_position)) end ctx.break_handler_chain end end end -#Equip tiara -on :event, :second_item_option do |ctx, player, event| - tiara = TIARAS_BY_ID[event.id] +# Equip tiara +on :message, :second_item_option do |ctx, player, message| + tiara = TIARAS_BY_ID[message.id] if (tiara != nil) tiara.send_config(player) ctx.break_handler_chain end end -#Unequip tiara -on :event, :first_item_action do |ctx, player, event| - tiara = TIARAS_BY_ID[event.id] +# Unequip tiara +on :message, :first_item_action do |ctx, player, message| + tiara = TIARAS_BY_ID[message.id] if (tiara != nil) send_empty_config(player) ctx.break_handler_chain end end -#Create tiara -on :event, :item_on_object do |ctx, player, event| - tiara= TIARAS_BY_TALISMAN[event.id]; altar = CRAFTING_ALTARS[event.object_id] +#C reate tiara +on :message, :item_on_object do |ctx, player, message| + tiara= TIARAS_BY_TALISMAN[message.id]; altar = CRAFTING_ALTARS[message.object_id] if (tiara != nil && altar != nil) - player.start_action(CreateTiaraAction.new(player, event.position, tiara, altar)) + player.start_action(CreateTiaraAction.new(player, message.position, tiara, altar)) ctx.break_handler_chain end end diff --git a/src/org/apollo/game/GameConstants.java b/src/org/apollo/game/GameConstants.java index 38d186c7..270427d2 100644 --- a/src/org/apollo/game/GameConstants.java +++ b/src/org/apollo/game/GameConstants.java @@ -8,9 +8,9 @@ package org.apollo.game; public final class GameConstants { /** - * The maximum events per pulse per session. + * The maximum amount of messages to process per pulse (per session). */ - public static final int EVENTS_PER_PULSE = 10; + public static final int MESSAGES_PER_PULSE = 10; /** * The delay between consecutive pulses, in milliseconds. diff --git a/src/org/apollo/game/GameService.java b/src/org/apollo/game/GameService.java index ecee01b0..654edb10 100644 --- a/src/org/apollo/game/GameService.java +++ b/src/org/apollo/game/GameService.java @@ -10,12 +10,12 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apollo.Service; -import org.apollo.game.event.handler.chain.EventHandlerChainGroup; +import org.apollo.game.message.handler.MessageHandlerChainGroup; import org.apollo.game.model.World; import org.apollo.game.model.World.RegistrationStatus; import org.apollo.game.model.entity.Player; import org.apollo.game.sync.ClientSynchronizer; -import org.apollo.io.EventHandlerChainParser; +import org.apollo.io.MessageHandlerChainParser; import org.apollo.login.LoginService; import org.apollo.net.session.GameSession; import org.apollo.util.NamedThreadFactory; @@ -37,9 +37,9 @@ public final class GameService extends Service { private static final int UNREGISTERS_PER_CYCLE = 50; /** - * The {@link EventHandlerChainGroup}. + * The {@link MessageHandlerChainGroup}. */ - private EventHandlerChainGroup chainGroup; + private MessageHandlerChainGroup chainGroup; /** * A queue of players to remove. @@ -78,11 +78,11 @@ public final class GameService extends Service { } /** - * Gets the event handler chains. + * Gets the message handler chains. * - * @return The event handler chains. + * @return The message handler chains. */ - public EventHandlerChainGroup getEventHandlerChains() { + public MessageHandlerChainGroup getMessageHandlerChains() { return chainGroup; } @@ -92,14 +92,14 @@ public final class GameService extends Service { * @throws IOException If there is an error with the file (e.g. does not exist, cannot be read, does not contain * valid nodes). * @throws SAXException If there is an error parsing the file. - * @throws ClassNotFoundException If an event handler could not be found. - * @throws InstantiationException If an event handler could not be instantiated. - * @throws IllegalAccessException If an event handler could not be accessed. + * @throws ClassNotFoundException If a message handler could not be found. + * @throws InstantiationException If a message handler could not be instantiated. + * @throws IllegalAccessException If a message handler could not be accessed. */ private void init() throws IOException, SAXException, ClassNotFoundException, InstantiationException, IllegalAccessException { - try (InputStream is = new FileInputStream("data/events.xml")) { - EventHandlerChainParser chainGroupParser = new EventHandlerChainParser(is); + try (InputStream is = new FileInputStream("data/messages.xml")) { + MessageHandlerChainParser chainGroupParser = new MessageHandlerChainParser(is); chainGroup = chainGroupParser.parse(); } @@ -139,7 +139,7 @@ public final class GameService extends Service { for (Player p : world.getPlayerRepository()) { GameSession session = p.getSession(); if (session != null) { - session.handlePendingEvents(chainGroup); + session.handlePendingMessages(chainGroup); } } diff --git a/src/org/apollo/game/command/CommandDispatcher.java b/src/org/apollo/game/command/CommandDispatcher.java index be3015db..72302abc 100644 --- a/src/org/apollo/game/command/CommandDispatcher.java +++ b/src/org/apollo/game/command/CommandDispatcher.java @@ -13,7 +13,7 @@ import org.apollo.game.model.entity.Player; public final class CommandDispatcher { /** - * A map of event listeners. + * A map of command strings to command listeners. */ private final Map listeners = new HashMap(); diff --git a/src/org/apollo/game/event/Event.java b/src/org/apollo/game/event/Event.java deleted file mode 100644 index fd6530d8..00000000 --- a/src/org/apollo/game/event/Event.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.apollo.game.event; - -/** - * Represents an event that can occur in the game world. - * - * @author Graham - */ -public abstract class Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/EventHandler.java b/src/org/apollo/game/event/handler/EventHandler.java deleted file mode 100644 index b4cdc5b5..00000000 --- a/src/org/apollo/game/event/handler/EventHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.game.event.handler; - -import org.apollo.game.event.Event; -import org.apollo.game.model.entity.Player; - -/** - * A class which handles events. - * - * @author Graham - * @param The type of event this class handles. - */ -public abstract class EventHandler { - - /** - * Handles an event. - * - * @param ctx The context. - * @param player The player. - * @param event The event. - */ - public abstract void handle(EventHandlerContext ctx, Player player, E event); - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/EventHandlerContext.java b/src/org/apollo/game/event/handler/EventHandlerContext.java deleted file mode 100644 index 3720fe27..00000000 --- a/src/org/apollo/game/event/handler/EventHandlerContext.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.apollo.game.event.handler; - -import org.apollo.game.event.handler.chain.EventHandlerChain; - -/** - * Provides operations specific to an {@link EventHandler} in an {@link EventHandlerChain}. - * - * @author Graham - */ -public abstract class EventHandlerContext { - - /** - * Breaks the handler chain. - */ - public abstract void breakHandlerChain(); - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/chain/EventHandlerChain.java b/src/org/apollo/game/event/handler/chain/EventHandlerChain.java deleted file mode 100644 index d67c443a..00000000 --- a/src/org/apollo/game/event/handler/chain/EventHandlerChain.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.apollo.game.event.handler.chain; - -import org.apollo.game.event.Event; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.model.entity.Player; - -/** - * A chain of event handlers. - * - * @author Graham - * @param The type of event the handlers in this chain handle. - */ -public final class EventHandlerChain { - - /** - * The handlers. - */ - private EventHandler[] handlers; - - /** - * Creates the event handler chain. - * - * @param handlers The handlers. - */ - @SafeVarargs - public EventHandlerChain(EventHandler... handlers) { - this.handlers = handlers; - } - - /** - * Dynamically adds an event handler to the end of the chain. - * - * @param handler The handler. - */ - @SuppressWarnings("unchecked") - public void addLast(EventHandler handler) { - EventHandler[] old = handlers; - handlers = new EventHandler[old.length + 1]; - System.arraycopy(old, 0, handlers, 0, old.length); - handlers[old.length] = handler; - } - - /** - * Handles the event, passing it down the chain until the chain is broken or the event reaches the end of the chain. - * - * @param player The player. - * @param event The event. - */ - public void handle(Player player, E event) { - final boolean[] running = new boolean[1]; - running[0] = true; - - EventHandlerContext ctx = new EventHandlerContext() { - - @Override - public void breakHandlerChain() { - running[0] = false; - } - }; - - for (EventHandler handler : handlers) { - handler.handle(ctx, player, event); - if (!running[0]) { - break; - } - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/chain/EventHandlerChainGroup.java b/src/org/apollo/game/event/handler/chain/EventHandlerChainGroup.java deleted file mode 100644 index f3a8bf5e..00000000 --- a/src/org/apollo/game/event/handler/chain/EventHandlerChainGroup.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.apollo.game.event.handler.chain; - -import java.util.Map; - -import org.apollo.game.event.Event; - -/** - * A group of {@link EventHandlerChain}s classified by the {@link Event} type. - * - * @author Graham - */ -public final class EventHandlerChainGroup { - - /** - * The map of event classes to event handler chains. - */ - private final Map, EventHandlerChain> chains; - - /** - * Creates the event handler chain group. - * - * @param chains The chains map. - */ - public EventHandlerChainGroup(Map, EventHandlerChain> chains) { - this.chains = chains; - } - - /** - * Gets an {@link EventHandlerChain} from this group. - * - * @param The type of event. - * @param clazz The event class. - * @return The {@link EventHandlerChain} if one was found, {@code null} otherwise. - */ - @SuppressWarnings("unchecked") - public EventHandlerChain getChain(Class clazz) { - return (EventHandlerChain) chains.get(clazz); - } - - /** - * Registers an {@link EventHandlerChain} associated with the specified {@link Class} to this group. - * - * @param clazz The event class. - * @param chain The event handler chain. - */ - public void register(Class clazz, EventHandlerChain chain) { - chains.put(clazz, chain); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/chain/package-info.java b/src/org/apollo/game/event/handler/chain/package-info.java deleted file mode 100644 index 73aa7f14..00000000 --- a/src/org/apollo/game/event/handler/chain/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains classes related to the chaining of event handlers. - */ -package org.apollo.game.event.handler.chain; \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java b/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java deleted file mode 100644 index 37623a06..00000000 --- a/src/org/apollo/game/event/handler/impl/BankButtonEventHandler.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ButtonEvent; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} that responds to {@link ButtonEvent}s for withdrawing items as notes. - * - * @author Graham - */ -public final class BankButtonEventHandler extends EventHandler { - - /** - * The withdraw as item button id. - */ - private static final int WITHDRAW_AS_ITEM = 5387; - - /** - * The withdraw as note button id. - */ - private static final int WITHDRAW_AS_NOTE = 5386; - - @Override - public void handle(EventHandlerContext ctx, Player player, ButtonEvent event) { - if (event.getWidgetId() == WITHDRAW_AS_ITEM) { - player.setWithdrawingNotes(false); - } else if (event.getWidgetId() == WITHDRAW_AS_NOTE) { - player.setWithdrawingNotes(true); - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/BankEventHandler.java b/src/org/apollo/game/event/handler/impl/BankEventHandler.java deleted file mode 100644 index 8f5199c9..00000000 --- a/src/org/apollo/game/event/handler/impl/BankEventHandler.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ItemActionEvent; -import org.apollo.game.model.entity.Player; -import org.apollo.game.model.inter.bank.BankConstants; -import org.apollo.game.model.inter.bank.BankDepositEnterAmountListener; -import org.apollo.game.model.inter.bank.BankUtils; -import org.apollo.game.model.inter.bank.BankWithdrawEnterAmountListener; - -/** - * An {@link EventHandler} that handles withdrawing and depositing items from/to a player's bank. - * - * @author Graham - */ -public final class BankEventHandler extends EventHandler { - - /** - * Converts an option to an amount. - * - * @param option The option. - * @return The amount. - * @throws IllegalArgumentException If the option is invalid. - */ - private static final int optionToAmount(int option) { - switch (option) { - case 1: - return 1; - case 2: - return 5; - case 3: - return 10; - case 4: - return Integer.MAX_VALUE; - case 5: - return -1; - } - throw new IllegalArgumentException("Invalid option supplied."); - } - - /** - * Handles a deposit action. - * - * @param ctx The event handler context. - * @param player The player. - * @param event The event. - */ - private void deposit(EventHandlerContext ctx, Player player, ItemActionEvent event) { - int amount = optionToAmount(event.getOption()); - if (amount == -1) { - player.getInterfaceSet().openEnterAmountDialogue( - new BankDepositEnterAmountListener(player, event.getSlot(), event.getId())); - } else if (!BankUtils.deposit(player, event.getSlot(), event.getId(), amount)) { - ctx.breakHandlerChain(); - } - } - - @Override - public void handle(EventHandlerContext ctx, Player player, ItemActionEvent event) { - if (player.getInterfaceSet().contains(BankConstants.BANK_WINDOW_ID)) { - if (event.getInterfaceId() == BankConstants.SIDEBAR_INVENTORY_ID) { - deposit(ctx, player, event); - } else if (event.getInterfaceId() == BankConstants.BANK_INVENTORY_ID) { - withdraw(ctx, player, event); - } - } - } - - /** - * Handles a withdraw action. - * - * @param ctx The event handler context. - * @param player The player. - * @param event The event. - */ - private void withdraw(EventHandlerContext ctx, Player player, ItemActionEvent event) { - int amount = optionToAmount(event.getOption()); - if (amount == -1) { - player.getInterfaceSet().openEnterAmountDialogue( - new BankWithdrawEnterAmountListener(player, event.getSlot(), event.getId())); - } else if (!BankUtils.withdraw(player, event.getSlot(), event.getId(), amount)) { - ctx.breakHandlerChain(); - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/ChatEventHandler.java b/src/org/apollo/game/event/handler/impl/ChatEventHandler.java deleted file mode 100644 index 5cde13f9..00000000 --- a/src/org/apollo/game/event/handler/impl/ChatEventHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ChatEvent; -import org.apollo.game.model.entity.Player; -import org.apollo.game.sync.block.SynchronizationBlock; - -/** - * An {@link EventHandler} that broadcasts public chat messages. - * - * @author Graham - */ -public final class ChatEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, ChatEvent event) { - player.getBlockSet().add(SynchronizationBlock.createChatBlock(player, event)); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java b/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java deleted file mode 100644 index b750d6c8..00000000 --- a/src/org/apollo/game/event/handler/impl/ChatVerificationHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ChatEvent; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} that verifies {@link ChatEvent}s. - * - * @author Graham - */ -public final class ChatVerificationHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, ChatEvent event) { - int color = event.getTextColor(); - int effects = event.getTextEffects(); - if (color < 0 || color > 11 || effects < 0 || effects > 5) { - ctx.breakHandlerChain(); - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/ClosedInterfaceEventHandler.java b/src/org/apollo/game/event/handler/impl/ClosedInterfaceEventHandler.java deleted file mode 100644 index 467b12f1..00000000 --- a/src/org/apollo/game/event/handler/impl/ClosedInterfaceEventHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ClosedInterfaceEvent; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} for the {@link ClosedInterfaceEvent}. - * - * @author Graham - */ -public final class ClosedInterfaceEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, ClosedInterfaceEvent event) { - player.getInterfaceSet().interfaceClosed(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/CommandEventHandler.java b/src/org/apollo/game/event/handler/impl/CommandEventHandler.java deleted file mode 100644 index 837c5c08..00000000 --- a/src/org/apollo/game/event/handler/impl/CommandEventHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.command.Command; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.CommandEvent; -import org.apollo.game.model.World; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} that dispatches {@link CommandEvent}s. - * - * @author Graham - */ -public final class CommandEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, CommandEvent event) { - String[] components = event.getCommand().split(" "); - String name = components[0]; - - String[] arguments = new String[components.length - 1]; - System.arraycopy(components, 1, arguments, 0, arguments.length); - - Command command = new Command(name, arguments); - World.getWorld().getCommandDispatcher().dispatch(player, command); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/DialogueButtonHandler.java b/src/org/apollo/game/event/handler/impl/DialogueButtonHandler.java deleted file mode 100644 index d7d56324..00000000 --- a/src/org/apollo/game/event/handler/impl/DialogueButtonHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ButtonEvent; -import org.apollo.game.model.entity.Player; -import org.apollo.game.model.inter.InterfaceType; - -/** - * An {@link EventHandler} which intercepts button clicks on dialogues, and forwards the event to the current listener. - * - * @author Chris Fletcher - */ -public final class DialogueButtonHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, ButtonEvent event) { - if (player.getInterfaceSet().contains(InterfaceType.DIALOGUE)) { - boolean breakChain = player.getInterfaceSet().buttonClicked(event.getWidgetId()); - - if (breakChain) { - ctx.breakHandlerChain(); - } - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/DialogueContinueEventHandler.java b/src/org/apollo/game/event/handler/impl/DialogueContinueEventHandler.java deleted file mode 100644 index 804cae2a..00000000 --- a/src/org/apollo/game/event/handler/impl/DialogueContinueEventHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.DialogueContinueEvent; -import org.apollo.game.model.entity.Player; -import org.apollo.game.model.inter.InterfaceType; - -/** - * An {@link EventHandler} for the {@link DialogueContinueEvent}. - * - * @author Chris Fletcher - */ -public final class DialogueContinueEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, DialogueContinueEvent event) { - if (player.getInterfaceSet().contains(InterfaceType.DIALOGUE)) { - player.getInterfaceSet().continueRequested(); - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/EnteredAmountEventHandler.java b/src/org/apollo/game/event/handler/impl/EnteredAmountEventHandler.java deleted file mode 100644 index 5984f483..00000000 --- a/src/org/apollo/game/event/handler/impl/EnteredAmountEventHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.EnteredAmountEvent; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} for the {@link EnteredAmountEvent}. - * - * @author Graham - */ -public final class EnteredAmountEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, EnteredAmountEvent event) { - player.getInterfaceSet().enteredAmount(event.getAmount()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/ItemOnObjectVerificationHandler.java b/src/org/apollo/game/event/handler/impl/ItemOnObjectVerificationHandler.java deleted file mode 100644 index 0f7470ae..00000000 --- a/src/org/apollo/game/event/handler/impl/ItemOnObjectVerificationHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ItemOnObjectEvent; -import org.apollo.game.model.Item; -import org.apollo.game.model.entity.Player; -import org.apollo.game.model.inter.bank.BankConstants; -import org.apollo.game.model.inv.Inventory; -import org.apollo.game.model.inv.SynchronizationInventoryListener; - -/** - * An {@link EventHandler} that verifies {@link ItemObObjectEvent}s. - * - * @author Major - */ -public final class ItemOnObjectVerificationHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, ItemOnObjectEvent event) { - if (event.getInterfaceId() != SynchronizationInventoryListener.INVENTORY_ID - && event.getInterfaceId() != BankConstants.SIDEBAR_INVENTORY_ID) { - ctx.breakHandlerChain(); - return; - } - - Inventory inventory = player.getInventory(); - - int slot = event.getSlot(); - if (slot < 0 || slot >= inventory.capacity()) { - ctx.breakHandlerChain(); - return; - } - - Item item = inventory.get(slot); - if (item == null || item.getId() != event.getId()) { - ctx.breakHandlerChain(); - return; - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java b/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java deleted file mode 100644 index 8ded34b0..00000000 --- a/src/org/apollo/game/event/handler/impl/PlayerDesignEventHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.game.event.impl.PlayerDesignEvent; -import org.apollo.game.model.entity.Player; - -/** - * An {@link EventHandler} that handles {@link PlayerDesignEvent}s. - * - * @author Graham - */ -public final class PlayerDesignEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, PlayerDesignEvent event) { - player.setAppearance(event.getAppearance()); - player.setNew(true); - player.send(new CloseInterfaceEvent()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/WalkEventHandler.java b/src/org/apollo/game/event/handler/impl/WalkEventHandler.java deleted file mode 100644 index ee7e5182..00000000 --- a/src/org/apollo/game/event/handler/impl/WalkEventHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.apollo.game.event.handler.impl; - -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.WalkEvent; -import org.apollo.game.model.Position; -import org.apollo.game.model.entity.Player; -import org.apollo.game.model.entity.WalkingQueue; - -/** - * A{@link EventHandler} that handles {@link WalkEvent}s. - * - * @author Graham - */ -public final class WalkEventHandler extends EventHandler { - - @Override - public void handle(EventHandlerContext ctx, Player player, WalkEvent event) { - WalkingQueue queue = player.getWalkingQueue(); - - Position[] steps = event.getSteps(); - for (int i = 0; i < steps.length; i++) { - Position step = steps[i]; - if (i == 0) { - if (!queue.addFirstStep(step)) { - return; // ignore packet - } - } else { - queue.addStep(step); - } - } - - queue.setRunningQueue(event.isRunning() || player.isRunning()); - - if (queue.size() > 0) { - player.stopAction(); - } - player.getInterfaceSet().close(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/package-info.java b/src/org/apollo/game/event/handler/impl/package-info.java deleted file mode 100644 index cd21c817..00000000 --- a/src/org/apollo/game/event/handler/impl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains event handler implementations. - */ -package org.apollo.game.event.handler.impl; \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/package-info.java b/src/org/apollo/game/event/handler/package-info.java deleted file mode 100644 index e930252a..00000000 --- a/src/org/apollo/game/event/handler/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains classes which define abstract event handlers. - */ -package org.apollo.game.event.handler; \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/CloseInterfaceEvent.java b/src/org/apollo/game/event/impl/CloseInterfaceEvent.java deleted file mode 100644 index db14f386..00000000 --- a/src/org/apollo/game/event/impl/CloseInterfaceEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client that closes the open interface. - * - * @author Graham - */ -public final class CloseInterfaceEvent extends Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ClosedInterfaceEvent.java b/src/org/apollo/game/event/impl/ClosedInterfaceEvent.java deleted file mode 100644 index 615845cf..00000000 --- a/src/org/apollo/game/event/impl/ClosedInterfaceEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent by the client when the current interface is closed. - * - * @author Graham - */ -public final class ClosedInterfaceEvent extends Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/DisplayTabInterfaceEvent.java b/src/org/apollo/game/event/impl/DisplayTabInterfaceEvent.java deleted file mode 100644 index a4b284d8..00000000 --- a/src/org/apollo/game/event/impl/DisplayTabInterfaceEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to change the currently displayed tab interface. - * - * @author Chris Fletcher - */ -public final class DisplayTabInterfaceEvent extends Event { - - /** - * The tab index. - */ - private final int tab; - - /** - * Creates a new display tab interface event. - * - * @param tab The index of the tab to display. - */ - public DisplayTabInterfaceEvent(int tab) { - this.tab = tab; - } - - /** - * Gets the index of the tab to display. - * - * @return The tab index. - */ - public int getTab() { - return tab; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/EnterAmountEvent.java b/src/org/apollo/game/event/impl/EnterAmountEvent.java deleted file mode 100644 index 4c27584f..00000000 --- a/src/org/apollo/game/event/impl/EnterAmountEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to open up the enter amount interface. - * - * @author Graham - */ -public final class EnterAmountEvent extends Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/EnteredAmountEvent.java b/src/org/apollo/game/event/impl/EnteredAmountEvent.java deleted file mode 100644 index 74930dcc..00000000 --- a/src/org/apollo/game/event/impl/EnteredAmountEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent by the client when the player has entered an amount. - * - * @author Graham - */ -public final class EnteredAmountEvent extends Event { - - /** - * The amount. - */ - private final int amount; - - /** - * Creates the entered amount event. - * - * @param amount The amount. - */ - public EnteredAmountEvent(int amount) { - this.amount = amount; - } - - /** - * Gets the amount. - * - * @return The amount. - */ - public int getAmount() { - return amount; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FifthItemActionEvent.java b/src/org/apollo/game/event/impl/FifthItemActionEvent.java deleted file mode 100644 index 7895979d..00000000 --- a/src/org/apollo/game/event/impl/FifthItemActionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fifth {@link ItemActionEvent}. - * - * @author Graham - */ -public final class FifthItemActionEvent extends ItemActionEvent { - - /** - * Creates the fifth item action event. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FifthItemActionEvent(int interfaceId, int id, int slot) { - super(5, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FifthItemOptionEvent.java b/src/org/apollo/game/event/impl/FifthItemOptionEvent.java deleted file mode 100644 index bc7e6251..00000000 --- a/src/org/apollo/game/event/impl/FifthItemOptionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fifth {@link ItemOptionEvent}. - * - * @author Chris Fletcher - */ -public final class FifthItemOptionEvent extends ItemOptionEvent { - - /** - * Creates the fifth item option event. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FifthItemOptionEvent(int interfaceId, int id, int slot) { - super(5, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FifthPlayerActionEvent.java b/src/org/apollo/game/event/impl/FifthPlayerActionEvent.java deleted file mode 100644 index 55a512c4..00000000 --- a/src/org/apollo/game/event/impl/FifthPlayerActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fifth {@link PlayerActionEvent}. - * - * @author Major - */ -public final class FifthPlayerActionEvent extends PlayerActionEvent { - - /** - * Creates a fifth player action event. - * - * @param playerIndex The index of the clicked player. - */ - public FifthPlayerActionEvent(int playerIndex) { - super(5, playerIndex); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FirstItemActionEvent.java b/src/org/apollo/game/event/impl/FirstItemActionEvent.java deleted file mode 100644 index c1cd0123..00000000 --- a/src/org/apollo/game/event/impl/FirstItemActionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The first {@link ItemActionEvent}. - * - * @author Graham - */ -public final class FirstItemActionEvent extends ItemActionEvent { - - /** - * Creates the first item action event. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FirstItemActionEvent(int interfaceId, int id, int slot) { - super(1, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FirstItemOptionEvent.java b/src/org/apollo/game/event/impl/FirstItemOptionEvent.java deleted file mode 100644 index 0af5e860..00000000 --- a/src/org/apollo/game/event/impl/FirstItemOptionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The first {@link ItemOptionEvent}. - * - * @author Chris Fletcher - */ -public final class FirstItemOptionEvent extends ItemOptionEvent { - - /** - * Creates the first item option event. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FirstItemOptionEvent(int interfaceId, int id, int slot) { - super(1, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FirstNpcActionEvent.java b/src/org/apollo/game/event/impl/FirstNpcActionEvent.java deleted file mode 100644 index 39124bdb..00000000 --- a/src/org/apollo/game/event/impl/FirstNpcActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The first {@link NpcActionEvent}. - * - * @author Major - */ -public final class FirstNpcActionEvent extends NpcActionEvent { - - /** - * Creates a new first npc action event. - * - * @param index The index of the npc. - */ - public FirstNpcActionEvent(int index) { - super(1, index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FirstObjectActionEvent.java b/src/org/apollo/game/event/impl/FirstObjectActionEvent.java deleted file mode 100644 index b51ddcaf..00000000 --- a/src/org/apollo/game/event/impl/FirstObjectActionEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.model.Position; - -/** - * The first {@link ObjectActionEvent}. - * - * @author Graham - */ -public final class FirstObjectActionEvent extends ObjectActionEvent { - - /** - * Creates the first object action event. - * - * @param id The id. - * @param position The position. - */ - public FirstObjectActionEvent(int id, Position position) { - super(1, id, position); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FirstPlayerActionEvent.java b/src/org/apollo/game/event/impl/FirstPlayerActionEvent.java deleted file mode 100644 index e920192e..00000000 --- a/src/org/apollo/game/event/impl/FirstPlayerActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The first {@link PlayerActionEvent}. - * - * @author Major - */ -public final class FirstPlayerActionEvent extends PlayerActionEvent { - - /** - * Creates a first player action event. - * - * @param playerIndex The index of the clicked player. - */ - public FirstPlayerActionEvent(int playerIndex) { - super(1, playerIndex); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FourthItemActionEvent.java b/src/org/apollo/game/event/impl/FourthItemActionEvent.java deleted file mode 100644 index 21298adc..00000000 --- a/src/org/apollo/game/event/impl/FourthItemActionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fourth {@link ItemActionEvent}. - * - * @author Graham - */ -public final class FourthItemActionEvent extends ItemActionEvent { - - /** - * Creates the fourth item action event. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public FourthItemActionEvent(int interfaceId, int id, int slot) { - super(4, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FourthItemOptionEvent.java b/src/org/apollo/game/event/impl/FourthItemOptionEvent.java deleted file mode 100644 index 5d9fa6e5..00000000 --- a/src/org/apollo/game/event/impl/FourthItemOptionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fourth {@link ItemOptionEvent}. - * - * @author Chris Fletcher - */ -public final class FourthItemOptionEvent extends ItemOptionEvent { - - /** - * Creates the fourth item option event. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public FourthItemOptionEvent(int interfaceId, int id, int slot) { - super(4, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FourthPlayerActionEvent.java b/src/org/apollo/game/event/impl/FourthPlayerActionEvent.java deleted file mode 100644 index 5267c8a0..00000000 --- a/src/org/apollo/game/event/impl/FourthPlayerActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The fourth {@link PlayerActionEvent}. - * - * @author Major - */ -public final class FourthPlayerActionEvent extends PlayerActionEvent { - - /** - * Creates a fourth player action event. - * - * @param playerIndex The index of the clicked player. - */ - public FourthPlayerActionEvent(int playerIndex) { - super(4, playerIndex); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ItemActionEvent.java b/src/org/apollo/game/event/impl/ItemActionEvent.java deleted file mode 100644 index 7b2f9105..00000000 --- a/src/org/apollo/game/event/impl/ItemActionEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent by the client that represents some sort of action on an item. Note that the actual event sent - * by the client is one of the five item action events, but this is the event that should be intercepted (and the option - * verified). - * - * @author Chris Fletcher - */ -public abstract class ItemActionEvent extends InventoryItemEvent { - - /** - * Creates the item action event. - * - * @param option The option number. - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public ItemActionEvent(int option, int interfaceId, int id, int slot) { - super(option, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ItemOptionEvent.java b/src/org/apollo/game/event/impl/ItemOptionEvent.java deleted file mode 100644 index 44f5d5c7..00000000 --- a/src/org/apollo/game/event/impl/ItemOptionEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * An {@link InventoryItemEvent} sent by the client when an item's option is clicked (e.g. equip, eat, drink, etc). Note - * that the actual event sent by the client is one of the five item option events, but this is the event that should be - * intercepted (and the option verified). - * - * @author Chris Fletcher - */ -public abstract class ItemOptionEvent extends InventoryItemEvent { - - /** - * Creates the item option event. - * - * @param option The option number. - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public ItemOptionEvent(int option, int interfaceId, int id, int slot) { - super(option, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/KeepAliveEvent.java b/src/org/apollo/game/event/impl/KeepAliveEvent.java deleted file mode 100644 index 0876eb68..00000000 --- a/src/org/apollo/game/event/impl/KeepAliveEvent.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} periodically sent by the client to keep a connection alive. - * - * @author Graham - */ -public final class KeepAliveEvent extends Event { - - /** - * The time this event was created. - */ - private final long createdAt; - - /** - * Creates the keep alive event. - */ - public KeepAliveEvent() { - createdAt = System.currentTimeMillis(); - } - - /** - * Gets the time when this event was created. - * - * @return The time when this event was created. - */ - public long getCreatedAt() { - return createdAt; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/LogoutEvent.java b/src/org/apollo/game/event/impl/LogoutEvent.java deleted file mode 100644 index 4524f359..00000000 --- a/src/org/apollo/game/event/impl/LogoutEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client that cleanly logs it out. - * - * @author Graham - */ -public final class LogoutEvent extends Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/MobAnimationResetEvent.java b/src/org/apollo/game/event/impl/MobAnimationResetEvent.java deleted file mode 100644 index 2a6a1bce..00000000 --- a/src/org/apollo/game/event/impl/MobAnimationResetEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to reset the animations of every mob. - * - * @author Major - */ -public final class MobAnimationResetEvent extends Event { - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/NpcActionEvent.java b/src/org/apollo/game/event/impl/NpcActionEvent.java deleted file mode 100644 index 7cc247fc..00000000 --- a/src/org/apollo/game/event/impl/NpcActionEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent by the client representing the clicking of an npc menu action. Note that the actual event sent - * by the client is one of the three npc action events, but this is the event that should be intercepted (and the option - * verified). - * - * @author Major - */ -public abstract class NpcActionEvent extends Event { - - /** - * The option number. - */ - private final int option; - - /** - * The index of the clicked npc. - */ - private final int index; - - /** - * Creates an npc action event. - * - * @param option The option number. - * @param index The index of the npc. - */ - public NpcActionEvent(int option, int index) { - this.option = option; - this.index = index - 1; - } - - /** - * Gets the menu action number (i.e. the action event 'option') clicked. - * - * @return The option number. - */ - public int getOption() { - return option; - } - - /** - * Gets the index of the npc clicked. - * - * @return The npc index. - */ - public int getIndex() { - return index; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/OpenDialogueInterfaceEvent.java b/src/org/apollo/game/event/impl/OpenDialogueInterfaceEvent.java deleted file mode 100644 index 7cf87c24..00000000 --- a/src/org/apollo/game/event/impl/OpenDialogueInterfaceEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client that opens a dialogue interface (an interface that appears in the chat box). - * - * @author Chris Fletcher - */ -public final class OpenDialogueInterfaceEvent extends Event { - - /** - * The interface id. - */ - private final int interfaceId; - - /** - * Creates a new event with the specified interface id. - * - * @param interfaceId The interface id. - */ - public OpenDialogueInterfaceEvent(int interfaceId) { - this.interfaceId = interfaceId; - } - - /** - * Gets the interface id. - * - * @return The interface id. - */ - public int getInterfaceId() { - return interfaceId; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/OpenInterfaceEvent.java b/src/org/apollo/game/event/impl/OpenInterfaceEvent.java deleted file mode 100644 index 368b958b..00000000 --- a/src/org/apollo/game/event/impl/OpenInterfaceEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client that opens an interface. - * - * @author Graham - */ -public final class OpenInterfaceEvent extends Event { - - /** - * The interface id. - */ - private final int id; - - /** - * Creates the event with the specified interface id. - * - * @param id The interface id. - */ - public OpenInterfaceEvent(int id) { - this.id = id; - } - - /** - * Gets the interface id. - * - * @return The interface id. - */ - public int getId() { - return id; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SecondItemActionEvent.java b/src/org/apollo/game/event/impl/SecondItemActionEvent.java deleted file mode 100644 index dee318fc..00000000 --- a/src/org/apollo/game/event/impl/SecondItemActionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The second {@link ItemActionEvent}. - * - * @author Graham - */ -public final class SecondItemActionEvent extends ItemActionEvent { - - /** - * Creates the second item action event. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public SecondItemActionEvent(int interfaceId, int id, int slot) { - super(2, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SecondItemOptionEvent.java b/src/org/apollo/game/event/impl/SecondItemOptionEvent.java deleted file mode 100644 index db4c6e22..00000000 --- a/src/org/apollo/game/event/impl/SecondItemOptionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The second {@link ItemOptionEvent}. - * - * @author Chris Fletcher - */ -public final class SecondItemOptionEvent extends ItemOptionEvent { - - /** - * Creates the second item option event. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public SecondItemOptionEvent(int interfaceId, int id, int slot) { - super(2, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SecondNpcActionEvent.java b/src/org/apollo/game/event/impl/SecondNpcActionEvent.java deleted file mode 100644 index 1b2b1703..00000000 --- a/src/org/apollo/game/event/impl/SecondNpcActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The second {@link NpcActionEvent}. - * - * @author Major - */ -public final class SecondNpcActionEvent extends NpcActionEvent { - - /** - * Creates a new second npc action event. - * - * @param index The index of the npc. - */ - public SecondNpcActionEvent(int index) { - super(2, index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SecondObjectActionEvent.java b/src/org/apollo/game/event/impl/SecondObjectActionEvent.java deleted file mode 100644 index 85444d9c..00000000 --- a/src/org/apollo/game/event/impl/SecondObjectActionEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.model.Position; - -/** - * The second {@link ObjectActionEvent}. - * - * @author Graham - */ -public final class SecondObjectActionEvent extends ObjectActionEvent { - - /** - * Creates the second object action event. - * - * @param id The id. - * @param position The position. - */ - public SecondObjectActionEvent(int id, Position position) { - super(2, id, position); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SecondPlayerActionEvent.java b/src/org/apollo/game/event/impl/SecondPlayerActionEvent.java deleted file mode 100644 index 2f481544..00000000 --- a/src/org/apollo/game/event/impl/SecondPlayerActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The second {@link PlayerActionEvent}. - * - * @author Major - */ -public final class SecondPlayerActionEvent extends PlayerActionEvent { - - /** - * Creates a second player action event. - * - * @param playerIndex The index of the clicked player. - */ - public SecondPlayerActionEvent(int playerIndex) { - super(2, playerIndex); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ServerMessageEvent.java b/src/org/apollo/game/event/impl/ServerMessageEvent.java deleted file mode 100644 index 544eb3eb..00000000 --- a/src/org/apollo/game/event/impl/ServerMessageEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to display a server message. - * - * @author Graham - */ -public final class ServerMessageEvent extends Event { - - /** - * The message. - */ - private final String message; - - /** - * Creates a server message event. - * - * @param message The message. - */ - public ServerMessageEvent(String message) { - this(message, false); - } - - /** - * Creates a server message event. - * - * @param message The message. - * @param filterable If the message can be filtered. - */ - public ServerMessageEvent(String message, boolean filterable) { - this.message = message + (filterable ? ":filterable:" : ""); - } - - /** - * Gets the message. - * - * @return The message. - */ - public String getMessage() { - return message; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SetWidgetPlayerModelEvent.java b/src/org/apollo/game/event/impl/SetWidgetPlayerModelEvent.java deleted file mode 100644 index 4d12a771..00000000 --- a/src/org/apollo/game/event/impl/SetWidgetPlayerModelEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to set a widget's displayed player model. - * - * @author Chris Fletcher - */ -public final class SetWidgetPlayerModelEvent extends Event { - - /** - * The interface's id. - */ - private final int interfaceId; - - /** - * Creates a new set interface player model event. - * - * @param interfaceId The interface's id. - */ - public SetWidgetPlayerModelEvent(int interfaceId) { - this.interfaceId = interfaceId; - } - - /** - * Gets the interface's id. - * - * @return The id. - */ - public int getInterfaceId() { - return interfaceId; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SpamPacketEvent.java b/src/org/apollo/game/event/impl/SpamPacketEvent.java deleted file mode 100644 index 84e1cdd7..00000000 --- a/src/org/apollo/game/event/impl/SpamPacketEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * A {@link Event} sent by the client after a short period of time containing random data. - * - * @author Major - */ -public final class SpamPacketEvent extends Event { - - /** - * Data sent by the spam packet. - */ - private final byte[] data; - - /** - * Creates a new spam packet event. - * - * @param data The data sent. - */ - public SpamPacketEvent(byte[] data) { - this.data = data; - } - - /** - * Gets the data sent. - * - * @return The data. - */ - public byte[] getData() { - return data; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ThirdItemActionEvent.java b/src/org/apollo/game/event/impl/ThirdItemActionEvent.java deleted file mode 100644 index f04e6138..00000000 --- a/src/org/apollo/game/event/impl/ThirdItemActionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The third {@link ItemActionEvent}. - * - * @author Graham - */ -public final class ThirdItemActionEvent extends ItemActionEvent { - - /** - * Creates the third item action event. - * - * @param interfaceId The interface id. - * @param id The item id. - * @param slot The item slot. - */ - public ThirdItemActionEvent(int interfaceId, int id, int slot) { - super(3, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ThirdItemOptionEvent.java b/src/org/apollo/game/event/impl/ThirdItemOptionEvent.java deleted file mode 100644 index f474ca27..00000000 --- a/src/org/apollo/game/event/impl/ThirdItemOptionEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The third {@link ItemOptionEvent}. - * - * @author Chris Fletcher - */ -public final class ThirdItemOptionEvent extends ItemOptionEvent { - - /** - * Creates the third item option event. - * - * @param interfaceId The interface id. - * @param id The id. - * @param slot The slot. - */ - public ThirdItemOptionEvent(int interfaceId, int id, int slot) { - super(3, interfaceId, id, slot); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ThirdNpcActionEvent.java b/src/org/apollo/game/event/impl/ThirdNpcActionEvent.java deleted file mode 100644 index 27c7f93d..00000000 --- a/src/org/apollo/game/event/impl/ThirdNpcActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The third {@link NpcActionEvent}. - * - * @author Major - */ -public final class ThirdNpcActionEvent extends NpcActionEvent { - - /** - * Creates a new third npc action event. - * - * @param index The index of the npc. - */ - public ThirdNpcActionEvent(int index) { - super(3, index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ThirdObjectActionEvent.java b/src/org/apollo/game/event/impl/ThirdObjectActionEvent.java deleted file mode 100644 index c759aa50..00000000 --- a/src/org/apollo/game/event/impl/ThirdObjectActionEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.model.Position; - -/** - * The third {@link ObjectActionEvent}. - * - * @author Graham - */ -public final class ThirdObjectActionEvent extends ObjectActionEvent { - - /** - * Creates the third object action event. - * - * @param id The id. - * @param position The position. - */ - public ThirdObjectActionEvent(int id, Position position) { - super(3, id, position); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ThirdPlayerActionEvent.java b/src/org/apollo/game/event/impl/ThirdPlayerActionEvent.java deleted file mode 100644 index b68ace5e..00000000 --- a/src/org/apollo/game/event/impl/ThirdPlayerActionEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.game.event.impl; - -/** - * The third {@link PlayerActionEvent}. - * - * @author Major - */ -public final class ThirdPlayerActionEvent extends PlayerActionEvent { - - /** - * Creates a third player action event. - * - * @param playerIndex The index of the clicked player. - */ - public ThirdPlayerActionEvent(int playerIndex) { - super(3, playerIndex); - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/UpdateRunEnergyEvent.java b/src/org/apollo/game/event/impl/UpdateRunEnergyEvent.java deleted file mode 100644 index ea5187e2..00000000 --- a/src/org/apollo/game/event/impl/UpdateRunEnergyEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apollo.game.event.impl; - -import org.apollo.game.event.Event; - -/** - * An {@link Event} sent to the client to update the remaining run energy value. - * - * @author Major - */ -public final class UpdateRunEnergyEvent extends Event { - - /** - * The run energy. - */ - private final int energy; - - /** - * Creates a new update run energy event. - * - * @param energy The energy. - */ - public UpdateRunEnergyEvent(int energy) { - this.energy = energy; - } - - /** - * Gets the amount of run energy. - * - * @return The energy. - */ - public int getEnergy() { - return energy; - } - -} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/package-info.java b/src/org/apollo/game/event/impl/package-info.java deleted file mode 100644 index a0078584..00000000 --- a/src/org/apollo/game/event/impl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains event implementations. - */ -package org.apollo.game.event.impl; \ No newline at end of file diff --git a/src/org/apollo/game/event/package-info.java b/src/org/apollo/game/event/package-info.java deleted file mode 100644 index 87a9193d..00000000 --- a/src/org/apollo/game/event/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains classes related to the event management in the game. - */ -package org.apollo.game.event; \ No newline at end of file diff --git a/src/org/apollo/game/message/Message.java b/src/org/apollo/game/message/Message.java new file mode 100644 index 00000000..0b7ce3a6 --- /dev/null +++ b/src/org/apollo/game/message/Message.java @@ -0,0 +1,10 @@ +package org.apollo.game.message; + +/** + * A message sent by the client that can be intercepted. + * + * @author Graham + */ +public abstract class Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/MessageHandler.java b/src/org/apollo/game/message/handler/MessageHandler.java new file mode 100644 index 00000000..ba0e0b34 --- /dev/null +++ b/src/org/apollo/game/message/handler/MessageHandler.java @@ -0,0 +1,23 @@ +package org.apollo.game.message.handler; + +import org.apollo.game.message.Message; +import org.apollo.game.model.entity.Player; + +/** + * Handles messages received from the client. + * + * @author Graham + * @param The type of message handled by this class. + */ +public abstract class MessageHandler { + + /** + * Handles a message. + * + * @param ctx The context. + * @param player The player. + * @param message The message. + */ + public abstract void handle(MessageHandlerContext ctx, Player player, M message); + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/MessageHandlerChain.java b/src/org/apollo/game/message/handler/MessageHandlerChain.java new file mode 100644 index 00000000..c3c9942c --- /dev/null +++ b/src/org/apollo/game/message/handler/MessageHandlerChain.java @@ -0,0 +1,69 @@ +package org.apollo.game.message.handler; + +import org.apollo.game.message.Message; +import org.apollo.game.model.entity.Player; + +/** + * A chain of message handlers. + * + * @author Graham + * @param The type of message handled by this chain. + */ +public final class MessageHandlerChain { + + /** + * The handlers. + */ + private MessageHandler[] handlers; + + /** + * Creates the message handler chain. + * + * @param handlers The handlers. + */ + @SafeVarargs + public MessageHandlerChain(MessageHandler... handlers) { + this.handlers = handlers; + } + + /** + * Dynamically adds a message handler to the end of the chain. + * + * @param handler The handler. + */ + @SuppressWarnings("unchecked") + public void addLast(MessageHandler handler) { + MessageHandler[] old = handlers; + handlers = new MessageHandler[old.length + 1]; + System.arraycopy(old, 0, handlers, 0, old.length); + handlers[old.length] = handler; + } + + /** + * Handles the message, passing it down the chain until the chain is broken or the message reaches the end of the + * chain. + * + * @param player The player. + * @param message The message. + */ + public void handle(Player player, M message) { + final boolean[] running = new boolean[1]; + running[0] = true; + + MessageHandlerContext ctx = new MessageHandlerContext() { + + @Override + public void breakHandlerChain() { + running[0] = false; + } + }; + + for (MessageHandler handler : handlers) { + handler.handle(ctx, player, message); + if (!running[0]) { + break; + } + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java b/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java new file mode 100644 index 00000000..b6a5079c --- /dev/null +++ b/src/org/apollo/game/message/handler/MessageHandlerChainGroup.java @@ -0,0 +1,50 @@ +package org.apollo.game.message.handler; + +import java.util.Map; + +import org.apollo.game.message.Message; + +/** + * A group of {@link MessageHandlerChain}s classified by the {@link Message} type. + * + * @author Graham + */ +public final class MessageHandlerChainGroup { + + /** + * The map of message classes to message handler chains. + */ + private final Map, MessageHandlerChain> chains; + + /** + * Creates the message handler chain group. + * + * @param chains The chains map. + */ + public MessageHandlerChainGroup(Map, MessageHandlerChain> chains) { + this.chains = chains; + } + + /** + * Gets a {@link MessageHandlerChain} from this group. + * + * @param The type of message. + * @param clazz The message class. + * @return The {@link MessageHandlerChain} if one was found, {@code null} otherwise. + */ + @SuppressWarnings("unchecked") + public MessageHandlerChain getChain(Class clazz) { + return (MessageHandlerChain) chains.get(clazz); + } + + /** + * Registers a {@link MessageHandlerChain} associated with the specified {@link Class} to this group. + * + * @param clazz The message class. + * @param chain The message handler chain. + */ + public void register(Class clazz, MessageHandlerChain chain) { + chains.put(clazz, chain); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/MessageHandlerContext.java b/src/org/apollo/game/message/handler/MessageHandlerContext.java new file mode 100644 index 00000000..98af4de9 --- /dev/null +++ b/src/org/apollo/game/message/handler/MessageHandlerContext.java @@ -0,0 +1,16 @@ +package org.apollo.game.message.handler; + + +/** + * Provides operations specific to a {@link MessageHandler} in an {@link MessageHandlerChain}. + * + * @author Graham + */ +public abstract class MessageHandlerContext { + + /** + * Breaks the handler chain. + */ + public abstract void breakHandlerChain(); + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/BankButtonMessageHandler.java b/src/org/apollo/game/message/handler/impl/BankButtonMessageHandler.java new file mode 100644 index 00000000..67f07fac --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/BankButtonMessageHandler.java @@ -0,0 +1,34 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ButtonMessage; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} that responds to {@link ButtonMessage}s for withdrawing items as notes. + * + * @author Graham + */ +public final class BankButtonMessageHandler extends MessageHandler { + + /** + * The withdraw as item button id. + */ + private static final int WITHDRAW_AS_ITEM = 5387; + + /** + * The withdraw as note button id. + */ + private static final int WITHDRAW_AS_NOTE = 5386; + + @Override + public void handle(MessageHandlerContext ctx, Player player, ButtonMessage message) { + if (message.getWidgetId() == WITHDRAW_AS_ITEM) { + player.setWithdrawingNotes(false); + } else if (message.getWidgetId() == WITHDRAW_AS_NOTE) { + player.setWithdrawingNotes(true); + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/BankMessageHandler.java b/src/org/apollo/game/message/handler/impl/BankMessageHandler.java new file mode 100644 index 00000000..226bc739 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/BankMessageHandler.java @@ -0,0 +1,87 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ItemActionMessage; +import org.apollo.game.model.entity.Player; +import org.apollo.game.model.inter.bank.BankConstants; +import org.apollo.game.model.inter.bank.BankDepositEnterAmountListener; +import org.apollo.game.model.inter.bank.BankUtils; +import org.apollo.game.model.inter.bank.BankWithdrawEnterAmountListener; + +/** + * A {@link MessageHandler} that handles withdrawing and depositing items from/to a player's bank. + * + * @author Graham + */ +public final class BankMessageHandler extends MessageHandler { + + /** + * Converts an option to an amount. + * + * @param option The option. + * @return The amount. + * @throws IllegalArgumentException If the option is invalid. + */ + private static final int optionToAmount(int option) { + switch (option) { + case 1: + return 1; + case 2: + return 5; + case 3: + return 10; + case 4: + return Integer.MAX_VALUE; + case 5: + return -1; + } + throw new IllegalArgumentException("Invalid option supplied."); + } + + /** + * Handles a deposit action. + * + * @param ctx The message handler context. + * @param player The player. + * @param message The message. + */ + private void deposit(MessageHandlerContext ctx, Player player, ItemActionMessage message) { + int amount = optionToAmount(message.getOption()); + if (amount == -1) { + player.getInterfaceSet().openEnterAmountDialogue( + new BankDepositEnterAmountListener(player, message.getSlot(), message.getId())); + } else if (!BankUtils.deposit(player, message.getSlot(), message.getId(), amount)) { + ctx.breakHandlerChain(); + } + } + + @Override + public void handle(MessageHandlerContext ctx, Player player, ItemActionMessage message) { + if (player.getInterfaceSet().contains(BankConstants.BANK_WINDOW_ID)) { + if (message.getInterfaceId() == BankConstants.SIDEBAR_INVENTORY_ID) { + deposit(ctx, player, message); + } else if (message.getInterfaceId() == BankConstants.BANK_INVENTORY_ID) { + withdraw(ctx, player, message); + } + } + } + + /** + * Handles a withdraw action. + * + * @param ctx The message handler context. + * @param player The player. + * @param message The message. + */ + private void withdraw(MessageHandlerContext ctx, Player player, ItemActionMessage message) { + int amount = optionToAmount(message.getOption()); + if (amount == -1) { + player.getInterfaceSet().openEnterAmountDialogue( + new BankWithdrawEnterAmountListener(player, message.getSlot(), message.getId())); + } else if (!BankUtils.withdraw(player, message.getSlot(), message.getId(), amount)) { + ctx.breakHandlerChain(); + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/ChatMessageHandler.java b/src/org/apollo/game/message/handler/impl/ChatMessageHandler.java new file mode 100644 index 00000000..a1ec4202 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/ChatMessageHandler.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ChatMessage; +import org.apollo.game.model.entity.Player; +import org.apollo.game.sync.block.SynchronizationBlock; + +/** + * A {@link MessageHandler} that broadcasts public chat messages. + * + * @author Graham + */ +public final class ChatMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, ChatMessage message) { + player.getBlockSet().add(SynchronizationBlock.createChatBlock(player, message)); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/ChatVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ChatVerificationHandler.java new file mode 100644 index 00000000..36bf1efd --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/ChatVerificationHandler.java @@ -0,0 +1,24 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ChatMessage; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} that verifies {@link ChatMessage}s. + * + * @author Graham + */ +public final class ChatVerificationHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, ChatMessage message) { + int color = message.getTextColor(); + int effects = message.getTextEffects(); + if (color < 0 || color > 11 || effects < 0 || effects > 5) { + ctx.breakHandlerChain(); + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/ClosedInterfaceMessageHandler.java b/src/org/apollo/game/message/handler/impl/ClosedInterfaceMessageHandler.java new file mode 100644 index 00000000..d755bf05 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/ClosedInterfaceMessageHandler.java @@ -0,0 +1,20 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ClosedInterfaceMessage; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} for the {@link ClosedInterfaceMessage}. + * + * @author Graham + */ +public final class ClosedInterfaceMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, ClosedInterfaceMessage message) { + player.getInterfaceSet().interfaceClosed(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/CommandMessageHandler.java b/src/org/apollo/game/message/handler/impl/CommandMessageHandler.java new file mode 100644 index 00000000..f5042acd --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/CommandMessageHandler.java @@ -0,0 +1,29 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.command.Command; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.CommandMessage; +import org.apollo.game.model.World; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} that dispatches {@link CommandMessage}s. + * + * @author Graham + */ +public final class CommandMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, CommandMessage message) { + String[] components = message.getCommand().split(" "); + String name = components[0]; + + String[] arguments = new String[components.length - 1]; + System.arraycopy(components, 1, arguments, 0, arguments.length); + + Command command = new Command(name, arguments); + World.getWorld().getCommandDispatcher().dispatch(player, command); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/DialogueButtonHandler.java b/src/org/apollo/game/message/handler/impl/DialogueButtonHandler.java new file mode 100644 index 00000000..9d4971e3 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/DialogueButtonHandler.java @@ -0,0 +1,28 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ButtonMessage; +import org.apollo.game.model.entity.Player; +import org.apollo.game.model.inter.InterfaceType; + +/** + * A {@link MessageHandler} which intercepts button clicks on dialogues, and forwards the message to the current + * listener. + * + * @author Chris Fletcher + */ +public final class DialogueButtonHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, ButtonMessage message) { + if (player.getInterfaceSet().contains(InterfaceType.DIALOGUE)) { + boolean breakChain = player.getInterfaceSet().buttonClicked(message.getWidgetId()); + + if (breakChain) { + ctx.breakHandlerChain(); + } + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/DialogueContinueMessageHandler.java b/src/org/apollo/game/message/handler/impl/DialogueContinueMessageHandler.java new file mode 100644 index 00000000..3b5a7b1a --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/DialogueContinueMessageHandler.java @@ -0,0 +1,23 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.DialogueContinueMessage; +import org.apollo.game.model.entity.Player; +import org.apollo.game.model.inter.InterfaceType; + +/** + * A {@link MessageHandler} for the {@link DialogueContinueMessage}. + * + * @author Chris Fletcher + */ +public final class DialogueContinueMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, DialogueContinueMessage message) { + if (player.getInterfaceSet().contains(InterfaceType.DIALOGUE)) { + player.getInterfaceSet().continueRequested(); + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/EnteredAmountMessageHandler.java b/src/org/apollo/game/message/handler/impl/EnteredAmountMessageHandler.java new file mode 100644 index 00000000..aad2923d --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/EnteredAmountMessageHandler.java @@ -0,0 +1,20 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.EnteredAmountMessage; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} for the {@link EnteredAmountMessage}. + * + * @author Graham + */ +public final class EnteredAmountMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, EnteredAmountMessage message) { + player.getInterfaceSet().enteredAmount(message.getAmount()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java b/src/org/apollo/game/message/handler/impl/EquipItemHandler.java similarity index 80% rename from src/org/apollo/game/event/handler/impl/EquipEventHandler.java rename to src/org/apollo/game/message/handler/impl/EquipItemHandler.java index 3a3d93af..793e99bc 100644 --- a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java +++ b/src/org/apollo/game/message/handler/impl/EquipItemHandler.java @@ -1,8 +1,8 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ItemOptionEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ItemOptionMessage; import org.apollo.game.model.Item; import org.apollo.game.model.def.EquipmentDefinition; import org.apollo.game.model.entity.EquipmentConstants; @@ -13,26 +13,26 @@ import org.apollo.game.model.inv.SynchronizationInventoryListener; import org.apollo.util.LanguageUtil; /** - * An {@link EventHandler} that equips items. + * A {@link MessageHandler} that equips items. * * @author Major * @author Graham */ -public final class EquipEventHandler extends EventHandler { +public final class EquipItemHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, ItemOptionEvent event) { - if (event.getOption() != 2 || event.getInterfaceId() != SynchronizationInventoryListener.INVENTORY_ID) { + public void handle(MessageHandlerContext ctx, Player player, ItemOptionMessage message) { + if (message.getOption() != 2 || message.getInterfaceId() != SynchronizationInventoryListener.INVENTORY_ID) { return; } - int inventorySlot = event.getSlot(); + int inventorySlot = message.getSlot(); Item equipping = player.getInventory().get(inventorySlot); int equippingId = equipping.getId(); EquipmentDefinition definition = EquipmentDefinition.lookup(equippingId); if (definition == null) { - // We don't break the chain here or any item option events won't work! + // We don't break the chain here or any item option messages won't work! return; } diff --git a/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ItemOnItemVerificationHandler.java similarity index 58% rename from src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java rename to src/org/apollo/game/message/handler/impl/ItemOnItemVerificationHandler.java index 13d620a2..f01221a2 100644 --- a/src/org/apollo/game/event/handler/impl/ItemOnItemVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/ItemOnItemVerificationHandler.java @@ -1,8 +1,8 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ItemOnItemEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ItemOnItemMessage; import org.apollo.game.model.Item; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inter.bank.BankConstants; @@ -10,17 +10,17 @@ import org.apollo.game.model.inv.Inventory; import org.apollo.game.model.inv.SynchronizationInventoryListener; /** - * An {@link EventHandler} that verifies the target item in {@link ItemOnItemEvent}s. + * A {@link MessageHandler} that verifies the target item in {@link ItemOnItemMessage}s. * * @author Chris Fletcher */ -public final class ItemOnItemVerificationHandler extends EventHandler { +public final class ItemOnItemVerificationHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, ItemOnItemEvent event) { + public void handle(MessageHandlerContext ctx, Player player, ItemOnItemMessage message) { Inventory inventory; - switch (event.getInterfaceId()) { + switch (message.getInterfaceId()) { case SynchronizationInventoryListener.INVENTORY_ID: case BankConstants.SIDEBAR_INVENTORY_ID: inventory = player.getInventory(); @@ -36,14 +36,14 @@ public final class ItemOnItemVerificationHandler extends EventHandler= inventory.capacity()) { ctx.breakHandlerChain(); return; } Item item = inventory.get(slot); - if (item == null || item.getId() != event.getTargetId()) { + if (item == null || item.getId() != message.getTargetId()) { ctx.breakHandlerChain(); } } diff --git a/src/org/apollo/game/message/handler/impl/ItemOnObjectVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ItemOnObjectVerificationHandler.java new file mode 100644 index 00000000..d2b23d32 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/ItemOnObjectVerificationHandler.java @@ -0,0 +1,42 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ItemOnObjectMessage; +import org.apollo.game.model.Item; +import org.apollo.game.model.entity.Player; +import org.apollo.game.model.inter.bank.BankConstants; +import org.apollo.game.model.inv.Inventory; +import org.apollo.game.model.inv.SynchronizationInventoryListener; + +/** + * A {@link MessageHandler} that verifies {@link ItemOnObjectMessage}s. + * + * @author Major + */ +public final class ItemOnObjectVerificationHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, ItemOnObjectMessage message) { + if (message.getInterfaceId() != SynchronizationInventoryListener.INVENTORY_ID + && message.getInterfaceId() != BankConstants.SIDEBAR_INVENTORY_ID) { + ctx.breakHandlerChain(); + return; + } + + Inventory inventory = player.getInventory(); + + int slot = message.getSlot(); + if (slot < 0 || slot >= inventory.capacity()) { + ctx.breakHandlerChain(); + return; + } + + Item item = inventory.get(slot); + if (item == null || item.getId() != message.getId()) { + ctx.breakHandlerChain(); + return; + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java similarity index 59% rename from src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java rename to src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java index cee919b8..31773b17 100644 --- a/src/org/apollo/game/event/handler/impl/ItemVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java @@ -1,8 +1,8 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.InventoryItemEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.InventoryItemMessage; import org.apollo.game.model.Item; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inter.bank.BankConstants; @@ -10,17 +10,17 @@ import org.apollo.game.model.inv.Inventory; import org.apollo.game.model.inv.SynchronizationInventoryListener; /** - * An {@link EventHandler} that verifies {@link InventoryItemEvent}s. + * A {@link MessageHandler} that verifies {@link InventoryItemMessage}s. * * @author Chris Fletcher */ -public final class ItemVerificationHandler extends EventHandler { +public final class ItemVerificationHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, InventoryItemEvent event) { + public void handle(MessageHandlerContext ctx, Player player, InventoryItemMessage message) { Inventory inventory; - switch (event.getInterfaceId()) { + switch (message.getInterfaceId()) { case SynchronizationInventoryListener.INVENTORY_ID: case BankConstants.SIDEBAR_INVENTORY_ID: inventory = player.getInventory(); @@ -36,14 +36,14 @@ public final class ItemVerificationHandler extends EventHandler= inventory.capacity()) { ctx.breakHandlerChain(); return; } Item item = inventory.get(slot); - if (item == null || item.getId() != event.getId()) { + if (item == null || item.getId() != message.getId()) { ctx.breakHandlerChain(); } } diff --git a/src/org/apollo/game/event/handler/impl/NpcActionVerificationHandler.java b/src/org/apollo/game/message/handler/impl/NpcActionVerificationHandler.java similarity index 50% rename from src/org/apollo/game/event/handler/impl/NpcActionVerificationHandler.java rename to src/org/apollo/game/message/handler/impl/NpcActionVerificationHandler.java index 4653399b..565befc1 100644 --- a/src/org/apollo/game/event/handler/impl/NpcActionVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/NpcActionVerificationHandler.java @@ -1,25 +1,25 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.NpcActionEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.NpcActionMessage; import org.apollo.game.model.World; import org.apollo.game.model.entity.Npc; import org.apollo.game.model.entity.Player; import org.apollo.util.MobRepository; /** - * A verification {@link EventHandler} for the {@link NpcActionEvent}. + * A verification {@link MessageHandler} for the {@link NpcActionMessage}. * * @author Stuart * @author Major */ -public final class NpcActionVerificationHandler extends EventHandler { +public final class NpcActionVerificationHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, NpcActionEvent event) { + public void handle(MessageHandlerContext ctx, Player player, NpcActionMessage message) { MobRepository repository = World.getWorld().getNpcRepository(); - int index = event.getIndex(); + int index = message.getIndex(); if (index < 0 || index >= repository.capacity()) { ctx.breakHandlerChain(); @@ -33,7 +33,7 @@ public final class NpcActionVerificationHandler extends EventHandler= npc.getDefinition().getInteractions().length) { + if (message.getOption() >= npc.getDefinition().getInteractions().length) { ctx.breakHandlerChain(); return; } diff --git a/src/org/apollo/game/event/handler/impl/ObjectActionVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java similarity index 68% rename from src/org/apollo/game/event/handler/impl/ObjectActionVerificationHandler.java rename to src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java index 6e64b32d..7809efa2 100644 --- a/src/org/apollo/game/event/handler/impl/ObjectActionVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/ObjectActionVerificationHandler.java @@ -1,10 +1,10 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; import java.util.List; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ObjectActionEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +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.Sector; @@ -14,21 +14,21 @@ import org.apollo.game.model.entity.GameObject; import org.apollo.game.model.entity.Player; /** - * A verification {@link EventHandler} for the {@link ObjectActionEvent}. + * A verification {@link MessageHandler} for the {@link ObjectActionMessage}. * * @author Major */ -public final class ObjectActionVerificationHandler extends EventHandler { +public final class ObjectActionVerificationHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, ObjectActionEvent event) { - int id = event.getId(); + public void handle(MessageHandlerContext ctx, Player player, ObjectActionMessage message) { + int id = message.getId(); if (id < 0 || id >= ObjectDefinition.count()) { ctx.breakHandlerChain(); return; } - Position position = event.getPosition(); + Position position = message.getPosition(); Sector sector = World.getWorld().getSectorRepository().fromPosition(position); List objects = sector.getEntities(position, EntityType.GAME_OBJECT); @@ -43,7 +43,7 @@ public final class ObjectActionVerificationHandler extends EventHandler= ObjectDefinition.lookup(id).getMenuActions().length) { + if (message.getOption() >= ObjectDefinition.lookup(id).getMenuActions().length) { ctx.breakHandlerChain(); return; } diff --git a/src/org/apollo/game/message/handler/impl/PlayerDesignMessageHandler.java b/src/org/apollo/game/message/handler/impl/PlayerDesignMessageHandler.java new file mode 100644 index 00000000..96dfa71a --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/PlayerDesignMessageHandler.java @@ -0,0 +1,23 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.game.message.impl.PlayerDesignMessage; +import org.apollo.game.model.entity.Player; + +/** + * A {@link MessageHandler} that handles {@link PlayerDesignMessage}s. + * + * @author Graham + */ +public final class PlayerDesignMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, PlayerDesignMessage message) { + player.setAppearance(message.getAppearance()); + player.setNew(true); + player.send(new CloseInterfaceMessage()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java b/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java similarity index 79% rename from src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java rename to src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java index 3a7c514f..49c11412 100644 --- a/src/org/apollo/game/event/handler/impl/PlayerDesignVerificationHandler.java +++ b/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java @@ -1,22 +1,22 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.PlayerDesignEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.PlayerDesignMessage; import org.apollo.game.model.Appearance; import org.apollo.game.model.entity.Player; import org.apollo.game.model.setting.Gender; /** - * An {@link EventHandler} that verifies {@link PlayerDesignEvent}s. + * A {@link MessageHandler} that verifies {@link PlayerDesignMessage}s. * * @author Graham */ -public final class PlayerDesignVerificationHandler extends EventHandler { +public final class PlayerDesignVerificationHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, PlayerDesignEvent event) { - if (!valid(event.getAppearance())) { + public void handle(MessageHandlerContext ctx, Player player, PlayerDesignMessage message) { + if (!valid(message.getAppearance())) { ctx.breakHandlerChain(); } } diff --git a/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java b/src/org/apollo/game/message/handler/impl/RemoveEquippedItemHandler.java similarity index 64% rename from src/org/apollo/game/event/handler/impl/RemoveEventHandler.java rename to src/org/apollo/game/message/handler/impl/RemoveEquippedItemHandler.java index c08d270f..ad2c87f9 100644 --- a/src/org/apollo/game/event/handler/impl/RemoveEventHandler.java +++ b/src/org/apollo/game/message/handler/impl/RemoveEquippedItemHandler.java @@ -1,28 +1,28 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.ItemActionEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.ItemActionMessage; import org.apollo.game.model.Item; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inv.Inventory; import org.apollo.game.model.inv.SynchronizationInventoryListener; /** - * An {@link EventHandler} that removes equipped items. + * A {@link MessageHandler} that removes equipped items. * * @author Graham * @author Major */ -public final class RemoveEventHandler extends EventHandler { +public final class RemoveEquippedItemHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, ItemActionEvent event) { - if (event.getOption() == 1 && event.getInterfaceId() == SynchronizationInventoryListener.EQUIPMENT_ID) { + public void handle(MessageHandlerContext ctx, Player player, ItemActionMessage message) { + if (message.getOption() == 1 && message.getInterfaceId() == SynchronizationInventoryListener.EQUIPMENT_ID) { Inventory inventory = player.getInventory(); Inventory equipment = player.getEquipment(); - int slot = event.getSlot(); + int slot = message.getSlot(); Item item = equipment.get(slot); int id = item.getId(); diff --git a/src/org/apollo/game/event/handler/impl/SwitchItemEventHandler.java b/src/org/apollo/game/message/handler/impl/SwitchItemMessageHandler.java similarity index 50% rename from src/org/apollo/game/event/handler/impl/SwitchItemEventHandler.java rename to src/org/apollo/game/message/handler/impl/SwitchItemMessageHandler.java index 56ec674c..3f79a1c1 100644 --- a/src/org/apollo/game/event/handler/impl/SwitchItemEventHandler.java +++ b/src/org/apollo/game/message/handler/impl/SwitchItemMessageHandler.java @@ -1,27 +1,27 @@ -package org.apollo.game.event.handler.impl; +package org.apollo.game.message.handler.impl; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.EventHandlerContext; -import org.apollo.game.event.impl.SwitchItemEvent; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.SwitchItemMessage; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inter.bank.BankConstants; import org.apollo.game.model.inv.Inventory; import org.apollo.game.model.inv.SynchronizationInventoryListener; /** - * An {@link EventHandler} which updates an {@link Inventory} when the client sends a {@link SwitchItemEvent} to the + * A {@link MessageHandler} which updates an {@link Inventory} when the client sends a {@link SwitchItemMessage} to the * server. * * @author Graham */ -public final class SwitchItemEventHandler extends EventHandler { +public final class SwitchItemMessageHandler extends MessageHandler { @Override - public void handle(EventHandlerContext ctx, Player player, SwitchItemEvent event) { + public void handle(MessageHandlerContext ctx, Player player, SwitchItemMessage message) { Inventory inventory; boolean insertPermitted = false; - switch (event.getInterfaceId()) { + switch (message.getInterfaceId()) { case SynchronizationInventoryListener.INVENTORY_ID: case BankConstants.SIDEBAR_INVENTORY_ID: inventory = player.getInventory(); @@ -37,10 +37,10 @@ public final class SwitchItemEventHandler extends EventHandler return; // not a known inventory, ignore } - if (event.getOldSlot() >= 0 && event.getNewSlot() >= 0 && event.getOldSlot() < inventory.capacity() - && event.getNewSlot() < inventory.capacity()) { + if (message.getOldSlot() >= 0 && message.getNewSlot() >= 0 && message.getOldSlot() < inventory.capacity() + && message.getNewSlot() < inventory.capacity()) { // events must be fired for it to work if a sidebar inventory overlay is used - inventory.swap(insertPermitted ? event.isInserting() : false, event.getOldSlot(), event.getNewSlot()); + inventory.swap(insertPermitted && message.isInserting(), message.getOldSlot(), message.getNewSlot()); } } diff --git a/src/org/apollo/game/message/handler/impl/WalkMessageHandler.java b/src/org/apollo/game/message/handler/impl/WalkMessageHandler.java new file mode 100644 index 00000000..003a9cee --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/WalkMessageHandler.java @@ -0,0 +1,41 @@ +package org.apollo.game.message.handler.impl; + +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerContext; +import org.apollo.game.message.impl.WalkMessage; +import org.apollo.game.model.Position; +import org.apollo.game.model.entity.Player; +import org.apollo.game.model.entity.WalkingQueue; + +/** + * A {@link MessageHandler} that handles {@link WalkMessage}s. + * + * @author Graham + */ +public final class WalkMessageHandler extends MessageHandler { + + @Override + public void handle(MessageHandlerContext ctx, Player player, WalkMessage message) { + WalkingQueue queue = player.getWalkingQueue(); + + Position[] steps = message.getSteps(); + for (int i = 0; i < steps.length; i++) { + Position step = steps[i]; + if (i == 0) { + if (!queue.addFirstStep(step)) { + return; // ignore packet + } + } else { + queue.addStep(step); + } + } + + queue.setRunningQueue(message.isRunning() || player.isRunning()); + + if (queue.size() > 0) { + player.stopAction(); + } + player.getInterfaceSet().close(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/impl/package-info.java b/src/org/apollo/game/message/handler/impl/package-info.java new file mode 100644 index 00000000..c6ff1f33 --- /dev/null +++ b/src/org/apollo/game/message/handler/impl/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains message handler implementations. + */ +package org.apollo.game.message.handler.impl; \ No newline at end of file diff --git a/src/org/apollo/game/message/handler/package-info.java b/src/org/apollo/game/message/handler/package-info.java new file mode 100644 index 00000000..117b2622 --- /dev/null +++ b/src/org/apollo/game/message/handler/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains the base classes for message handling. + */ +package org.apollo.game.message.handler; \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/AddFriendEvent.java b/src/org/apollo/game/message/impl/AddFriendMessage.java similarity index 54% rename from src/org/apollo/game/event/impl/AddFriendEvent.java rename to src/org/apollo/game/message/impl/AddFriendMessage.java index ce442241..19c888bb 100644 --- a/src/org/apollo/game/event/impl/AddFriendEvent.java +++ b/src/org/apollo/game/message/impl/AddFriendMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when a player adds someone to their friends list. + * A {@link Message} sent by the client when a player adds someone to their friends list. * * @author Major */ -public final class AddFriendEvent extends Event { +public final class AddFriendMessage extends Message { /** * The username of the befriended player. @@ -15,11 +15,11 @@ public final class AddFriendEvent extends Event { private final String username; /** - * Creates a new befriend user event. + * Creates a new befriend user message. * * @param username The befriended player's username. */ - public AddFriendEvent(String username) { + public AddFriendMessage(String username) { this.username = username; } diff --git a/src/org/apollo/game/event/impl/AddGlobalTileItemEvent.java b/src/org/apollo/game/message/impl/AddGlobalTileItemMessage.java similarity index 76% rename from src/org/apollo/game/event/impl/AddGlobalTileItemEvent.java rename to src/org/apollo/game/message/impl/AddGlobalTileItemMessage.java index 8f5b73d4..4c8b5a0f 100644 --- a/src/org/apollo/game/event/impl/AddGlobalTileItemEvent.java +++ b/src/org/apollo/game/message/impl/AddGlobalTileItemMessage.java @@ -1,9 +1,9 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Item; -public final class AddGlobalTileItemEvent extends Event { +public final class AddGlobalTileItemMessage extends Message { /** * The item to add to the tile. @@ -21,23 +21,23 @@ public final class AddGlobalTileItemEvent extends Event { private final int index; /** - * Creates the add global tile item event. + * Creates the add global tile item message. * * @param item The item to add to the tile. * @param index The index of the player who dropped the item. */ - public AddGlobalTileItemEvent(Item item, int index) { + public AddGlobalTileItemMessage(Item item, int index) { this(item, index, 0); } /** - * Creates the add global tile item event. + * Creates the add global tile item message. * * @param item The item to add to the tile. * @param index The index of the player who dropped the item. * @param positionOffset The offset from the 'base' position. */ - public AddGlobalTileItemEvent(Item item, int index, int positionOffset) { + public AddGlobalTileItemMessage(Item item, int index, int positionOffset) { this.item = item; this.index = index; this.positionOffset = positionOffset; diff --git a/src/org/apollo/game/event/impl/AddIgnoreEvent.java b/src/org/apollo/game/message/impl/AddIgnoreMessage.java similarity index 53% rename from src/org/apollo/game/event/impl/AddIgnoreEvent.java rename to src/org/apollo/game/message/impl/AddIgnoreMessage.java index fff53923..7c825df8 100644 --- a/src/org/apollo/game/event/impl/AddIgnoreEvent.java +++ b/src/org/apollo/game/message/impl/AddIgnoreMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when a player adds someone to their ignore list. + * A {@link Message} sent by the client when a player adds someone to their ignore list. * * @author Major */ -public final class AddIgnoreEvent extends Event { +public final class AddIgnoreMessage extends Message { /** * The username of the ignored player. @@ -15,11 +15,11 @@ public final class AddIgnoreEvent extends Event { private final String username; /** - * Creates a new ignore player event. + * Creates a new ignore player message. * * @param username The ignored player's username. */ - public AddIgnoreEvent(String username) { + public AddIgnoreMessage(String username) { this.username = username; } diff --git a/src/org/apollo/game/event/impl/AddTileItemEvent.java b/src/org/apollo/game/message/impl/AddTileItemMessage.java similarity index 69% rename from src/org/apollo/game/event/impl/AddTileItemEvent.java rename to src/org/apollo/game/message/impl/AddTileItemMessage.java index 87621c8c..8eb6a22d 100644 --- a/src/org/apollo/game/event/impl/AddTileItemEvent.java +++ b/src/org/apollo/game/message/impl/AddTileItemMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Item; /** - * An {@link Event} sent to the client that adds an item to a tile. + * A {@link Message} sent to the client that adds an item to a tile. * * @author Major */ -public final class AddTileItemEvent extends Event { +public final class AddTileItemMessage extends Message { /** * The item to add to the tile. @@ -21,21 +21,21 @@ public final class AddTileItemEvent extends Event { private final int positionOffset; /** - * Creates an add tile item event. + * Creates an add tile item message. * * @param item The item to add to the tile. */ - public AddTileItemEvent(Item item) { + public AddTileItemMessage(Item item) { this(item, 0); } /** - * Creates an add tile item event. + * Creates an add tile item message. * * @param item The item to add to the tile. * @param positionOffset The offset from the 'base' position. */ - public AddTileItemEvent(Item item, int positionOffset) { + public AddTileItemMessage(Item item, int positionOffset) { this.item = item; this.positionOffset = positionOffset; } diff --git a/src/org/apollo/game/event/impl/ArrowKeyEvent.java b/src/org/apollo/game/message/impl/ArrowKeyMessage.java similarity index 58% rename from src/org/apollo/game/event/impl/ArrowKeyEvent.java rename to src/org/apollo/game/message/impl/ArrowKeyMessage.java index 3b5ebe33..13010a13 100644 --- a/src/org/apollo/game/event/impl/ArrowKeyEvent.java +++ b/src/org/apollo/game/message/impl/ArrowKeyMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when the user has pressed an arrow key. + * A {@link Message} sent by the client when the user has pressed an arrow key. * * @author Major */ -public final class ArrowKeyEvent extends Event { +public final class ArrowKeyMessage extends Message { /** * The camera roll. @@ -20,9 +20,9 @@ public final class ArrowKeyEvent extends Event { private final int yaw; /** - * Creates a new arrow key event. + * Creates a new arrow key message. */ - public ArrowKeyEvent(int roll, int yaw) { + public ArrowKeyMessage(int roll, int yaw) { this.roll = roll; this.yaw = yaw; } diff --git a/src/org/apollo/game/event/impl/ButtonEvent.java b/src/org/apollo/game/message/impl/ButtonMessage.java similarity index 51% rename from src/org/apollo/game/event/impl/ButtonEvent.java rename to src/org/apollo/game/message/impl/ButtonMessage.java index a52744be..8de71050 100644 --- a/src/org/apollo/game/event/impl/ButtonEvent.java +++ b/src/org/apollo/game/message/impl/ButtonMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when a player clicks a button. + * A {@link Message} sent by the client when a player clicks a button. * * @author Graham */ -public final class ButtonEvent extends Event { +public final class ButtonMessage extends Message { /** * The widget id. @@ -15,11 +15,11 @@ public final class ButtonEvent extends Event { private final int widgetId; /** - * Creates the button event. + * Creates the button message. * * @param widgetId The widget id. */ - public ButtonEvent(int widgetId) { + public ButtonMessage(int widgetId) { this.widgetId = widgetId; } diff --git a/src/org/apollo/game/event/impl/ChatEvent.java b/src/org/apollo/game/message/impl/ChatMessage.java similarity index 76% rename from src/org/apollo/game/event/impl/ChatEvent.java rename to src/org/apollo/game/message/impl/ChatMessage.java index f3565fd8..8b6b3b56 100644 --- a/src/org/apollo/game/event/impl/ChatEvent.java +++ b/src/org/apollo/game/message/impl/ChatMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client to send a public chat message to other players. + * A {@link Message} sent by the client to send a public chat message to other players. * * @author Graham */ -public final class ChatEvent extends Event { +public final class ChatMessage extends Message { /** * The text color. @@ -30,14 +30,14 @@ public final class ChatEvent extends Event { private final String message; /** - * Creates a new chat event. + * Creates a new chat message. * * @param message The message. * @param compressedMessage The compressed message. * @param color The text color. * @param effects The text effects. */ - public ChatEvent(String message, byte[] compressedMessage, int color, int effects) { + public ChatMessage(String message, byte[] compressedMessage, int color, int effects) { this.message = message; this.compressedMessage = compressedMessage; this.color = color; diff --git a/src/org/apollo/game/message/impl/CloseInterfaceMessage.java b/src/org/apollo/game/message/impl/CloseInterfaceMessage.java new file mode 100644 index 00000000..79cba224 --- /dev/null +++ b/src/org/apollo/game/message/impl/CloseInterfaceMessage.java @@ -0,0 +1,12 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client that closes the open interface. + * + * @author Graham + */ +public final class CloseInterfaceMessage extends Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/ClosedInterfaceMessage.java b/src/org/apollo/game/message/impl/ClosedInterfaceMessage.java new file mode 100644 index 00000000..9b8c9348 --- /dev/null +++ b/src/org/apollo/game/message/impl/ClosedInterfaceMessage.java @@ -0,0 +1,12 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client when the current interface is closed. + * + * @author Graham + */ +public final class ClosedInterfaceMessage extends Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/CommandEvent.java b/src/org/apollo/game/message/impl/CommandMessage.java similarity index 50% rename from src/org/apollo/game/event/impl/CommandEvent.java rename to src/org/apollo/game/message/impl/CommandMessage.java index a0332197..977bf39a 100644 --- a/src/org/apollo/game/event/impl/CommandEvent.java +++ b/src/org/apollo/game/message/impl/CommandMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client to send a {@code ::} command. + * A {@link Message} sent by the client to send a {@code ::} command. * * @author Graham */ -public final class CommandEvent extends Event { +public final class CommandMessage extends Message { /** * The command. @@ -15,11 +15,11 @@ public final class CommandEvent extends Event { private final String command; /** - * Creates the command event. + * Creates the command message. * * @param command The command. */ - public CommandEvent(String command) { + public CommandMessage(String command) { this.command = command; } diff --git a/src/org/apollo/game/event/impl/ConfigEvent.java b/src/org/apollo/game/message/impl/ConfigMessage.java similarity index 63% rename from src/org/apollo/game/event/impl/ConfigEvent.java rename to src/org/apollo/game/message/impl/ConfigMessage.java index dae8caf4..0a68b271 100644 --- a/src/org/apollo/game/event/impl/ConfigEvent.java +++ b/src/org/apollo/game/message/impl/ConfigMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to adjust a certain config or attribute setting. + * A {@link Message} sent to the client to adjust a certain config or attribute setting. * * @author Chris Fletcher */ -public final class ConfigEvent extends Event { +public final class ConfigMessage extends Message { /** * The identifier. @@ -20,12 +20,12 @@ public final class ConfigEvent extends Event { private final int value; /** - * Creates a new config event. + * Creates a new config message. * * @param id The config's identifier. * @param value The value. */ - public ConfigEvent(int id, int value) { + public ConfigMessage(int id, int value) { this.id = id; this.value = value; } diff --git a/src/org/apollo/game/event/impl/DialogueContinueEvent.java b/src/org/apollo/game/message/impl/DialogueContinueMessage.java similarity index 50% rename from src/org/apollo/game/event/impl/DialogueContinueEvent.java rename to src/org/apollo/game/message/impl/DialogueContinueMessage.java index a1b10557..7c6798e7 100644 --- a/src/org/apollo/game/event/impl/DialogueContinueEvent.java +++ b/src/org/apollo/game/message/impl/DialogueContinueMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when the player clicks the "Click here to continue" button on a dialogue + * A {@link Message} sent by the client when the player clicks the "Click here to continue" button on a dialogue * interface. * * @author Chris Fletcher */ -public final class DialogueContinueEvent extends Event { +public final class DialogueContinueMessage extends Message { /** * The interface id. @@ -16,11 +16,11 @@ public final class DialogueContinueEvent extends Event { private final int interfaceId; /** - * Creates a new dialogue continue event. + * Creates a new dialogue continue message. * * @param interfaceId The interface id. */ - public DialogueContinueEvent(int interfaceId) { + public DialogueContinueMessage(int interfaceId) { this.interfaceId = interfaceId; } diff --git a/src/org/apollo/game/event/impl/DisplayCrossbonesEvent.java b/src/org/apollo/game/message/impl/DisplayCrossbonesMessage.java similarity index 57% rename from src/org/apollo/game/event/impl/DisplayCrossbonesEvent.java rename to src/org/apollo/game/message/impl/DisplayCrossbonesMessage.java index a9344fe9..bc3d7c38 100644 --- a/src/org/apollo/game/event/impl/DisplayCrossbonesEvent.java +++ b/src/org/apollo/game/message/impl/DisplayCrossbonesMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to display crossbones when the player enters a multi-combat zone. + * A {@link Message} sent to the client to display crossbones when the player enters a multi-combat zone. * * @author Major */ -public final class DisplayCrossbonesEvent extends Event { +public final class DisplayCrossbonesMessage extends Message { /** * Whether or not the crossbones should be displayed. @@ -15,11 +15,11 @@ public final class DisplayCrossbonesEvent extends Event { private final boolean display; /** - * Creates a display crossbones event. + * Creates a display crossbones message. * * @param display Whether or not the crossbones should be displayed. */ - public DisplayCrossbonesEvent(boolean display) { + public DisplayCrossbonesMessage(boolean display) { this.display = display; } diff --git a/src/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java b/src/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java new file mode 100644 index 00000000..ce93187d --- /dev/null +++ b/src/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to change the currently displayed tab interface. + * + * @author Chris Fletcher + */ +public final class DisplayTabInterfaceMessage extends Message { + + /** + * The tab index. + */ + private final int tab; + + /** + * Creates a new display tab interface message. + * + * @param tab The index of the tab to display. + */ + public DisplayTabInterfaceMessage(int tab) { + this.tab = tab; + } + + /** + * Gets the index of the tab to display. + * + * @return The tab index. + */ + public int getTab() { + return tab; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/EnterAmountMessage.java b/src/org/apollo/game/message/impl/EnterAmountMessage.java new file mode 100644 index 00000000..a26d7fb5 --- /dev/null +++ b/src/org/apollo/game/message/impl/EnterAmountMessage.java @@ -0,0 +1,12 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to open up the enter amount interface. + * + * @author Graham + */ +public final class EnterAmountMessage extends Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/EnteredAmountMessage.java b/src/org/apollo/game/message/impl/EnteredAmountMessage.java new file mode 100644 index 00000000..0da1c84b --- /dev/null +++ b/src/org/apollo/game/message/impl/EnteredAmountMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client when the player has entered an amount. + * + * @author Graham + */ +public final class EnteredAmountMessage extends Message { + + /** + * The amount. + */ + private final int amount; + + /** + * Creates the entered amount message. + * + * @param amount The amount. + */ + public EnteredAmountMessage(int amount) { + this.amount = amount; + } + + /** + * Gets the amount. + * + * @return The amount. + */ + public int getAmount() { + return amount; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FifthItemActionMessage.java b/src/org/apollo/game/message/impl/FifthItemActionMessage.java new file mode 100644 index 00000000..d3934715 --- /dev/null +++ b/src/org/apollo/game/message/impl/FifthItemActionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The fifth {@link ItemActionMessage}. + * + * @author Graham + */ +public final class FifthItemActionMessage extends ItemActionMessage { + + /** + * Creates the fifth item action message. + * + * @param interfaceId The interface id. + * @param id The item id. + * @param slot The item slot. + */ + public FifthItemActionMessage(int interfaceId, int id, int slot) { + super(5, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FifthItemOptionMessage.java b/src/org/apollo/game/message/impl/FifthItemOptionMessage.java new file mode 100644 index 00000000..0826d39a --- /dev/null +++ b/src/org/apollo/game/message/impl/FifthItemOptionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The fifth {@link ItemOptionMessage}. + * + * @author Chris Fletcher + */ +public final class FifthItemOptionMessage extends ItemOptionMessage { + + /** + * Creates the fifth item option message. + * + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public FifthItemOptionMessage(int interfaceId, int id, int slot) { + super(5, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FifthPlayerActionMessage.java b/src/org/apollo/game/message/impl/FifthPlayerActionMessage.java new file mode 100644 index 00000000..73934b79 --- /dev/null +++ b/src/org/apollo/game/message/impl/FifthPlayerActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The fifth {@link PlayerActionMessage}. + * + * @author Major + */ +public final class FifthPlayerActionMessage extends PlayerActionMessage { + + /** + * Creates a fifth player action message. + * + * @param playerIndex The index of the clicked player. + */ + public FifthPlayerActionMessage(int playerIndex) { + super(5, playerIndex); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FirstItemActionMessage.java b/src/org/apollo/game/message/impl/FirstItemActionMessage.java new file mode 100644 index 00000000..cb399cd4 --- /dev/null +++ b/src/org/apollo/game/message/impl/FirstItemActionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The first {@link ItemActionMessage}. + * + * @author Graham + */ +public final class FirstItemActionMessage extends ItemActionMessage { + + /** + * Creates the first item action message. + * + * @param interfaceId The interface id. + * @param id The item id. + * @param slot The item slot. + */ + public FirstItemActionMessage(int interfaceId, int id, int slot) { + super(1, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FirstItemOptionMessage.java b/src/org/apollo/game/message/impl/FirstItemOptionMessage.java new file mode 100644 index 00000000..72b1125b --- /dev/null +++ b/src/org/apollo/game/message/impl/FirstItemOptionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The first {@link ItemOptionMessage}. + * + * @author Chris Fletcher + */ +public final class FirstItemOptionMessage extends ItemOptionMessage { + + /** + * Creates the first item option message. + * + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public FirstItemOptionMessage(int interfaceId, int id, int slot) { + super(1, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FirstNpcActionMessage.java b/src/org/apollo/game/message/impl/FirstNpcActionMessage.java new file mode 100644 index 00000000..9578c82c --- /dev/null +++ b/src/org/apollo/game/message/impl/FirstNpcActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The first {@link NpcActionMessage}. + * + * @author Major + */ +public final class FirstNpcActionMessage extends NpcActionMessage { + + /** + * Creates a new first npc action message. + * + * @param index The index of the npc. + */ + public FirstNpcActionMessage(int index) { + super(1, index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FirstObjectActionMessage.java b/src/org/apollo/game/message/impl/FirstObjectActionMessage.java new file mode 100644 index 00000000..cef59087 --- /dev/null +++ b/src/org/apollo/game/message/impl/FirstObjectActionMessage.java @@ -0,0 +1,22 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.model.Position; + +/** + * The first {@link ObjectActionMessage}. + * + * @author Graham + */ +public final class FirstObjectActionMessage extends ObjectActionMessage { + + /** + * Creates the first object action message. + * + * @param id The id. + * @param position The position. + */ + public FirstObjectActionMessage(int id, Position position) { + super(1, id, position); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FirstPlayerActionMessage.java b/src/org/apollo/game/message/impl/FirstPlayerActionMessage.java new file mode 100644 index 00000000..c1261202 --- /dev/null +++ b/src/org/apollo/game/message/impl/FirstPlayerActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The first {@link PlayerActionMessage}. + * + * @author Major + */ +public final class FirstPlayerActionMessage extends PlayerActionMessage { + + /** + * Creates a first player action message. + * + * @param playerIndex The index of the clicked player. + */ + public FirstPlayerActionMessage(int playerIndex) { + super(1, playerIndex); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FocusUpdateEvent.java b/src/org/apollo/game/message/impl/FocusUpdateMessage.java similarity index 54% rename from src/org/apollo/game/event/impl/FocusUpdateEvent.java rename to src/org/apollo/game/message/impl/FocusUpdateMessage.java index ad4605d8..e2d5e0d1 100644 --- a/src/org/apollo/game/event/impl/FocusUpdateEvent.java +++ b/src/org/apollo/game/message/impl/FocusUpdateMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client to indicate a change in the client's focus (i.e. if it is the active window). + * A {@link Message} sent by the client to indicate a change in the client's focus (i.e. if it is the active window). * * @author Major */ -public final class FocusUpdateEvent extends Event { +public final class FocusUpdateMessage extends Message { /** * Indicates whether the client is focused or not. @@ -15,11 +15,11 @@ public final class FocusUpdateEvent extends Event { private final boolean focused; /** - * Creates a new focus update event. + * Creates a new focus update message. * * @param update The data received. */ - public FocusUpdateEvent(boolean focused) { + public FocusUpdateMessage(boolean focused) { this.focused = focused; } diff --git a/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java b/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java similarity index 73% rename from src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java rename to src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java index 4344413b..8eb8262e 100644 --- a/src/org/apollo/game/event/impl/ForwardPrivateMessageEvent.java +++ b/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.setting.PrivilegeLevel; /** - * An {@link Event} sent to the client that forwards a private message. + * A {@link Message} sent to the client that forwards a private chat. * * @author Major */ -public final class ForwardPrivateMessageEvent extends Event { +public final class ForwardPrivateChatMessage extends Message { /** * The username of the player sending the message. @@ -26,12 +26,12 @@ public final class ForwardPrivateMessageEvent extends Event { private final byte[] message; /** - * Creates a new forward private message event. + * Creates a new forward private message message. * * @param sender The player sending the message. * @param message The compressed message. */ - public ForwardPrivateMessageEvent(String username, PrivilegeLevel level, byte[] message) { + public ForwardPrivateChatMessage(String username, PrivilegeLevel level, byte[] message) { this.username = username; this.privilege = level; this.message = message; diff --git a/src/org/apollo/game/message/impl/FourthItemActionMessage.java b/src/org/apollo/game/message/impl/FourthItemActionMessage.java new file mode 100644 index 00000000..7f969520 --- /dev/null +++ b/src/org/apollo/game/message/impl/FourthItemActionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The fourth {@link ItemActionMessage}. + * + * @author Graham + */ +public final class FourthItemActionMessage extends ItemActionMessage { + + /** + * Creates the fourth item action message. + * + * @param interfaceId The interface id. + * @param id The item id. + * @param slot The item slot. + */ + public FourthItemActionMessage(int interfaceId, int id, int slot) { + super(4, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FourthItemOptionMessage.java b/src/org/apollo/game/message/impl/FourthItemOptionMessage.java new file mode 100644 index 00000000..cdc8e6d8 --- /dev/null +++ b/src/org/apollo/game/message/impl/FourthItemOptionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The fourth {@link ItemOptionMessage}. + * + * @author Chris Fletcher + */ +public final class FourthItemOptionMessage extends ItemOptionMessage { + + /** + * Creates the fourth item option message. + * + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public FourthItemOptionMessage(int interfaceId, int id, int slot) { + super(4, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/FourthPlayerActionMessage.java b/src/org/apollo/game/message/impl/FourthPlayerActionMessage.java new file mode 100644 index 00000000..9454bfa7 --- /dev/null +++ b/src/org/apollo/game/message/impl/FourthPlayerActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The fourth {@link PlayerActionMessage}. + * + * @author Major + */ +public final class FourthPlayerActionMessage extends PlayerActionMessage { + + /** + * Creates a fourth player action message. + * + * @param playerIndex The index of the clicked player. + */ + public FourthPlayerActionMessage(int playerIndex) { + super(4, playerIndex); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/FriendServerStatusEvent.java b/src/org/apollo/game/message/impl/FriendServerStatusMessage.java similarity index 54% rename from src/org/apollo/game/event/impl/FriendServerStatusEvent.java rename to src/org/apollo/game/message/impl/FriendServerStatusMessage.java index ec2c1d3d..6ed66bc9 100644 --- a/src/org/apollo/game/event/impl/FriendServerStatusEvent.java +++ b/src/org/apollo/game/message/impl/FriendServerStatusMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.setting.ServerStatus; /** - * An {@link Event} sent to the client to update the friend server status. + * A {@link Message} sent to the client to update the friend server status. * * @author Major */ -public final class FriendServerStatusEvent extends Event { +public final class FriendServerStatusMessage extends Message { /** * The status code of the friend server. @@ -16,11 +16,11 @@ public final class FriendServerStatusEvent extends Event { private final int status; /** - * Creates a new friend server status event. + * Creates a new friend server status message. * * @param status The status. */ - public FriendServerStatusEvent(ServerStatus status) { + public FriendServerStatusMessage(ServerStatus status) { this.status = status.getCode(); } diff --git a/src/org/apollo/game/event/impl/IdAssignmentEvent.java b/src/org/apollo/game/message/impl/IdAssignmentMessage.java similarity index 60% rename from src/org/apollo/game/event/impl/IdAssignmentEvent.java rename to src/org/apollo/game/message/impl/IdAssignmentMessage.java index becbc728..aaadda5b 100644 --- a/src/org/apollo/game/event/impl/IdAssignmentEvent.java +++ b/src/org/apollo/game/message/impl/IdAssignmentMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client that specifies the local id and membership status of the current player. + * A {@link Message} sent to the client that specifies the local id and membership status of the current player. * * @author Graham */ -public final class IdAssignmentEvent extends Event { +public final class IdAssignmentMessage extends Message { /** * The id of this player. @@ -20,12 +20,12 @@ public final class IdAssignmentEvent extends Event { private final boolean members; /** - * Creates the local id event. + * Creates the local id message. * * @param id The id. * @param members The membership flag. */ - public IdAssignmentEvent(int id, boolean members) { + public IdAssignmentMessage(int id, boolean members) { this.id = id; this.members = members; } diff --git a/src/org/apollo/game/event/impl/IgnoreListEvent.java b/src/org/apollo/game/message/impl/IgnoreListMessage.java similarity index 55% rename from src/org/apollo/game/event/impl/IgnoreListEvent.java rename to src/org/apollo/game/message/impl/IgnoreListMessage.java index 58e69a22..d1984f77 100644 --- a/src/org/apollo/game/event/impl/IgnoreListEvent.java +++ b/src/org/apollo/game/message/impl/IgnoreListMessage.java @@ -1,15 +1,15 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; import java.util.List; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client that updates the ignored user list. + * A {@link Message} sent to the client that updates the ignored user list. * * @author Major */ -public final class IgnoreListEvent extends Event { +public final class IgnoreListMessage extends Message { /** * The list of ignored player usernames. @@ -17,11 +17,11 @@ public final class IgnoreListEvent extends Event { private final List usernames; /** - * Creates a new ignore list event. + * Creates a new ignore list message. * * @param player The player. */ - public IgnoreListEvent(List usernames) { + public IgnoreListMessage(List usernames) { this.usernames = usernames; } diff --git a/src/org/apollo/game/event/impl/InventoryItemEvent.java b/src/org/apollo/game/message/impl/InventoryItemMessage.java similarity index 66% rename from src/org/apollo/game/event/impl/InventoryItemEvent.java rename to src/org/apollo/game/message/impl/InventoryItemMessage.java index b3830027..d00f804a 100644 --- a/src/org/apollo/game/event/impl/InventoryItemEvent.java +++ b/src/org/apollo/game/message/impl/InventoryItemMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} that represents some sort of action on an item in an inventory. Note that this is the parent of both - * item option and item action event, and so cannot be used to determine when one of those events is fired. + * A {@link Message} that represents some sort of action on an item in an inventory. Note that this is the parent of both + * item option and item action message, and so cannot be used to determine when one of those messages is fired. * * @author Chris Fletcher */ -public abstract class InventoryItemEvent extends Event { +public abstract class InventoryItemMessage extends Message { /** * The item id. @@ -31,14 +31,14 @@ public abstract class InventoryItemEvent extends Event { private final int slot; /** - * Creates the item action event. + * Creates the item action message. * * @param option The option number. * @param interfaceId The interface id. * @param id The id. * @param slot The slot. */ - protected InventoryItemEvent(int option, int interfaceId, int id, int slot) { + protected InventoryItemMessage(int option, int interfaceId, int id, int slot) { this.option = option; this.interfaceId = interfaceId; this.id = id; diff --git a/src/org/apollo/game/message/impl/ItemActionMessage.java b/src/org/apollo/game/message/impl/ItemActionMessage.java new file mode 100644 index 00000000..545803b3 --- /dev/null +++ b/src/org/apollo/game/message/impl/ItemActionMessage.java @@ -0,0 +1,26 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client that represents some sort of action on an item. Note that the actual message sent + * by the client is one of the five item action messages, but this is the message that should be intercepted (and the option + * verified). + * + * @author Chris Fletcher + */ +public abstract class ItemActionMessage extends InventoryItemMessage { + + /** + * Creates the item action message. + * + * @param option The option number. + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public ItemActionMessage(int option, int interfaceId, int id, int slot) { + super(option, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/ItemOnItemEvent.java b/src/org/apollo/game/message/impl/ItemOnItemMessage.java similarity index 78% rename from src/org/apollo/game/event/impl/ItemOnItemEvent.java rename to src/org/apollo/game/message/impl/ItemOnItemMessage.java index 40c2c912..827afe9a 100644 --- a/src/org/apollo/game/event/impl/ItemOnItemEvent.java +++ b/src/org/apollo/game/message/impl/ItemOnItemMessage.java @@ -1,11 +1,11 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; /** - * An {@link Event} sent by the client when a player uses one inventory item on another. + * A {@link Message} sent by the client when a player uses one inventory item on another. * * @author Chris Fletcher */ -public final class ItemOnItemEvent extends InventoryItemEvent { +public final class ItemOnItemMessage extends InventoryItemMessage { /** * The id of the target item. @@ -23,7 +23,7 @@ public final class ItemOnItemEvent extends InventoryItemEvent { private final int targetSlot; /** - * Creates a new item-on-item event. + * Creates a new item-on-item message. * * @param usedInterface The interface id of the used item. * @param usedId The id of the used item. @@ -32,7 +32,7 @@ public final class ItemOnItemEvent extends InventoryItemEvent { * @param targetId The id of the target item. * @param targetSlot The slot of the target item. */ - public ItemOnItemEvent(int usedInterface, int usedId, int usedSlot, int targetInterface, int targetId, + public ItemOnItemMessage(int usedInterface, int usedId, int usedSlot, int targetInterface, int targetId, int targetSlot) { super(0, usedInterface, usedId, usedSlot); this.targetInterface = targetInterface; diff --git a/src/org/apollo/game/event/impl/ItemOnObjectEvent.java b/src/org/apollo/game/message/impl/ItemOnObjectMessage.java similarity index 69% rename from src/org/apollo/game/event/impl/ItemOnObjectEvent.java rename to src/org/apollo/game/message/impl/ItemOnObjectMessage.java index 23ea81c1..48ca26fe 100644 --- a/src/org/apollo/game/event/impl/ItemOnObjectEvent.java +++ b/src/org/apollo/game/message/impl/ItemOnObjectMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event} sent by the client when an item is used on an object. + * A {@link Message} sent by the client when an item is used on an object. * * @author Major */ -public final class ItemOnObjectEvent extends InventoryItemEvent { +public final class ItemOnObjectMessage extends InventoryItemMessage { /** * The object id the item was used on. @@ -21,7 +21,7 @@ public final class ItemOnObjectEvent extends InventoryItemEvent { private final Position position; /** - * Creates an item on object event. + * Creates an item on object message. * * @param interfaceId The interface id. * @param itemId The item id. @@ -30,7 +30,7 @@ public final class ItemOnObjectEvent extends InventoryItemEvent { * @param x The x coordinate. * @param y The y coordinate. */ - public ItemOnObjectEvent(int interfaceId, int itemId, int itemSlot, int objectId, int x, int y) { + public ItemOnObjectMessage(int interfaceId, int itemId, int itemSlot, int objectId, int x, int y) { super(0, interfaceId, itemId, itemSlot); this.objectId = objectId; this.position = new Position(x, y); diff --git a/src/org/apollo/game/message/impl/ItemOptionMessage.java b/src/org/apollo/game/message/impl/ItemOptionMessage.java new file mode 100644 index 00000000..c6905b81 --- /dev/null +++ b/src/org/apollo/game/message/impl/ItemOptionMessage.java @@ -0,0 +1,24 @@ +package org.apollo.game.message.impl; + +/** + * An {@link InventoryItemMessage} sent by the client when an item's option is clicked (e.g. equip, eat, drink, etc). Note + * that the actual message sent by the client is one of the five item option messages, but this is the message that should be + * intercepted (and the option verified). + * + * @author Chris Fletcher + */ +public abstract class ItemOptionMessage extends InventoryItemMessage { + + /** + * Creates the item option message. + * + * @param option The option number. + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public ItemOptionMessage(int option, int interfaceId, int id, int slot) { + super(option, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/KeepAliveMessage.java b/src/org/apollo/game/message/impl/KeepAliveMessage.java new file mode 100644 index 00000000..24e11f7b --- /dev/null +++ b/src/org/apollo/game/message/impl/KeepAliveMessage.java @@ -0,0 +1,33 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} periodically sent by the client to keep a connection alive. + * + * @author Graham + */ +public final class KeepAliveMessage extends Message { + + /** + * The time this message was created. + */ + private final long createdAt; + + /** + * Creates the keep alive message. + */ + public KeepAliveMessage() { + createdAt = System.currentTimeMillis(); + } + + /** + * Gets the time when this message was created. + * + * @return The time when this message was created. + */ + public long getCreatedAt() { + return createdAt; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/LogoutMessage.java b/src/org/apollo/game/message/impl/LogoutMessage.java new file mode 100644 index 00000000..16e147c6 --- /dev/null +++ b/src/org/apollo/game/message/impl/LogoutMessage.java @@ -0,0 +1,12 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client that cleanly logs it out. + * + * @author Graham + */ +public final class LogoutMessage extends Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/MagicOnItemEvent.java b/src/org/apollo/game/message/impl/MagicOnItemMessage.java similarity index 56% rename from src/org/apollo/game/event/impl/MagicOnItemEvent.java rename to src/org/apollo/game/message/impl/MagicOnItemMessage.java index f6996972..bd09e4dc 100644 --- a/src/org/apollo/game/event/impl/MagicOnItemEvent.java +++ b/src/org/apollo/game/message/impl/MagicOnItemMessage.java @@ -1,11 +1,11 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; /** - * An {@link Event} sent by the client when a player casts a spell on an inventory item. + * A {@link Message} sent by the client when a player casts a spell on an inventory item. * * @author Chris Fletcher */ -public final class MagicOnItemEvent extends InventoryItemEvent { +public final class MagicOnItemMessage extends InventoryItemMessage { /** * The spell id. @@ -13,14 +13,14 @@ public final class MagicOnItemEvent extends InventoryItemEvent { private final int spell; /** - * Creates a new magic on item event. + * Creates a new magic on item message. * * @param interfaceId The interface id. * @param id The item id. * @param slot The item slot. * @param spell The spell id. */ - public MagicOnItemEvent(int interfaceId, int id, int slot, int spell) { + public MagicOnItemMessage(int interfaceId, int id, int slot, int spell) { super(0, interfaceId, id, slot); this.spell = spell; } diff --git a/src/org/apollo/game/message/impl/MobAnimationResetMessage.java b/src/org/apollo/game/message/impl/MobAnimationResetMessage.java new file mode 100644 index 00000000..3ad14e18 --- /dev/null +++ b/src/org/apollo/game/message/impl/MobAnimationResetMessage.java @@ -0,0 +1,12 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to reset the animations of every mob. + * + * @author Major + */ +public final class MobAnimationResetMessage extends Message { + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/MouseClickEvent.java b/src/org/apollo/game/message/impl/MouseClickMessage.java similarity index 80% rename from src/org/apollo/game/event/impl/MouseClickEvent.java rename to src/org/apollo/game/message/impl/MouseClickMessage.java index a034b634..4af02429 100644 --- a/src/org/apollo/game/event/impl/MouseClickEvent.java +++ b/src/org/apollo/game/message/impl/MouseClickMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when the player clicks with their mouse (or mousekeys etc). + * A {@link Message} sent by the client when the player clicks with their mouse (or mousekeys etc). * * @author Major */ -public final class MouseClickEvent extends Event { +public final class MouseClickMessage extends Message { /** * The number of clicks on this point (i.e. the point ({@link #x}, {@link #y})). @@ -31,14 +31,14 @@ public final class MouseClickEvent extends Event { private final boolean delta; /** - * Creates a new mouse click event. + * Creates a new mouse click message. * * @param clickCount The number of clicks on this point. * @param x The x coordinate of the mouse click. * @param y The y coordinate of the mouse click. * @param delta If the coordinates represent a change in x/y, rather than the values themselves. */ - public MouseClickEvent(int clickCount, int x, int y, boolean delta) { + public MouseClickMessage(int clickCount, int x, int y, boolean delta) { this.clickCount = clickCount; this.x = x; this.y = y; diff --git a/src/org/apollo/game/message/impl/NpcActionMessage.java b/src/org/apollo/game/message/impl/NpcActionMessage.java new file mode 100644 index 00000000..bb27db2f --- /dev/null +++ b/src/org/apollo/game/message/impl/NpcActionMessage.java @@ -0,0 +1,53 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client representing the clicking of an npc menu action. Note that the actual message sent + * by the client is one of the three npc action messages, but this is the message that should be intercepted (and the option + * verified). + * + * @author Major + */ +public abstract class NpcActionMessage extends Message { + + /** + * The option number. + */ + private final int option; + + /** + * The index of the clicked npc. + */ + private final int index; + + /** + * Creates an npc action message. + * + * @param option The option number. + * @param index The index of the npc. + */ + public NpcActionMessage(int option, int index) { + this.option = option; + this.index = index - 1; + } + + /** + * Gets the menu action number (i.e. the action message 'option') clicked. + * + * @return The option number. + */ + public int getOption() { + return option; + } + + /** + * Gets the index of the npc clicked. + * + * @return The npc index. + */ + public int getIndex() { + return index; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/NpcSynchronizationEvent.java b/src/org/apollo/game/message/impl/NpcSynchronizationMessage.java similarity index 74% rename from src/org/apollo/game/event/impl/NpcSynchronizationEvent.java rename to src/org/apollo/game/message/impl/NpcSynchronizationMessage.java index 1f961234..e474b83e 100644 --- a/src/org/apollo/game/event/impl/NpcSynchronizationEvent.java +++ b/src/org/apollo/game/message/impl/NpcSynchronizationMessage.java @@ -1,18 +1,18 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; import java.util.List; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; import org.apollo.game.model.entity.Npc; import org.apollo.game.sync.seg.SynchronizationSegment; /** - * An {@link Event} sent to the client to synchronize npcs with players. + * A {@link Message} sent to the client to synchronize npcs with players. * * @author Major */ -public final class NpcSynchronizationEvent extends Event { +public final class NpcSynchronizationMessage extends Message { /** * The amount of local npcs. @@ -30,13 +30,13 @@ public final class NpcSynchronizationEvent extends Event { private final List segments; /** - * Creates a new {@link NpcSynchronizationEvent}. + * Creates a new {@link NpcSynchronizationMessage}. * * @param position The position of the {@link Npc}. * @param segments The list of segments. * @param localNpcs The amount of local npcs. */ - public NpcSynchronizationEvent(Position position, List segments, int localNpcs) { + public NpcSynchronizationMessage(Position position, List segments, int localNpcs) { this.position = position; this.segments = segments; this.localNpcs = localNpcs; diff --git a/src/org/apollo/game/event/impl/ObjectActionEvent.java b/src/org/apollo/game/message/impl/ObjectActionMessage.java similarity index 64% rename from src/org/apollo/game/event/impl/ObjectActionEvent.java rename to src/org/apollo/game/message/impl/ObjectActionMessage.java index c4de0482..b9f5172f 100644 --- a/src/org/apollo/game/event/impl/ObjectActionEvent.java +++ b/src/org/apollo/game/message/impl/ObjectActionMessage.java @@ -1,16 +1,16 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event} sent by the client that represents some sort of action on an object. Note that the actual event sent - * by the client is one of the five object action events, but this is the event that should be intercepted (and the + * A {@link Message} sent by the client that represents some sort of action on an object. Note that the actual message sent + * by the client is one of the five object action messages, but this is the message that should be intercepted (and the * option verified). * * @author Graham */ -public abstract class ObjectActionEvent extends Event { +public abstract class ObjectActionMessage extends Message { /** * The object's id. @@ -28,13 +28,13 @@ public abstract class ObjectActionEvent extends Event { private final Position position; /** - * Creates a new object action event. + * Creates a new object action message. * * @param option The option number. * @param id The id of the object. * @param position The position of the object. */ - public ObjectActionEvent(int option, int id, Position position) { + public ObjectActionMessage(int option, int id, Position position) { this.option = option; this.id = id; this.position = position; diff --git a/src/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java b/src/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java new file mode 100644 index 00000000..4ce7e5ac --- /dev/null +++ b/src/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client that opens a dialogue interface (an interface that appears in the chat box). + * + * @author Chris Fletcher + */ +public final class OpenDialogueInterfaceMessage extends Message { + + /** + * The interface id. + */ + private final int interfaceId; + + /** + * Creates a new message with the specified interface id. + * + * @param interfaceId The interface id. + */ + public OpenDialogueInterfaceMessage(int interfaceId) { + this.interfaceId = interfaceId; + } + + /** + * Gets the interface id. + * + * @return The interface id. + */ + public int getInterfaceId() { + return interfaceId; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/OpenInterfaceMessage.java b/src/org/apollo/game/message/impl/OpenInterfaceMessage.java new file mode 100644 index 00000000..64a48ed3 --- /dev/null +++ b/src/org/apollo/game/message/impl/OpenInterfaceMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client that opens an interface. + * + * @author Graham + */ +public final class OpenInterfaceMessage extends Message { + + /** + * The interface id. + */ + private final int id; + + /** + * Creates the message with the specified interface id. + * + * @param id The interface id. + */ + public OpenInterfaceMessage(int id) { + this.id = id; + } + + /** + * Gets the interface id. + * + * @return The interface id. + */ + public int getId() { + return id; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/OpenInterfaceSidebarEvent.java b/src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java similarity index 61% rename from src/org/apollo/game/event/impl/OpenInterfaceSidebarEvent.java rename to src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java index b7990691..276047e6 100644 --- a/src/org/apollo/game/event/impl/OpenInterfaceSidebarEvent.java +++ b/src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to open an interface and temporary sidebar overlay. + * A {@link Message} sent to the client to open an interface and temporary sidebar overlay. * * @author Graham */ -public final class OpenInterfaceSidebarEvent extends Event { +public final class OpenInterfaceSidebarMessage extends Message { /** * The interface id. @@ -20,12 +20,12 @@ public final class OpenInterfaceSidebarEvent extends Event { private final int sidebarId; /** - * Creates the open interface sidebar event. + * Creates the open interface sidebar message. * * @param interfaceId The interface id. * @param sidebarId The sidebar id. */ - public OpenInterfaceSidebarEvent(int interfaceId, int sidebarId) { + public OpenInterfaceSidebarMessage(int interfaceId, int sidebarId) { this.interfaceId = interfaceId; this.sidebarId = sidebarId; } diff --git a/src/org/apollo/game/event/impl/PlayerActionEvent.java b/src/org/apollo/game/message/impl/PlayerActionMessage.java similarity index 50% rename from src/org/apollo/game/event/impl/PlayerActionEvent.java rename to src/org/apollo/game/message/impl/PlayerActionMessage.java index 54ca3567..265439d9 100644 --- a/src/org/apollo/game/event/impl/PlayerActionEvent.java +++ b/src/org/apollo/game/message/impl/PlayerActionMessage.java @@ -1,15 +1,15 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client representing the clicking of a player menu action. Note that the actual event - * sent by the client is one of the five player action events, but this is the event that should be intercepted (and the + * A {@link Message} sent by the client representing the clicking of a player menu action. Note that the actual message + * sent by the client is one of the five player action messages, but this is the message that should be intercepted (and the * option verified). * * @author Major */ -public abstract class PlayerActionEvent extends Event { +public abstract class PlayerActionMessage extends Message { /** * The option number. @@ -22,18 +22,18 @@ public abstract class PlayerActionEvent extends Event { private final int index; /** - * Creates a player action event. + * Creates a player action message. * * @param option The option number. * @param playerIndex The index of the player. */ - public PlayerActionEvent(int option, int playerIndex) { + public PlayerActionMessage(int option, int playerIndex) { this.option = option; this.index = playerIndex; } /** - * Gets the menu action number (i.e. the action event 'option') clicked. + * Gets the menu action number (i.e. the action message 'option') clicked. * * @return The option number. */ diff --git a/src/org/apollo/game/event/impl/PlayerDesignEvent.java b/src/org/apollo/game/message/impl/PlayerDesignMessage.java similarity index 54% rename from src/org/apollo/game/event/impl/PlayerDesignEvent.java rename to src/org/apollo/game/message/impl/PlayerDesignMessage.java index a8396703..bad236aa 100644 --- a/src/org/apollo/game/event/impl/PlayerDesignEvent.java +++ b/src/org/apollo/game/message/impl/PlayerDesignMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Appearance; /** - * An {@link Event} sent by the client when the player modifies their design. + * A {@link Message} sent by the client when the player modifies their design. * * @author Graham */ -public final class PlayerDesignEvent extends Event { +public final class PlayerDesignMessage extends Message { /** * The appearance. @@ -16,11 +16,11 @@ public final class PlayerDesignEvent extends Event { private final Appearance appearance; /** - * Creates the player design event. + * Creates the player design message. * * @param appearance The appearance. */ - public PlayerDesignEvent(Appearance appearance) { + public PlayerDesignMessage(Appearance appearance) { this.appearance = appearance; } diff --git a/src/org/apollo/game/event/impl/PlayerSynchronizationEvent.java b/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java similarity index 86% rename from src/org/apollo/game/event/impl/PlayerSynchronizationEvent.java rename to src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java index c69d3f3b..5dbdb17d 100644 --- a/src/org/apollo/game/event/impl/PlayerSynchronizationEvent.java +++ b/src/org/apollo/game/message/impl/PlayerSynchronizationMessage.java @@ -1,17 +1,17 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; import java.util.List; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; import org.apollo.game.sync.seg.SynchronizationSegment; /** - * An {@link Event} sent to the client to synchronize players. + * A {@link Message} sent to the client to synchronize players. * * @author Graham */ -public final class PlayerSynchronizationEvent extends Event { +public final class PlayerSynchronizationMessage extends Message { /** * The last known region. @@ -44,7 +44,7 @@ public final class PlayerSynchronizationEvent extends Event { private final List segments; /** - * Creates the player synchronization event. + * Creates the player synchronization message. * * @param lastKnownRegion The last known region. * @param position The player's current position. @@ -53,7 +53,7 @@ public final class PlayerSynchronizationEvent extends Event { * @param localPlayers The number of local players. * @param segments A list of segments. */ - public PlayerSynchronizationEvent(Position lastKnownRegion, Position position, boolean regionChanged, + public PlayerSynchronizationMessage(Position lastKnownRegion, Position position, boolean regionChanged, SynchronizationSegment segment, int localPlayers, List segments) { this.lastKnownRegion = lastKnownRegion; this.position = position; diff --git a/src/org/apollo/game/event/impl/PositionEvent.java b/src/org/apollo/game/message/impl/PositionMessage.java similarity index 65% rename from src/org/apollo/game/event/impl/PositionEvent.java rename to src/org/apollo/game/message/impl/PositionMessage.java index b059e1b0..b2c5eeff 100644 --- a/src/org/apollo/game/event/impl/PositionEvent.java +++ b/src/org/apollo/game/message/impl/PositionMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event} sent to the client to focus on a specific {@link Position} (on which an action should be performed). + * A {@link Message} sent to the client to focus on a specific {@link Position} (on which an action should be performed). * * @author Chris Fletcher */ -public final class PositionEvent extends Event { +public final class PositionMessage extends Message { /** * The base position. @@ -21,12 +21,12 @@ public final class PositionEvent extends Event { private final Position position; /** - * Creates a new position event. + * Creates a new position message. * * @param base The base from which the position is being focused on. * @param position The position to focus on. */ - public PositionEvent(Position base, Position position) { + public PositionMessage(Position base, Position position) { this.base = base; this.position = position; } diff --git a/src/org/apollo/game/event/impl/PrivacyOptionEvent.java b/src/org/apollo/game/message/impl/PrivacyOptionMessage.java similarity index 77% rename from src/org/apollo/game/event/impl/PrivacyOptionEvent.java rename to src/org/apollo/game/message/impl/PrivacyOptionMessage.java index 7bc6e81e..f53bde1f 100644 --- a/src/org/apollo/game/event/impl/PrivacyOptionEvent.java +++ b/src/org/apollo/game/message/impl/PrivacyOptionMessage.java @@ -1,16 +1,16 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.setting.PrivacyState; /** - * An {@link Event} sent both by and to the client to update the public chat, private (friend) chat, and trade chat + * A {@link Message} sent both by and to the client to update the public chat, private (friend) chat, and trade chat * privacy state. * * @author Kyle Stevenson * @author Major */ -public final class PrivacyOptionEvent extends Event { +public final class PrivacyOptionMessage extends Message { /** * The privacy state of the player's chat. @@ -28,13 +28,13 @@ public final class PrivacyOptionEvent extends Event { private final PrivacyState tradePrivacy; /** - * Creates a privacy option event. + * Creates a privacy option message. * * @param chatPrivacy The privacy state of the player's chat. * @param friendPrivacy The privacy state of the player's friend chat. * @param tradePrivacy The privacy state of the player's trade chat. */ - public PrivacyOptionEvent(int chatPrivacy, int friendPrivacy, int tradePrivacy) { + public PrivacyOptionMessage(int chatPrivacy, int friendPrivacy, int tradePrivacy) { this.chatPrivacy = PrivacyState.valueOf(chatPrivacy, true); this.friendPrivacy = PrivacyState.valueOf(friendPrivacy, false); this.tradePrivacy = PrivacyState.valueOf(tradePrivacy, false); diff --git a/src/org/apollo/game/event/impl/PrivateMessageEvent.java b/src/org/apollo/game/message/impl/PrivateMessageMessage.java similarity index 73% rename from src/org/apollo/game/event/impl/PrivateMessageEvent.java rename to src/org/apollo/game/message/impl/PrivateMessageMessage.java index 3e00d021..eed897bc 100644 --- a/src/org/apollo/game/event/impl/PrivateMessageEvent.java +++ b/src/org/apollo/game/message/impl/PrivateMessageMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client to send a private message to another player. + * A {@link Message} sent by the client to send a private message to another player. * * @author Major */ -public final class PrivateMessageEvent extends Event { +public final class PrivateMessageMessage extends Message { /** * The username this message is being sent to. @@ -25,13 +25,13 @@ public final class PrivateMessageEvent extends Event { private final byte[] compressedMessage; /** - * Creates a new private message event. + * Creates a new private message message. * * @param username The username of the player the message is being sent to. * @param message The message. * @param compressedMessage The message, in a compressed form. */ - public PrivateMessageEvent(String username, String message, byte[] compressedMessage) { + public PrivateMessageMessage(String username, String message, byte[] compressedMessage) { this.username = username; this.message = message; this.compressedMessage = compressedMessage; diff --git a/src/org/apollo/game/event/impl/RegionChangeEvent.java b/src/org/apollo/game/message/impl/RegionChangeMessage.java similarity index 57% rename from src/org/apollo/game/event/impl/RegionChangeEvent.java rename to src/org/apollo/game/message/impl/RegionChangeMessage.java index ab818a1a..7f5891a1 100644 --- a/src/org/apollo/game/event/impl/RegionChangeEvent.java +++ b/src/org/apollo/game/message/impl/RegionChangeMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event sent to the client instructing it to load the specified region. + * An {@link Message sent to the client instructing it to load the specified region. * * @author Graham */ -public final class RegionChangeEvent extends Event { +public final class RegionChangeMessage extends Message { /** * The position of the region to load. @@ -16,11 +16,11 @@ public final class RegionChangeEvent extends Event { private final Position position; /** - * Creates the region changed event. + * Creates the region changed message. * * @param position The position of the region. */ - public RegionChangeEvent(Position position) { + public RegionChangeMessage(Position position) { this.position = position; } diff --git a/src/org/apollo/game/event/impl/RemoveFriendEvent.java b/src/org/apollo/game/message/impl/RemoveFriendMessage.java similarity index 53% rename from src/org/apollo/game/event/impl/RemoveFriendEvent.java rename to src/org/apollo/game/message/impl/RemoveFriendMessage.java index 7008c0c9..025ec7be 100644 --- a/src/org/apollo/game/event/impl/RemoveFriendEvent.java +++ b/src/org/apollo/game/message/impl/RemoveFriendMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when a player removes someone from their friends list. + * A {@link Message} sent by the client when a player removes someone from their friends list. * * @author Major */ -public final class RemoveFriendEvent extends Event { +public final class RemoveFriendMessage extends Message { /** * The username of the defriended player. @@ -15,11 +15,11 @@ public final class RemoveFriendEvent extends Event { private final String username; /** - * Creates a new defriend user event. + * Creates a new defriend user message. * * @param username The defriended player's username. */ - public RemoveFriendEvent(String username) { + public RemoveFriendMessage(String username) { this.username = username; } diff --git a/src/org/apollo/game/event/impl/RemoveIgnoreEvent.java b/src/org/apollo/game/message/impl/RemoveIgnoreMessage.java similarity index 53% rename from src/org/apollo/game/event/impl/RemoveIgnoreEvent.java rename to src/org/apollo/game/message/impl/RemoveIgnoreMessage.java index a5316fe0..5cb5995e 100644 --- a/src/org/apollo/game/event/impl/RemoveIgnoreEvent.java +++ b/src/org/apollo/game/message/impl/RemoveIgnoreMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when a player removes someone from their ignore list. + * A {@link Message} sent by the client when a player removes someone from their ignore list. * * @author Major */ -public final class RemoveIgnoreEvent extends Event { +public final class RemoveIgnoreMessage extends Message { /** * The username of the unignored player. @@ -15,11 +15,11 @@ public final class RemoveIgnoreEvent extends Event { private final String username; /** - * Creates a new unignore player event. + * Creates a new unignore player message. * * @param username The unignored player's username. */ - public RemoveIgnoreEvent(String username) { + public RemoveIgnoreMessage(String username) { this.username = username; } diff --git a/src/org/apollo/game/event/impl/RemoveTileItemEvent.java b/src/org/apollo/game/message/impl/RemoveTileItemMessage.java similarity index 64% rename from src/org/apollo/game/event/impl/RemoveTileItemEvent.java rename to src/org/apollo/game/message/impl/RemoveTileItemMessage.java index 82a8a1d5..c92f7f00 100644 --- a/src/org/apollo/game/event/impl/RemoveTileItemEvent.java +++ b/src/org/apollo/game/message/impl/RemoveTileItemMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to remove an item from a tile. + * A {@link Message} sent to the client to remove an item from a tile. * * @author Major */ -public final class RemoveTileItemEvent extends Event { +public final class RemoveTileItemMessage extends Message { /** * The item. @@ -20,21 +20,21 @@ public final class RemoveTileItemEvent extends Event { private final int positionOffset; /** - * Creates a remove tile item event. + * Creates a remove tile item message. * * @param id The id of the item to remove. */ - public RemoveTileItemEvent(int id) { + public RemoveTileItemMessage(int id) { this(id, 0); } /** - * Creates a remove tile item event. + * Creates a remove tile item message. * * @param id The id of the item to remove. * @param positionOffset The offset from the 'base' position. */ - public RemoveTileItemEvent(int id, int positionOffset) { + public RemoveTileItemMessage(int id, int positionOffset) { this.id = id; this.positionOffset = positionOffset; } diff --git a/src/org/apollo/game/message/impl/SecondItemActionMessage.java b/src/org/apollo/game/message/impl/SecondItemActionMessage.java new file mode 100644 index 00000000..a9731053 --- /dev/null +++ b/src/org/apollo/game/message/impl/SecondItemActionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The second {@link ItemActionMessage}. + * + * @author Graham + */ +public final class SecondItemActionMessage extends ItemActionMessage { + + /** + * Creates the second item action message. + * + * @param interfaceId The interface id. + * @param id The item id. + * @param slot The item slot. + */ + public SecondItemActionMessage(int interfaceId, int id, int slot) { + super(2, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/SecondItemOptionMessage.java b/src/org/apollo/game/message/impl/SecondItemOptionMessage.java new file mode 100644 index 00000000..3f7341f9 --- /dev/null +++ b/src/org/apollo/game/message/impl/SecondItemOptionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The second {@link ItemOptionMessage}. + * + * @author Chris Fletcher + */ +public final class SecondItemOptionMessage extends ItemOptionMessage { + + /** + * Creates the second item option message. + * + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public SecondItemOptionMessage(int interfaceId, int id, int slot) { + super(2, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/SecondNpcActionMessage.java b/src/org/apollo/game/message/impl/SecondNpcActionMessage.java new file mode 100644 index 00000000..679daf73 --- /dev/null +++ b/src/org/apollo/game/message/impl/SecondNpcActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The second {@link NpcActionMessage}. + * + * @author Major + */ +public final class SecondNpcActionMessage extends NpcActionMessage { + + /** + * Creates a new second npc action message. + * + * @param index The index of the npc. + */ + public SecondNpcActionMessage(int index) { + super(2, index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/SecondObjectActionMessage.java b/src/org/apollo/game/message/impl/SecondObjectActionMessage.java new file mode 100644 index 00000000..43b76c03 --- /dev/null +++ b/src/org/apollo/game/message/impl/SecondObjectActionMessage.java @@ -0,0 +1,22 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.model.Position; + +/** + * The second {@link ObjectActionMessage}. + * + * @author Graham + */ +public final class SecondObjectActionMessage extends ObjectActionMessage { + + /** + * Creates the second object action message. + * + * @param id The id. + * @param position The position. + */ + public SecondObjectActionMessage(int id, Position position) { + super(2, id, position); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/SecondPlayerActionMessage.java b/src/org/apollo/game/message/impl/SecondPlayerActionMessage.java new file mode 100644 index 00000000..577cb18d --- /dev/null +++ b/src/org/apollo/game/message/impl/SecondPlayerActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The second {@link PlayerActionMessage}. + * + * @author Major + */ +public final class SecondPlayerActionMessage extends PlayerActionMessage { + + /** + * Creates a second player action message. + * + * @param playerIndex The index of the clicked player. + */ + public SecondPlayerActionMessage(int playerIndex) { + super(2, playerIndex); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SendFriendEvent.java b/src/org/apollo/game/message/impl/SendFriendMessage.java similarity index 67% rename from src/org/apollo/game/event/impl/SendFriendEvent.java rename to src/org/apollo/game/message/impl/SendFriendMessage.java index 8eb886c3..e6f11089 100644 --- a/src/org/apollo/game/event/impl/SendFriendEvent.java +++ b/src/org/apollo/game/message/impl/SendFriendMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to add a player to the friend list. + * A {@link Message} sent to the client to add a player to the friend list. * * @author Major */ -public final class SendFriendEvent extends Event { +public final class SendFriendMessage extends Message { /** * The username of the friend. @@ -20,12 +20,12 @@ public final class SendFriendEvent extends Event { private final int world; /** - * Creates a new send friend event. + * Creates a new send friend message. * * @param username The username of the friend. * @param world The world the friend is in. */ - public SendFriendEvent(String username, int world) { + public SendFriendMessage(String username, int world) { this.username = username; this.world = world == 0 ? 0 : world + 9; } diff --git a/src/org/apollo/game/event/impl/SendObjectEvent.java b/src/org/apollo/game/message/impl/SendObjectMessage.java similarity index 79% rename from src/org/apollo/game/event/impl/SendObjectEvent.java rename to src/org/apollo/game/message/impl/SendObjectMessage.java index 4a8c64d9..da40741d 100644 --- a/src/org/apollo/game/event/impl/SendObjectEvent.java +++ b/src/org/apollo/game/message/impl/SendObjectMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.entity.GameObject; /** - * An {@link Event} sent to the client to spawn an object. + * A {@link Message} sent to the client to spawn an object. * * @author Major */ -public final class SendObjectEvent extends Event { +public final class SendObjectMessage extends Message { /** * The id of the object. @@ -31,11 +31,11 @@ public final class SendObjectEvent extends Event { private final int type; /** - * Creates the send object event. + * Creates the send object message. * * @param object The {@link GameObject} to send. */ - public SendObjectEvent(GameObject object) { + public SendObjectMessage(GameObject object) { this.id = object.getId(); this.positionOffset = 0; this.type = object.getType(); diff --git a/src/org/apollo/game/message/impl/ServerChatMessage.java b/src/org/apollo/game/message/impl/ServerChatMessage.java new file mode 100644 index 00000000..ec2df797 --- /dev/null +++ b/src/org/apollo/game/message/impl/ServerChatMessage.java @@ -0,0 +1,45 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to display a server chat message. + * + * @author Graham + */ +public final class ServerChatMessage extends Message { + + /** + * The chat message. + */ + private final String message; + + /** + * Creates a server chat message. + * + * @param message The chat message. + */ + public ServerChatMessage(String message) { + this(message, false); + } + + /** + * Creates a server chat message. + * + * @param message The chat message. + * @param filterable Whether or not the message can be filtered. + */ + public ServerChatMessage(String message, boolean filterable) { + this.message = message + (filterable ? ":filterable:" : ""); + } + + /** + * Gets the chat message. + * + * @return The chat message. + */ + public String getMessage() { + return message; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SetPlayerActionEvent.java b/src/org/apollo/game/message/impl/SetPlayerActionMessage.java similarity index 71% rename from src/org/apollo/game/event/impl/SetPlayerActionEvent.java rename to src/org/apollo/game/message/impl/SetPlayerActionMessage.java index 915a566d..c933e198 100644 --- a/src/org/apollo/game/event/impl/SetPlayerActionEvent.java +++ b/src/org/apollo/game/message/impl/SetPlayerActionMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client to add an action to the menu when a player right-clicks another. + * A {@link Message} sent by the client to add an action to the menu when a player right-clicks another. * * @author Major */ -public final class SetPlayerActionEvent extends Event { +public final class SetPlayerActionMessage extends Message { /** * This action's text (e.g. "Follow"). @@ -25,23 +25,23 @@ public final class SetPlayerActionEvent extends Event { private final boolean primaryAction; /** - * Creates the set player action event. + * Creates the set player action message. * * @param text The action text. * @param slot The menu slot. */ - public SetPlayerActionEvent(String text, int slot) { + public SetPlayerActionMessage(String text, int slot) { this(text, slot, false); } /** - * Creates the set player action event. + * Creates the set player action message. * * @param text The action text. * @param slot The menu slot. * @param primaryInteraction Whether or not the action is the primary action. */ - public SetPlayerActionEvent(String text, int slot, boolean primaryInteraction) { + public SetPlayerActionMessage(String text, int slot, boolean primaryInteraction) { this.text = text; this.slot = slot; this.primaryAction = primaryInteraction; diff --git a/src/org/apollo/game/event/impl/SetWidgetItemModelEvent.java b/src/org/apollo/game/message/impl/SetWidgetItemModelMessage.java similarity index 69% rename from src/org/apollo/game/event/impl/SetWidgetItemModelEvent.java rename to src/org/apollo/game/message/impl/SetWidgetItemModelMessage.java index 1cff80c9..aa406c3d 100644 --- a/src/org/apollo/game/event/impl/SetWidgetItemModelEvent.java +++ b/src/org/apollo/game/message/impl/SetWidgetItemModelMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to set a widget's displayed item model. + * A {@link Message} sent to the client to set a widget's displayed item model. * * @author Chris Fletcher */ -public final class SetWidgetItemModelEvent extends Event { +public final class SetWidgetItemModelMessage extends Message { /** * The interface's id. @@ -25,13 +25,13 @@ public final class SetWidgetItemModelEvent extends Event { private final int zoom; /** - * Creates a new set interface item model event. + * Creates a new set interface item model message. * * @param interfaceId The interface's id. * @param modelId The model's (item) id. * @param zoom The zoom level. */ - public SetWidgetItemModelEvent(int interfaceId, int modelId, int zoom) { + public SetWidgetItemModelMessage(int interfaceId, int modelId, int zoom) { this.interfaceId = interfaceId; this.modelId = modelId; this.zoom = zoom; diff --git a/src/org/apollo/game/event/impl/SetWidgetModelAnimationEvent.java b/src/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java similarity index 62% rename from src/org/apollo/game/event/impl/SetWidgetModelAnimationEvent.java rename to src/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java index de6e1a7c..30a491a0 100644 --- a/src/org/apollo/game/event/impl/SetWidgetModelAnimationEvent.java +++ b/src/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to set a widget's displayed mob's animation. + * A {@link Message} sent to the client to set a widget's displayed mob's animation. * * @author Chris Fletcher */ -public final class SetWidgetModelAnimationEvent extends Event { +public final class SetWidgetModelAnimationMessage extends Message { /** * The model's animation id. @@ -20,12 +20,12 @@ public final class SetWidgetModelAnimationEvent extends Event { private final int interfaceId; /** - * Creates a new set interface npc model's animation event. + * Creates a new set interface npc model's animation message. * * @param interfaceId The interface id. * @param animation The model's animation id. */ - public SetWidgetModelAnimationEvent(int interfaceId, int animation) { + public SetWidgetModelAnimationMessage(int interfaceId, int animation) { this.interfaceId = interfaceId; this.animation = animation; } diff --git a/src/org/apollo/game/event/impl/SetWidgetNpcModelEvent.java b/src/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java similarity index 63% rename from src/org/apollo/game/event/impl/SetWidgetNpcModelEvent.java rename to src/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java index 0b36069f..1add8bb3 100644 --- a/src/org/apollo/game/event/impl/SetWidgetNpcModelEvent.java +++ b/src/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to set a widget's displayed npc model. + * A {@link Message} sent to the client to set a widget's displayed npc model. * * @author Chris Fletcher */ -public final class SetWidgetNpcModelEvent extends Event { +public final class SetWidgetNpcModelMessage extends Message { /** * The interface's id. @@ -20,12 +20,12 @@ public final class SetWidgetNpcModelEvent extends Event { private final int modelId; /** - * Creates a new set interface NPC model event. + * Creates a new set interface NPC model message. * * @param interfaceId The interface's id. * @param modelId The model's (NPC) id. */ - public SetWidgetNpcModelEvent(int interfaceId, int modelId) { + public SetWidgetNpcModelMessage(int interfaceId, int modelId) { this.interfaceId = interfaceId; this.modelId = modelId; } diff --git a/src/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java b/src/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java new file mode 100644 index 00000000..3a7890c0 --- /dev/null +++ b/src/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to set a widget's displayed player model. + * + * @author Chris Fletcher + */ +public final class SetWidgetPlayerModelMessage extends Message { + + /** + * The interface's id. + */ + private final int interfaceId; + + /** + * Creates a new set interface player model message. + * + * @param interfaceId The interface's id. + */ + public SetWidgetPlayerModelMessage(int interfaceId) { + this.interfaceId = interfaceId; + } + + /** + * Gets the interface's id. + * + * @return The id. + */ + public int getInterfaceId() { + return interfaceId; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SetWidgetTextEvent.java b/src/org/apollo/game/message/impl/SetWidgetTextMessage.java similarity index 64% rename from src/org/apollo/game/event/impl/SetWidgetTextEvent.java rename to src/org/apollo/game/message/impl/SetWidgetTextMessage.java index 33f5027c..7700981a 100644 --- a/src/org/apollo/game/event/impl/SetWidgetTextEvent.java +++ b/src/org/apollo/game/message/impl/SetWidgetTextMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to set a widget's text. + * A {@link Message} sent to the client to set a widget's text. * * @author Graham */ -public final class SetWidgetTextEvent extends Event { +public final class SetWidgetTextMessage extends Message { /** * The interface's id. @@ -20,12 +20,12 @@ public final class SetWidgetTextEvent extends Event { private final String text; /** - * Creates the set interface text event. + * Creates the set interface text message. * * @param interfaceId The interface's id. * @param text The interface's text. */ - public SetWidgetTextEvent(int interfaceId, String text) { + public SetWidgetTextMessage(int interfaceId, String text) { this.interfaceId = interfaceId; this.text = text; } diff --git a/src/org/apollo/game/event/impl/SetWidgetVisibilityEvent.java b/src/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java similarity index 64% rename from src/org/apollo/game/event/impl/SetWidgetVisibilityEvent.java rename to src/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java index 8889a9f7..8cfe885f 100644 --- a/src/org/apollo/game/event/impl/SetWidgetVisibilityEvent.java +++ b/src/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client that changes the state of a hidden widget component (e.g. the special attack bar + * A {@link Message} sent to the client that changes the state of a hidden widget component (e.g. the special attack bar * on the weapon tab). * * @author Chris Fletcher */ -public final class SetWidgetVisibilityEvent extends Event { +public final class SetWidgetVisibilityMessage extends Message { /** * The component id. @@ -21,12 +21,12 @@ public final class SetWidgetVisibilityEvent extends Event { private final boolean visible; /** - * Creates the interface component state event. + * Creates the interface component state message. * * @param component The compononent id. * @param visible The flag for showing or hiding the component. */ - public SetWidgetVisibilityEvent(int component, boolean visible) { + public SetWidgetVisibilityMessage(int component, boolean visible) { this.component = component; this.visible = visible; } diff --git a/src/org/apollo/game/message/impl/SpamPacketMessage.java b/src/org/apollo/game/message/impl/SpamPacketMessage.java new file mode 100644 index 00000000..804e7684 --- /dev/null +++ b/src/org/apollo/game/message/impl/SpamPacketMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent by the client after a short period of time containing random data. + * + * @author Major + */ +public final class SpamPacketMessage extends Message { + + /** + * Data sent by the spam packet. + */ + private final byte[] data; + + /** + * Creates a new spam packet message. + * + * @param data The data sent. + */ + public SpamPacketMessage(byte[] data) { + this.data = data; + } + + /** + * Gets the data sent. + * + * @return The data. + */ + public byte[] getData() { + return data; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/SwitchItemEvent.java b/src/org/apollo/game/message/impl/SwitchItemMessage.java similarity index 73% rename from src/org/apollo/game/event/impl/SwitchItemEvent.java rename to src/org/apollo/game/message/impl/SwitchItemMessage.java index 7b8d991e..02c5d753 100644 --- a/src/org/apollo/game/event/impl/SwitchItemEvent.java +++ b/src/org/apollo/game/message/impl/SwitchItemMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent by the client when two items are switched. + * A {@link Message} sent by the client when two items are switched. * * @author Graham */ -public final class SwitchItemEvent extends Event { +public final class SwitchItemMessage extends Message { /** * A flag indicating if insertion mode is enabled. @@ -30,14 +30,14 @@ public final class SwitchItemEvent extends Event { private final int oldSlot; /** - * Creates a new switch item event. + * Creates a new switch item message. * * @param interfaceId The interface id. * @param inserting A flag indicating if the interface is in 'insert' mode instead of swap mode. * @param oldSlot The old slot. * @param newSlot The new slot. */ - public SwitchItemEvent(int interfaceId, boolean inserting, int oldSlot, int newSlot) { + public SwitchItemMessage(int interfaceId, boolean inserting, int oldSlot, int newSlot) { this.interfaceId = interfaceId; this.inserting = inserting; this.oldSlot = oldSlot; @@ -72,7 +72,7 @@ public final class SwitchItemEvent extends Event { } /** - * Checks if this event is in insertion mode. + * Checks if this message is in insertion mode. * * @return The insertion flag. */ @@ -81,7 +81,7 @@ public final class SwitchItemEvent extends Event { } /** - * Checks if this event is in swap mode. + * Checks if this message is in swap mode. * * @return The swap flag. */ diff --git a/src/org/apollo/game/event/impl/SwitchTabInterfaceEvent.java b/src/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java similarity index 62% rename from src/org/apollo/game/event/impl/SwitchTabInterfaceEvent.java rename to src/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java index 9801a5e7..9516cac9 100644 --- a/src/org/apollo/game/event/impl/SwitchTabInterfaceEvent.java +++ b/src/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to change the interface of a tab. + * A {@link Message} sent to the client to change the interface of a tab. * * @author Graham */ -public final class SwitchTabInterfaceEvent extends Event { +public final class SwitchTabInterfaceMessage extends Message { /** * The interface id. @@ -20,12 +20,12 @@ public final class SwitchTabInterfaceEvent extends Event { private final int tab; /** - * Creates the switch interface event. + * Creates the switch interface message. * * @param tab The tab id. * @param interfaceId The interface id. */ - public SwitchTabInterfaceEvent(int tab, int interfaceId) { + public SwitchTabInterfaceMessage(int tab, int interfaceId) { this.tab = tab; this.interfaceId = interfaceId; } diff --git a/src/org/apollo/game/event/impl/TakeTileItemEvent.java b/src/org/apollo/game/message/impl/TakeTileItemMessage.java similarity index 65% rename from src/org/apollo/game/event/impl/TakeTileItemEvent.java rename to src/org/apollo/game/message/impl/TakeTileItemMessage.java index 7643e13d..c0dbd62b 100644 --- a/src/org/apollo/game/event/impl/TakeTileItemEvent.java +++ b/src/org/apollo/game/message/impl/TakeTileItemMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event} sent by the client to pick up an item on a tile. + * A {@link Message} sent by the client to pick up an item on a tile. * * @author Major */ -public final class TakeTileItemEvent extends Event { +public final class TakeTileItemMessage extends Message { /** * The id of the item. @@ -21,12 +21,12 @@ public final class TakeTileItemEvent extends Event { private final Position position; /** - * Creates a new take tile item event. + * Creates a new take tile item message. * * @param id The id of the item. * @param position The position of the tile. */ - public TakeTileItemEvent(int id, Position position) { + public TakeTileItemMessage(int id, Position position) { this.id = id; this.position = position; } diff --git a/src/org/apollo/game/message/impl/ThirdItemActionMessage.java b/src/org/apollo/game/message/impl/ThirdItemActionMessage.java new file mode 100644 index 00000000..e371bdcf --- /dev/null +++ b/src/org/apollo/game/message/impl/ThirdItemActionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The third {@link ItemActionMessage}. + * + * @author Graham + */ +public final class ThirdItemActionMessage extends ItemActionMessage { + + /** + * Creates the third item action message. + * + * @param interfaceId The interface id. + * @param id The item id. + * @param slot The item slot. + */ + public ThirdItemActionMessage(int interfaceId, int id, int slot) { + super(3, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/ThirdItemOptionMessage.java b/src/org/apollo/game/message/impl/ThirdItemOptionMessage.java new file mode 100644 index 00000000..0df3fe86 --- /dev/null +++ b/src/org/apollo/game/message/impl/ThirdItemOptionMessage.java @@ -0,0 +1,21 @@ +package org.apollo.game.message.impl; + +/** + * The third {@link ItemOptionMessage}. + * + * @author Chris Fletcher + */ +public final class ThirdItemOptionMessage extends ItemOptionMessage { + + /** + * Creates the third item option message. + * + * @param interfaceId The interface id. + * @param id The id. + * @param slot The slot. + */ + public ThirdItemOptionMessage(int interfaceId, int id, int slot) { + super(3, interfaceId, id, slot); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/ThirdNpcActionMessage.java b/src/org/apollo/game/message/impl/ThirdNpcActionMessage.java new file mode 100644 index 00000000..9685f9b0 --- /dev/null +++ b/src/org/apollo/game/message/impl/ThirdNpcActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The third {@link NpcActionMessage}. + * + * @author Major + */ +public final class ThirdNpcActionMessage extends NpcActionMessage { + + /** + * Creates a new third npc action message. + * + * @param index The index of the npc. + */ + public ThirdNpcActionMessage(int index) { + super(3, index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/ThirdObjectActionMessage.java b/src/org/apollo/game/message/impl/ThirdObjectActionMessage.java new file mode 100644 index 00000000..3dbe2aff --- /dev/null +++ b/src/org/apollo/game/message/impl/ThirdObjectActionMessage.java @@ -0,0 +1,22 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.model.Position; + +/** + * The third {@link ObjectActionMessage}. + * + * @author Graham + */ +public final class ThirdObjectActionMessage extends ObjectActionMessage { + + /** + * Creates the third object action message. + * + * @param id The id. + * @param position The position. + */ + public ThirdObjectActionMessage(int id, Position position) { + super(3, id, position); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/ThirdPlayerActionMessage.java b/src/org/apollo/game/message/impl/ThirdPlayerActionMessage.java new file mode 100644 index 00000000..c3e1e125 --- /dev/null +++ b/src/org/apollo/game/message/impl/ThirdPlayerActionMessage.java @@ -0,0 +1,19 @@ +package org.apollo.game.message.impl; + +/** + * The third {@link PlayerActionMessage}. + * + * @author Major + */ +public final class ThirdPlayerActionMessage extends PlayerActionMessage { + + /** + * Creates a third player action message. + * + * @param playerIndex The index of the clicked player. + */ + public ThirdPlayerActionMessage(int playerIndex) { + super(3, playerIndex); + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/UpdateItemsEvent.java b/src/org/apollo/game/message/impl/UpdateItemsMessage.java similarity index 63% rename from src/org/apollo/game/event/impl/UpdateItemsEvent.java rename to src/org/apollo/game/message/impl/UpdateItemsMessage.java index fe18b877..6b508f34 100644 --- a/src/org/apollo/game/event/impl/UpdateItemsEvent.java +++ b/src/org/apollo/game/message/impl/UpdateItemsMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Item; /** - * An {@link Event} sent to the client that updates all the items in an interface. + * A {@link Message} sent to the client that updates all the items in an interface. * * @author Graham */ -public final class UpdateItemsEvent extends Event { +public final class UpdateItemsMessage extends Message { /** * The interface id. @@ -21,12 +21,12 @@ public final class UpdateItemsEvent extends Event { private final Item[] items; /** - * Creates the update inventory interface event. + * Creates the update inventory interface message. * * @param interfaceId The interface id. * @param items The items. */ - public UpdateItemsEvent(int interfaceId, Item[] items) { + public UpdateItemsMessage(int interfaceId, Item[] items) { this.interfaceId = interfaceId; this.items = items; } diff --git a/src/org/apollo/game/message/impl/UpdateRunEnergyMessage.java b/src/org/apollo/game/message/impl/UpdateRunEnergyMessage.java new file mode 100644 index 00000000..6edde6f6 --- /dev/null +++ b/src/org/apollo/game/message/impl/UpdateRunEnergyMessage.java @@ -0,0 +1,35 @@ +package org.apollo.game.message.impl; + +import org.apollo.game.message.Message; + +/** + * A {@link Message} sent to the client to update the remaining run energy value. + * + * @author Major + */ +public final class UpdateRunEnergyMessage extends Message { + + /** + * The run energy. + */ + private final int energy; + + /** + * Creates a new update run energy message. + * + * @param energy The energy. + */ + public UpdateRunEnergyMessage(int energy) { + this.energy = energy; + } + + /** + * Gets the amount of run energy. + * + * @return The energy. + */ + public int getEnergy() { + return energy; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/event/impl/UpdateSkillEvent.java b/src/org/apollo/game/message/impl/UpdateSkillMessage.java similarity index 63% rename from src/org/apollo/game/event/impl/UpdateSkillEvent.java rename to src/org/apollo/game/message/impl/UpdateSkillMessage.java index e4d2e249..5cda75e3 100644 --- a/src/org/apollo/game/event/impl/UpdateSkillEvent.java +++ b/src/org/apollo/game/message/impl/UpdateSkillMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.entity.Skill; /** - * An {@link Event} sent to the client to update a player's skill level. + * A {@link Message} sent to the client to update a player's skill level. * * @author Graham */ -public final class UpdateSkillEvent extends Event { +public final class UpdateSkillMessage extends Message { /** * The skill's id. @@ -21,12 +21,12 @@ public final class UpdateSkillEvent extends Event { private final Skill skill; /** - * Creates an update skill event. + * Creates an update skill message. * * @param id The id. * @param skill The skill. */ - public UpdateSkillEvent(int id, Skill skill) { + public UpdateSkillMessage(int id, Skill skill) { this.id = id; this.skill = skill; } diff --git a/src/org/apollo/game/event/impl/UpdateSlottedItemsEvent.java b/src/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java similarity index 64% rename from src/org/apollo/game/event/impl/UpdateSlottedItemsEvent.java rename to src/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java index 49554791..6947ecc3 100644 --- a/src/org/apollo/game/event/impl/UpdateSlottedItemsEvent.java +++ b/src/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.inv.SlottedItem; /** - * An {@link Event} sent to the client that updates a single item in an interface. + * A {@link Message} sent to the client that updates a single item in an interface. * * @author Graham */ -public final class UpdateSlottedItemsEvent extends Event { +public final class UpdateSlottedItemsMessage extends Message { /** * The interface id. @@ -21,12 +21,12 @@ public final class UpdateSlottedItemsEvent extends Event { private final SlottedItem[] items; /** - * Creates the update item in interface event. + * Creates the update item in interface message. * * @param interfaceId The interface id. * @param items The slotted items. */ - public UpdateSlottedItemsEvent(int interfaceId, SlottedItem... items) { + public UpdateSlottedItemsMessage(int interfaceId, SlottedItem... items) { this.interfaceId = interfaceId; this.items = items; } diff --git a/src/org/apollo/game/event/impl/UpdateTileItemEvent.java b/src/org/apollo/game/message/impl/UpdateTileItemMessage.java similarity index 72% rename from src/org/apollo/game/event/impl/UpdateTileItemEvent.java rename to src/org/apollo/game/message/impl/UpdateTileItemMessage.java index 574a9103..1d18d0e2 100644 --- a/src/org/apollo/game/event/impl/UpdateTileItemEvent.java +++ b/src/org/apollo/game/message/impl/UpdateTileItemMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Item; /** - * An {@link Event} sent to the client to update the amount of an item display on a tile. + * A {@link Message} sent to the client to update the amount of an item display on a tile. * * @author Major */ -public final class UpdateTileItemEvent extends Event { +public final class UpdateTileItemMessage extends Message { /** * The {@link Item}. @@ -26,23 +26,23 @@ public final class UpdateTileItemEvent extends Event { private final int previousAmount; /** - * Creates a new event that updates the previous amount of the item. + * Creates a new message that updates the previous amount of the item. * * @param id The item to be placed. * @param previousAmount The previous amount of the item. */ - public UpdateTileItemEvent(Item item, int previousAmount) { + public UpdateTileItemMessage(Item item, int previousAmount) { this(item, previousAmount, 0); } /** - * Creates a new set tile item event. + * Creates a new set tile item message. * * @param id The item to be placed. * @param previousAmount The previous amount of the item. * @param positionOffset The offset from the client's base position. */ - public UpdateTileItemEvent(Item item, int previousAmount, int positionOffset) { + public UpdateTileItemMessage(Item item, int previousAmount, int positionOffset) { this.item = item; this.previousAmount = previousAmount; this.positionOffset = positionOffset; diff --git a/src/org/apollo/game/event/impl/UpdateWeightEvent.java b/src/org/apollo/game/message/impl/UpdateWeightMessage.java similarity index 51% rename from src/org/apollo/game/event/impl/UpdateWeightEvent.java rename to src/org/apollo/game/message/impl/UpdateWeightMessage.java index cdec011e..551968fe 100644 --- a/src/org/apollo/game/event/impl/UpdateWeightEvent.java +++ b/src/org/apollo/game/message/impl/UpdateWeightMessage.java @@ -1,13 +1,13 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; /** - * An {@link Event} sent to the client to update the player's weight. + * A {@link Message} sent to the client to update the player's weight. * * @author Major */ -public final class UpdateWeightEvent extends Event { +public final class UpdateWeightMessage extends Message { /** * The weight of the player @@ -15,11 +15,11 @@ public final class UpdateWeightEvent extends Event { private final int weight; /** - * Creates the update weight event. + * Creates the update weight message. * * @param weight The weight of the player. */ - public UpdateWeightEvent(int weight) { + public UpdateWeightMessage(int weight) { this.weight = weight; } diff --git a/src/org/apollo/game/event/impl/WalkEvent.java b/src/org/apollo/game/message/impl/WalkMessage.java similarity index 71% rename from src/org/apollo/game/event/impl/WalkEvent.java rename to src/org/apollo/game/message/impl/WalkMessage.java index 1055d2b6..faf6cd76 100644 --- a/src/org/apollo/game/event/impl/WalkEvent.java +++ b/src/org/apollo/game/message/impl/WalkMessage.java @@ -1,14 +1,14 @@ -package org.apollo.game.event.impl; +package org.apollo.game.message.impl; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.game.model.Position; /** - * An {@link Event} sent by the client to request that the player walks somewhere. + * A {@link Message} sent by the client to request that the player walks somewhere. * * @author Graham */ -public final class WalkEvent extends Event { +public final class WalkMessage extends Message { /** * The running flag. @@ -21,12 +21,12 @@ public final class WalkEvent extends Event { private final Position[] steps; /** - * Creates the event. + * Creates the message. * * @param steps The steps array. * @param run The run flag. */ - public WalkEvent(Position[] steps, boolean run) { + public WalkMessage(Position[] steps, boolean run) { if (steps.length < 0) { throw new IllegalArgumentException("Number of steps must not be negative."); } diff --git a/src/org/apollo/game/message/impl/package-info.java b/src/org/apollo/game/message/impl/package-info.java new file mode 100644 index 00000000..6bebefcf --- /dev/null +++ b/src/org/apollo/game/message/impl/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains message implementations. + */ +package org.apollo.game.message.impl; \ No newline at end of file diff --git a/src/org/apollo/game/message/package-info.java b/src/org/apollo/game/message/package-info.java new file mode 100644 index 00000000..40fd60d1 --- /dev/null +++ b/src/org/apollo/game/message/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains message-related classes. + */ +package org.apollo.game.message; \ No newline at end of file diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java index ec365b34..5dc3bc2e 100644 --- a/src/org/apollo/game/model/entity/Player.java +++ b/src/org/apollo/game/model/entity/Player.java @@ -5,16 +5,16 @@ import java.util.ArrayList; import java.util.Deque; import java.util.List; -import org.apollo.game.event.Event; -import org.apollo.game.event.impl.ConfigEvent; -import org.apollo.game.event.impl.IdAssignmentEvent; -import org.apollo.game.event.impl.IgnoreListEvent; -import org.apollo.game.event.impl.LogoutEvent; -import org.apollo.game.event.impl.SendFriendEvent; -import org.apollo.game.event.impl.ServerMessageEvent; -import org.apollo.game.event.impl.SetWidgetTextEvent; -import org.apollo.game.event.impl.SwitchTabInterfaceEvent; -import org.apollo.game.event.impl.UpdateRunEnergyEvent; +import org.apollo.game.message.Message; +import org.apollo.game.message.impl.ConfigMessage; +import org.apollo.game.message.impl.IdAssignmentMessage; +import org.apollo.game.message.impl.IgnoreListMessage; +import org.apollo.game.message.impl.LogoutMessage; +import org.apollo.game.message.impl.SendFriendMessage; +import org.apollo.game.message.impl.ServerChatMessage; +import org.apollo.game.message.impl.SetWidgetTextMessage; +import org.apollo.game.message.impl.SwitchTabInterfaceMessage; +import org.apollo.game.message.impl.UpdateRunEnergyMessage; import org.apollo.game.model.Appearance; import org.apollo.game.model.Position; import org.apollo.game.model.World; @@ -145,9 +145,9 @@ public final class Player extends Mob { private PrivilegeLevel privilegeLevel = PrivilegeLevel.STANDARD; /** - * A temporary queue of events sent during the login process. + * A temporary queue of messages sent during the login process. */ - private final transient Deque queuedEvents = new ArrayDeque<>(); + private final transient Deque queuedMessages = new ArrayDeque<>(); /** * A flag indicating if the region changed in the last cycle. @@ -613,7 +613,7 @@ public final class Player extends Mob { * Logs the player out, if possible. */ public void logout() { - send(new LogoutEvent()); + send(new LogoutMessage()); } /** @@ -674,29 +674,29 @@ public final class Player extends Mob { } /** - * Sends an {@link Event} to this player. + * Sends an {@link Message} to this player. * - * @param event The event. + * @param message The message.. */ - public void send(Event event) { + public void send(Message message) { if (isActive()) { - if (!queuedEvents.isEmpty()) { - for (Event queuedEvent : queuedEvents) { - session.dispatchEvent(queuedEvent); + if (!queuedMessages.isEmpty()) { + for (Message queuedMessage : queuedMessages) { + session.dispatchMessage(queuedMessage); } - queuedEvents.clear(); + queuedMessages.clear(); } - session.dispatchEvent(event); + session.dispatchMessage(message); } else { - queuedEvents.add(event); + queuedMessages.add(message); } } /** - * Sends the initial events. + * Sends the initial messages. */ - private void sendInitialEvents() { - send(new IdAssignmentEvent(index, members)); // TODO should this be sent when we reconnect? + private void sendInitialMessages() { + send(new IdAssignmentMessage(index, members)); // TODO should this be sent when we reconnect? sendMessage("Welcome to RuneScape."); if (!newPlayer) { interfaceSet.openWindow(InterfaceConstants.AVATAR_DESIGN); @@ -704,7 +704,7 @@ public final class Player extends Mob { int[] tabs = InterfaceConstants.DEFAULT_INVENTORY_TABS; for (int tab = 0; tab < tabs.length; tab++) { - send(new SwitchTabInterfaceEvent(tab, tabs[tab])); + send(new SwitchTabInterfaceMessage(tab, tabs[tab])); } inventory.forceRefresh(); @@ -731,9 +731,9 @@ public final class Player extends Mob { */ public void sendMessage(String message, boolean filterable) { if (clientVersion > 0) { - send(new ServerMessageEvent(message, filterable)); + send(new ServerChatMessage(message, filterable)); } else if (!filterable || !filteringMessages) { - send(new ServerMessageEvent(message)); + send(new ServerChatMessage(message)); } } @@ -749,7 +749,7 @@ public final class Player extends Mob { } for (int pos = 0; pos < lines; pos++) { - send(new SetWidgetTextEvent(InterfaceConstants.QUEST_TEXT[pos], pos < size ? text.get(pos) : "")); + send(new SetWidgetTextMessage(InterfaceConstants.QUEST_TEXT[pos], pos < size ? text.get(pos) : "")); } interfaceSet.openWindow(InterfaceConstants.QUEST_INTERFACE); } @@ -759,13 +759,13 @@ public final class Player extends Mob { */ public void sendUserLists() { if (ignores.size() > 0) { - send(new IgnoreListEvent(ignores)); + send(new IgnoreListMessage(ignores)); } World world = World.getWorld(); for (String username : friends) { int worldId = world.isPlayerOnline(username) ? world.getPlayer(username).worldId : 0; - send(new SendFriendEvent(username, worldId)); + send(new SendFriendMessage(username, worldId)); } } @@ -894,7 +894,7 @@ public final class Player extends Mob { */ public void setRunEnergy(int runEnergy) { this.runEnergy = runEnergy; - send(new UpdateRunEnergyEvent(runEnergy)); + send(new UpdateRunEnergyMessage(runEnergy)); } /** @@ -915,7 +915,7 @@ public final class Player extends Mob { public void setSession(GameSession session, boolean reconnecting) { this.session = session; if (!reconnecting) { - sendInitialEvents(); + sendInitialMessages(); } blockSet.add(SynchronizationBlock.createAppearanceBlock(this)); } @@ -966,7 +966,7 @@ public final class Player extends Mob { public void toggleRunning() { running = !running; walkingQueue.setRunningQueue(running); - send(new ConfigEvent(173, running ? 1 : 0)); + send(new ConfigMessage(173, running ? 1 : 0)); } @Override diff --git a/src/org/apollo/game/model/inter/InterfaceListener.java b/src/org/apollo/game/model/inter/InterfaceListener.java index 7e4f21cf..0ebe299d 100644 --- a/src/org/apollo/game/model/inter/InterfaceListener.java +++ b/src/org/apollo/game/model/inter/InterfaceListener.java @@ -1,7 +1,7 @@ package org.apollo.game.model.inter; /** - * Listens to interface-related events. + * Listens to interface-related messages. * * @author Graham */ diff --git a/src/org/apollo/game/model/inter/InterfaceSet.java b/src/org/apollo/game/model/inter/InterfaceSet.java index 1763fe32..63fd4ea2 100644 --- a/src/org/apollo/game/model/inter/InterfaceSet.java +++ b/src/org/apollo/game/model/inter/InterfaceSet.java @@ -3,11 +3,11 @@ package org.apollo.game.model.inter; import java.util.HashMap; import java.util.Map; -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.game.event.impl.EnterAmountEvent; -import org.apollo.game.event.impl.OpenDialogueInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceSidebarEvent; +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.game.message.impl.EnterAmountMessage; +import org.apollo.game.message.impl.OpenDialogueInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inter.dialogue.DialogueListener; @@ -69,7 +69,7 @@ public final class InterfaceSet { * Called when the player has clicked the specified button. Notifies the current dialogue listener. * * @param button The button. - * @return {@code true} if the event handler chain should be broken. + * @return {@code true} if the message handler chain should be broken. */ public boolean buttonClicked(int button) { if (dialogueListener != null) { @@ -83,11 +83,12 @@ public final class InterfaceSet { */ public void close() { closeAndNotify(); - player.send(new CloseInterfaceEvent()); + player.send(new CloseInterfaceMessage()); } /** - * An internal method for closing the interface, notifying the listener if appropriate, but not sending any events. + * An internal method for closing the interface, notifying the listener if appropriate, but not sending any + * messages. */ private void closeAndNotify() { amountListener = null; @@ -161,7 +162,7 @@ public final class InterfaceSet { this.listener = listener; interfaces.put(InterfaceType.DIALOGUE, dialogueId); - player.send(new OpenDialogueInterfaceEvent(dialogueId)); + player.send(new OpenDialogueInterfaceMessage(dialogueId)); } /** @@ -180,7 +181,7 @@ public final class InterfaceSet { */ public void openEnterAmountDialogue(EnterAmountListener listener) { amountListener = listener; - player.send(new EnterAmountEvent()); + player.send(new EnterAmountMessage()); } /** @@ -203,7 +204,7 @@ public final class InterfaceSet { this.listener = listener; interfaces.put(InterfaceType.WINDOW, windowId); - player.send(new OpenInterfaceEvent(windowId)); + player.send(new OpenInterfaceMessage(windowId)); } /** @@ -230,7 +231,7 @@ public final class InterfaceSet { interfaces.put(InterfaceType.WINDOW, windowId); interfaces.put(InterfaceType.SIDEBAR, sidebarId); - player.send(new OpenInterfaceSidebarEvent(windowId, sidebarId)); + player.send(new OpenInterfaceSidebarMessage(windowId, sidebarId)); } /** diff --git a/src/org/apollo/game/model/inter/dialogue/DialogueListener.java b/src/org/apollo/game/model/inter/dialogue/DialogueListener.java index 43e335fb..c8071df9 100644 --- a/src/org/apollo/game/model/inter/dialogue/DialogueListener.java +++ b/src/org/apollo/game/model/inter/dialogue/DialogueListener.java @@ -3,7 +3,7 @@ package org.apollo.game.model.inter.dialogue; import org.apollo.game.model.inter.InterfaceListener; /** - * An {@link InterfaceListener} that listens for dialogue-specific events (e.g. clicking buttons). + * An {@link InterfaceListener} that listens for dialogue-specific message (e.g. clicking buttons). * * @author Chris Fletcher */ @@ -13,11 +13,11 @@ public interface DialogueListener extends InterfaceListener { * Called when the player has clicked the specified button. *

* Note that this method is invoked when any button is clicked whilst the dialogue is opened. In case the button is - * not being handled by this listener, simply return {@code false} to allow further processing of the event. + * not being handled by this listener, simply return {@code false} to allow further processing of the message. *

* * @param button The button interface id. - * @return {@code true} if the event handler chain should be broken, {@code false} if it should be continued. + * @return {@code true} if the message handler chain should be broken, {@code false} if it should be continued. */ public boolean buttonClicked(int button); diff --git a/src/org/apollo/game/model/inv/FullInventoryListener.java b/src/org/apollo/game/model/inv/FullInventoryListener.java index 0254b964..00f747d8 100644 --- a/src/org/apollo/game/model/inv/FullInventoryListener.java +++ b/src/org/apollo/game/model/inv/FullInventoryListener.java @@ -1,7 +1,7 @@ package org.apollo.game.model.inv; -import org.apollo.game.event.Event; -import org.apollo.game.event.impl.ServerMessageEvent; +import org.apollo.game.message.Message; +import org.apollo.game.message.impl.ServerChatMessage; import org.apollo.game.model.entity.Player; /** @@ -22,9 +22,9 @@ public final class FullInventoryListener extends InventoryAdapter { public static final String FULL_INVENTORY_MESSAGE = "Not enough inventory space."; /** - * The event to send when the capacity has been exceeded. + * The message to send when the capacity has been exceeded. */ - private final Event event; + private final Message message; /** * The player. @@ -39,12 +39,12 @@ public final class FullInventoryListener extends InventoryAdapter { */ public FullInventoryListener(Player player, String message) { this.player = player; - event = new ServerMessageEvent(message); + this.message = new ServerChatMessage(message); } @Override public void capacityExceeded(Inventory inventory) { - player.send(event); + player.send(message); } } \ No newline at end of file diff --git a/src/org/apollo/game/model/inv/SynchronizationInventoryListener.java b/src/org/apollo/game/model/inv/SynchronizationInventoryListener.java index 7569e998..f6b9d7de 100644 --- a/src/org/apollo/game/model/inv/SynchronizationInventoryListener.java +++ b/src/org/apollo/game/model/inv/SynchronizationInventoryListener.java @@ -1,7 +1,7 @@ package org.apollo.game.model.inv; -import org.apollo.game.event.impl.UpdateItemsEvent; -import org.apollo.game.event.impl.UpdateSlottedItemsEvent; +import org.apollo.game.message.impl.UpdateItemsMessage; +import org.apollo.game.message.impl.UpdateSlottedItemsMessage; import org.apollo.game.model.Item; import org.apollo.game.model.entity.Player; @@ -45,12 +45,12 @@ public final class SynchronizationInventoryListener extends InventoryAdapter { @Override public void itemsUpdated(Inventory inventory) { - player.send(new UpdateItemsEvent(interfaceId, inventory.getItems())); + player.send(new UpdateItemsMessage(interfaceId, inventory.getItems())); } @Override public void itemUpdated(Inventory inventory, int slot, Item item) { - player.send(new UpdateSlottedItemsEvent(interfaceId, new SlottedItem(slot, item))); + player.send(new UpdateSlottedItemsMessage(interfaceId, new SlottedItem(slot, item))); } } \ No newline at end of file diff --git a/src/org/apollo/game/model/skill/SynchronizationSkillListener.java b/src/org/apollo/game/model/skill/SynchronizationSkillListener.java index 0313c4c5..60d0f3b4 100644 --- a/src/org/apollo/game/model/skill/SynchronizationSkillListener.java +++ b/src/org/apollo/game/model/skill/SynchronizationSkillListener.java @@ -1,6 +1,6 @@ package org.apollo.game.model.skill; -import org.apollo.game.event.impl.UpdateSkillEvent; +import org.apollo.game.message.impl.UpdateSkillMessage; import org.apollo.game.model.entity.Player; import org.apollo.game.model.entity.Skill; import org.apollo.game.model.entity.SkillSet; @@ -35,13 +35,13 @@ public final class SynchronizationSkillListener extends SkillAdapter { @Override public void skillsUpdated(SkillSet set) { for (int id = 0; id < set.size(); id++) { - player.send(new UpdateSkillEvent(id, set.getSkill(id))); + player.send(new UpdateSkillMessage(id, set.getSkill(id))); } } @Override public void skillUpdated(SkillSet set, int id, Skill skill) { - player.send(new UpdateSkillEvent(id, skill)); + player.send(new UpdateSkillMessage(id, skill)); } } \ 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 f10d0344..de3eb001 100644 --- a/src/org/apollo/game/sync/block/ChatBlock.java +++ b/src/org/apollo/game/sync/block/ChatBlock.java @@ -1,6 +1,6 @@ package org.apollo.game.sync.block; -import org.apollo.game.event.impl.ChatEvent; +import org.apollo.game.message.impl.ChatMessage; import org.apollo.game.model.setting.PrivilegeLevel; /** @@ -11,9 +11,9 @@ import org.apollo.game.model.setting.PrivilegeLevel; public final class ChatBlock extends SynchronizationBlock { /** - * The {@link ChatEvent}. + * The {@link ChatMessage}. */ - private final ChatEvent chatEvent; + private final ChatMessage chatMessage; /** * The {@link PrivilegeLevel}. @@ -24,11 +24,11 @@ public final class ChatBlock extends SynchronizationBlock { * Creates the chat block. * * @param privilegeLevel The {@link PrivilegeLevel} of the player who said the message. - * @param chatEvent The {@link ChatEvent}. + * @param chatMessage The {@link ChatMessage}. */ - ChatBlock(PrivilegeLevel privilegeLevel, ChatEvent chatEvent) { + ChatBlock(PrivilegeLevel privilegeLevel, ChatMessage chatMessage) { this.privilegeLevel = privilegeLevel; - this.chatEvent = chatEvent; + this.chatMessage = chatMessage; } /** @@ -37,7 +37,7 @@ public final class ChatBlock extends SynchronizationBlock { * @return The compressed message. */ public byte[] getCompressedMessage() { - return chatEvent.getCompressedMessage(); + return chatMessage.getCompressedMessage(); } /** @@ -46,7 +46,7 @@ public final class ChatBlock extends SynchronizationBlock { * @return The message. */ public String getMessage() { - return chatEvent.getMessage(); + return chatMessage.getMessage(); } /** @@ -64,7 +64,7 @@ public final class ChatBlock extends SynchronizationBlock { * @return The text color. */ public int getTextColor() { - return chatEvent.getTextColor(); + return chatMessage.getTextColor(); } /** @@ -73,7 +73,7 @@ public final class ChatBlock extends SynchronizationBlock { * @return The text effects. */ public int getTextEffects() { - return chatEvent.getTextEffects(); + return chatMessage.getTextEffects(); } } \ No newline at end of file diff --git a/src/org/apollo/game/sync/block/SynchronizationBlock.java b/src/org/apollo/game/sync/block/SynchronizationBlock.java index f4e4ff85..7bb017a5 100644 --- a/src/org/apollo/game/sync/block/SynchronizationBlock.java +++ b/src/org/apollo/game/sync/block/SynchronizationBlock.java @@ -1,6 +1,6 @@ package org.apollo.game.sync.block; -import org.apollo.game.event.impl.ChatEvent; +import org.apollo.game.message.impl.ChatMessage; import org.apollo.game.model.Animation; import org.apollo.game.model.Direction; import org.apollo.game.model.Graphic; @@ -43,11 +43,11 @@ public abstract class SynchronizationBlock { * Creates a {@link ChatBlock} for the specified player. * * @param player The player. - * @param chatEvent The chat event. + * @param chatMessage The chat message. * @return The chat block. */ - public static SynchronizationBlock createChatBlock(Player player, ChatEvent chatEvent) { - return new ChatBlock(player.getPrivilegeLevel(), chatEvent); + public static SynchronizationBlock createChatBlock(Player player, ChatMessage chatMessage) { + return new ChatBlock(player.getPrivilegeLevel(), chatMessage); } /** diff --git a/src/org/apollo/game/sync/task/NpcSynchronizationTask.java b/src/org/apollo/game/sync/task/NpcSynchronizationTask.java index c19b8e60..0f9255d3 100644 --- a/src/org/apollo/game/sync/task/NpcSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/NpcSynchronizationTask.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apollo.game.event.impl.NpcSynchronizationEvent; +import org.apollo.game.message.impl.NpcSynchronizationMessage; import org.apollo.game.model.Position; import org.apollo.game.model.World; import org.apollo.game.model.entity.Npc; @@ -79,7 +79,7 @@ public final class NpcSynchronizationTask extends SynchronizationTask { } } - player.send(new NpcSynchronizationEvent(playerPosition, segments, oldLocalNpcs)); + player.send(new NpcSynchronizationMessage(playerPosition, segments, oldLocalNpcs)); } } \ No newline at end of file diff --git a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java index 38142be6..f3e13bca 100644 --- a/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PlayerSynchronizationTask.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apollo.game.event.impl.PlayerSynchronizationEvent; +import org.apollo.game.message.impl.PlayerSynchronizationMessage; import org.apollo.game.model.Position; import org.apollo.game.model.World; import org.apollo.game.model.entity.Player; @@ -107,9 +107,9 @@ public final class PlayerSynchronizationTask extends SynchronizationTask { } } - PlayerSynchronizationEvent event = new PlayerSynchronizationEvent(lastKnownRegion, player.getPosition(), + PlayerSynchronizationMessage message = new PlayerSynchronizationMessage(lastKnownRegion, player.getPosition(), regionChanged, segment, oldLocalPlayers, segments); - player.send(event); + player.send(message); } } \ No newline at end of file diff --git a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java index bbd14280..9c3ba3b7 100644 --- a/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java +++ b/src/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java @@ -1,6 +1,6 @@ package org.apollo.game.sync.task; -import org.apollo.game.event.impl.RegionChangeEvent; +import org.apollo.game.message.impl.RegionChangeMessage; import org.apollo.game.model.Position; import org.apollo.game.model.entity.Player; @@ -54,7 +54,7 @@ public final class PrePlayerSynchronizationTask extends SynchronizationTask { Position position = player.getPosition(); player.setLastKnownRegion(position); - player.send(new RegionChangeEvent(position)); + player.send(new RegionChangeMessage(position)); } } diff --git a/src/org/apollo/io/EventHandlerChainParser.java b/src/org/apollo/io/EventHandlerChainParser.java deleted file mode 100644 index 19da3c7a..00000000 --- a/src/org/apollo/io/EventHandlerChainParser.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.apollo.io; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apollo.game.event.Event; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.chain.EventHandlerChain; -import org.apollo.game.event.handler.chain.EventHandlerChainGroup; -import org.apollo.util.xml.XmlNode; -import org.apollo.util.xml.XmlParser; -import org.xml.sax.SAXException; - -/** - * A class that parses the {@code events.xml} file to produce {@link EventHandlerChainGroup}s. - * - * @author Graham - */ -public final class EventHandlerChainParser { - - /** - * The source {@link InputStream}. - */ - private final InputStream is; - - /** - * The {@link XmlParser} instance. - */ - private final XmlParser parser; - - /** - * Creates the event chain parser. - * - * @param is The source {@link InputStream}. - * @throws SAXException If a SAX error occurs. - */ - public EventHandlerChainParser(InputStream is) throws SAXException { - this.is = is; - parser = new XmlParser(); - } - - /** - * Parses the XML and produces a group of {@link EventHandlerChain}s. - * - * @throws IOException If an I/O error occurs. - * @throws SAXException If a SAX error occurs. - * @throws ClassNotFoundException If a class was not found. - * @throws IllegalAccessException If a class was accessed illegally. - * @throws InstantiationException If a class could not be instantiated. - * @return An {@link EventHandlerChainGroup}. - */ - @SuppressWarnings("unchecked") - public EventHandlerChainGroup parse() throws IOException, SAXException, ClassNotFoundException, - InstantiationException, IllegalAccessException { - XmlNode rootNode = parser.parse(is); - if (!rootNode.getName().equals("events")) { - throw new IOException("Root node name is not 'events'."); - } - - Map, EventHandlerChain> chains = new HashMap, EventHandlerChain>(); - - for (XmlNode eventNode : rootNode) { - if (!eventNode.getName().equals("event")) { - throw new IOException("Only expected nodes named 'event' beneath the root node."); - } - - XmlNode typeNode = eventNode.getChild("type"); - if (typeNode == null) { - throw new IOException("No node named 'type' beneath current event node."); - } - XmlNode chainNode = eventNode.getChild("chain"); - if (chainNode == null) { - throw new IOException("No node named 'chain' beneath current event node."); - } - - String eventClassName = typeNode.getValue(); - if (eventClassName == null) { - throw new IOException("Type node must have a value."); - } - - Class eventClass = (Class) Class.forName(eventClassName); - List> handlers = new ArrayList>(); - - for (XmlNode handlerNode : chainNode) { - if (!handlerNode.getName().equals("handler")) { - throw new IOException("Only expected nodes named 'handler' beneath the root node."); - } - - String handlerClassName = handlerNode.getValue(); - if (handlerClassName == null) { - throw new IOException("Handler node must have a value."); - } - - Class> handlerClass = (Class>) Class - .forName(handlerClassName); - EventHandler handler = handlerClass.newInstance(); - handlers.add(handler); - } - - EventHandler[] handlersArray = handlers.toArray(new EventHandler[handlers.size()]); - @SuppressWarnings("rawtypes") - EventHandlerChain chain = new EventHandlerChain(handlersArray); - - chains.put(eventClass, chain); - } - - return new EventHandlerChainGroup(chains); - } - -} \ No newline at end of file diff --git a/src/org/apollo/io/MessageHandlerChainParser.java b/src/org/apollo/io/MessageHandlerChainParser.java new file mode 100644 index 00000000..fffeb1f4 --- /dev/null +++ b/src/org/apollo/io/MessageHandlerChainParser.java @@ -0,0 +1,114 @@ +package org.apollo.io; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apollo.game.message.Message; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerChain; +import org.apollo.game.message.handler.MessageHandlerChainGroup; +import org.apollo.util.xml.XmlNode; +import org.apollo.util.xml.XmlParser; +import org.xml.sax.SAXException; + +/** + * A class that parses the {@code messages.xml} file to produce {@link MessageHandlerChainGroup}s. + * + * @author Graham + */ +public final class MessageHandlerChainParser { + + /** + * The source {@link InputStream}. + */ + private final InputStream is; + + /** + * The {@link XmlParser} instance. + */ + private final XmlParser parser; + + /** + * Creates the message chain parser. + * + * @param is The source {@link InputStream}. + * @throws SAXException If a SAX error occurs. + */ + public MessageHandlerChainParser(InputStream is) throws SAXException { + this.is = is; + parser = new XmlParser(); + } + + /** + * Parses the XML and produces a group of {@link MessageHandlerChain}s. + * + * @throws IOException If an I/O error occurs. + * @throws SAXException If a SAX error occurs. + * @throws ClassNotFoundException If a class was not found. + * @throws IllegalAccessException If a class was accessed illegally. + * @throws InstantiationException If a class could not be instantiated. + * @return An {@link MessageHandlerChainGroup}. + */ + @SuppressWarnings("unchecked") + public MessageHandlerChainGroup parse() throws IOException, SAXException, ClassNotFoundException, + InstantiationException, IllegalAccessException { + XmlNode messages = parser.parse(is); + if (!messages.getName().equals("messages")) { + throw new IOException("Root node name is not 'messages'."); + } + + Map, MessageHandlerChain> chains = new HashMap<>(); + + for (XmlNode message : messages) { + if (!message.getName().equals("message")) { + throw new IOException("Only expected nodes named 'message' beneath the root node."); + } + + XmlNode typeNode = message.getChild("type"); + if (typeNode == null) { + throw new IOException("No node named 'type' beneath current message node."); + } + XmlNode chainNode = message.getChild("chain"); + if (chainNode == null) { + throw new IOException("No node named 'chain' beneath current message node."); + } + + String messageClassName = typeNode.getValue(); + if (messageClassName == null) { + throw new IOException("Type node must have a value."); + } + + Class messageClass = (Class) Class.forName(messageClassName); + List> handlers = new ArrayList>(); + + for (XmlNode handlerNode : chainNode) { + if (!handlerNode.getName().equals("handler")) { + throw new IOException("Only expected nodes named 'handler' beneath the root node."); + } + + String handlerClassName = handlerNode.getValue(); + if (handlerClassName == null) { + throw new IOException("Handler node must have a value."); + } + + Class> handlerClass = (Class>) Class + .forName(handlerClassName); + MessageHandler handler = handlerClass.newInstance(); + handlers.add(handler); + } + + MessageHandler[] handlersArray = handlers.toArray(new MessageHandler[handlers.size()]); + @SuppressWarnings("rawtypes") + MessageHandlerChain chain = new MessageHandlerChain(handlersArray); + + chains.put(messageClass, chain); + } + + return new MessageHandlerChainGroup(chains); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/codec/game/GameEventEncoder.java b/src/org/apollo/net/codec/game/GameEventEncoder.java deleted file mode 100644 index f500957a..00000000 --- a/src/org/apollo/net/codec/game/GameEventEncoder.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.apollo.net.codec.game; - -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageEncoder; - -import java.util.List; - -import org.apollo.game.event.Event; -import org.apollo.net.release.EventEncoder; -import org.apollo.net.release.Release; - -/** - * A {@link MessageToMessageEncoder} which encodes {@link Event}s into {@link GamePacket}s. - * - * @author Graham - */ -public final class GameEventEncoder extends MessageToMessageEncoder { - - /** - * The current release. - */ - private final Release release; - - /** - * Creates the game event encoder with the specified release. - * - * @param release The release. - */ - public GameEventEncoder(Release release) { - this.release = release; - } - - @SuppressWarnings("unchecked") - @Override - protected void encode(ChannelHandlerContext ctx, Event event, List out) { - EventEncoder encoder = (EventEncoder) release.getEventEncoder(event.getClass()); - if (encoder != null) { - out.add(encoder.encode(event)); - } - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/codec/game/GameEventDecoder.java b/src/org/apollo/net/codec/game/GameMessageDecoder.java similarity index 64% rename from src/org/apollo/net/codec/game/GameEventDecoder.java rename to src/org/apollo/net/codec/game/GameMessageDecoder.java index 09aecf12..4726fdf2 100644 --- a/src/org/apollo/net/codec/game/GameEventDecoder.java +++ b/src/org/apollo/net/codec/game/GameMessageDecoder.java @@ -5,16 +5,16 @@ import io.netty.handler.codec.MessageToMessageDecoder; import java.util.List; -import org.apollo.game.event.Event; -import org.apollo.net.release.EventDecoder; +import org.apollo.game.message.Message; +import org.apollo.net.release.MessageDecoder; import org.apollo.net.release.Release; /** - * A {@link MessageToMessageDecoder} that decodes {@link GamePacket}s into {@link Event}s. + * A {@link MessageToMessageDecoder} that decodes {@link GamePacket}s into {@link Message}s. * * @author Graham */ -public final class GameEventDecoder extends MessageToMessageDecoder { +public final class GameMessageDecoder extends MessageToMessageDecoder { /** * The current release. @@ -22,17 +22,17 @@ public final class GameEventDecoder extends MessageToMessageDecoder private final Release release; /** - * Creates the game event decoder with the specified release. + * Creates the game message decoder with the specified release. * * @param release The release. */ - public GameEventDecoder(Release release) { + public GameMessageDecoder(Release release) { this.release = release; } @Override protected void decode(ChannelHandlerContext ctx, GamePacket packet, List out) { - EventDecoder decoder = release.getEventDecoder(packet.getOpcode()); + MessageDecoder decoder = release.getMessageDecoder(packet.getOpcode()); if (decoder != null) { out.add(decoder.decode(packet)); } else { diff --git a/src/org/apollo/net/codec/game/GameMessageEncoder.java b/src/org/apollo/net/codec/game/GameMessageEncoder.java new file mode 100644 index 00000000..d26bc0ed --- /dev/null +++ b/src/org/apollo/net/codec/game/GameMessageEncoder.java @@ -0,0 +1,42 @@ +package org.apollo.net.codec.game; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageEncoder; + +import java.util.List; + +import org.apollo.game.message.Message; +import org.apollo.net.release.MessageEncoder; +import org.apollo.net.release.Release; + +/** + * A {@link MessageToMessageEncoder} which encodes {@link Message}s into {@link GamePacket}s. + * + * @author Graham + */ +public final class GameMessageEncoder extends MessageToMessageEncoder { + + /** + * The current release. + */ + private final Release release; + + /** + * Creates the game message encoder with the specified release. + * + * @param release The release. + */ + public GameMessageEncoder(Release release) { + this.release = release; + } + + @SuppressWarnings("unchecked") + @Override + protected void encode(ChannelHandlerContext ctx, Message message, List out) { + MessageEncoder encoder = (MessageEncoder) release.getMessageEncoder(message.getClass()); + if (encoder != null) { + out.add(encoder.encode(message)); + } + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/EventDecoder.java b/src/org/apollo/net/release/EventDecoder.java deleted file mode 100644 index 5ceee0a8..00000000 --- a/src/org/apollo/net/release/EventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release; - -import org.apollo.game.event.Event; -import org.apollo.net.codec.game.GamePacket; - -/** - * An {@link EventDecoder} decodes a {@link GamePacket} into an {@link Event} object which can be processed by the - * server. - * - * @author Graham - * @param The type of {@link Event}. - */ -public abstract class EventDecoder { - - /** - * Decodes the specified packet into an event. - * - * @param packet The packet. - * @return The event. - */ - public abstract E decode(GamePacket packet); - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/EventEncoder.java b/src/org/apollo/net/release/EventEncoder.java deleted file mode 100644 index 91bb632c..00000000 --- a/src/org/apollo/net/release/EventEncoder.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.net.release; - -import org.apollo.game.event.Event; -import org.apollo.net.codec.game.GamePacket; - -/** - * An {@link EventEncoder} encodes {@link Event} objects into {@link GamePacket}s which can be sent over the network. - * - * @author Graham - * @param The type of {@link Event}. - */ -public abstract class EventEncoder { - - /** - * Encodes the specified event into a packet. - * - * @param event The event. - * @return The packet. - */ - public abstract GamePacket encode(E event); - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/MessageDecoder.java b/src/org/apollo/net/release/MessageDecoder.java new file mode 100644 index 00000000..21221661 --- /dev/null +++ b/src/org/apollo/net/release/MessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release; + +import org.apollo.game.message.Message; +import org.apollo.net.codec.game.GamePacket; + +/** + * A {@link MessageDecoder} decodes a {@link GamePacket} into an {@link Message} object which can be processed by the + * server. + * + * @author Graham + * @param The type of message. + */ +public abstract class MessageDecoder { + + /** + * Decodes the specified packet into a message. + * + * @param packet The packet. + * @return The message. + */ + public abstract M decode(GamePacket packet); + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/MessageEncoder.java b/src/org/apollo/net/release/MessageEncoder.java new file mode 100644 index 00000000..235861da --- /dev/null +++ b/src/org/apollo/net/release/MessageEncoder.java @@ -0,0 +1,22 @@ +package org.apollo.net.release; + +import org.apollo.game.message.Message; +import org.apollo.net.codec.game.GamePacket; + +/** + * A {@link MessageEncoder} encodes {@link Message} objects into {@link GamePacket}s which can be sent over the network. + * + * @author Graham + * @param The type of message. + */ +public abstract class MessageEncoder { + + /** + * Encodes the specified message into a packet. + * + * @param message The message. + * @return The packet. + */ + public abstract GamePacket encode(M message); + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/Release.java b/src/org/apollo/net/release/Release.java index c4470b5f..ef0e1c4b 100644 --- a/src/org/apollo/net/release/Release.java +++ b/src/org/apollo/net/release/Release.java @@ -3,26 +3,26 @@ package org.apollo.net.release; import java.util.HashMap; import java.util.Map; -import org.apollo.game.event.Event; +import org.apollo.game.message.Message; import org.apollo.net.meta.PacketMetaData; import org.apollo.net.meta.PacketMetaDataGroup; /** - * A {@link Release} is a distinct client version, for example 317 is a common release used in server emulators. + * A {@link Release} is a distinct client version, e.g. {@code 317}. * * @author Graham */ public abstract class Release { /** - * The decoders. + * The array of message decoders. */ - private final EventDecoder[] decoders = new EventDecoder[256]; + private final MessageDecoder[] decoders = new MessageDecoder[256]; /** - * The encoders. + * The map of message classes to message encoders. */ - private final Map, EventEncoder> encoders = new HashMap, EventEncoder>(); + private final Map, MessageEncoder> encoders = new HashMap<>(); /** * The incoming packet meta data. @@ -45,30 +45,6 @@ public abstract class Release { this.incomingPacketMetaData = incomingPacketMetaData; } - /** - * Gets the {@link EventDecoder} for the specified opcode. - * - * @param opcode The opcode. - * @return The {@link EventDecoder}. - */ - public final EventDecoder getEventDecoder(int opcode) { - if (opcode < 0 || opcode >= decoders.length) { - throw new IndexOutOfBoundsException("Opcode is out of bounds."); - } - return decoders[opcode]; - } - - /** - * Gets an {@link EventEncoder} for the specified event type. - * - * @param type The type of event. - * @return The {@link EventEncoder}. - */ - @SuppressWarnings("unchecked") - public EventEncoder getEventEncoder(Class type) { - return (EventEncoder) encoders.get(type); - } - /** * Gets meta data for the specified incoming packet. * @@ -79,6 +55,30 @@ public abstract class Release { return incomingPacketMetaData.getMetaData(opcode); } + /** + * Gets the {@link MessageDecoder} for the specified opcode. + * + * @param opcode The opcode. + * @return The message decoder. + */ + public final MessageDecoder getMessageDecoder(int opcode) { + if (opcode < 0 || opcode >= decoders.length) { + throw new IndexOutOfBoundsException("Opcode is out of bounds."); + } + return decoders[opcode]; + } + + /** + * Gets the {@link MessageEncoder} for the specified message type. + * + * @param type The type of message. + * @return The message encoder. + */ + @SuppressWarnings("unchecked") + public MessageEncoder getMessageEncoder(Class type) { + return (MessageEncoder) encoders.get(type); + } + /** * Gets the release number. * @@ -89,22 +89,22 @@ public abstract class Release { } /** - * Registers a {@link EventEncoder} for the specified event type. + * Registers a {@link MessageEncoder} for the specified message type. * - * @param type The event type. - * @param encoder The {@link EventEncoder}. + * @param type The message type. + * @param encoder The message encoder. */ - public final void register(Class type, EventEncoder encoder) { + public final void register(Class type, MessageEncoder encoder) { encoders.put(type, encoder); } /** - * Registers a {@link EventDecoder} for the specified opcode. + * Registers a {@link MessageDecoder} for the specified opcode. * * @param opcode The opcode, between 0 and 255 inclusive. - * @param decoder The {@link EventDecoder}. + * @param decoder The message decoder. */ - public final void register(int opcode, EventDecoder decoder) { + public final void register(int opcode, MessageDecoder decoder) { if (opcode < 0 || opcode >= decoders.length) { throw new IndexOutOfBoundsException("Opcode is out of bounds."); } diff --git a/src/org/apollo/net/release/r317/AddIgnoreEventDecoder.java b/src/org/apollo/net/release/r317/AddFriendMessageDecoder.java similarity index 53% rename from src/org/apollo/net/release/r317/AddIgnoreEventDecoder.java rename to src/org/apollo/net/release/r317/AddFriendMessageDecoder.java index 3b78d133..6a47861c 100644 --- a/src/org/apollo/net/release/r317/AddIgnoreEventDecoder.java +++ b/src/org/apollo/net/release/r317/AddFriendMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.AddIgnoreEvent; +import org.apollo.game.message.impl.AddFriendMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link AddIgnoreEvent}. + * A {@link MessageDecoder} for the {@link AddFriendMessage}. * * @author Major */ -public final class AddIgnoreEventDecoder extends EventDecoder { +public final class AddFriendMessageDecoder extends MessageDecoder { @Override - public AddIgnoreEvent decode(GamePacket packet) { + public AddFriendMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new AddIgnoreEvent(username); + return new AddFriendMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/AddGlobalTileItemEventEncoder.java b/src/org/apollo/net/release/r317/AddGlobalTileItemEventEncoder.java deleted file mode 100644 index e43f6d39..00000000 --- a/src/org/apollo/net/release/r317/AddGlobalTileItemEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.AddGlobalTileItemEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link AddGlobalTileItemEvent}. - * - * @author Major - */ -public final class AddGlobalTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(AddGlobalTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(215); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getId()); - builder.put(DataType.BYTE, DataTransformation.SUBTRACT, event.getPositionOffset()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getIndex()); - builder.put(DataType.SHORT, event.getAmount()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/AddGlobalTileItemMessageEncoder.java b/src/org/apollo/net/release/r317/AddGlobalTileItemMessageEncoder.java new file mode 100644 index 00000000..da8879cf --- /dev/null +++ b/src/org/apollo/net/release/r317/AddGlobalTileItemMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.AddGlobalTileItemMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link AddGlobalTileItemMessage}. + * + * @author Major + */ +public final class AddGlobalTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(AddGlobalTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(215); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getId()); + builder.put(DataType.BYTE, DataTransformation.SUBTRACT, message.getPositionOffset()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getIndex()); + builder.put(DataType.SHORT, message.getAmount()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/RemoveFriendEventDecoder.java b/src/org/apollo/net/release/r317/AddIgnoreMessageDecoder.java similarity index 53% rename from src/org/apollo/net/release/r317/RemoveFriendEventDecoder.java rename to src/org/apollo/net/release/r317/AddIgnoreMessageDecoder.java index 94cde280..28439b40 100644 --- a/src/org/apollo/net/release/r317/RemoveFriendEventDecoder.java +++ b/src/org/apollo/net/release/r317/AddIgnoreMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.RemoveFriendEvent; +import org.apollo.game.message.impl.AddIgnoreMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link RemoveFriendEvent}. + * A {@link MessageDecoder} for the {@link AddIgnoreMessage}. * * @author Major */ -public final class RemoveFriendEventDecoder extends EventDecoder { +public final class AddIgnoreMessageDecoder extends MessageDecoder { @Override - public RemoveFriendEvent decode(GamePacket packet) { + public AddIgnoreMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new RemoveFriendEvent(username); + return new AddIgnoreMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/AddTileItemEventEncoder.java b/src/org/apollo/net/release/r317/AddTileItemMessageEncoder.java similarity index 51% rename from src/org/apollo/net/release/r317/AddTileItemEventEncoder.java rename to src/org/apollo/net/release/r317/AddTileItemMessageEncoder.java index f7d96521..9e56ce3a 100644 --- a/src/org/apollo/net/release/r317/AddTileItemEventEncoder.java +++ b/src/org/apollo/net/release/r317/AddTileItemMessageEncoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.AddTileItemEvent; +import org.apollo.game.message.impl.AddTileItemMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link AddTileItemEvent}. + * A {@link MessageEncoder} for the {@link AddTileItemMessage}. * * @author Major */ -public final class AddTileItemEventEncoder extends EventEncoder { +public final class AddTileItemMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(AddTileItemEvent event) { + public GamePacket encode(AddTileItemMessage message) { GamePacketBuilder builder = new GamePacketBuilder(44); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getId()); - builder.put(DataType.SHORT, event.getAmount()); - builder.put(DataType.BYTE, event.getPositionOffset()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getId()); + builder.put(DataType.SHORT, message.getAmount()); + builder.put(DataType.BYTE, message.getPositionOffset()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/ArrowKeyEventDecoder.java b/src/org/apollo/net/release/r317/ArrowKeyMessageDecoder.java similarity index 58% rename from src/org/apollo/net/release/r317/ArrowKeyEventDecoder.java rename to src/org/apollo/net/release/r317/ArrowKeyMessageDecoder.java index 49cf8984..5cb603d2 100644 --- a/src/org/apollo/net/release/r317/ArrowKeyEventDecoder.java +++ b/src/org/apollo/net/release/r317/ArrowKeyMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ArrowKeyEvent; +import org.apollo.game.message.impl.ArrowKeyMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ArrowKeyEvent}. + * A {@link MessageDecoder} for the {@link ArrowKeyMessage}. * * @author Major */ -public final class ArrowKeyEventDecoder extends EventDecoder { +public final class ArrowKeyMessageDecoder extends MessageDecoder { @Override - public ArrowKeyEvent decode(GamePacket packet) { + public ArrowKeyMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int roll = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int yaw = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ArrowKeyEvent(roll, yaw); + return new ArrowKeyMessage(roll, yaw); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ButtonEventDecoder.java b/src/org/apollo/net/release/r317/ButtonMessageDecoder.java similarity index 51% rename from src/org/apollo/net/release/r317/ButtonEventDecoder.java rename to src/org/apollo/net/release/r317/ButtonMessageDecoder.java index 14e56120..5c8dcea7 100644 --- a/src/org/apollo/net/release/r317/ButtonEventDecoder.java +++ b/src/org/apollo/net/release/r317/ButtonMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ButtonEvent; +import org.apollo.game.message.impl.ButtonMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ButtonEvent}. + * A {@link MessageDecoder} for the {@link ButtonMessage}. * * @author Graham */ -public final class ButtonEventDecoder extends EventDecoder { +public final class ButtonMessageDecoder extends MessageDecoder { @Override - public ButtonEvent decode(GamePacket packet) { + public ButtonMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new ButtonEvent(interfaceId); + return new ButtonMessage(interfaceId); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ChatEventDecoder.java b/src/org/apollo/net/release/r317/ChatMessageDecoder.java similarity index 75% rename from src/org/apollo/net/release/r317/ChatEventDecoder.java rename to src/org/apollo/net/release/r317/ChatMessageDecoder.java index 4a66464f..db7f64d7 100644 --- a/src/org/apollo/net/release/r317/ChatEventDecoder.java +++ b/src/org/apollo/net/release/r317/ChatMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ChatEvent; +import org.apollo.game.message.impl.ChatMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.TextUtil; /** - * An {@link EventDecoder} for the {@link ChatEvent}. + * A {@link MessageDecoder} for the {@link ChatMessage}. * * @author Graham */ -public final class ChatEventDecoder extends EventDecoder { +public final class ChatMessageDecoder extends MessageDecoder { @Override - public ChatEvent decode(GamePacket packet) { + public ChatMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int effects = (int) reader.getUnsigned(DataType.BYTE, DataTransformation.SUBTRACT); @@ -34,7 +34,7 @@ public final class ChatEventDecoder extends EventDecoder { TextUtil.compress(uncompressed, recompressed); // in case invalid data gets sent, this effectively verifies it - return new ChatEvent(uncompressed, recompressed, color, effects); + return new ChatMessage(uncompressed, recompressed, color, effects); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/CloseInterfaceEventEncoder.java b/src/org/apollo/net/release/r317/CloseInterfaceEventEncoder.java deleted file mode 100644 index df1c404c..00000000 --- a/src/org/apollo/net/release/r317/CloseInterfaceEventEncoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link CloseInterfaceEvent}. - * - * @author Graham - */ -public final class CloseInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(CloseInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(219); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/CloseInterfaceMessageEncoder.java b/src/org/apollo/net/release/r317/CloseInterfaceMessageEncoder.java new file mode 100644 index 00000000..cfabc5df --- /dev/null +++ b/src/org/apollo/net/release/r317/CloseInterfaceMessageEncoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link CloseInterfaceMessage}. + * + * @author Graham + */ +public final class CloseInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(CloseInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(219); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ClosedInterfaceEventDecoder.java b/src/org/apollo/net/release/r317/ClosedInterfaceEventDecoder.java deleted file mode 100644 index 24004950..00000000 --- a/src/org/apollo/net/release/r317/ClosedInterfaceEventDecoder.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.ClosedInterfaceEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link ClosedInterfaceEvent}. - * - * @author Graham - */ -public final class ClosedInterfaceEventDecoder extends EventDecoder { - - @Override - public ClosedInterfaceEvent decode(GamePacket packet) { - return new ClosedInterfaceEvent(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ClosedInterfaceMessageDecoder.java b/src/org/apollo/net/release/r317/ClosedInterfaceMessageDecoder.java new file mode 100644 index 00000000..431fda4e --- /dev/null +++ b/src/org/apollo/net/release/r317/ClosedInterfaceMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.ClosedInterfaceMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link ClosedInterfaceMessage}. + * + * @author Graham + */ +public final class ClosedInterfaceMessageDecoder extends MessageDecoder { + + @Override + public ClosedInterfaceMessage decode(GamePacket packet) { + return new ClosedInterfaceMessage(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/CommandEventDecoder.java b/src/org/apollo/net/release/r317/CommandEventDecoder.java deleted file mode 100644 index 5ced5885..00000000 --- a/src/org/apollo/net/release/r317/CommandEventDecoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.CommandEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link CommandEvent}. - * - * @author Graham - */ -public final class CommandEventDecoder extends EventDecoder { - - @Override - public CommandEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - return new CommandEvent(reader.getString()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/CommandMessageDecoder.java b/src/org/apollo/net/release/r317/CommandMessageDecoder.java new file mode 100644 index 00000000..d031ecb2 --- /dev/null +++ b/src/org/apollo/net/release/r317/CommandMessageDecoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.CommandMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link CommandMessage}. + * + * @author Graham + */ +public final class CommandMessageDecoder extends MessageDecoder { + + @Override + public CommandMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + return new CommandMessage(reader.getString()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ConfigEventEncoder.java b/src/org/apollo/net/release/r317/ConfigMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r317/ConfigEventEncoder.java rename to src/org/apollo/net/release/r317/ConfigMessageEncoder.java index ac28c4a3..8c9375ea 100644 --- a/src/org/apollo/net/release/r317/ConfigEventEncoder.java +++ b/src/org/apollo/net/release/r317/ConfigMessageEncoder.java @@ -1,34 +1,34 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ConfigEvent; +import org.apollo.game.message.impl.ConfigMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link ConfigEvent}. + * A {@link MessageEncoder} for the {@link ConfigMessage}. * * @author Chris Fletcher * @author Major */ -public final class ConfigEventEncoder extends EventEncoder { +public final class ConfigMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(ConfigEvent event) { + public GamePacket encode(ConfigMessage message) { GamePacketBuilder builder; - int value = event.getValue(); + int value = message.getValue(); if (value > Byte.MIN_VALUE && value < Byte.MAX_VALUE) { builder = new GamePacketBuilder(36); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getId()); builder.put(DataType.BYTE, value & 0xFF); } else { builder = new GamePacketBuilder(87); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getId()); builder.put(DataType.INT, DataOrder.MIDDLE, value); } diff --git a/src/org/apollo/net/release/r317/DialogueContinueEventEncoder.java b/src/org/apollo/net/release/r317/DialogueContinueEventEncoder.java index b70a8ca5..2c09d6db 100644 --- a/src/org/apollo/net/release/r317/DialogueContinueEventEncoder.java +++ b/src/org/apollo/net/release/r317/DialogueContinueEventEncoder.java @@ -1,23 +1,23 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.DialogueContinueEvent; +import org.apollo.game.message.impl.DialogueContinueMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link DialogueContinueEvent}. + * A {@link MessageDecoder} for the {@link DialogueContinueMessage}. * * @author Chris Fletcher */ -final class DialogueContinueEventDecoder extends EventDecoder { +final class DialogueContinueMessageDecoder extends MessageDecoder { @Override - public DialogueContinueEvent decode(GamePacket packet) { + public DialogueContinueMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new DialogueContinueEvent(interfaceId); + return new DialogueContinueMessage(interfaceId); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/DisplayCrossbonesEventEncoder.java b/src/org/apollo/net/release/r317/DisplayCrossbonesEventEncoder.java deleted file mode 100644 index 8797fb0d..00000000 --- a/src/org/apollo/net/release/r317/DisplayCrossbonesEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.DisplayCrossbonesEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link DisplayCrossbonesEvent}. - * - * @author Major - */ -public final class DisplayCrossbonesEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(DisplayCrossbonesEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(61); - builder.put(DataType.BYTE, event.isDisplayed() ? 1 : 0); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/DisplayCrossbonesMessageEncoder.java b/src/org/apollo/net/release/r317/DisplayCrossbonesMessageEncoder.java new file mode 100644 index 00000000..f9b5f9b5 --- /dev/null +++ b/src/org/apollo/net/release/r317/DisplayCrossbonesMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.DisplayCrossbonesMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link DisplayCrossbonesMessage}. + * + * @author Major + */ +public final class DisplayCrossbonesMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(DisplayCrossbonesMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(61); + builder.put(DataType.BYTE, message.isDisplayed() ? 1 : 0); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/DisplayTabInterfaceEventEncoder.java b/src/org/apollo/net/release/r317/DisplayTabInterfaceEventEncoder.java deleted file mode 100644 index ad75a49d..00000000 --- a/src/org/apollo/net/release/r317/DisplayTabInterfaceEventEncoder.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.DisplayTabInterfaceEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link DisplayTabInterfaceEvent}. - * - * @author Chris Fletcher - */ -final class DisplayTabInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(DisplayTabInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(106); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getTab()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/DisplayTabInterfaceMessageEncoder.java b/src/org/apollo/net/release/r317/DisplayTabInterfaceMessageEncoder.java new file mode 100644 index 00000000..d6f7789b --- /dev/null +++ b/src/org/apollo/net/release/r317/DisplayTabInterfaceMessageEncoder.java @@ -0,0 +1,24 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.DisplayTabInterfaceMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link DisplayTabInterfaceMessage}. + * + * @author Chris Fletcher + */ +final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(DisplayTabInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(106); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getTab()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/EnterAmountEventEncoder.java b/src/org/apollo/net/release/r317/EnterAmountEventEncoder.java deleted file mode 100644 index 3b6dc958..00000000 --- a/src/org/apollo/net/release/r317/EnterAmountEventEncoder.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.net.release.r317; - -import io.netty.buffer.Unpooled; - -import org.apollo.game.event.impl.EnterAmountEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link EnterAmountEvent}. - * - * @author Graham - */ -public final class EnterAmountEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(EnterAmountEvent event) { - return new GamePacket(27, PacketType.FIXED, Unpooled.EMPTY_BUFFER); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/EnterAmountMessageEncoder.java b/src/org/apollo/net/release/r317/EnterAmountMessageEncoder.java new file mode 100644 index 00000000..1ef8f8e2 --- /dev/null +++ b/src/org/apollo/net/release/r317/EnterAmountMessageEncoder.java @@ -0,0 +1,22 @@ +package org.apollo.net.release.r317; + +import io.netty.buffer.Unpooled; + +import org.apollo.game.message.impl.EnterAmountMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link EnterAmountMessage}. + * + * @author Graham + */ +public final class EnterAmountMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(EnterAmountMessage message) { + return new GamePacket(27, PacketType.FIXED, Unpooled.EMPTY_BUFFER); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/EnteredAmountEventDecoder.java b/src/org/apollo/net/release/r317/EnteredAmountEventDecoder.java deleted file mode 100644 index e77bd209..00000000 --- a/src/org/apollo/net/release/r317/EnteredAmountEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.EnteredAmountEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link EnteredAmountEvent}. - * - * @author Graham - */ -public final class EnteredAmountEventDecoder extends EventDecoder { - - @Override - public EnteredAmountEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int amount = (int) reader.getUnsigned(DataType.INT); - return new EnteredAmountEvent(amount); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/EnteredAmountMessageDecoder.java b/src/org/apollo/net/release/r317/EnteredAmountMessageDecoder.java new file mode 100644 index 00000000..352d345a --- /dev/null +++ b/src/org/apollo/net/release/r317/EnteredAmountMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.EnteredAmountMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link EnteredAmountMessage}. + * + * @author Graham + */ +public final class EnteredAmountMessageDecoder extends MessageDecoder { + + @Override + public EnteredAmountMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int amount = (int) reader.getUnsigned(DataType.INT); + return new EnteredAmountMessage(amount); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FifthItemActionEventDecoder.java b/src/org/apollo/net/release/r317/FifthItemActionMessageDecoder.java similarity index 60% rename from src/org/apollo/net/release/r317/FifthItemActionEventDecoder.java rename to src/org/apollo/net/release/r317/FifthItemActionMessageDecoder.java index d6109c1b..4ecb589e 100644 --- a/src/org/apollo/net/release/r317/FifthItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FifthItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FifthItemActionEvent; +import org.apollo.game.message.impl.FifthItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthItemActionEvent}. + * A {@link MessageDecoder} for the {@link FifthItemActionMessage}. * * @author Graham */ -public final class FifthItemActionEventDecoder extends EventDecoder { +public final class FifthItemActionMessageDecoder extends MessageDecoder { @Override - public FifthItemActionEvent decode(GamePacket packet) { + public FifthItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthItemActionEvent(interfaceId, id, slot); + return new FifthItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FifthItemOptionEventDecoder.java b/src/org/apollo/net/release/r317/FifthItemOptionMessageDecoder.java similarity index 59% rename from src/org/apollo/net/release/r317/FifthItemOptionEventDecoder.java rename to src/org/apollo/net/release/r317/FifthItemOptionMessageDecoder.java index b214049c..b435561f 100644 --- a/src/org/apollo/net/release/r317/FifthItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FifthItemOptionMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FifthItemOptionEvent; +import org.apollo.game.message.impl.FifthItemOptionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. * * @author Chris Fletcher */ -final class FifthItemOptionEventDecoder extends EventDecoder { +final class FifthItemOptionMessageDecoder extends MessageDecoder { @Override - public FifthItemOptionEvent decode(GamePacket packet) { + public FifthItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FifthItemOptionEvent(interfaceId, id, slot); + return new FifthItemOptionMessage(interfaceId, id, slot); } } diff --git a/src/org/apollo/net/release/r317/FourthPlayerActionEventDecoder.java b/src/org/apollo/net/release/r317/FifthPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r317/FourthPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r317/FifthPlayerActionMessageDecoder.java index e0b52aa6..74e29752 100644 --- a/src/org/apollo/net/release/r317/FourthPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FifthPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FourthPlayerActionEvent; +import org.apollo.game.message.impl.FifthPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FourthPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. * * @author Major */ -public final class FourthPlayerActionEventDecoder extends EventDecoder { +public final class FifthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FourthPlayerActionEvent decode(GamePacket packet) { + public FifthPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FourthPlayerActionEvent(index); + return new FifthPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstItemActionEventDecoder.java b/src/org/apollo/net/release/r317/FirstItemActionMessageDecoder.java similarity index 59% rename from src/org/apollo/net/release/r317/FirstItemActionEventDecoder.java rename to src/org/apollo/net/release/r317/FirstItemActionMessageDecoder.java index c818ddfa..6505fefa 100644 --- a/src/org/apollo/net/release/r317/FirstItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FirstItemActionMessageDecoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FirstItemActionEvent; +import org.apollo.game.message.impl.FirstItemActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstItemActionEvent}. + * A {@link MessageDecoder} for the {@link FirstItemActionMessage}. * * @author Graham */ -public final class FirstItemActionEventDecoder extends EventDecoder { +public final class FirstItemActionMessageDecoder extends MessageDecoder { @Override - public FirstItemActionEvent decode(GamePacket packet) { + public FirstItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstItemActionEvent(interfaceId, id, slot); + return new FirstItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstItemOptionEventDecoder.java b/src/org/apollo/net/release/r317/FirstItemOptionMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r317/FirstItemOptionEventDecoder.java rename to src/org/apollo/net/release/r317/FirstItemOptionMessageDecoder.java index 6d27117e..a2fd8545 100644 --- a/src/org/apollo/net/release/r317/FirstItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FirstItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FirstItemOptionEvent; +import org.apollo.game.message.impl.FirstItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. * * @author Graham */ -final class FirstItemOptionEventDecoder extends EventDecoder { +final class FirstItemOptionMessageDecoder extends MessageDecoder { @Override - public FirstItemOptionEvent decode(GamePacket packet) { + public FirstItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstItemOptionEvent(interfaceId, id, slot); + return new FirstItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstNpcActionEventDecoder.java b/src/org/apollo/net/release/r317/FirstNpcActionEventDecoder.java deleted file mode 100644 index f52d5a33..00000000 --- a/src/org/apollo/net/release/r317/FirstNpcActionEventDecoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.FirstNpcActionEvent; -import org.apollo.net.codec.game.*; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link FirstNpcActionEvent}. - * - * @author Major - */ -public final class FirstNpcActionEventDecoder extends EventDecoder { - - @Override - public FirstNpcActionEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstNpcActionEvent(index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstNpcActionMessageDecoder.java b/src/org/apollo/net/release/r317/FirstNpcActionMessageDecoder.java new file mode 100644 index 00000000..2711d7ce --- /dev/null +++ b/src/org/apollo/net/release/r317/FirstNpcActionMessageDecoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.FirstNpcActionMessage; +import org.apollo.net.codec.game.*; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link FirstNpcActionMessage}. + * + * @author Major + */ +public final class FirstNpcActionMessageDecoder extends MessageDecoder { + + @Override + public FirstNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); + return new FirstNpcActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstObjectActionEventDecoder.java b/src/org/apollo/net/release/r317/FirstObjectActionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r317/FirstObjectActionEventDecoder.java rename to src/org/apollo/net/release/r317/FirstObjectActionMessageDecoder.java index 0ae24bc4..51185cec 100644 --- a/src/org/apollo/net/release/r317/FirstObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FirstObjectActionMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FirstObjectActionEvent; +import org.apollo.game.message.impl.FirstObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstObjectActionEvent}. + * A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. * * @author Graham */ -public final class FirstObjectActionEventDecoder extends EventDecoder { +public final class FirstObjectActionMessageDecoder extends MessageDecoder { @Override - public FirstObjectActionEvent decode(GamePacket packet) { + public FirstObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstObjectActionEvent(id, new Position(x, y)); + return new FirstObjectActionMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstPlayerActionEventDecoder.java b/src/org/apollo/net/release/r317/FirstPlayerActionEventDecoder.java deleted file mode 100644 index 6a70e584..00000000 --- a/src/org/apollo/net/release/r317/FirstPlayerActionEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.FirstPlayerActionEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link FirstPlayerActionEvent}. - * - * @author Major - */ -public final class FirstPlayerActionEventDecoder extends EventDecoder { - - @Override - public FirstPlayerActionEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int index = (int) reader.getUnsigned(DataType.SHORT); - return new FirstPlayerActionEvent(index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FirstPlayerActionMessageDecoder.java b/src/org/apollo/net/release/r317/FirstPlayerActionMessageDecoder.java new file mode 100644 index 00000000..c05eeb94 --- /dev/null +++ b/src/org/apollo/net/release/r317/FirstPlayerActionMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.FirstPlayerActionMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link FirstPlayerActionMessage}. + * + * @author Major + */ +public final class FirstPlayerActionMessageDecoder extends MessageDecoder { + + @Override + public FirstPlayerActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getUnsigned(DataType.SHORT); + return new FirstPlayerActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FocusUpdateEventDecoder.java b/src/org/apollo/net/release/r317/FocusUpdateEventDecoder.java deleted file mode 100644 index 1de2e1ea..00000000 --- a/src/org/apollo/net/release/r317/FocusUpdateEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.FocusUpdateEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link FocusUpdateEvent}. - * - * @author Major - */ -public final class FocusUpdateEventDecoder extends EventDecoder { - - @Override - public FocusUpdateEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - boolean focused = (byte) reader.getUnsigned(DataType.BYTE) == 1; - return new FocusUpdateEvent(focused); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FocusUpdateMessageDecoder.java b/src/org/apollo/net/release/r317/FocusUpdateMessageDecoder.java new file mode 100644 index 00000000..dd0e89ad --- /dev/null +++ b/src/org/apollo/net/release/r317/FocusUpdateMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.FocusUpdateMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link FocusUpdateMessage}. + * + * @author Major + */ +public final class FocusUpdateMessageDecoder extends MessageDecoder { + + @Override + public FocusUpdateMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + boolean focused = (byte) reader.getUnsigned(DataType.BYTE) == 1; + return new FocusUpdateMessage(focused); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ForwardPrivateMessageEventEncoder.java b/src/org/apollo/net/release/r317/ForwardPrivateChatMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r317/ForwardPrivateMessageEventEncoder.java rename to src/org/apollo/net/release/r317/ForwardPrivateChatMessageEncoder.java index 8464b2cb..d53649e0 100644 --- a/src/org/apollo/net/release/r317/ForwardPrivateMessageEventEncoder.java +++ b/src/org/apollo/net/release/r317/ForwardPrivateChatMessageEncoder.java @@ -2,20 +2,20 @@ package org.apollo.net.release.r317; import java.util.concurrent.atomic.AtomicInteger; -import org.apollo.game.event.impl.ForwardPrivateMessageEvent; +import org.apollo.game.message.impl.ForwardPrivateChatMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; import org.apollo.util.NameUtil; /** - * An {@link EventEncoder} for the {@link ForwardPrivateMessageEvent}. + * A {@link MessageEncoder} for the {@link ForwardPrivateChatMessage}. * * @author Major */ -public final class ForwardPrivateMessageEventEncoder extends EventEncoder { +public final class ForwardPrivateChatMessageEncoder extends MessageEncoder { /** * The amount of messages sent globally, offset by a random variable x, {@code 0 <= x < 100,000,000}. @@ -23,13 +23,13 @@ public final class ForwardPrivateMessageEventEncoder extends EventEncoder { +public final class FourthItemActionMessageDecoder extends MessageDecoder { @Override - public FourthItemActionEvent decode(GamePacket packet) { + public FourthItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FourthItemActionEvent(interfaceId, id, slot); + return new FourthItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FourthItemOptionEventDecoder.java b/src/org/apollo/net/release/r317/FourthItemOptionMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r317/FourthItemOptionEventDecoder.java rename to src/org/apollo/net/release/r317/FourthItemOptionMessageDecoder.java index ff4e9fde..555ced90 100644 --- a/src/org/apollo/net/release/r317/FourthItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FourthItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FourthItemOptionEvent; +import org.apollo.game.message.impl.FourthItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FourthItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. * * @author Chris Fletcher */ -final class FourthItemOptionEventDecoder extends EventDecoder { +final class FourthItemOptionMessageDecoder extends MessageDecoder { @Override - public FourthItemOptionEvent decode(GamePacket packet) { + public FourthItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FourthItemOptionEvent(interfaceId, id, slot); + return new FourthItemOptionMessage(interfaceId, id, slot); } } diff --git a/src/org/apollo/net/release/r317/SecondPlayerActionEventDecoder.java b/src/org/apollo/net/release/r317/FourthPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r317/SecondPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r317/FourthPlayerActionMessageDecoder.java index 00269a3f..2ebe856b 100644 --- a/src/org/apollo/net/release/r317/SecondPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/FourthPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SecondPlayerActionEvent; +import org.apollo.game.message.impl.FourthPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. * * @author Major */ -public final class SecondPlayerActionEventDecoder extends EventDecoder { +public final class FourthPlayerActionMessageDecoder extends MessageDecoder { @Override - public SecondPlayerActionEvent decode(GamePacket packet) { + public FourthPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondPlayerActionEvent(index); + return new FourthPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FriendServerStatusEventEncoder.java b/src/org/apollo/net/release/r317/FriendServerStatusEventEncoder.java deleted file mode 100644 index 73ec2fdc..00000000 --- a/src/org/apollo/net/release/r317/FriendServerStatusEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.FriendServerStatusEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link FriendServerStatusEvent}. - * - * @author Major - */ -public final class FriendServerStatusEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(FriendServerStatusEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(221); - builder.put(DataType.BYTE, event.getStatusCode()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FriendServerStatusMessageEncoder.java b/src/org/apollo/net/release/r317/FriendServerStatusMessageEncoder.java new file mode 100644 index 00000000..7fce26fa --- /dev/null +++ b/src/org/apollo/net/release/r317/FriendServerStatusMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.FriendServerStatusMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link FriendServerStatusMessage}. + * + * @author Major + */ +public final class FriendServerStatusMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(FriendServerStatusMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(221); + builder.put(DataType.BYTE, message.getStatusCode()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/IdAssignmentEventEncoder.java b/src/org/apollo/net/release/r317/IdAssignmentMessageEncoder.java similarity index 52% rename from src/org/apollo/net/release/r317/IdAssignmentEventEncoder.java rename to src/org/apollo/net/release/r317/IdAssignmentMessageEncoder.java index d16e7e16..0b71a164 100644 --- a/src/org/apollo/net/release/r317/IdAssignmentEventEncoder.java +++ b/src/org/apollo/net/release/r317/IdAssignmentMessageEncoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.IdAssignmentEvent; +import org.apollo.game.message.impl.IdAssignmentMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link IdAssignmentEvent}. + * A {@link MessageEncoder} for the {@link IdAssignmentMessage}. * * @author Graham */ -public final class IdAssignmentEventEncoder extends EventEncoder { +public final class IdAssignmentMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(IdAssignmentEvent event) { + public GamePacket encode(IdAssignmentMessage message) { GamePacketBuilder builder = new GamePacketBuilder(249); - builder.put(DataType.BYTE, DataTransformation.ADD, event.isMembers() ? 1 : 0); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getId()); + builder.put(DataType.BYTE, DataTransformation.ADD, message.isMembers() ? 1 : 0); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/IgnoreListEventEncoder.java b/src/org/apollo/net/release/r317/IgnoreListMessageEncoder.java similarity index 60% rename from src/org/apollo/net/release/r317/IgnoreListEventEncoder.java rename to src/org/apollo/net/release/r317/IgnoreListMessageEncoder.java index 445a08c6..6793bbf4 100644 --- a/src/org/apollo/net/release/r317/IgnoreListEventEncoder.java +++ b/src/org/apollo/net/release/r317/IgnoreListMessageEncoder.java @@ -2,26 +2,26 @@ package org.apollo.net.release.r317; import java.util.List; -import org.apollo.game.event.impl.IgnoreListEvent; +import org.apollo.game.message.impl.IgnoreListMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; import org.apollo.util.NameUtil; /** - * An {@link EventEncoder} for the {@link IgnoreListEvent}. + * A {@link MessageEncoder} for the {@link IgnoreListMessage}. * * @author Major */ -public final class IgnoreListEventEncoder extends EventEncoder { +public final class IgnoreListMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(IgnoreListEvent event) { + public GamePacket encode(IgnoreListMessage message) { GamePacketBuilder builder = new GamePacketBuilder(214, PacketType.VARIABLE_SHORT); - List usernames = event.getUsernames(); + List usernames = message.getUsernames(); for (String username : usernames) { builder.put(DataType.LONG, NameUtil.encodeBase37(username)); } diff --git a/src/org/apollo/net/release/r317/ItemOnItemEventDecoder.java b/src/org/apollo/net/release/r317/ItemOnItemMessageDecoder.java similarity index 67% rename from src/org/apollo/net/release/r317/ItemOnItemEventDecoder.java rename to src/org/apollo/net/release/r317/ItemOnItemMessageDecoder.java index 847b1238..7a1f8a77 100644 --- a/src/org/apollo/net/release/r317/ItemOnItemEventDecoder.java +++ b/src/org/apollo/net/release/r317/ItemOnItemMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ItemOnItemEvent; +import org.apollo.game.message.impl.ItemOnItemMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ItemOnItemEventDecoder}. + * A {@link MessageDecoder} for the {@link ItemOnItemMessageDecoder}. * * @author Chris Fletcher */ -final class ItemOnItemEventDecoder extends EventDecoder { +final class ItemOnItemMessageDecoder extends MessageDecoder { @Override - public ItemOnItemEvent decode(GamePacket packet) { + public ItemOnItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int targetSlot = (int) reader.getUnsigned(DataType.SHORT); @@ -28,7 +28,7 @@ final class ItemOnItemEventDecoder extends EventDecoder { int usedId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE); int usedInterface = (int) reader.getUnsigned(DataType.SHORT); - return new ItemOnItemEvent(usedInterface, usedId, usedSlot, targetInterface, targetId, targetSlot); + return new ItemOnItemMessage(usedInterface, usedId, usedSlot, targetInterface, targetId, targetSlot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ItemOnObjectEventDecoder.java b/src/org/apollo/net/release/r317/ItemOnObjectMessageDecoder.java similarity index 68% rename from src/org/apollo/net/release/r317/ItemOnObjectEventDecoder.java rename to src/org/apollo/net/release/r317/ItemOnObjectMessageDecoder.java index d9056643..282251be 100644 --- a/src/org/apollo/net/release/r317/ItemOnObjectEventDecoder.java +++ b/src/org/apollo/net/release/r317/ItemOnObjectMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ItemOnObjectEvent; +import org.apollo.game.message.impl.ItemOnObjectMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ItemOnObjectEvent}. + * A {@link MessageDecoder} for the {@link ItemOnObjectMessage}. * * @author Major */ -public final class ItemOnObjectEventDecoder extends EventDecoder { +public final class ItemOnObjectMessageDecoder extends MessageDecoder { @Override - public ItemOnObjectEvent decode(GamePacket packet) { + public ItemOnObjectMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); @@ -26,7 +26,7 @@ public final class ItemOnObjectEventDecoder extends EventDecoder { - - @Override - public KeepAliveEvent decode(GamePacket packet) { - return new KeepAliveEvent(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/KeepAliveMessageDecoder.java b/src/org/apollo/net/release/r317/KeepAliveMessageDecoder.java new file mode 100644 index 00000000..4fb689bd --- /dev/null +++ b/src/org/apollo/net/release/r317/KeepAliveMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.KeepAliveMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link KeepAliveMessage}. + * + * @author Graham + */ +public final class KeepAliveMessageDecoder extends MessageDecoder { + + @Override + public KeepAliveMessage decode(GamePacket packet) { + return new KeepAliveMessage(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/LogoutEventEncoder.java b/src/org/apollo/net/release/r317/LogoutEventEncoder.java deleted file mode 100644 index 19844bfc..00000000 --- a/src/org/apollo/net/release/r317/LogoutEventEncoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.LogoutEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link LogoutEvent}. - * - * @author Graham - */ -public final class LogoutEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(LogoutEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(109); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/LogoutMessageEncoder.java b/src/org/apollo/net/release/r317/LogoutMessageEncoder.java new file mode 100644 index 00000000..2175b016 --- /dev/null +++ b/src/org/apollo/net/release/r317/LogoutMessageEncoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.LogoutMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link LogoutMessage}. + * + * @author Graham + */ +public final class LogoutMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(LogoutMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(109); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/MagicOnItemEventDecoder.java b/src/org/apollo/net/release/r317/MagicOnItemMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r317/MagicOnItemEventDecoder.java rename to src/org/apollo/net/release/r317/MagicOnItemMessageDecoder.java index ae17675e..9631294d 100644 --- a/src/org/apollo/net/release/r317/MagicOnItemEventDecoder.java +++ b/src/org/apollo/net/release/r317/MagicOnItemMessageDecoder.java @@ -1,21 +1,21 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.MagicOnItemEvent; +import org.apollo.game.message.impl.MagicOnItemMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link MagicOnItemEvent}. + * A {@link MessageDecoder} for the {@link MagicOnItemMessage}. * * @author Chris Fletcher */ -final class MagicOnItemEventDecoder extends EventDecoder { +final class MagicOnItemMessageDecoder extends MessageDecoder { @Override - public MagicOnItemEvent decode(GamePacket packet) { + public MagicOnItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT); @@ -23,7 +23,7 @@ final class MagicOnItemEventDecoder extends EventDecoder { int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int spell = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new MagicOnItemEvent(interfaceId, id, slot, spell); + return new MagicOnItemMessage(interfaceId, id, slot, spell); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/MobAnimationResetEventEncoder.java b/src/org/apollo/net/release/r317/MobAnimationResetEventEncoder.java deleted file mode 100644 index cc90bcca..00000000 --- a/src/org/apollo/net/release/r317/MobAnimationResetEventEncoder.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.MobAnimationResetEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link MobAnimationResetEvent}. - * - * @author Major - */ -public final class MobAnimationResetEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(MobAnimationResetEvent event) { - return new GamePacketBuilder(1).toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/MobAnimationResetMessageEncoder.java b/src/org/apollo/net/release/r317/MobAnimationResetMessageEncoder.java new file mode 100644 index 00000000..dd6dc4ad --- /dev/null +++ b/src/org/apollo/net/release/r317/MobAnimationResetMessageEncoder.java @@ -0,0 +1,20 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.MobAnimationResetMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link MobAnimationResetMessage}. + * + * @author Major + */ +public final class MobAnimationResetMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(MobAnimationResetMessage message) { + return new GamePacketBuilder(1).toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/MouseClickEventDecoder.java b/src/org/apollo/net/release/r317/MouseClickMessageDecoder.java similarity index 64% rename from src/org/apollo/net/release/r317/MouseClickEventDecoder.java rename to src/org/apollo/net/release/r317/MouseClickMessageDecoder.java index 0377324d..f39b6b7e 100644 --- a/src/org/apollo/net/release/r317/MouseClickEventDecoder.java +++ b/src/org/apollo/net/release/r317/MouseClickMessageDecoder.java @@ -1,20 +1,20 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.MouseClickEvent; +import org.apollo.game.message.impl.MouseClickMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link MouseClickEvent}. + * A {@link MessageDecoder} for the {@link MouseClickMessage}. * * @author Major */ -public final class MouseClickEventDecoder extends EventDecoder { +public final class MouseClickMessageDecoder extends MessageDecoder { @Override - public MouseClickEvent decode(GamePacket packet) { + public MouseClickMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int read; if (reader.getLength() == 2) { @@ -22,7 +22,7 @@ public final class MouseClickEventDecoder extends EventDecoder int clickCount = (read >> 12); int dX = (read >> 6) & 0x3f; int dY = read & 0x3f; - return new MouseClickEvent(clickCount, dX, dY, true); + return new MouseClickMessage(clickCount, dX, dY, true); } else if (reader.getLength() == 3) { read = (int) reader.getUnsigned(DataType.TRI_BYTE) & ~0x800000; } else { @@ -31,7 +31,7 @@ public final class MouseClickEventDecoder extends EventDecoder int clickCount = (read >> 19); int x = (read & 0x7f) % 765; int y = (read & 0x7f) / 765; - return new MouseClickEvent(clickCount, x, y, false); + return new MouseClickMessage(clickCount, x, y, false); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/NpcSynchronizationEventEncoder.java b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java similarity index 91% rename from src/org/apollo/net/release/r317/NpcSynchronizationEventEncoder.java rename to src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java index 3720ceb6..05447f70 100644 --- a/src/org/apollo/net/release/r317/NpcSynchronizationEventEncoder.java +++ b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.NpcSynchronizationEvent; +import org.apollo.game.message.impl.NpcSynchronizationMessage; import org.apollo.game.model.Animation; import org.apollo.game.model.Direction; import org.apollo.game.model.Graphic; @@ -24,32 +24,32 @@ import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link NpcSynchronizationEvent}. + * A {@link MessageEncoder} for the {@link NpcSynchronizationMessage}. * * @author Major */ -public final class NpcSynchronizationEventEncoder extends EventEncoder { +public final class NpcSynchronizationMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(NpcSynchronizationEvent event) { + public GamePacket encode(NpcSynchronizationMessage message) { GamePacketBuilder builder = new GamePacketBuilder(65, PacketType.VARIABLE_SHORT); builder.switchToBitAccess(); GamePacketBuilder blockBuilder = new GamePacketBuilder(); - builder.putBits(8, event.getLocalNpcCount()); + builder.putBits(8, message.getLocalNpcCount()); - for (SynchronizationSegment segment : event.getSegments()) { + for (SynchronizationSegment segment : message.getSegments()) { SegmentType type = segment.getType(); if (type == SegmentType.REMOVE_MOB) { putRemoveMobUpdate(builder); } else if (type == SegmentType.ADD_MOB) { - putAddNpcUpdate((AddNpcSegment) segment, event, builder); + putAddNpcUpdate((AddNpcSegment) segment, message, builder); putBlocks(segment, blockBuilder); } else { - putMovementUpdate(segment, event, builder); + putMovementUpdate(segment, message, builder); putBlocks(segment, blockBuilder); } } @@ -69,12 +69,12 @@ public final class NpcSynchronizationEventEncoder extends EventEncoder 0; - Position npc = event.getPosition(); + Position npc = message.getPosition(); Position other = seg.getPosition(); builder.putBits(14, seg.getIndex()); builder.putBits(5, other.getY() - npc.getY()); @@ -224,10 +224,10 @@ public final class NpcSynchronizationEventEncoder extends EventEncoder 0; if (segment.getType() == SegmentType.RUN) { diff --git a/src/org/apollo/net/release/r317/OpenDialogueInterfaceEventEncoder.java b/src/org/apollo/net/release/r317/OpenDialogueInterfaceEventEncoder.java deleted file mode 100644 index acabd337..00000000 --- a/src/org/apollo/net/release/r317/OpenDialogueInterfaceEventEncoder.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.OpenDialogueInterfaceEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link OpenDialogueInterfaceEvent}. - * - * @author Chris Fletcher - */ -public final class OpenDialogueInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(OpenDialogueInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(164); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getInterfaceId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/OpenDialogueInterfaceMessageEncoder.java b/src/org/apollo/net/release/r317/OpenDialogueInterfaceMessageEncoder.java new file mode 100644 index 00000000..6069b2ed --- /dev/null +++ b/src/org/apollo/net/release/r317/OpenDialogueInterfaceMessageEncoder.java @@ -0,0 +1,24 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.OpenDialogueInterfaceMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link OpenDialogueInterfaceMessage}. + * + * @author Chris Fletcher + */ +public final class OpenDialogueInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenDialogueInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(164); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getInterfaceId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/OpenInterfaceEventEncoder.java b/src/org/apollo/net/release/r317/OpenInterfaceEventEncoder.java deleted file mode 100644 index 7d536b2e..00000000 --- a/src/org/apollo/net/release/r317/OpenInterfaceEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.OpenInterfaceEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link OpenInterfaceEvent}. - * - * @author Graham - */ -public final class OpenInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(OpenInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(97); - builder.put(DataType.SHORT, event.getId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/OpenInterfaceMessageEncoder.java b/src/org/apollo/net/release/r317/OpenInterfaceMessageEncoder.java new file mode 100644 index 00000000..e0c29dcb --- /dev/null +++ b/src/org/apollo/net/release/r317/OpenInterfaceMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.OpenInterfaceMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link OpenInterfaceMessage}. + * + * @author Graham + */ +public final class OpenInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(97); + builder.put(DataType.SHORT, message.getId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/OpenInterfaceSidebarEventEncoder.java b/src/org/apollo/net/release/r317/OpenInterfaceSidebarEventEncoder.java deleted file mode 100644 index 22a21e47..00000000 --- a/src/org/apollo/net/release/r317/OpenInterfaceSidebarEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.OpenInterfaceSidebarEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link OpenInterfaceSidebarEvent}. - * - * @author Graham - */ -public final class OpenInterfaceSidebarEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(OpenInterfaceSidebarEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(248); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getInterfaceId()); - builder.put(DataType.SHORT, event.getSidebarId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java b/src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java new file mode 100644 index 00000000..a13edd65 --- /dev/null +++ b/src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link OpenInterfaceSidebarMessage}. + * + * @author Graham + */ +public final class OpenInterfaceSidebarMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenInterfaceSidebarMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(248); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); + builder.put(DataType.SHORT, message.getSidebarId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java b/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java similarity index 67% rename from src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java rename to src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java index c3d2ada5..9aaaaf51 100644 --- a/src/org/apollo/net/release/r317/PlayerDesignEventDecoder.java +++ b/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.PlayerDesignEvent; +import org.apollo.game.message.impl.PlayerDesignMessage; import org.apollo.game.model.Appearance; import org.apollo.game.model.setting.Gender; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link PlayerDesignEvent}. + * A {@link MessageDecoder} for the {@link PlayerDesignMessage}. * * @author Graham */ -public final class PlayerDesignEventDecoder extends EventDecoder { +public final class PlayerDesignMessageDecoder extends MessageDecoder { @Override - public PlayerDesignEvent decode(GamePacket packet) { + public PlayerDesignMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int genderIntValue = (int) reader.getUnsigned(DataType.BYTE); @@ -33,7 +33,7 @@ public final class PlayerDesignEventDecoder extends EventDecoder { +public final class PlayerSynchronizationMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(PlayerSynchronizationEvent event) { + public GamePacket encode(PlayerSynchronizationMessage message) { GamePacketBuilder builder = new GamePacketBuilder(81, PacketType.VARIABLE_SHORT); builder.switchToBitAccess(); GamePacketBuilder blockBuilder = new GamePacketBuilder(); - putMovementUpdate(event.getSegment(), event, builder); - putBlocks(event.getSegment(), blockBuilder); + putMovementUpdate(message.getSegment(), message, builder); + putBlocks(message.getSegment(), blockBuilder); - builder.putBits(8, event.getLocalPlayers()); + builder.putBits(8, message.getLocalPlayers()); - for (SynchronizationSegment segment : event.getSegments()) { + for (SynchronizationSegment segment : message.getSegments()) { SegmentType type = segment.getType(); if (type == SegmentType.REMOVE_MOB) { putRemovePlayerUpdate(builder); } else if (type == SegmentType.ADD_MOB) { - putAddPlayerUpdate((AddPlayerSegment) segment, event, builder); + putAddPlayerUpdate((AddPlayerSegment) segment, message, builder); putBlocks(segment, blockBuilder); } else { - putMovementUpdate(segment, event, builder); + putMovementUpdate(segment, message, builder); putBlocks(segment, blockBuilder); } } @@ -83,12 +83,12 @@ public final class PlayerSynchronizationEventEncoder extends EventEncoder 0; - Position player = event.getPosition(); + Position player = message.getPosition(); Position other = seg.getPosition(); builder.putBits(11, seg.getIndex()); builder.putBits(1, updateRequired ? 1 : 0); @@ -385,10 +385,10 @@ public final class PlayerSynchronizationEventEncoder extends EventEncoder 0; if (seg.getType() == SegmentType.TELEPORT) { @@ -396,10 +396,10 @@ public final class PlayerSynchronizationEventEncoder extends EventEncoder { +final class PositionMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(PositionEvent event) { + public GamePacket encode(PositionMessage message) { GamePacketBuilder builder = new GamePacketBuilder(85); - Position base = event.getBase(), pos = event.getPosition(); + Position base = message.getBase(), pos = message.getPosition(); builder.put(DataType.BYTE, DataTransformation.NEGATE, pos.getLocalY(base)); builder.put(DataType.BYTE, DataTransformation.NEGATE, pos.getLocalX(base)); diff --git a/src/org/apollo/net/release/r317/PrivacyOptionEventEncoder.java b/src/org/apollo/net/release/r317/PrivacyOptionEventEncoder.java deleted file mode 100644 index 08459cfb..00000000 --- a/src/org/apollo/net/release/r317/PrivacyOptionEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.PrivacyOptionEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link PrivacyOptionEvent}. - * - * @author Kyle Stevenson - */ -public final class PrivacyOptionEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(final PrivacyOptionEvent event) { - final GamePacketBuilder builder = new GamePacketBuilder(206); - - builder.put(DataType.BYTE, event.getChatPrivacy().toInteger(true)); - builder.put(DataType.BYTE, event.getFriendPrivacy().toInteger(true)); - builder.put(DataType.BYTE, event.getTradePrivacy().toInteger(true)); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/PrivacyOptionEventDecoder.java b/src/org/apollo/net/release/r317/PrivacyOptionMessageDecoder.java similarity index 54% rename from src/org/apollo/net/release/r317/PrivacyOptionEventDecoder.java rename to src/org/apollo/net/release/r317/PrivacyOptionMessageDecoder.java index 911d02a8..eb4a6032 100644 --- a/src/org/apollo/net/release/r317/PrivacyOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/PrivacyOptionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.PrivacyOptionEvent; +import org.apollo.game.message.impl.PrivacyOptionMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link PrivacyOptionEvent}. + * A {@link MessageDecoder} for the {@link PrivacyOptionMessage}. * * @author Kyle Stevenson */ -public final class PrivacyOptionEventDecoder extends EventDecoder { +public final class PrivacyOptionMessageDecoder extends MessageDecoder { @Override - public PrivacyOptionEvent decode(GamePacket packet) { + public PrivacyOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int publicChatState = (int) reader.getUnsigned(DataType.BYTE); int privateChatState = (int) reader.getUnsigned(DataType.BYTE); int tradeChatState = (int) reader.getUnsigned(DataType.BYTE); - return new PrivacyOptionEvent(publicChatState, privateChatState, tradeChatState); + return new PrivacyOptionMessage(publicChatState, privateChatState, tradeChatState); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/PrivacyOptionMessageEncoder.java b/src/org/apollo/net/release/r317/PrivacyOptionMessageEncoder.java new file mode 100644 index 00000000..32c4324f --- /dev/null +++ b/src/org/apollo/net/release/r317/PrivacyOptionMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.PrivacyOptionMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link PrivacyOptionMessage}. + * + * @author Kyle Stevenson + */ +public final class PrivacyOptionMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(final PrivacyOptionMessage message) { + final GamePacketBuilder builder = new GamePacketBuilder(206); + + builder.put(DataType.BYTE, message.getChatPrivacy().toInteger(true)); + builder.put(DataType.BYTE, message.getFriendPrivacy().toInteger(true)); + builder.put(DataType.BYTE, message.getTradePrivacy().toInteger(true)); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java b/src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java similarity index 66% rename from src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java rename to src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java index 9235c9eb..1c2e3373 100644 --- a/src/org/apollo/net/release/r317/PrivateMessageEventDecoder.java +++ b/src/org/apollo/net/release/r317/PrivateMessageMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.PrivateMessageEvent; +import org.apollo.game.message.impl.PrivateMessageMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; import org.apollo.util.TextUtil; /** - * An {@link EventDecoder} for the {@link PrivateMessageEvent}. + * A {@link MessageDecoder} for the {@link PrivateMessageMessage}. * * @author Major */ -public final class PrivateMessageEventDecoder extends EventDecoder { +public final class PrivateMessageMessageDecoder extends MessageDecoder { @Override - public PrivateMessageEvent decode(GamePacket packet) { + public PrivateMessageMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); @@ -32,7 +32,7 @@ public final class PrivateMessageEventDecoder extends EventDecoder { - - @Override - public GamePacket encode(RegionChangeEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(73); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getPosition().getCentralSectorX()); - builder.put(DataType.SHORT, event.getPosition().getCentralSectorY()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/RegionChangeMessageEncoder.java b/src/org/apollo/net/release/r317/RegionChangeMessageEncoder.java new file mode 100644 index 00000000..881d5f62 --- /dev/null +++ b/src/org/apollo/net/release/r317/RegionChangeMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.RegionChangeMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link RegionChangeMessage}. + * + * @author Graham + */ +public final class RegionChangeMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(RegionChangeMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(73); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getPosition().getCentralSectorX()); + builder.put(DataType.SHORT, message.getPosition().getCentralSectorY()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/Release317.java b/src/org/apollo/net/release/r317/Release317.java index feac2f52..2698d6b1 100644 --- a/src/org/apollo/net/release/r317/Release317.java +++ b/src/org/apollo/net/release/r317/Release317.java @@ -1,43 +1,43 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.AddGlobalTileItemEvent; -import org.apollo.game.event.impl.AddTileItemEvent; -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.game.event.impl.ConfigEvent; -import org.apollo.game.event.impl.DisplayCrossbonesEvent; -import org.apollo.game.event.impl.DisplayTabInterfaceEvent; -import org.apollo.game.event.impl.EnterAmountEvent; -import org.apollo.game.event.impl.ForwardPrivateMessageEvent; -import org.apollo.game.event.impl.FriendServerStatusEvent; -import org.apollo.game.event.impl.IdAssignmentEvent; -import org.apollo.game.event.impl.IgnoreListEvent; -import org.apollo.game.event.impl.LogoutEvent; -import org.apollo.game.event.impl.NpcSynchronizationEvent; -import org.apollo.game.event.impl.OpenDialogueInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceSidebarEvent; -import org.apollo.game.event.impl.PlayerSynchronizationEvent; -import org.apollo.game.event.impl.PositionEvent; -import org.apollo.game.event.impl.PrivacyOptionEvent; -import org.apollo.game.event.impl.RegionChangeEvent; -import org.apollo.game.event.impl.RemoveTileItemEvent; -import org.apollo.game.event.impl.SendFriendEvent; -import org.apollo.game.event.impl.SendObjectEvent; -import org.apollo.game.event.impl.ServerMessageEvent; -import org.apollo.game.event.impl.SetPlayerActionEvent; -import org.apollo.game.event.impl.SetWidgetItemModelEvent; -import org.apollo.game.event.impl.SetWidgetModelAnimationEvent; -import org.apollo.game.event.impl.SetWidgetNpcModelEvent; -import org.apollo.game.event.impl.SetWidgetPlayerModelEvent; -import org.apollo.game.event.impl.SetWidgetTextEvent; -import org.apollo.game.event.impl.SetWidgetVisibilityEvent; -import org.apollo.game.event.impl.SwitchTabInterfaceEvent; -import org.apollo.game.event.impl.UpdateItemsEvent; -import org.apollo.game.event.impl.UpdateRunEnergyEvent; -import org.apollo.game.event.impl.UpdateSkillEvent; -import org.apollo.game.event.impl.UpdateSlottedItemsEvent; -import org.apollo.game.event.impl.UpdateTileItemEvent; -import org.apollo.game.event.impl.UpdateWeightEvent; +import org.apollo.game.message.impl.AddGlobalTileItemMessage; +import org.apollo.game.message.impl.AddTileItemMessage; +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.game.message.impl.ConfigMessage; +import org.apollo.game.message.impl.DisplayCrossbonesMessage; +import org.apollo.game.message.impl.DisplayTabInterfaceMessage; +import org.apollo.game.message.impl.EnterAmountMessage; +import org.apollo.game.message.impl.ForwardPrivateChatMessage; +import org.apollo.game.message.impl.FriendServerStatusMessage; +import org.apollo.game.message.impl.IdAssignmentMessage; +import org.apollo.game.message.impl.IgnoreListMessage; +import org.apollo.game.message.impl.LogoutMessage; +import org.apollo.game.message.impl.NpcSynchronizationMessage; +import org.apollo.game.message.impl.OpenDialogueInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; +import org.apollo.game.message.impl.PlayerSynchronizationMessage; +import org.apollo.game.message.impl.PositionMessage; +import org.apollo.game.message.impl.PrivacyOptionMessage; +import org.apollo.game.message.impl.RegionChangeMessage; +import org.apollo.game.message.impl.RemoveTileItemMessage; +import org.apollo.game.message.impl.SendFriendMessage; +import org.apollo.game.message.impl.SendObjectMessage; +import org.apollo.game.message.impl.ServerChatMessage; +import org.apollo.game.message.impl.SetPlayerActionMessage; +import org.apollo.game.message.impl.SetWidgetItemModelMessage; +import org.apollo.game.message.impl.SetWidgetModelAnimationMessage; +import org.apollo.game.message.impl.SetWidgetNpcModelMessage; +import org.apollo.game.message.impl.SetWidgetPlayerModelMessage; +import org.apollo.game.message.impl.SetWidgetTextMessage; +import org.apollo.game.message.impl.SetWidgetVisibilityMessage; +import org.apollo.game.message.impl.SwitchTabInterfaceMessage; +import org.apollo.game.message.impl.UpdateItemsMessage; +import org.apollo.game.message.impl.UpdateRunEnergyMessage; +import org.apollo.game.message.impl.UpdateSkillMessage; +import org.apollo.game.message.impl.UpdateSlottedItemsMessage; +import org.apollo.game.message.impl.UpdateTileItemMessage; +import org.apollo.game.message.impl.UpdateWeightMessage; import org.apollo.net.meta.PacketMetaDataGroup; import org.apollo.net.release.Release; @@ -92,114 +92,114 @@ public final class Release317 extends Release { */ private void init() { // register decoders - WalkEventDecoder walkEventDecoder = new WalkEventDecoder(); - register(248, walkEventDecoder); - register(164, walkEventDecoder); - register(98, walkEventDecoder); + WalkMessageDecoder walkMessageDecoder = new WalkMessageDecoder(); + register(248, walkMessageDecoder); + register(164, walkMessageDecoder); + register(98, walkMessageDecoder); - register(0, new KeepAliveEventDecoder()); - register(101, new PlayerDesignEventDecoder()); - register(4, new ChatEventDecoder()); - register(103, new CommandEventDecoder()); - register(214, new SwitchItemEventDecoder()); + register(0, new KeepAliveMessageDecoder()); + register(101, new PlayerDesignMessageDecoder()); + register(4, new ChatMessageDecoder()); + register(103, new CommandMessageDecoder()); + register(214, new SwitchItemMessageDecoder()); - register(132, new FirstObjectActionEventDecoder()); - register(252, new SecondObjectActionEventDecoder()); - register(70, new ThirdObjectActionEventDecoder()); + register(132, new FirstObjectActionMessageDecoder()); + register(252, new SecondObjectActionMessageDecoder()); + register(70, new ThirdObjectActionMessageDecoder()); - register(122, new FirstItemOptionEventDecoder()); - register(41, new SecondItemOptionEventDecoder()); - register(16, new ThirdItemOptionEventDecoder()); - register(75, new FourthItemOptionEventDecoder()); - register(87, new FifthItemOptionEventDecoder()); + register(122, new FirstItemOptionMessageDecoder()); + register(41, new SecondItemOptionMessageDecoder()); + register(16, new ThirdItemOptionMessageDecoder()); + register(75, new FourthItemOptionMessageDecoder()); + register(87, new FifthItemOptionMessageDecoder()); - register(145, new FirstItemActionEventDecoder()); - register(117, new SecondItemActionEventDecoder()); - register(43, new ThirdItemActionEventDecoder()); - register(129, new FourthItemActionEventDecoder()); - register(135, new FifthItemActionEventDecoder()); + register(145, new FirstItemActionMessageDecoder()); + register(117, new SecondItemActionMessageDecoder()); + register(43, new ThirdItemActionMessageDecoder()); + register(129, new FourthItemActionMessageDecoder()); + register(135, new FifthItemActionMessageDecoder()); - register(185, new ButtonEventDecoder()); - register(130, new ClosedInterfaceEventDecoder()); - register(208, new EnteredAmountEventDecoder()); - register(40, new DialogueContinueEventDecoder()); + register(185, new ButtonMessageDecoder()); + register(130, new ClosedInterfaceMessageDecoder()); + register(208, new EnteredAmountMessageDecoder()); + register(40, new DialogueContinueMessageDecoder()); - register(53, new ItemOnItemEventDecoder()); - register(237, new MagicOnItemEventDecoder()); + register(53, new ItemOnItemMessageDecoder()); + register(237, new MagicOnItemMessageDecoder()); - register(3, new FocusUpdateEventDecoder()); - register(241, new MouseClickEventDecoder()); - register(86, new ArrowKeyEventDecoder()); - register(95, new PrivacyOptionEventDecoder()); + register(3, new FocusUpdateMessageDecoder()); + register(241, new MouseClickMessageDecoder()); + register(86, new ArrowKeyMessageDecoder()); + register(95, new PrivacyOptionMessageDecoder()); - SpamPacketEventDecoder spamEventDecoder = new SpamPacketEventDecoder(); - register(77, spamEventDecoder); - register(78, spamEventDecoder); - register(165, spamEventDecoder); - register(189, spamEventDecoder); - register(210, spamEventDecoder); - register(226, spamEventDecoder); - register(121, spamEventDecoder); + SpamPacketMessageDecoder spamMessageDecoder = new SpamPacketMessageDecoder(); + register(77, spamMessageDecoder); + register(78, spamMessageDecoder); + register(165, spamMessageDecoder); + register(189, spamMessageDecoder); + register(210, spamMessageDecoder); + register(226, spamMessageDecoder); + register(121, spamMessageDecoder); - register(155, new FirstNpcActionEventDecoder()); - register(17, new SecondNpcActionEventDecoder()); - register(21, new ThirdNpcActionEventDecoder()); - register(236, new TakeTileItemEventDecoder()); - register(192, new ItemOnObjectEventDecoder()); + register(155, new FirstNpcActionMessageDecoder()); + register(17, new SecondNpcActionMessageDecoder()); + register(21, new ThirdNpcActionMessageDecoder()); + register(236, new TakeTileItemMessageDecoder()); + register(192, new ItemOnObjectMessageDecoder()); - register(128, new FirstPlayerActionEventDecoder()); - register(153, new SecondPlayerActionEventDecoder()); - register(73, new ThirdPlayerActionEventDecoder()); - register(139, new FourthPlayerActionEventDecoder()); - register(39, new FifthPlayerActionEventDecoder()); + register(128, new FirstPlayerActionMessageDecoder()); + register(153, new SecondPlayerActionMessageDecoder()); + register(73, new ThirdPlayerActionMessageDecoder()); + register(139, new FourthPlayerActionMessageDecoder()); + register(39, new FifthPlayerActionMessageDecoder()); - register(188, new AddFriendEventDecoder()); - register(133, new AddIgnoreEventDecoder()); - register(215, new RemoveFriendEventDecoder()); - register(74, new RemoveIgnoreEventDecoder()); - register(126, new PrivateMessageEventDecoder()); + register(188, new AddFriendMessageDecoder()); + register(133, new AddIgnoreMessageDecoder()); + register(215, new RemoveFriendMessageDecoder()); + register(74, new RemoveIgnoreMessageDecoder()); + register(126, new PrivateMessageMessageDecoder()); // register encoders - register(IdAssignmentEvent.class, new IdAssignmentEventEncoder()); - register(RegionChangeEvent.class, new RegionChangeEventEncoder()); - register(ServerMessageEvent.class, new ServerMessageEventEncoder()); - register(PlayerSynchronizationEvent.class, new PlayerSynchronizationEventEncoder()); - register(OpenInterfaceEvent.class, new OpenInterfaceEventEncoder()); - register(CloseInterfaceEvent.class, new CloseInterfaceEventEncoder()); - register(SwitchTabInterfaceEvent.class, new SwitchTabInterfaceEventEncoder()); - register(LogoutEvent.class, new LogoutEventEncoder()); - register(UpdateItemsEvent.class, new UpdateItemsEventEncoder()); - register(UpdateSlottedItemsEvent.class, new UpdateSlottedItemsEventEncoder()); - register(UpdateSkillEvent.class, new UpdateSkillEventEncoder()); - register(OpenInterfaceSidebarEvent.class, new OpenInterfaceSidebarEventEncoder()); - register(EnterAmountEvent.class, new EnterAmountEventEncoder()); - register(SetWidgetTextEvent.class, new SetWidgetTextEventEncoder()); - register(NpcSynchronizationEvent.class, new NpcSynchronizationEventEncoder()); - register(SetWidgetVisibilityEvent.class, new SetWidgetVisibilityEventEncoder()); - register(SetWidgetItemModelEvent.class, new SetWidgetItemModelEventEncoder()); - register(SetWidgetNpcModelEvent.class, new SetWidgetNpcModelEventEncoder()); - register(SetWidgetPlayerModelEvent.class, new SetWidgetPlayerModelEventEncoder()); - register(SetWidgetModelAnimationEvent.class, new SetWidgetModelAnimationEventEncoder()); - register(ConfigEvent.class, new ConfigEventEncoder()); - register(DisplayTabInterfaceEvent.class, new DisplayTabInterfaceEventEncoder()); - register(PositionEvent.class, new PositionEventEncoder()); - register(UpdateRunEnergyEvent.class, new UpdateRunEnergyEventEncoder()); - register(PrivacyOptionEvent.class, new PrivacyOptionEventEncoder()); - register(OpenDialogueInterfaceEvent.class, new OpenDialogueInterfaceEventEncoder()); - register(UpdateWeightEvent.class, new UpdateWeightEventEncoder()); - register(SetPlayerActionEvent.class, new SetPlayerActionEventEncoder()); - register(DisplayCrossbonesEvent.class, new DisplayCrossbonesEventEncoder()); + register(IdAssignmentMessage.class, new IdAssignmentMessageEncoder()); + register(RegionChangeMessage.class, new RegionChangeMessageEncoder()); + register(ServerChatMessage.class, new ServerMessageMessageEncoder()); + register(PlayerSynchronizationMessage.class, new PlayerSynchronizationMessageEncoder()); + register(OpenInterfaceMessage.class, new OpenInterfaceMessageEncoder()); + register(CloseInterfaceMessage.class, new CloseInterfaceMessageEncoder()); + register(SwitchTabInterfaceMessage.class, new SwitchTabInterfaceMessageEncoder()); + register(LogoutMessage.class, new LogoutMessageEncoder()); + register(UpdateItemsMessage.class, new UpdateItemsMessageEncoder()); + register(UpdateSlottedItemsMessage.class, new UpdateSlottedItemsMessageEncoder()); + register(UpdateSkillMessage.class, new UpdateSkillMessageEncoder()); + register(OpenInterfaceSidebarMessage.class, new OpenInterfaceSidebarMessageEncoder()); + register(EnterAmountMessage.class, new EnterAmountMessageEncoder()); + register(SetWidgetTextMessage.class, new SetWidgetTextMessageEncoder()); + register(NpcSynchronizationMessage.class, new NpcSynchronizationMessageEncoder()); + register(SetWidgetVisibilityMessage.class, new SetWidgetVisibilityMessageEncoder()); + register(SetWidgetItemModelMessage.class, new SetWidgetItemModelMessageEncoder()); + register(SetWidgetNpcModelMessage.class, new SetWidgetNpcModelMessageEncoder()); + register(SetWidgetPlayerModelMessage.class, new SetWidgetPlayerModelMessageEncoder()); + register(SetWidgetModelAnimationMessage.class, new SetWidgetModelAnimationMessageEncoder()); + register(ConfigMessage.class, new ConfigMessageEncoder()); + register(DisplayTabInterfaceMessage.class, new DisplayTabInterfaceMessageEncoder()); + register(PositionMessage.class, new PositionMessageEncoder()); + register(UpdateRunEnergyMessage.class, new UpdateRunEnergyMessageEncoder()); + register(PrivacyOptionMessage.class, new PrivacyOptionMessageEncoder()); + register(OpenDialogueInterfaceMessage.class, new OpenDialogueInterfaceMessageEncoder()); + register(UpdateWeightMessage.class, new UpdateWeightMessageEncoder()); + register(SetPlayerActionMessage.class, new SetPlayerActionMessageEncoder()); + register(DisplayCrossbonesMessage.class, new DisplayCrossbonesMessageEncoder()); - register(AddGlobalTileItemEvent.class, new AddGlobalTileItemEventEncoder()); - register(AddTileItemEvent.class, new AddTileItemEventEncoder()); - register(UpdateTileItemEvent.class, new UpdateTileItemEventEncoder()); - register(RemoveTileItemEvent.class, new RemoveTileItemEventEncoder()); - register(SendObjectEvent.class, new SendObjectEventEncoder()); + register(AddGlobalTileItemMessage.class, new AddGlobalTileItemMessageEncoder()); + register(AddTileItemMessage.class, new AddTileItemMessageEncoder()); + register(UpdateTileItemMessage.class, new UpdateTileItemMessageEncoder()); + register(RemoveTileItemMessage.class, new RemoveTileItemMessageEncoder()); + register(SendObjectMessage.class, new SendObjectMessageEncoder()); - register(ForwardPrivateMessageEvent.class, new ForwardPrivateMessageEventEncoder()); - register(FriendServerStatusEvent.class, new FriendServerStatusEventEncoder()); - register(IgnoreListEvent.class, new IgnoreListEventEncoder()); - register(SendFriendEvent.class, new SendFriendEventEncoder()); + register(ForwardPrivateChatMessage.class, new ForwardPrivateChatMessageEncoder()); + register(FriendServerStatusMessage.class, new FriendServerStatusMessageEncoder()); + register(IgnoreListMessage.class, new IgnoreListMessageEncoder()); + register(SendFriendMessage.class, new SendFriendMessageEncoder()); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/AddFriendEventDecoder.java b/src/org/apollo/net/release/r317/RemoveFriendMessageDecoder.java similarity index 52% rename from src/org/apollo/net/release/r317/AddFriendEventDecoder.java rename to src/org/apollo/net/release/r317/RemoveFriendMessageDecoder.java index 43106bd7..59aa41c8 100644 --- a/src/org/apollo/net/release/r317/AddFriendEventDecoder.java +++ b/src/org/apollo/net/release/r317/RemoveFriendMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.AddFriendEvent; +import org.apollo.game.message.impl.RemoveFriendMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link AddFriendEvent}. + * A {@link MessageDecoder} for the {@link RemoveFriendMessage}. * * @author Major */ -public final class AddFriendEventDecoder extends EventDecoder { +public final class RemoveFriendMessageDecoder extends MessageDecoder { @Override - public AddFriendEvent decode(GamePacket packet) { + public RemoveFriendMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new AddFriendEvent(username); + return new RemoveFriendMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/RemoveIgnoreEventDecoder.java b/src/org/apollo/net/release/r317/RemoveIgnoreMessageDecoder.java similarity index 52% rename from src/org/apollo/net/release/r317/RemoveIgnoreEventDecoder.java rename to src/org/apollo/net/release/r317/RemoveIgnoreMessageDecoder.java index 6569f654..2ec28020 100644 --- a/src/org/apollo/net/release/r317/RemoveIgnoreEventDecoder.java +++ b/src/org/apollo/net/release/r317/RemoveIgnoreMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.RemoveIgnoreEvent; +import org.apollo.game.message.impl.RemoveIgnoreMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link RemoveIgnoreEvent}. + * A {@link MessageDecoder} for the {@link RemoveIgnoreMessage}. * * @author Major */ -public final class RemoveIgnoreEventDecoder extends EventDecoder { +public final class RemoveIgnoreMessageDecoder extends MessageDecoder { @Override - public RemoveIgnoreEvent decode(GamePacket packet) { + public RemoveIgnoreMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new RemoveIgnoreEvent(username); + return new RemoveIgnoreMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/RemoveTileItemEventEncoder.java b/src/org/apollo/net/release/r317/RemoveTileItemEventEncoder.java deleted file mode 100644 index 1ef41f1d..00000000 --- a/src/org/apollo/net/release/r317/RemoveTileItemEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.RemoveTileItemEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link RemoveTileItemEvent}. - * - * @author Major - */ -public final class RemoveTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(RemoveTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(156); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getPositionOffset()); - builder.put(DataType.SHORT, event.getId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/RemoveTileItemMessageEncoder.java b/src/org/apollo/net/release/r317/RemoveTileItemMessageEncoder.java new file mode 100644 index 00000000..23fa0e02 --- /dev/null +++ b/src/org/apollo/net/release/r317/RemoveTileItemMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.RemoveTileItemMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link RemoveTileItemMessage}. + * + * @author Major + */ +public final class RemoveTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(RemoveTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(156); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getPositionOffset()); + builder.put(DataType.SHORT, message.getId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SecondItemActionEventDecoder.java b/src/org/apollo/net/release/r317/SecondItemActionMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r317/SecondItemActionEventDecoder.java rename to src/org/apollo/net/release/r317/SecondItemActionMessageDecoder.java index f93d0294..544c8459 100644 --- a/src/org/apollo/net/release/r317/SecondItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/SecondItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SecondItemActionEvent; +import org.apollo.game.message.impl.SecondItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondItemActionEvent}. + * A {@link MessageDecoder} for the {@link SecondItemActionMessage}. * * @author Graham */ -public final class SecondItemActionEventDecoder extends EventDecoder { +public final class SecondItemActionMessageDecoder extends MessageDecoder { @Override - public SecondItemActionEvent decode(GamePacket packet) { + public SecondItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondItemActionEvent(interfaceId, id, slot); + return new SecondItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SecondItemOptionEventDecoder.java b/src/org/apollo/net/release/r317/SecondItemOptionMessageDecoder.java similarity index 58% rename from src/org/apollo/net/release/r317/SecondItemOptionEventDecoder.java rename to src/org/apollo/net/release/r317/SecondItemOptionMessageDecoder.java index df1c93cc..29230a36 100644 --- a/src/org/apollo/net/release/r317/SecondItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/SecondItemOptionMessageDecoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SecondItemOptionEvent; +import org.apollo.game.message.impl.SecondItemOptionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondItemOptionEvent}. + * A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. * * @author Graham */ -final class SecondItemOptionEventDecoder extends EventDecoder { +final class SecondItemOptionMessageDecoder extends MessageDecoder { @Override - public SecondItemOptionEvent decode(GamePacket packet) { + public SecondItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondItemOptionEvent(interfaceId, id, slot); + return new SecondItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SecondNpcActionEventDecoder.java b/src/org/apollo/net/release/r317/SecondNpcActionEventDecoder.java deleted file mode 100644 index c1ecf717..00000000 --- a/src/org/apollo/net/release/r317/SecondNpcActionEventDecoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SecondNpcActionEvent; -import org.apollo.net.codec.game.*; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link SecondNpcActionEvent}. - * - * @author Major - */ -public final class SecondNpcActionEventDecoder extends EventDecoder { - - @Override - public SecondNpcActionEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new SecondNpcActionEvent(index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SecondNpcActionMessageDecoder.java b/src/org/apollo/net/release/r317/SecondNpcActionMessageDecoder.java new file mode 100644 index 00000000..25ca164a --- /dev/null +++ b/src/org/apollo/net/release/r317/SecondNpcActionMessageDecoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SecondNpcActionMessage; +import org.apollo.net.codec.game.*; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link SecondNpcActionMessage}. + * + * @author Major + */ +public final class SecondNpcActionMessageDecoder extends MessageDecoder { + + @Override + public SecondNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); + return new SecondNpcActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SecondObjectActionEventDecoder.java b/src/org/apollo/net/release/r317/SecondObjectActionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r317/SecondObjectActionEventDecoder.java rename to src/org/apollo/net/release/r317/SecondObjectActionMessageDecoder.java index af849044..0e5cfb61 100644 --- a/src/org/apollo/net/release/r317/SecondObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/SecondObjectActionMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SecondObjectActionEvent; +import org.apollo.game.message.impl.SecondObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondObjectActionEvent}. + * A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. * * @author Graham */ -public final class SecondObjectActionEventDecoder extends EventDecoder { +public final class SecondObjectActionMessageDecoder extends MessageDecoder { @Override - public SecondObjectActionEvent decode(GamePacket packet) { + public SecondObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondObjectActionEvent(id, new Position(x, y)); + return new SecondObjectActionMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ThirdPlayerActionEventDecoder.java b/src/org/apollo/net/release/r317/SecondPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r317/ThirdPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r317/SecondPlayerActionMessageDecoder.java index 6797c45e..3c9981a7 100644 --- a/src/org/apollo/net/release/r317/ThirdPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/SecondPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ThirdPlayerActionEvent; +import org.apollo.game.message.impl.SecondPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. * * @author Major */ -public final class ThirdPlayerActionEventDecoder extends EventDecoder { +public final class SecondPlayerActionMessageDecoder extends MessageDecoder { @Override - public ThirdPlayerActionEvent decode(GamePacket packet) { + public SecondPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdPlayerActionEvent(index); + return new SecondPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SendFriendEventEncoder.java b/src/org/apollo/net/release/r317/SendFriendEventEncoder.java deleted file mode 100644 index 375567c9..00000000 --- a/src/org/apollo/net/release/r317/SendFriendEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SendFriendEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; -import org.apollo.util.NameUtil; - -/** - * An {@link EventEncoder} for the {@link SendFriendEvent}. - * - * @author Major - */ -public final class SendFriendEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SendFriendEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(50); - builder.put(DataType.LONG, NameUtil.encodeBase37(event.getUsername())); - builder.put(DataType.BYTE, event.getWorld()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SendFriendMessageEncoder.java b/src/org/apollo/net/release/r317/SendFriendMessageEncoder.java new file mode 100644 index 00000000..8aa06fab --- /dev/null +++ b/src/org/apollo/net/release/r317/SendFriendMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SendFriendMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; +import org.apollo.util.NameUtil; + +/** + * A {@link MessageEncoder} for the {@link SendFriendMessage}. + * + * @author Major + */ +public final class SendFriendMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SendFriendMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(50); + builder.put(DataType.LONG, NameUtil.encodeBase37(message.getUsername())); + builder.put(DataType.BYTE, message.getWorld()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SendObjectEventEncoder.java b/src/org/apollo/net/release/r317/SendObjectEventEncoder.java deleted file mode 100644 index 07b773ec..00000000 --- a/src/org/apollo/net/release/r317/SendObjectEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SendObjectEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SendObjectEvent}. - * - * @author Major - */ -public final class SendObjectEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SendObjectEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(151); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getPositionOffset()); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getId()); - builder.put(DataType.BYTE, DataTransformation.SUBTRACT, event.getType() << 2 + event.getOrientation()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SendObjectMessageEncoder.java b/src/org/apollo/net/release/r317/SendObjectMessageEncoder.java new file mode 100644 index 00000000..67cf38c6 --- /dev/null +++ b/src/org/apollo/net/release/r317/SendObjectMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SendObjectMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SendObjectMessage}. + * + * @author Major + */ +public final class SendObjectMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SendObjectMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(151); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getPositionOffset()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getId()); + builder.put(DataType.BYTE, DataTransformation.SUBTRACT, message.getType() << 2 + message.getOrientation()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ServerMessageEventEncoder.java b/src/org/apollo/net/release/r317/ServerMessageEventEncoder.java deleted file mode 100644 index 6fff772f..00000000 --- a/src/org/apollo/net/release/r317/ServerMessageEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.ServerMessageEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link ServerMessageEvent}. - * - * @author Graham - */ -public final class ServerMessageEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(ServerMessageEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(253, PacketType.VARIABLE_BYTE); - builder.putString(event.getMessage()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ServerMessageMessageEncoder.java b/src/org/apollo/net/release/r317/ServerMessageMessageEncoder.java new file mode 100644 index 00000000..dfaf714b --- /dev/null +++ b/src/org/apollo/net/release/r317/ServerMessageMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.ServerChatMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link ServerChatMessage}. + * + * @author Graham + */ +public final class ServerMessageMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(ServerChatMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(253, PacketType.VARIABLE_BYTE); + builder.putString(message.getMessage()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetPlayerActionEventEncoder.java b/src/org/apollo/net/release/r317/SetPlayerActionEventEncoder.java deleted file mode 100644 index 06c7eff5..00000000 --- a/src/org/apollo/net/release/r317/SetPlayerActionEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SetPlayerActionEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * The {@link EventEncoder} for the {@link SetPlayerActionEvent}. - * - * @author Major - */ -public final class SetPlayerActionEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetPlayerActionEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(104, PacketType.VARIABLE_BYTE); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getSlot()); - builder.put(DataType.BYTE, DataTransformation.ADD, event.isPrimaryAction() ? 0 : 1); - builder.putString(event.getText()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetPlayerActionMessageEncoder.java b/src/org/apollo/net/release/r317/SetPlayerActionMessageEncoder.java new file mode 100644 index 00000000..eb596b88 --- /dev/null +++ b/src/org/apollo/net/release/r317/SetPlayerActionMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SetPlayerActionMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * The {@link MessageEncoder} for the {@link SetPlayerActionMessage}. + * + * @author Major + */ +public final class SetPlayerActionMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetPlayerActionMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(104, PacketType.VARIABLE_BYTE); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getSlot()); + builder.put(DataType.BYTE, DataTransformation.ADD, message.isPrimaryAction() ? 0 : 1); + builder.putString(message.getText()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetWidgetItemModelEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetItemModelEventEncoder.java deleted file mode 100644 index 338029b9..00000000 --- a/src/org/apollo/net/release/r317/SetWidgetItemModelEventEncoder.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SetWidgetItemModelEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetItemModelEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetItemModelEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetItemModelEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(246); - - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getInterfaceId()); - builder.put(DataType.SHORT, event.getZoom()); - builder.put(DataType.SHORT, event.getModelId()); - - return builder.toGamePacket(); - } - -} diff --git a/src/org/apollo/net/release/r317/SetWidgetItemModelMessageEncoder.java b/src/org/apollo/net/release/r317/SetWidgetItemModelMessageEncoder.java new file mode 100644 index 00000000..e5570120 --- /dev/null +++ b/src/org/apollo/net/release/r317/SetWidgetItemModelMessageEncoder.java @@ -0,0 +1,28 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SetWidgetItemModelMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetItemModelMessage}. + * + * @author Chris Fletcher + */ +final class SetWidgetItemModelMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetItemModelMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(246); + + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getInterfaceId()); + builder.put(DataType.SHORT, message.getZoom()); + builder.put(DataType.SHORT, message.getModelId()); + + return builder.toGamePacket(); + } + +} diff --git a/src/org/apollo/net/release/r317/SetWidgetModelAnimationEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetModelAnimationEventEncoder.java deleted file mode 100644 index 63432589..00000000 --- a/src/org/apollo/net/release/r317/SetWidgetModelAnimationEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SetWidgetModelAnimationEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetModelAnimationEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetModelAnimationEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetModelAnimationEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(200); - - builder.put(DataType.SHORT, event.getInterfaceId() & 0xFFFF); - builder.put(DataType.SHORT, event.getAnimation()); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetWidgetModelAnimationMessageEncoder.java b/src/org/apollo/net/release/r317/SetWidgetModelAnimationMessageEncoder.java new file mode 100644 index 00000000..ff197a23 --- /dev/null +++ b/src/org/apollo/net/release/r317/SetWidgetModelAnimationMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SetWidgetModelAnimationMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetModelAnimationMessage}. + * + * @author Chris Fletcher + */ +final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetModelAnimationMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(200); + + builder.put(DataType.SHORT, message.getInterfaceId() & 0xFFFF); + builder.put(DataType.SHORT, message.getAnimation()); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetWidgetNpcModelEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetNpcModelMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r317/SetWidgetNpcModelEventEncoder.java rename to src/org/apollo/net/release/r317/SetWidgetNpcModelMessageEncoder.java index 01d47a7d..c4853441 100644 --- a/src/org/apollo/net/release/r317/SetWidgetNpcModelEventEncoder.java +++ b/src/org/apollo/net/release/r317/SetWidgetNpcModelMessageEncoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SetWidgetNpcModelEvent; +import org.apollo.game.message.impl.SetWidgetNpcModelMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link SetWidgetNpcModelEvent}. + * A {@link MessageEncoder} for the {@link SetWidgetNpcModelMessage}. * * @author Chris Fletcher */ -final class SetWidgetNpcModelEventEncoder extends EventEncoder { +final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(SetWidgetNpcModelEvent event) { + public GamePacket encode(SetWidgetNpcModelMessage message) { GamePacketBuilder builder = new GamePacketBuilder(75); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getModelId()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getModelId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/SetWidgetPlayerModelEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetPlayerModelMessageEncoder.java similarity index 55% rename from src/org/apollo/net/release/r317/SetWidgetPlayerModelEventEncoder.java rename to src/org/apollo/net/release/r317/SetWidgetPlayerModelMessageEncoder.java index d66a781b..9c9e1f94 100644 --- a/src/org/apollo/net/release/r317/SetWidgetPlayerModelEventEncoder.java +++ b/src/org/apollo/net/release/r317/SetWidgetPlayerModelMessageEncoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SetWidgetPlayerModelEvent; +import org.apollo.game.message.impl.SetWidgetPlayerModelMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link SetWidgetPlayerModelEvent}. + * A {@link MessageEncoder} for the {@link SetWidgetPlayerModelMessage}. * * @author Chris Fletcher */ -final class SetWidgetPlayerModelEventEncoder extends EventEncoder { +final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(SetWidgetPlayerModelEvent event) { + public GamePacket encode(SetWidgetPlayerModelMessage message) { GamePacketBuilder builder = new GamePacketBuilder(185); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/SetWidgetTextEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetTextMessageEncoder.java similarity index 50% rename from src/org/apollo/net/release/r317/SetWidgetTextEventEncoder.java rename to src/org/apollo/net/release/r317/SetWidgetTextMessageEncoder.java index 63a65e77..ae68eb78 100644 --- a/src/org/apollo/net/release/r317/SetWidgetTextEventEncoder.java +++ b/src/org/apollo/net/release/r317/SetWidgetTextMessageEncoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SetWidgetTextEvent; +import org.apollo.game.message.impl.SetWidgetTextMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link SetWidgetTextEvent}. + * A {@link MessageEncoder} for the {@link SetWidgetTextMessage}. * * @author The Wanderer */ -public final class SetWidgetTextEventEncoder extends EventEncoder { +public final class SetWidgetTextMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(SetWidgetTextEvent event) { + public GamePacket encode(SetWidgetTextMessage message) { GamePacketBuilder builder = new GamePacketBuilder(126, PacketType.VARIABLE_SHORT); - builder.putString(event.getText()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getInterfaceId()); + builder.putString(message.getText()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/SetWidgetVisibilityEventEncoder.java b/src/org/apollo/net/release/r317/SetWidgetVisibilityEventEncoder.java deleted file mode 100644 index f8644c96..00000000 --- a/src/org/apollo/net/release/r317/SetWidgetVisibilityEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SetWidgetVisibilityEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetVisibilityEvent}. - * - * @author Major - */ -final class SetWidgetVisibilityEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetVisibilityEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(171); - - builder.put(DataType.BYTE, event.isVisible() ? 0 : 1); - builder.put(DataType.SHORT, event.getWidgetId()); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SetWidgetVisibilityMessageEncoder.java b/src/org/apollo/net/release/r317/SetWidgetVisibilityMessageEncoder.java new file mode 100644 index 00000000..9ff63892 --- /dev/null +++ b/src/org/apollo/net/release/r317/SetWidgetVisibilityMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SetWidgetVisibilityMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetVisibilityMessage}. + * + * @author Major + */ +final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetVisibilityMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(171); + + builder.put(DataType.BYTE, message.isVisible() ? 0 : 1); + builder.put(DataType.SHORT, message.getWidgetId()); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SpamPacketEventDecoder.java b/src/org/apollo/net/release/r317/SpamPacketEventDecoder.java deleted file mode 100644 index 29e2a1dd..00000000 --- a/src/org/apollo/net/release/r317/SpamPacketEventDecoder.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SpamPacketEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link SpamPacketEvent}. - * - * @author Major - */ -public final class SpamPacketEventDecoder extends EventDecoder { - - @Override - public SpamPacketEvent decode(GamePacket packet) { - return new SpamPacketEvent(packet.getPayload().array()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SpamPacketMessageDecoder.java b/src/org/apollo/net/release/r317/SpamPacketMessageDecoder.java new file mode 100644 index 00000000..655c5c4e --- /dev/null +++ b/src/org/apollo/net/release/r317/SpamPacketMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SpamPacketMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link SpamPacketMessage}. + * + * @author Major + */ +public final class SpamPacketMessageDecoder extends MessageDecoder { + + @Override + public SpamPacketMessage decode(GamePacket packet) { + return new SpamPacketMessage(packet.getPayload().array()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SwitchItemEventDecoder.java b/src/org/apollo/net/release/r317/SwitchItemMessageDecoder.java similarity index 66% rename from src/org/apollo/net/release/r317/SwitchItemEventDecoder.java rename to src/org/apollo/net/release/r317/SwitchItemMessageDecoder.java index a0e17da0..694929a9 100644 --- a/src/org/apollo/net/release/r317/SwitchItemEventDecoder.java +++ b/src/org/apollo/net/release/r317/SwitchItemMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.SwitchItemEvent; +import org.apollo.game.message.impl.SwitchItemMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SwitchItemEvent}. + * A {@link MessageDecoder} for the {@link SwitchItemMessage}. * * @author Graham */ -public final class SwitchItemEventDecoder extends EventDecoder { +public final class SwitchItemMessageDecoder extends MessageDecoder { @Override - public SwitchItemEvent decode(GamePacket packet) { + public SwitchItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); boolean inserting = reader.getUnsigned(DataType.BYTE, DataTransformation.NEGATE) == 1; int oldSlot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int newSlot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SwitchItemEvent(interfaceId, inserting, oldSlot, newSlot); + return new SwitchItemMessage(interfaceId, inserting, oldSlot, newSlot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SwitchTabInterfaceEventEncoder.java b/src/org/apollo/net/release/r317/SwitchTabInterfaceEventEncoder.java deleted file mode 100644 index 5651fb80..00000000 --- a/src/org/apollo/net/release/r317/SwitchTabInterfaceEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.SwitchTabInterfaceEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SwitchTabInterfaceEvent}. - * - * @author Graham - */ -public final class SwitchTabInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SwitchTabInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(71); - builder.put(DataType.SHORT, event.getInterfaceId()); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getTabId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/SwitchTabInterfaceMessageEncoder.java b/src/org/apollo/net/release/r317/SwitchTabInterfaceMessageEncoder.java new file mode 100644 index 00000000..e8e90bbb --- /dev/null +++ b/src/org/apollo/net/release/r317/SwitchTabInterfaceMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.SwitchTabInterfaceMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SwitchTabInterfaceMessage}. + * + * @author Graham + */ +public final class SwitchTabInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SwitchTabInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(71); + builder.put(DataType.SHORT, message.getInterfaceId()); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getTabId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/TakeTileItemEventDecoder.java b/src/org/apollo/net/release/r317/TakeTileItemMessageDecoder.java similarity index 59% rename from src/org/apollo/net/release/r317/TakeTileItemEventDecoder.java rename to src/org/apollo/net/release/r317/TakeTileItemMessageDecoder.java index 24f0dde8..6a07b101 100644 --- a/src/org/apollo/net/release/r317/TakeTileItemEventDecoder.java +++ b/src/org/apollo/net/release/r317/TakeTileItemMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.TakeTileItemEvent; +import org.apollo.game.message.impl.TakeTileItemMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link TakeTileItemEvent}. + * A {@link MessageDecoder} for the {@link TakeTileItemMessage}. * * @author Major */ -public final class TakeTileItemEventDecoder extends EventDecoder { +public final class TakeTileItemMessageDecoder extends MessageDecoder { @Override - public TakeTileItemEvent decode(GamePacket packet) { + public TakeTileItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new TakeTileItemEvent(id, new Position(x, y)); + return new TakeTileItemMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ThirdItemActionEventDecoder.java b/src/org/apollo/net/release/r317/ThirdItemActionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r317/ThirdItemActionEventDecoder.java rename to src/org/apollo/net/release/r317/ThirdItemActionMessageDecoder.java index e2082abf..2cf6bf5a 100644 --- a/src/org/apollo/net/release/r317/ThirdItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/ThirdItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ThirdItemActionEvent; +import org.apollo.game.message.impl.ThirdItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdItemActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. * * @author Graham */ -public final class ThirdItemActionEventDecoder extends EventDecoder { +public final class ThirdItemActionMessageDecoder extends MessageDecoder { @Override - public ThirdItemActionEvent decode(GamePacket packet) { + public ThirdItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new ThirdItemActionEvent(interfaceId, id, slot); + return new ThirdItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ThirdItemOptionEventDecoder.java b/src/org/apollo/net/release/r317/ThirdItemOptionMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r317/ThirdItemOptionEventDecoder.java rename to src/org/apollo/net/release/r317/ThirdItemOptionMessageDecoder.java index cadf96ea..ce11509c 100644 --- a/src/org/apollo/net/release/r317/ThirdItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r317/ThirdItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ThirdItemOptionEvent; +import org.apollo.game.message.impl.ThirdItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdItemOptionEvent}. + * A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. * * @author Chris Fletcher */ -final class ThirdItemOptionEventDecoder extends EventDecoder { +final class ThirdItemOptionMessageDecoder extends MessageDecoder { @Override - public ThirdItemOptionEvent decode(GamePacket packet) { + public ThirdItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdItemOptionEvent(interfaceId, id, slot); + return new ThirdItemOptionMessage(interfaceId, id, slot); } } diff --git a/src/org/apollo/net/release/r317/ThirdNpcActionEventDecoder.java b/src/org/apollo/net/release/r317/ThirdNpcActionEventDecoder.java deleted file mode 100644 index 5241f48a..00000000 --- a/src/org/apollo/net/release/r317/ThirdNpcActionEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.ThirdNpcActionEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link ThirdNpcActionEvent}. - * - * @author Major - */ -public final class ThirdNpcActionEventDecoder extends EventDecoder { - - @Override - public ThirdNpcActionEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int index = (int) reader.getSigned(DataType.SHORT); - return new ThirdNpcActionEvent(index); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ThirdNpcActionMessageDecoder.java b/src/org/apollo/net/release/r317/ThirdNpcActionMessageDecoder.java new file mode 100644 index 00000000..960db2df --- /dev/null +++ b/src/org/apollo/net/release/r317/ThirdNpcActionMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.ThirdNpcActionMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. + * + * @author Major + */ +public final class ThirdNpcActionMessageDecoder extends MessageDecoder { + + @Override + public ThirdNpcActionMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int index = (int) reader.getSigned(DataType.SHORT); + return new ThirdNpcActionMessage(index); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/ThirdObjectActionEventDecoder.java b/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r317/ThirdObjectActionEventDecoder.java rename to src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java index f7c06d65..f147104e 100644 --- a/src/org/apollo/net/release/r317/ThirdObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/ThirdObjectActionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.ThirdObjectActionEvent; +import org.apollo.game.message.impl.ThirdObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdObjectActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. * * @author Graham */ -public final class ThirdObjectActionEventDecoder extends EventDecoder { +public final class ThirdObjectActionMessageDecoder extends MessageDecoder { @Override - public ThirdObjectActionEvent decode(GamePacket packet) { + public ThirdObjectActionMessage decode(GamePacket packet) { // TODO ripped out of some Winterlove-based server, so probably wrong GamePacketReader reader = new GamePacketReader(packet); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int y = (int) reader.getUnsigned(DataType.SHORT); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdObjectActionEvent(id, new Position(x, y)); + return new ThirdObjectActionMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/FifthPlayerActionEventDecoder.java b/src/org/apollo/net/release/r317/ThirdPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r317/FifthPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r317/ThirdPlayerActionMessageDecoder.java index ac7942a7..cf9e3a68 100644 --- a/src/org/apollo/net/release/r317/FifthPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r317/ThirdPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.FifthPlayerActionEvent; +import org.apollo.game.message.impl.ThirdPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. * * @author Major */ -public final class FifthPlayerActionEventDecoder extends EventDecoder { +public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { @Override - public FifthPlayerActionEvent decode(GamePacket packet) { + public ThirdPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthPlayerActionEvent(index); + return new ThirdPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateItemsEventEncoder.java b/src/org/apollo/net/release/r317/UpdateItemsMessageEncoder.java similarity index 70% rename from src/org/apollo/net/release/r317/UpdateItemsEventEncoder.java rename to src/org/apollo/net/release/r317/UpdateItemsMessageEncoder.java index 22762a6f..60551024 100644 --- a/src/org/apollo/net/release/r317/UpdateItemsEventEncoder.java +++ b/src/org/apollo/net/release/r317/UpdateItemsMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.UpdateItemsEvent; +import org.apollo.game.message.impl.UpdateItemsMessage; import org.apollo.game.model.Item; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -8,22 +8,22 @@ import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateItemsEvent}. + * A {@link MessageEncoder} for the {@link UpdateItemsMessage}. * * @author Graham */ -public final class UpdateItemsEventEncoder extends EventEncoder { +public final class UpdateItemsMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateItemsEvent event) { + public GamePacket encode(UpdateItemsMessage message) { GamePacketBuilder builder = new GamePacketBuilder(53, PacketType.VARIABLE_SHORT); - Item[] items = event.getItems(); + Item[] items = message.getItems(); - builder.put(DataType.SHORT, event.getInterfaceId()); + builder.put(DataType.SHORT, message.getInterfaceId()); builder.put(DataType.SHORT, items.length); for (Item item : items) { diff --git a/src/org/apollo/net/release/r317/UpdateRunEnergyEventEncoder.java b/src/org/apollo/net/release/r317/UpdateRunEnergyEventEncoder.java deleted file mode 100644 index 2657a99e..00000000 --- a/src/org/apollo/net/release/r317/UpdateRunEnergyEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.UpdateRunEnergyEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateRunEnergyEvent} - * - * @author Major - */ -public final class UpdateRunEnergyEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateRunEnergyEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(110); - builder.put(DataType.BYTE, event.getEnergy()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateRunEnergyMessageEncoder.java b/src/org/apollo/net/release/r317/UpdateRunEnergyMessageEncoder.java new file mode 100644 index 00000000..0072a087 --- /dev/null +++ b/src/org/apollo/net/release/r317/UpdateRunEnergyMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.UpdateRunEnergyMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateRunEnergyMessage} + * + * @author Major + */ +public final class UpdateRunEnergyMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateRunEnergyMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(110); + builder.put(DataType.BYTE, message.getEnergy()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateSkillEventEncoder.java b/src/org/apollo/net/release/r317/UpdateSkillMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r317/UpdateSkillEventEncoder.java rename to src/org/apollo/net/release/r317/UpdateSkillMessageEncoder.java index a2545ec2..9a586667 100644 --- a/src/org/apollo/net/release/r317/UpdateSkillEventEncoder.java +++ b/src/org/apollo/net/release/r317/UpdateSkillMessageEncoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.UpdateSkillEvent; +import org.apollo.game.message.impl.UpdateSkillMessage; import org.apollo.game.model.entity.Skill; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateSkillEvent}. + * A {@link MessageEncoder} for the {@link UpdateSkillMessage}. * * @author Graham */ -public final class UpdateSkillEventEncoder extends EventEncoder { +public final class UpdateSkillMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateSkillEvent event) { + public GamePacket encode(UpdateSkillMessage message) { GamePacketBuilder builder = new GamePacketBuilder(134); - Skill skill = event.getSkill(); + Skill skill = message.getSkill(); - builder.put(DataType.BYTE, event.getId()); + builder.put(DataType.BYTE, message.getId()); builder.put(DataType.INT, DataOrder.MIDDLE, (int) skill.getExperience()); builder.put(DataType.BYTE, skill.getCurrentLevel()); diff --git a/src/org/apollo/net/release/r317/UpdateSlottedItemsEventEncoder.java b/src/org/apollo/net/release/r317/UpdateSlottedItemsMessageEncoder.java similarity index 66% rename from src/org/apollo/net/release/r317/UpdateSlottedItemsEventEncoder.java rename to src/org/apollo/net/release/r317/UpdateSlottedItemsMessageEncoder.java index 9422aa72..b26283c4 100644 --- a/src/org/apollo/net/release/r317/UpdateSlottedItemsEventEncoder.java +++ b/src/org/apollo/net/release/r317/UpdateSlottedItemsMessageEncoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.UpdateSlottedItemsEvent; +import org.apollo.game.message.impl.UpdateSlottedItemsMessage; import org.apollo.game.model.Item; import org.apollo.game.model.inv.SlottedItem; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateSlottedItemsEvent}. + * A {@link MessageEncoder} for the {@link UpdateSlottedItemsMessage}. * * @author Graham */ -public final class UpdateSlottedItemsEventEncoder extends EventEncoder { +public final class UpdateSlottedItemsMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateSlottedItemsEvent event) { + public GamePacket encode(UpdateSlottedItemsMessage message) { GamePacketBuilder builder = new GamePacketBuilder(34, PacketType.VARIABLE_SHORT); - SlottedItem[] items = event.getSlottedItems(); + SlottedItem[] items = message.getSlottedItems(); - builder.put(DataType.SHORT, event.getInterfaceId()); + builder.put(DataType.SHORT, message.getInterfaceId()); for (SlottedItem slottedItem : items) { builder.putSmart(slottedItem.getSlot()); diff --git a/src/org/apollo/net/release/r317/UpdateTileItemEventEncoder.java b/src/org/apollo/net/release/r317/UpdateTileItemEventEncoder.java deleted file mode 100644 index 257ba7d9..00000000 --- a/src/org/apollo/net/release/r317/UpdateTileItemEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.UpdateTileItemEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateTileItemEvent}. - * - * @author Major - */ -public final class UpdateTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(84); - builder.put(DataType.BYTE, event.getPositionOffset()); - builder.put(DataType.SHORT, event.getId()); - builder.put(DataType.SHORT, event.getPreviousAmount()); - builder.put(DataType.SHORT, event.getAmount()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateTileItemMessageEncoder.java b/src/org/apollo/net/release/r317/UpdateTileItemMessageEncoder.java new file mode 100644 index 00000000..e8d78b58 --- /dev/null +++ b/src/org/apollo/net/release/r317/UpdateTileItemMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.UpdateTileItemMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateTileItemMessage}. + * + * @author Major + */ +public final class UpdateTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(84); + builder.put(DataType.BYTE, message.getPositionOffset()); + builder.put(DataType.SHORT, message.getId()); + builder.put(DataType.SHORT, message.getPreviousAmount()); + builder.put(DataType.SHORT, message.getAmount()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateWeightEventEncoder.java b/src/org/apollo/net/release/r317/UpdateWeightEventEncoder.java deleted file mode 100644 index ccdb8d2d..00000000 --- a/src/org/apollo/net/release/r317/UpdateWeightEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r317; - -import org.apollo.game.event.impl.UpdateWeightEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateWeightEvent}. - * - * @author Major - */ -public final class UpdateWeightEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateWeightEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(240); - builder.put(DataType.SHORT, event.getWeight()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/UpdateWeightMessageEncoder.java b/src/org/apollo/net/release/r317/UpdateWeightMessageEncoder.java new file mode 100644 index 00000000..f66e12b7 --- /dev/null +++ b/src/org/apollo/net/release/r317/UpdateWeightMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r317; + +import org.apollo.game.message.impl.UpdateWeightMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateWeightMessage}. + * + * @author Major + */ +public final class UpdateWeightMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateWeightMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(240); + builder.put(DataType.SHORT, message.getWeight()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r317/WalkEventDecoder.java b/src/org/apollo/net/release/r317/WalkMessageDecoder.java similarity index 79% rename from src/org/apollo/net/release/r317/WalkEventDecoder.java rename to src/org/apollo/net/release/r317/WalkMessageDecoder.java index 2e0c8473..ced9e6ec 100644 --- a/src/org/apollo/net/release/r317/WalkEventDecoder.java +++ b/src/org/apollo/net/release/r317/WalkMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.net.release.r317; -import org.apollo.game.event.impl.WalkEvent; +import org.apollo.game.message.impl.WalkMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link WalkEvent}. + * A {@link MessageDecoder} for the {@link WalkMessage}. * * @author Graham */ -public final class WalkEventDecoder extends EventDecoder { +public final class WalkMessageDecoder extends MessageDecoder { @Override - public WalkEvent decode(GamePacket packet) { + public WalkMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int length = packet.getLength(); @@ -42,7 +42,7 @@ public final class WalkEventDecoder extends EventDecoder { positions[i + 1] = new Position(path[i][0] + x, path[i][1] + y); } - return new WalkEvent(positions, run); + return new WalkMessage(positions, run); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddFriendEventDecoder.java b/src/org/apollo/net/release/r377/AddFriendMessageDecoder.java similarity index 53% rename from src/org/apollo/net/release/r377/AddFriendEventDecoder.java rename to src/org/apollo/net/release/r377/AddFriendMessageDecoder.java index 76867f11..bd2fb2f6 100644 --- a/src/org/apollo/net/release/r377/AddFriendEventDecoder.java +++ b/src/org/apollo/net/release/r377/AddFriendMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.AddFriendEvent; +import org.apollo.game.message.impl.AddFriendMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link AddFriendEvent}. + * A {@link MessageDecoder} for the {@link AddFriendMessage}. * * @author Major */ -public final class AddFriendEventDecoder extends EventDecoder { +public final class AddFriendMessageDecoder extends MessageDecoder { @Override - public AddFriendEvent decode(GamePacket packet) { + public AddFriendMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new AddFriendEvent(username); + return new AddFriendMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddGlobalTileItemEventEncoder.java b/src/org/apollo/net/release/r377/AddGlobalTileItemEventEncoder.java deleted file mode 100644 index 4737b912..00000000 --- a/src/org/apollo/net/release/r377/AddGlobalTileItemEventEncoder.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.AddGlobalTileItemEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link AddGlobalTileItemEvent}. - * - * @author Major - */ -public final class AddGlobalTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(AddGlobalTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(106); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getPositionOffset()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getAmount()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getId()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getIndex()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddGlobalTileItemMessageEncoder.java b/src/org/apollo/net/release/r377/AddGlobalTileItemMessageEncoder.java new file mode 100644 index 00000000..adcfaeb9 --- /dev/null +++ b/src/org/apollo/net/release/r377/AddGlobalTileItemMessageEncoder.java @@ -0,0 +1,28 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.AddGlobalTileItemMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link AddGlobalTileItemMessage}. + * + * @author Major + */ +public final class AddGlobalTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(AddGlobalTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(106); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getPositionOffset()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getAmount()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getId()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getIndex()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddIgnoreEventDecoder.java b/src/org/apollo/net/release/r377/AddIgnoreMessageDecoder.java similarity index 53% rename from src/org/apollo/net/release/r377/AddIgnoreEventDecoder.java rename to src/org/apollo/net/release/r377/AddIgnoreMessageDecoder.java index b3f56782..58e48947 100644 --- a/src/org/apollo/net/release/r377/AddIgnoreEventDecoder.java +++ b/src/org/apollo/net/release/r377/AddIgnoreMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.AddIgnoreEvent; +import org.apollo.game.message.impl.AddIgnoreMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link AddIgnoreEvent}. + * A {@link MessageDecoder} for the {@link AddIgnoreMessage}. * * @author Major */ -public final class AddIgnoreEventDecoder extends EventDecoder { +public final class AddIgnoreMessageDecoder extends MessageDecoder { @Override - public AddIgnoreEvent decode(GamePacket packet) { + public AddIgnoreMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new AddIgnoreEvent(username); + return new AddIgnoreMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddTileItemEventEncoder.java b/src/org/apollo/net/release/r377/AddTileItemEventEncoder.java deleted file mode 100644 index eb965d18..00000000 --- a/src/org/apollo/net/release/r377/AddTileItemEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.AddTileItemEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link AddTileItemEvent}. - * - * @author Major - */ -public final class AddTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(AddTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(107); - builder.put(DataType.SHORT, event.getId()); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getPositionOffset()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getAmount()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/AddTileItemMessageEncoder.java b/src/org/apollo/net/release/r377/AddTileItemMessageEncoder.java new file mode 100644 index 00000000..6b907bf9 --- /dev/null +++ b/src/org/apollo/net/release/r377/AddTileItemMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.AddTileItemMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link AddTileItemMessage}. + * + * @author Major + */ +public final class AddTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(AddTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(107); + builder.put(DataType.SHORT, message.getId()); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getPositionOffset()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getAmount()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ArrowKeyEventDecoder.java b/src/org/apollo/net/release/r377/ArrowKeyMessageDecoder.java similarity index 58% rename from src/org/apollo/net/release/r377/ArrowKeyEventDecoder.java rename to src/org/apollo/net/release/r377/ArrowKeyMessageDecoder.java index 7b987f5b..cb216890 100644 --- a/src/org/apollo/net/release/r377/ArrowKeyEventDecoder.java +++ b/src/org/apollo/net/release/r377/ArrowKeyMessageDecoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ArrowKeyEvent; +import org.apollo.game.message.impl.ArrowKeyMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ArrowKeyEvent}. + * A {@link MessageDecoder} for the {@link ArrowKeyMessage}. * * @author Major */ -public final class ArrowKeyEventDecoder extends EventDecoder { +public final class ArrowKeyMessageDecoder extends MessageDecoder { @Override - public ArrowKeyEvent decode(GamePacket packet) { + public ArrowKeyMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int roll = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int yaw = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ArrowKeyEvent(roll, yaw); + return new ArrowKeyMessage(roll, yaw); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ButtonEventDecoder.java b/src/org/apollo/net/release/r377/ButtonMessageDecoder.java similarity index 51% rename from src/org/apollo/net/release/r377/ButtonEventDecoder.java rename to src/org/apollo/net/release/r377/ButtonMessageDecoder.java index bc126118..63afacf9 100644 --- a/src/org/apollo/net/release/r377/ButtonEventDecoder.java +++ b/src/org/apollo/net/release/r377/ButtonMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ButtonEvent; +import org.apollo.game.message.impl.ButtonMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ButtonEvent}. + * A {@link MessageDecoder} for the {@link ButtonMessage}. * * @author Graham */ -public final class ButtonEventDecoder extends EventDecoder { +public final class ButtonMessageDecoder extends MessageDecoder { @Override - public ButtonEvent decode(GamePacket packet) { + public ButtonMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new ButtonEvent(interfaceId); + return new ButtonMessage(interfaceId); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ChatEventDecoder.java b/src/org/apollo/net/release/r377/ChatMessageDecoder.java similarity index 74% rename from src/org/apollo/net/release/r377/ChatEventDecoder.java rename to src/org/apollo/net/release/r377/ChatMessageDecoder.java index 8b63d088..f92a7cdb 100644 --- a/src/org/apollo/net/release/r377/ChatEventDecoder.java +++ b/src/org/apollo/net/release/r377/ChatMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ChatEvent; +import org.apollo.game.message.impl.ChatMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.TextUtil; /** - * An {@link EventDecoder} for the {@link ChatEvent}. + * A {@link MessageDecoder} for the {@link ChatMessage}. * * @author Graham */ -public final class ChatEventDecoder extends EventDecoder { +public final class ChatMessageDecoder extends MessageDecoder { @Override - public ChatEvent decode(GamePacket packet) { + public ChatMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int color = (int) reader.getUnsigned(DataType.BYTE, DataTransformation.NEGATE); @@ -34,7 +34,7 @@ public final class ChatEventDecoder extends EventDecoder { byte[] recompressed = new byte[length]; TextUtil.compress(uncompressed, recompressed); // in case invalid data gets sent, this effectively verifies it - return new ChatEvent(uncompressed, recompressed, color, effects); + return new ChatMessage(uncompressed, recompressed, color, effects); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/CloseInterfaceEventEncoder.java b/src/org/apollo/net/release/r377/CloseInterfaceEventEncoder.java deleted file mode 100644 index 0a74ae24..00000000 --- a/src/org/apollo/net/release/r377/CloseInterfaceEventEncoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link CloseInterfaceEvent}. - * - * @author Graham - */ -public final class CloseInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(CloseInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(29); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/CloseInterfaceMessageEncoder.java b/src/org/apollo/net/release/r377/CloseInterfaceMessageEncoder.java new file mode 100644 index 00000000..d4aa1ac3 --- /dev/null +++ b/src/org/apollo/net/release/r377/CloseInterfaceMessageEncoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link CloseInterfaceMessage}. + * + * @author Graham + */ +public final class CloseInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(CloseInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(29); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ClosedInterfaceEventDecoder.java b/src/org/apollo/net/release/r377/ClosedInterfaceEventDecoder.java deleted file mode 100644 index 8de0c730..00000000 --- a/src/org/apollo/net/release/r377/ClosedInterfaceEventDecoder.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.ClosedInterfaceEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link ClosedInterfaceEvent}. - * - * @author Graham - */ -public final class ClosedInterfaceEventDecoder extends EventDecoder { - - @Override - public ClosedInterfaceEvent decode(GamePacket packet) { - return new ClosedInterfaceEvent(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ClosedInterfaceMessageDecoder.java b/src/org/apollo/net/release/r377/ClosedInterfaceMessageDecoder.java new file mode 100644 index 00000000..b5187df7 --- /dev/null +++ b/src/org/apollo/net/release/r377/ClosedInterfaceMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.ClosedInterfaceMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link ClosedInterfaceMessage}. + * + * @author Graham + */ +public final class ClosedInterfaceMessageDecoder extends MessageDecoder { + + @Override + public ClosedInterfaceMessage decode(GamePacket packet) { + return new ClosedInterfaceMessage(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/CommandEventDecoder.java b/src/org/apollo/net/release/r377/CommandEventDecoder.java deleted file mode 100644 index 57f06fa5..00000000 --- a/src/org/apollo/net/release/r377/CommandEventDecoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.CommandEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link CommandEvent}. - * - * @author Graham - */ -public final class CommandEventDecoder extends EventDecoder { - - @Override - public CommandEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - return new CommandEvent(reader.getString()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/CommandMessageDecoder.java b/src/org/apollo/net/release/r377/CommandMessageDecoder.java new file mode 100644 index 00000000..39989d05 --- /dev/null +++ b/src/org/apollo/net/release/r377/CommandMessageDecoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.CommandMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link CommandMessage}. + * + * @author Graham + */ +public final class CommandMessageDecoder extends MessageDecoder { + + @Override + public CommandMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + return new CommandMessage(reader.getString()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ConfigEventEncoder.java b/src/org/apollo/net/release/r377/ConfigMessageEncoder.java similarity index 60% rename from src/org/apollo/net/release/r377/ConfigEventEncoder.java rename to src/org/apollo/net/release/r377/ConfigMessageEncoder.java index 46513736..e85cac23 100644 --- a/src/org/apollo/net/release/r377/ConfigEventEncoder.java +++ b/src/org/apollo/net/release/r377/ConfigMessageEncoder.java @@ -1,36 +1,36 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ConfigEvent; +import org.apollo.game.message.impl.ConfigMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link ConfigEvent}. + * A {@link MessageEncoder} for the {@link ConfigMessage}. * * @author Chris Fletcher * @author Major */ -final class ConfigEventEncoder extends EventEncoder { +final class ConfigMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(ConfigEvent event) { + public GamePacket encode(ConfigMessage message) { GamePacketBuilder builder; - int value = event.getValue(); + int value = message.getValue(); if (value > Byte.MIN_VALUE && value < Byte.MAX_VALUE) { builder = new GamePacketBuilder(182); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getId()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getId()); builder.put(DataType.BYTE, DataTransformation.SUBTRACT, value & 0xFF); } else { builder = new GamePacketBuilder(115); builder.put(DataType.INT, DataOrder.INVERSED_MIDDLE, value); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getId()); } return builder.toGamePacket(); diff --git a/src/org/apollo/net/release/r377/DialogueContinueEventDecoder.java b/src/org/apollo/net/release/r377/DialogueContinueEventDecoder.java deleted file mode 100644 index ea241b5e..00000000 --- a/src/org/apollo/net/release/r377/DialogueContinueEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.DialogueContinueEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link DialogueContinueEvent}. - * - * @author Chris Fletcher - */ -final class DialogueContinueEventDecoder extends EventDecoder { - - @Override - public DialogueContinueEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new DialogueContinueEvent(interfaceId); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/DialogueContinueMessageDecoder.java b/src/org/apollo/net/release/r377/DialogueContinueMessageDecoder.java new file mode 100644 index 00000000..7ec4d5ea --- /dev/null +++ b/src/org/apollo/net/release/r377/DialogueContinueMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.DialogueContinueMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link DialogueContinueMessage}. + * + * @author Chris Fletcher + */ +final class DialogueContinueMessageDecoder extends MessageDecoder { + + @Override + public DialogueContinueMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int interfaceId = (int) reader.getUnsigned(DataType.SHORT); + return new DialogueContinueMessage(interfaceId); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/DisplayCrossbonesEventEncoder.java b/src/org/apollo/net/release/r377/DisplayCrossbonesEventEncoder.java deleted file mode 100644 index 31b29b96..00000000 --- a/src/org/apollo/net/release/r377/DisplayCrossbonesEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.DisplayCrossbonesEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link DisplayCrossbonesEvent}. - * - * @author Major - */ -public final class DisplayCrossbonesEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(DisplayCrossbonesEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(233); - builder.put(DataType.BYTE, event.isDisplayed() ? 1 : 0); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/DisplayCrossbonesMessageEncoder.java b/src/org/apollo/net/release/r377/DisplayCrossbonesMessageEncoder.java new file mode 100644 index 00000000..2d25c827 --- /dev/null +++ b/src/org/apollo/net/release/r377/DisplayCrossbonesMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.DisplayCrossbonesMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link DisplayCrossbonesMessage}. + * + * @author Major + */ +public final class DisplayCrossbonesMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(DisplayCrossbonesMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(233); + builder.put(DataType.BYTE, message.isDisplayed() ? 1 : 0); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/DisplayTabInterfaceEventEncoder.java b/src/org/apollo/net/release/r377/DisplayTabInterfaceEventEncoder.java deleted file mode 100644 index 8f90018c..00000000 --- a/src/org/apollo/net/release/r377/DisplayTabInterfaceEventEncoder.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.DisplayTabInterfaceEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link DisplayTabInterfaceEvent}. - * - * @author Chris Fletcher - */ -final class DisplayTabInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(DisplayTabInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(252); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getTab()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/DisplayTabInterfaceMessageEncoder.java b/src/org/apollo/net/release/r377/DisplayTabInterfaceMessageEncoder.java new file mode 100644 index 00000000..c8ad7cc0 --- /dev/null +++ b/src/org/apollo/net/release/r377/DisplayTabInterfaceMessageEncoder.java @@ -0,0 +1,24 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.DisplayTabInterfaceMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link DisplayTabInterfaceMessage}. + * + * @author Chris Fletcher + */ +final class DisplayTabInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(DisplayTabInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(252); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getTab()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/EnterAmountEventEncoder.java b/src/org/apollo/net/release/r377/EnterAmountEventEncoder.java deleted file mode 100644 index 904fd994..00000000 --- a/src/org/apollo/net/release/r377/EnterAmountEventEncoder.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.net.release.r377; - -import io.netty.buffer.Unpooled; - -import org.apollo.game.event.impl.EnterAmountEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link EnterAmountEvent}. - * - * @author Graham - */ -public final class EnterAmountEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(EnterAmountEvent event) { - return new GamePacket(58, PacketType.FIXED, Unpooled.EMPTY_BUFFER); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/EnterAmountMessageEncoder.java b/src/org/apollo/net/release/r377/EnterAmountMessageEncoder.java new file mode 100644 index 00000000..b46a9712 --- /dev/null +++ b/src/org/apollo/net/release/r377/EnterAmountMessageEncoder.java @@ -0,0 +1,22 @@ +package org.apollo.net.release.r377; + +import io.netty.buffer.Unpooled; + +import org.apollo.game.message.impl.EnterAmountMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link EnterAmountMessage}. + * + * @author Graham + */ +public final class EnterAmountMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(EnterAmountMessage message) { + return new GamePacket(58, PacketType.FIXED, Unpooled.EMPTY_BUFFER); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/EnteredAmountEventDecoder.java b/src/org/apollo/net/release/r377/EnteredAmountEventDecoder.java deleted file mode 100644 index 6ee7ed4f..00000000 --- a/src/org/apollo/net/release/r377/EnteredAmountEventDecoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.EnteredAmountEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link EnteredAmountEvent}. - * - * @author Graham - */ -public final class EnteredAmountEventDecoder extends EventDecoder { - - @Override - public EnteredAmountEvent decode(GamePacket packet) { - GamePacketReader reader = new GamePacketReader(packet); - int amount = (int) reader.getUnsigned(DataType.INT); - return new EnteredAmountEvent(amount); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/EnteredAmountMessageDecoder.java b/src/org/apollo/net/release/r377/EnteredAmountMessageDecoder.java new file mode 100644 index 00000000..139e1f41 --- /dev/null +++ b/src/org/apollo/net/release/r377/EnteredAmountMessageDecoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.EnteredAmountMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link EnteredAmountMessage}. + * + * @author Graham + */ +public final class EnteredAmountMessageDecoder extends MessageDecoder { + + @Override + public EnteredAmountMessage decode(GamePacket packet) { + GamePacketReader reader = new GamePacketReader(packet); + int amount = (int) reader.getUnsigned(DataType.INT); + return new EnteredAmountMessage(amount); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FifthItemActionEventDecoder.java b/src/org/apollo/net/release/r377/FifthItemActionMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r377/FifthItemActionEventDecoder.java rename to src/org/apollo/net/release/r377/FifthItemActionMessageDecoder.java index 18b78ac6..62449679 100644 --- a/src/org/apollo/net/release/r377/FifthItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FifthItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FifthItemActionEvent; +import org.apollo.game.message.impl.FifthItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthItemActionEvent}. + * A {@link MessageDecoder} for the {@link FifthItemActionMessage}. * * @author Graham */ -public final class FifthItemActionEventDecoder extends EventDecoder { +public final class FifthItemActionMessageDecoder extends MessageDecoder { @Override - public FifthItemActionEvent decode(GamePacket packet) { + public FifthItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FifthItemActionEvent(interfaceId, id, slot); + return new FifthItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FifthItemOptionEventDecoder.java b/src/org/apollo/net/release/r377/FifthItemOptionMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r377/FifthItemOptionEventDecoder.java rename to src/org/apollo/net/release/r377/FifthItemOptionMessageDecoder.java index ff3a01db..d44c032b 100644 --- a/src/org/apollo/net/release/r377/FifthItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FifthItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FifthItemOptionEvent; +import org.apollo.game.message.impl.FifthItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FifthItemOptionMessage}. * * @author Chris Fletcher */ -final class FifthItemOptionEventDecoder extends EventDecoder { +final class FifthItemOptionMessageDecoder extends MessageDecoder { @Override - public FifthItemOptionEvent decode(GamePacket packet) { + public FifthItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new FifthItemOptionEvent(interfaceId, id, slot); + return new FifthItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FifthPlayerActionEventDecoder.java b/src/org/apollo/net/release/r377/FifthPlayerActionMessageDecoder.java similarity index 51% rename from src/org/apollo/net/release/r377/FifthPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r377/FifthPlayerActionMessageDecoder.java index 24a54060..f7e76f2b 100644 --- a/src/org/apollo/net/release/r377/FifthPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FifthPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FifthPlayerActionEvent; +import org.apollo.game.message.impl.FifthPlayerActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FifthPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link FifthPlayerActionMessage}. * * @author Major */ -public final class FifthPlayerActionEventDecoder extends EventDecoder { +public final class FifthPlayerActionMessageDecoder extends MessageDecoder { @Override - public FifthPlayerActionEvent decode(GamePacket packet) { + public FifthPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FifthPlayerActionEvent(index); + return new FifthPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FirstItemActionEventDecoder.java b/src/org/apollo/net/release/r377/FirstItemActionMessageDecoder.java similarity index 57% rename from src/org/apollo/net/release/r377/FirstItemActionEventDecoder.java rename to src/org/apollo/net/release/r377/FirstItemActionMessageDecoder.java index 7ac4cf4d..faace640 100644 --- a/src/org/apollo/net/release/r377/FirstItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FirstItemActionMessageDecoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FirstItemActionEvent; +import org.apollo.game.message.impl.FirstItemActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstItemActionEvent}. + * A {@link MessageDecoder} for the {@link FirstItemActionMessage}. * * @author Graham */ -public final class FirstItemActionEventDecoder extends EventDecoder { +public final class FirstItemActionMessageDecoder extends MessageDecoder { @Override - public FirstItemActionEvent decode(GamePacket packet) { + public FirstItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); int slot = (int) reader.getUnsigned(DataType.SHORT); - return new FirstItemActionEvent(interfaceId, id, slot); + return new FirstItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FirstItemOptionEventDecoder.java b/src/org/apollo/net/release/r377/FirstItemOptionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r377/FirstItemOptionEventDecoder.java rename to src/org/apollo/net/release/r377/FirstItemOptionMessageDecoder.java index 9c7c6548..c9aace72 100644 --- a/src/org/apollo/net/release/r377/FirstItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FirstItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FirstItemOptionEvent; +import org.apollo.game.message.impl.FirstItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FirstItemOptionMessage}. * * @author Chris Fletcher */ -final class FirstItemOptionEventDecoder extends EventDecoder { +final class FirstItemOptionMessageDecoder extends MessageDecoder { @Override - public FirstItemOptionEvent decode(GamePacket packet) { + public FirstItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstItemOptionEvent(interfaceId, id, slot); + return new FirstItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FirstNpcActionEventDecoder.java b/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java similarity index 52% rename from src/org/apollo/net/release/r377/FirstNpcActionEventDecoder.java rename to src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java index 81b9e8d6..c2842fc1 100644 --- a/src/org/apollo/net/release/r377/FirstNpcActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FirstNpcActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FirstNpcActionEvent; +import org.apollo.game.message.impl.FirstNpcActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * The {@link EventDecoder} for the {@link FirstNpcActionEvent}. + * The {@link MessageDecoder} for the {@link FirstNpcActionMessage}. * * @author Major */ -public final class FirstNpcActionEventDecoder extends EventDecoder { +public final class FirstNpcActionMessageDecoder extends MessageDecoder { @Override - public FirstNpcActionEvent decode(GamePacket packet) { + public FirstNpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new FirstNpcActionEvent(index); + return new FirstNpcActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FirstObjectActionEventDecoder.java b/src/org/apollo/net/release/r377/FirstObjectActionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r377/FirstObjectActionEventDecoder.java rename to src/org/apollo/net/release/r377/FirstObjectActionMessageDecoder.java index c56599c9..8c34b0d6 100644 --- a/src/org/apollo/net/release/r377/FirstObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FirstObjectActionMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FirstObjectActionEvent; +import org.apollo.game.message.impl.FirstObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstObjectActionEvent}. + * A {@link MessageDecoder} for the {@link FirstObjectActionMessage}. * * @author Graham */ -public final class FirstObjectActionEventDecoder extends EventDecoder { +public final class FirstObjectActionMessageDecoder extends MessageDecoder { @Override - public FirstObjectActionEvent decode(GamePacket packet) { + public FirstObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int x = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FirstObjectActionEvent(id, new Position(x, y)); + return new FirstObjectActionMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ThirdNpcActionEventDecoder.java b/src/org/apollo/net/release/r377/FirstPlayerActionMessageDecoder.java similarity index 55% rename from src/org/apollo/net/release/r377/ThirdNpcActionEventDecoder.java rename to src/org/apollo/net/release/r377/FirstPlayerActionMessageDecoder.java index 2cd89941..189b6c29 100644 --- a/src/org/apollo/net/release/r377/ThirdNpcActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FirstPlayerActionMessageDecoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ThirdNpcActionEvent; +import org.apollo.game.message.impl.FirstPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * The {@link EventDecoder} for the {@link ThirdNpcActionEvent}. + * A {@link MessageDecoder} for the {@link FirstPlayerActionMessage}. * * @author Major */ -public final class ThirdNpcActionEventDecoder extends EventDecoder { +public final class FirstPlayerActionMessageDecoder extends MessageDecoder { @Override - public ThirdNpcActionEvent decode(GamePacket packet) { + public FirstPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdNpcActionEvent(index); + return new FirstPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FocusUpdateEventDecoder.java b/src/org/apollo/net/release/r377/FocusUpdateEventDecoder.java deleted file mode 100644 index fe77bd3a..00000000 --- a/src/org/apollo/net/release/r377/FocusUpdateEventDecoder.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.FocusUpdateEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link FocusUpdateEvent}. - * - * @author Major - */ -public final class FocusUpdateEventDecoder extends EventDecoder { - - @Override - public FocusUpdateEvent decode(GamePacket packet) { - GamePacketReader decoder = new GamePacketReader(packet); - return new FocusUpdateEvent(decoder.getUnsigned(DataType.BYTE) == 1); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FocusUpdateMessageDecoder.java b/src/org/apollo/net/release/r377/FocusUpdateMessageDecoder.java new file mode 100644 index 00000000..34bacde5 --- /dev/null +++ b/src/org/apollo/net/release/r377/FocusUpdateMessageDecoder.java @@ -0,0 +1,22 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.FocusUpdateMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketReader; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link FocusUpdateMessage}. + * + * @author Major + */ +public final class FocusUpdateMessageDecoder extends MessageDecoder { + + @Override + public FocusUpdateMessage decode(GamePacket packet) { + GamePacketReader decoder = new GamePacketReader(packet); + return new FocusUpdateMessage(decoder.getUnsigned(DataType.BYTE) == 1); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ForwardPrivateMessageEventEncoder.java b/src/org/apollo/net/release/r377/ForwardPrivateChatMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r377/ForwardPrivateMessageEventEncoder.java rename to src/org/apollo/net/release/r377/ForwardPrivateChatMessageEncoder.java index 3add324d..a0ebf98c 100644 --- a/src/org/apollo/net/release/r377/ForwardPrivateMessageEventEncoder.java +++ b/src/org/apollo/net/release/r377/ForwardPrivateChatMessageEncoder.java @@ -2,20 +2,20 @@ package org.apollo.net.release.r377; import java.util.concurrent.atomic.AtomicInteger; -import org.apollo.game.event.impl.ForwardPrivateMessageEvent; +import org.apollo.game.message.impl.ForwardPrivateChatMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; import org.apollo.util.NameUtil; /** - * An {@link EventEncoder} for the {@link ForwardPrivateMessageEvent}. + * A {@link MessageEncoder} for the {@link ForwardPrivateChatMessage}. * * @author Major */ -public final class ForwardPrivateMessageEventEncoder extends EventEncoder { +public final class ForwardPrivateChatMessageEncoder extends MessageEncoder { /** * The amount of messages sent globally, offset by a random variable x, {@code 0 <= x < 100,000,000}. @@ -23,13 +23,13 @@ public final class ForwardPrivateMessageEventEncoder extends EventEncoder { +public final class FourthItemActionMessageDecoder extends MessageDecoder { @Override - public FourthItemActionEvent decode(GamePacket packet) { + public FourthItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT); - return new FourthItemActionEvent(interfaceId, id, slot); + return new FourthItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FourthItemOptionEventDecoder.java b/src/org/apollo/net/release/r377/FourthItemOptionMessageDecoder.java similarity index 60% rename from src/org/apollo/net/release/r377/FourthItemOptionEventDecoder.java rename to src/org/apollo/net/release/r377/FourthItemOptionMessageDecoder.java index 16e6d927..c837a237 100644 --- a/src/org/apollo/net/release/r377/FourthItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FourthItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FourthItemOptionEvent; +import org.apollo.game.message.impl.FourthItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FourthItemOptionEvent}. + * A {@link MessageDecoder} for the {@link FourthItemOptionMessage}. * * @author Chris Fletcher */ -final class FourthItemOptionEventDecoder extends EventDecoder { +final class FourthItemOptionMessageDecoder extends MessageDecoder { @Override - public FourthItemOptionEvent decode(GamePacket packet) { + public FourthItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new FourthItemOptionEvent(interfaceId, id, slot); + return new FourthItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SecondNpcActionEventDecoder.java b/src/org/apollo/net/release/r377/FourthPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r377/SecondNpcActionEventDecoder.java rename to src/org/apollo/net/release/r377/FourthPlayerActionMessageDecoder.java index 2288fe43..850c1a38 100644 --- a/src/org/apollo/net/release/r377/SecondNpcActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/FourthPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SecondNpcActionEvent; +import org.apollo.game.message.impl.FourthPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * The {@link EventDecoder} for the {@link SecondNpcActionEvent}. + * A {@link MessageDecoder} for the {@link FourthPlayerActionMessage}. * * @author Major */ -public final class SecondNpcActionEventDecoder extends EventDecoder { +public final class FourthPlayerActionMessageDecoder extends MessageDecoder { @Override - public SecondNpcActionEvent decode(GamePacket packet) { + public FourthPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondNpcActionEvent(index); + return new FourthPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FriendServerStatusEventEncoder.java b/src/org/apollo/net/release/r377/FriendServerStatusEventEncoder.java deleted file mode 100644 index 2afcf6f5..00000000 --- a/src/org/apollo/net/release/r377/FriendServerStatusEventEncoder.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.FriendServerStatusEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link FriendServerStatusEvent}. - * - * @author Major - */ -public final class FriendServerStatusEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(FriendServerStatusEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(251); - builder.put(DataType.BYTE, event.getStatusCode()); - return builder.toGamePacket(); - } -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FriendServerStatusMessageEncoder.java b/src/org/apollo/net/release/r377/FriendServerStatusMessageEncoder.java new file mode 100644 index 00000000..01bccf59 --- /dev/null +++ b/src/org/apollo/net/release/r377/FriendServerStatusMessageEncoder.java @@ -0,0 +1,22 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.FriendServerStatusMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link FriendServerStatusMessage}. + * + * @author Major + */ +public final class FriendServerStatusMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(FriendServerStatusMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(251); + builder.put(DataType.BYTE, message.getStatusCode()); + return builder.toGamePacket(); + } +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/IdAssignmentEventEncoder.java b/src/org/apollo/net/release/r377/IdAssignmentEventEncoder.java deleted file mode 100644 index 316ab341..00000000 --- a/src/org/apollo/net/release/r377/IdAssignmentEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.IdAssignmentEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link IdAssignmentEvent}. - * - * @author Graham - */ -public final class IdAssignmentEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(IdAssignmentEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(126); - builder.put(DataType.BYTE, event.isMembers() ? 1 : 0); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/IdAssignmentMessageEncoder.java b/src/org/apollo/net/release/r377/IdAssignmentMessageEncoder.java new file mode 100644 index 00000000..b399e4e7 --- /dev/null +++ b/src/org/apollo/net/release/r377/IdAssignmentMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.IdAssignmentMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link IdAssignmentMessage}. + * + * @author Graham + */ +public final class IdAssignmentMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(IdAssignmentMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(126); + builder.put(DataType.BYTE, message.isMembers() ? 1 : 0); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/IgnoreListEventEncoder.java b/src/org/apollo/net/release/r377/IgnoreListMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r377/IgnoreListEventEncoder.java rename to src/org/apollo/net/release/r377/IgnoreListMessageEncoder.java index 2eb289e6..a31219af 100644 --- a/src/org/apollo/net/release/r377/IgnoreListEventEncoder.java +++ b/src/org/apollo/net/release/r377/IgnoreListMessageEncoder.java @@ -2,25 +2,25 @@ package org.apollo.net.release.r377; import java.util.List; -import org.apollo.game.event.impl.IgnoreListEvent; +import org.apollo.game.message.impl.IgnoreListMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; import org.apollo.util.NameUtil; /** - * An {@link EventEncoder} for the {@link IgnoreListEvent}. + * A {@link MessageEncoder} for the {@link IgnoreListMessage}. * * @author Major */ -public final class IgnoreListEventEncoder extends EventEncoder { +public final class IgnoreListMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(IgnoreListEvent event) { + public GamePacket encode(IgnoreListMessage message) { GamePacketBuilder builder = new GamePacketBuilder(226); - List usernames = event.getUsernames(); + List usernames = message.getUsernames(); for (String username : usernames) { builder.put(DataType.LONG, NameUtil.encodeBase37(username)); } diff --git a/src/org/apollo/net/release/r377/ItemOnItemEventDecoder.java b/src/org/apollo/net/release/r377/ItemOnItemMessageDecoder.java similarity index 68% rename from src/org/apollo/net/release/r377/ItemOnItemEventDecoder.java rename to src/org/apollo/net/release/r377/ItemOnItemMessageDecoder.java index 9d457a82..74ce09ae 100644 --- a/src/org/apollo/net/release/r377/ItemOnItemEventDecoder.java +++ b/src/org/apollo/net/release/r377/ItemOnItemMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ItemOnItemEvent; +import org.apollo.game.message.impl.ItemOnItemMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ItemOnItemEventDecoder}. + * A {@link MessageDecoder} for the {@link ItemOnItemMessageDecoder}. * * @author Chris Fletcher */ -final class ItemOnItemEventDecoder extends EventDecoder { +final class ItemOnItemMessageDecoder extends MessageDecoder { @Override - public ItemOnItemEvent decode(GamePacket packet) { + public ItemOnItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int targetId = (int) reader.getUnsigned(DataType.SHORT); @@ -28,7 +28,7 @@ final class ItemOnItemEventDecoder extends EventDecoder { int targetSlot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int usedInterface = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new ItemOnItemEvent(usedInterface, usedId, usedSlot, targetInterface, targetId, targetSlot); + return new ItemOnItemMessage(usedInterface, usedId, usedSlot, targetInterface, targetId, targetSlot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ItemOnObjectEventDecoder.java b/src/org/apollo/net/release/r377/ItemOnObjectMessageDecoder.java similarity index 67% rename from src/org/apollo/net/release/r377/ItemOnObjectEventDecoder.java rename to src/org/apollo/net/release/r377/ItemOnObjectMessageDecoder.java index e831d7c4..edc02a42 100644 --- a/src/org/apollo/net/release/r377/ItemOnObjectEventDecoder.java +++ b/src/org/apollo/net/release/r377/ItemOnObjectMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ItemOnObjectEvent; +import org.apollo.game.message.impl.ItemOnObjectMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ItemOnObjectEvent}. + * A {@link MessageDecoder} for the {@link ItemOnObjectMessage}. * * @author Major */ -public final class ItemOnObjectEventDecoder extends EventDecoder { +public final class ItemOnObjectMessageDecoder extends MessageDecoder { @Override - public ItemOnObjectEvent decode(GamePacket packet) { + public ItemOnObjectMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int objectId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); @@ -26,7 +26,7 @@ public final class ItemOnObjectEventDecoder extends EventDecoder { - - @Override - public KeepAliveEvent decode(GamePacket packet) { - return new KeepAliveEvent(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/KeepAliveMessageDecoder.java b/src/org/apollo/net/release/r377/KeepAliveMessageDecoder.java new file mode 100644 index 00000000..65028c12 --- /dev/null +++ b/src/org/apollo/net/release/r377/KeepAliveMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.KeepAliveMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link KeepAliveMessage}. + * + * @author Graham + */ +public final class KeepAliveMessageDecoder extends MessageDecoder { + + @Override + public KeepAliveMessage decode(GamePacket packet) { + return new KeepAliveMessage(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/LogoutEventEncoder.java b/src/org/apollo/net/release/r377/LogoutEventEncoder.java deleted file mode 100644 index 579c55f7..00000000 --- a/src/org/apollo/net/release/r377/LogoutEventEncoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.LogoutEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link LogoutEvent}. - * - * @author Graham - */ -public final class LogoutEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(LogoutEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(5); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/LogoutMessageEncoder.java b/src/org/apollo/net/release/r377/LogoutMessageEncoder.java new file mode 100644 index 00000000..4c4e3fc1 --- /dev/null +++ b/src/org/apollo/net/release/r377/LogoutMessageEncoder.java @@ -0,0 +1,21 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.LogoutMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link LogoutMessage}. + * + * @author Graham + */ +public final class LogoutMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(LogoutMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(5); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/MagicOnItemEventDecoder.java b/src/org/apollo/net/release/r377/MagicOnItemMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r377/MagicOnItemEventDecoder.java rename to src/org/apollo/net/release/r377/MagicOnItemMessageDecoder.java index a1fd2519..44dd7927 100644 --- a/src/org/apollo/net/release/r377/MagicOnItemEventDecoder.java +++ b/src/org/apollo/net/release/r377/MagicOnItemMessageDecoder.java @@ -1,21 +1,21 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.MagicOnItemEvent; +import org.apollo.game.message.impl.MagicOnItemMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link MagicOnItemEvent}. + * A {@link MessageDecoder} for the {@link MagicOnItemMessage}. * * @author Chris Fletcher */ -final class MagicOnItemEventDecoder extends EventDecoder { +final class MagicOnItemMessageDecoder extends MessageDecoder { @Override - public MagicOnItemEvent decode(GamePacket packet) { + public MagicOnItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int spell = (int) reader.getUnsigned(DataType.SHORT); @@ -23,7 +23,7 @@ final class MagicOnItemEventDecoder extends EventDecoder { int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new MagicOnItemEvent(interfaceId, id, slot, spell); + return new MagicOnItemMessage(interfaceId, id, slot, spell); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/MobAnimationResetEventEncoder.java b/src/org/apollo/net/release/r377/MobAnimationResetEventEncoder.java index 8bc4d517..21ec2084 100644 --- a/src/org/apollo/net/release/r377/MobAnimationResetEventEncoder.java +++ b/src/org/apollo/net/release/r377/MobAnimationResetEventEncoder.java @@ -1,19 +1,19 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.MobAnimationResetEvent; +import org.apollo.game.message.impl.MobAnimationResetMessage; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link MobAnimationResetEvent}. + * A {@link MessageEncoder} for the {@link MobAnimationResetMessage}. * * @author Major */ -public final class MobAnimationResetEventEncoder extends EventEncoder { +public final class MobAnimationResetEventEncoder extends MessageEncoder { @Override - public GamePacket encode(MobAnimationResetEvent event) { + public GamePacket encode(MobAnimationResetMessage message) { return new GamePacketBuilder(13).toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/MouseClickEventDecoder.java b/src/org/apollo/net/release/r377/MouseClickMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r377/MouseClickEventDecoder.java rename to src/org/apollo/net/release/r377/MouseClickMessageDecoder.java index 9689f0ff..eb1af678 100644 --- a/src/org/apollo/net/release/r377/MouseClickEventDecoder.java +++ b/src/org/apollo/net/release/r377/MouseClickMessageDecoder.java @@ -1,20 +1,20 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.MouseClickEvent; +import org.apollo.game.message.impl.MouseClickMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link MouseClickEvent}. + * A {@link MessageDecoder} for the {@link MouseClickMessage}. * * @author Major */ -public final class MouseClickEventDecoder extends EventDecoder { +public final class MouseClickMessageDecoder extends MessageDecoder { @Override - public MouseClickEvent decode(GamePacket packet) { + public MouseClickMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int read, clickCount, x, y; @@ -23,7 +23,7 @@ public final class MouseClickEventDecoder extends EventDecoder clickCount = (read >> 12); x = (read >> 6) & 0x3f; y = read & 0x3f; - return new MouseClickEvent(clickCount, x, y, true); + return new MouseClickMessage(clickCount, x, y, true); } else if (reader.getLength() == 3) { read = (int) reader.getUnsigned(DataType.TRI_BYTE) & ~0x800000; } else { @@ -32,7 +32,7 @@ public final class MouseClickEventDecoder extends EventDecoder clickCount = (read >> 19); x = (read & 0x7f) % 765; y = (read & 0x7f) / 765; - return new MouseClickEvent(clickCount, x, y, false); + return new MouseClickMessage(clickCount, x, y, false); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/NpcSynchronizationEventEncoder.java b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java similarity index 91% rename from src/org/apollo/net/release/r377/NpcSynchronizationEventEncoder.java rename to src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java index 9b3414a0..4392d691 100644 --- a/src/org/apollo/net/release/r377/NpcSynchronizationEventEncoder.java +++ b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.NpcSynchronizationEvent; +import org.apollo.game.message.impl.NpcSynchronizationMessage; import org.apollo.game.model.Animation; import org.apollo.game.model.Direction; import org.apollo.game.model.Graphic; @@ -24,32 +24,32 @@ import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link NpcSynchronizationEvent}. + * A {@link MessageEncoder} for the {@link NpcSynchronizationMessage}. * * @author Major */ -public final class NpcSynchronizationEventEncoder extends EventEncoder { +public final class NpcSynchronizationMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(NpcSynchronizationEvent event) { + public GamePacket encode(NpcSynchronizationMessage message) { GamePacketBuilder builder = new GamePacketBuilder(71, PacketType.VARIABLE_SHORT); builder.switchToBitAccess(); GamePacketBuilder blockBuilder = new GamePacketBuilder(); - builder.putBits(8, event.getLocalNpcCount()); + builder.putBits(8, message.getLocalNpcCount()); - for (SynchronizationSegment segment : event.getSegments()) { + for (SynchronizationSegment segment : message.getSegments()) { SegmentType type = segment.getType(); if (type == SegmentType.REMOVE_MOB) { putRemoveNpcUpdate(builder); } else if (type == SegmentType.ADD_MOB) { - putAddNpcUpdate((AddNpcSegment) segment, event, builder); + putAddNpcUpdate((AddNpcSegment) segment, message, builder); putBlocks(segment, blockBuilder); } else { - putMovementUpdate(segment, event, builder); + putMovementUpdate(segment, message, builder); putBlocks(segment, blockBuilder); } } @@ -69,12 +69,12 @@ public final class NpcSynchronizationEventEncoder extends EventEncoder 0; - Position npc = event.getPosition(); + Position npc = message.getPosition(); Position other = seg.getPosition(); builder.putBits(14, seg.getIndex()); builder.putBits(1, updateRequired ? 1 : 0); @@ -224,10 +224,10 @@ public final class NpcSynchronizationEventEncoder extends EventEncoder 0; if (seg.getType() == SegmentType.RUN) { Direction[] directions = ((MovementSegment) seg).getDirections(); diff --git a/src/org/apollo/net/release/r377/OpenDialogueInterfaceEventEncoder.java b/src/org/apollo/net/release/r377/OpenDialogueInterfaceEventEncoder.java deleted file mode 100644 index 9ac686a8..00000000 --- a/src/org/apollo/net/release/r377/OpenDialogueInterfaceEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.OpenDialogueInterfaceEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link OpenDialogueInterfaceEvent}. - * - * @author Chris Fletcher - */ -public final class OpenDialogueInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(OpenDialogueInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(109); - builder.put(DataType.SHORT, event.getInterfaceId()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/OpenDialogueInterfaceMessageEncoder.java b/src/org/apollo/net/release/r377/OpenDialogueInterfaceMessageEncoder.java new file mode 100644 index 00000000..dd593d88 --- /dev/null +++ b/src/org/apollo/net/release/r377/OpenDialogueInterfaceMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.OpenDialogueInterfaceMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link OpenDialogueInterfaceMessage}. + * + * @author Chris Fletcher + */ +public final class OpenDialogueInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenDialogueInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(109); + builder.put(DataType.SHORT, message.getInterfaceId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/OpenInterfaceEventEncoder.java b/src/org/apollo/net/release/r377/OpenInterfaceMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r377/OpenInterfaceEventEncoder.java rename to src/org/apollo/net/release/r377/OpenInterfaceMessageEncoder.java index 6d7611bd..b7c167be 100644 --- a/src/org/apollo/net/release/r377/OpenInterfaceEventEncoder.java +++ b/src/org/apollo/net/release/r377/OpenInterfaceMessageEncoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.OpenInterfaceEvent; +import org.apollo.game.message.impl.OpenInterfaceMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link OpenInterfaceEvent}. + * A {@link MessageEncoder} for the {@link OpenInterfaceMessage}. * * @author Graham */ -public final class OpenInterfaceEventEncoder extends EventEncoder { +public final class OpenInterfaceMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(OpenInterfaceEvent event) { + public GamePacket encode(OpenInterfaceMessage message) { GamePacketBuilder builder = new GamePacketBuilder(159); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/OpenInterfaceSidebarEventEncoder.java b/src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java similarity index 50% rename from src/org/apollo/net/release/r377/OpenInterfaceSidebarEventEncoder.java rename to src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java index 6f3277ba..543c509a 100644 --- a/src/org/apollo/net/release/r377/OpenInterfaceSidebarEventEncoder.java +++ b/src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.OpenInterfaceSidebarEvent; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link OpenInterfaceSidebarEvent}. + * A {@link MessageEncoder} for the {@link OpenInterfaceSidebarMessage}. * * @author Graham */ -public final class OpenInterfaceSidebarEventEncoder extends EventEncoder { +public final class OpenInterfaceSidebarMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(OpenInterfaceSidebarEvent event) { + public GamePacket encode(OpenInterfaceSidebarMessage message) { GamePacketBuilder builder = new GamePacketBuilder(128); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getInterfaceId()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getSidebarId()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getSidebarId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java b/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java similarity index 67% rename from src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java rename to src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java index 052bb904..0572398e 100644 --- a/src/org/apollo/net/release/r377/PlayerDesignEventDecoder.java +++ b/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.PlayerDesignEvent; +import org.apollo.game.message.impl.PlayerDesignMessage; import org.apollo.game.model.Appearance; import org.apollo.game.model.setting.Gender; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link PlayerDesignEvent}. + * A {@link MessageDecoder} for the {@link PlayerDesignMessage}. * * @author Graham */ -public final class PlayerDesignEventDecoder extends EventDecoder { +public final class PlayerDesignMessageDecoder extends MessageDecoder { @Override - public PlayerDesignEvent decode(GamePacket packet) { + public PlayerDesignMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int genderIntValue = (int) reader.getUnsigned(DataType.BYTE); @@ -33,7 +33,7 @@ public final class PlayerDesignEventDecoder extends EventDecoder { +public final class PlayerSynchronizationMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(PlayerSynchronizationEvent event) { + public GamePacket encode(PlayerSynchronizationMessage message) { GamePacketBuilder builder = new GamePacketBuilder(90, PacketType.VARIABLE_SHORT); builder.switchToBitAccess(); GamePacketBuilder blockBuilder = new GamePacketBuilder(); - putMovementUpdate(event.getSegment(), event, builder); - putBlocks(event.getSegment(), blockBuilder); + putMovementUpdate(message.getSegment(), message, builder); + putBlocks(message.getSegment(), blockBuilder); - builder.putBits(8, event.getLocalPlayers()); + builder.putBits(8, message.getLocalPlayers()); - for (SynchronizationSegment segment : event.getSegments()) { + for (SynchronizationSegment segment : message.getSegments()) { SegmentType type = segment.getType(); if (type == SegmentType.REMOVE_MOB) { putRemovePlayerUpdate(builder); } else if (type == SegmentType.ADD_MOB) { - putAddPlayerUpdate((AddPlayerSegment) segment, event, builder); + putAddPlayerUpdate((AddPlayerSegment) segment, message, builder); putBlocks(segment, blockBuilder); } else { - putMovementUpdate(segment, event, builder); + putMovementUpdate(segment, message, builder); putBlocks(segment, blockBuilder); } } @@ -83,12 +83,12 @@ public final class PlayerSynchronizationEventEncoder extends EventEncoder 0; - Position player = event.getPosition(); + Position player = message.getPosition(); Position other = seg.getPosition(); builder.putBits(11, seg.getIndex()); builder.putBits(5, other.getX() - player.getX()); @@ -386,20 +386,20 @@ public final class PlayerSynchronizationEventEncoder extends EventEncoder 0; if (seg.getType() == SegmentType.TELEPORT) { Position pos = ((TeleportSegment) seg).getDestination(); builder.putBits(1, 1); builder.putBits(2, 3); - builder.putBits(1, event.hasRegionChanged() ? 0 : 1); + builder.putBits(1, message.hasRegionChanged() ? 0 : 1); builder.putBits(2, pos.getHeight()); - builder.putBits(7, pos.getLocalY(event.getLastKnownRegion())); - builder.putBits(7, pos.getLocalX(event.getLastKnownRegion())); + builder.putBits(7, pos.getLocalY(message.getLastKnownRegion())); + builder.putBits(7, pos.getLocalX(message.getLastKnownRegion())); builder.putBits(1, updateRequired ? 1 : 0); } else if (seg.getType() == SegmentType.RUN) { Direction[] directions = ((MovementSegment) seg).getDirections(); diff --git a/src/org/apollo/net/release/r377/PositionEventEncoder.java b/src/org/apollo/net/release/r377/PositionMessageEncoder.java similarity index 61% rename from src/org/apollo/net/release/r377/PositionEventEncoder.java rename to src/org/apollo/net/release/r377/PositionMessageEncoder.java index f1e9b03f..23926a20 100644 --- a/src/org/apollo/net/release/r377/PositionEventEncoder.java +++ b/src/org/apollo/net/release/r377/PositionMessageEncoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.PositionEvent; +import org.apollo.game.message.impl.PositionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link PositionEvent}. + * A {@link MessageEncoder} for the {@link PositionMessage}. * * @author Chris Fletcher * @author Major */ -public final class PositionEventEncoder extends EventEncoder { +public final class PositionMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(PositionEvent event) { + public GamePacket encode(PositionMessage message) { GamePacketBuilder builder = new GamePacketBuilder(75); - Position base = event.getBase(), pos = event.getPosition(); + Position base = message.getBase(), pos = message.getPosition(); builder.put(DataType.BYTE, DataTransformation.NEGATE, pos.getLocalX(base)); builder.put(DataType.BYTE, DataTransformation.ADD, pos.getLocalY(base)); diff --git a/src/org/apollo/net/release/r377/PrivacyOptionEventEncoder.java b/src/org/apollo/net/release/r377/PrivacyOptionEventEncoder.java deleted file mode 100644 index c6534dca..00000000 --- a/src/org/apollo/net/release/r377/PrivacyOptionEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.PrivacyOptionEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link PrivacyOptionEvent}. - * - * @author Major - */ -public final class PrivacyOptionEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(final PrivacyOptionEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(201); - - builder.put(DataType.BYTE, event.getChatPrivacy().ordinal()); - builder.put(DataType.BYTE, event.getFriendPrivacy().ordinal()); - builder.put(DataType.BYTE, event.getTradePrivacy().ordinal()); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/PrivacyOptionEventDecoder.java b/src/org/apollo/net/release/r377/PrivacyOptionMessageDecoder.java similarity index 54% rename from src/org/apollo/net/release/r377/PrivacyOptionEventDecoder.java rename to src/org/apollo/net/release/r377/PrivacyOptionMessageDecoder.java index a423d0c5..a2b55664 100644 --- a/src/org/apollo/net/release/r377/PrivacyOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/PrivacyOptionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.PrivacyOptionEvent; +import org.apollo.game.message.impl.PrivacyOptionMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link PrivacyOptionEvent}. + * A {@link MessageDecoder} for the {@link PrivacyOptionMessage}. * * @author Major */ -public final class PrivacyOptionEventDecoder extends EventDecoder { +public final class PrivacyOptionMessageDecoder extends MessageDecoder { @Override - public PrivacyOptionEvent decode(GamePacket packet) { + public PrivacyOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int publicChatState = (int) reader.getUnsigned(DataType.BYTE); int privateChatState = (int) reader.getUnsigned(DataType.BYTE); int tradeChatState = (int) reader.getUnsigned(DataType.BYTE); - return new PrivacyOptionEvent(publicChatState, privateChatState, tradeChatState); + return new PrivacyOptionMessage(publicChatState, privateChatState, tradeChatState); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/PrivacyOptionMessageEncoder.java b/src/org/apollo/net/release/r377/PrivacyOptionMessageEncoder.java new file mode 100644 index 00000000..d5ac16b8 --- /dev/null +++ b/src/org/apollo/net/release/r377/PrivacyOptionMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.PrivacyOptionMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link PrivacyOptionMessage}. + * + * @author Major + */ +public final class PrivacyOptionMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(final PrivacyOptionMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(201); + + builder.put(DataType.BYTE, message.getChatPrivacy().ordinal()); + builder.put(DataType.BYTE, message.getFriendPrivacy().ordinal()); + builder.put(DataType.BYTE, message.getTradePrivacy().ordinal()); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/PrivateMessageEventDecoder.java b/src/org/apollo/net/release/r377/PrivateMessageMessageDecoder.java similarity index 66% rename from src/org/apollo/net/release/r377/PrivateMessageEventDecoder.java rename to src/org/apollo/net/release/r377/PrivateMessageMessageDecoder.java index 95269e83..a39bde32 100644 --- a/src/org/apollo/net/release/r377/PrivateMessageEventDecoder.java +++ b/src/org/apollo/net/release/r377/PrivateMessageMessageDecoder.java @@ -1,22 +1,22 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.PrivateMessageEvent; +import org.apollo.game.message.impl.PrivateMessageMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; import org.apollo.util.TextUtil; /** - * An {@link EventDecoder} for the {@link PrivateMessageEvent}. + * A {@link MessageDecoder} for the {@link PrivateMessageMessage}. * * @author Major */ -public final class PrivateMessageEventDecoder extends EventDecoder { +public final class PrivateMessageMessageDecoder extends MessageDecoder { @Override - public PrivateMessageEvent decode(GamePacket packet) { + public PrivateMessageMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); @@ -32,7 +32,7 @@ public final class PrivateMessageEventDecoder extends EventDecoder { +public final class RegionChangeMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(RegionChangeEvent event) { + public GamePacket encode(RegionChangeMessage message) { GamePacketBuilder builder = new GamePacketBuilder(222); - builder.put(DataType.SHORT, event.getPosition().getCentralSectorY()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getPosition().getCentralSectorX()); + builder.put(DataType.SHORT, message.getPosition().getCentralSectorY()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getPosition().getCentralSectorX()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/Release377.java b/src/org/apollo/net/release/r377/Release377.java index a10bd3b8..14067014 100644 --- a/src/org/apollo/net/release/r377/Release377.java +++ b/src/org/apollo/net/release/r377/Release377.java @@ -1,43 +1,43 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.AddGlobalTileItemEvent; -import org.apollo.game.event.impl.AddTileItemEvent; -import org.apollo.game.event.impl.CloseInterfaceEvent; -import org.apollo.game.event.impl.ConfigEvent; -import org.apollo.game.event.impl.DisplayCrossbonesEvent; -import org.apollo.game.event.impl.DisplayTabInterfaceEvent; -import org.apollo.game.event.impl.EnterAmountEvent; -import org.apollo.game.event.impl.ForwardPrivateMessageEvent; -import org.apollo.game.event.impl.FriendServerStatusEvent; -import org.apollo.game.event.impl.IdAssignmentEvent; -import org.apollo.game.event.impl.IgnoreListEvent; -import org.apollo.game.event.impl.LogoutEvent; -import org.apollo.game.event.impl.NpcSynchronizationEvent; -import org.apollo.game.event.impl.OpenDialogueInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceEvent; -import org.apollo.game.event.impl.OpenInterfaceSidebarEvent; -import org.apollo.game.event.impl.PlayerSynchronizationEvent; -import org.apollo.game.event.impl.PositionEvent; -import org.apollo.game.event.impl.PrivacyOptionEvent; -import org.apollo.game.event.impl.RegionChangeEvent; -import org.apollo.game.event.impl.RemoveTileItemEvent; -import org.apollo.game.event.impl.SendFriendEvent; -import org.apollo.game.event.impl.SendObjectEvent; -import org.apollo.game.event.impl.ServerMessageEvent; -import org.apollo.game.event.impl.SetPlayerActionEvent; -import org.apollo.game.event.impl.SetWidgetItemModelEvent; -import org.apollo.game.event.impl.SetWidgetModelAnimationEvent; -import org.apollo.game.event.impl.SetWidgetNpcModelEvent; -import org.apollo.game.event.impl.SetWidgetPlayerModelEvent; -import org.apollo.game.event.impl.SetWidgetTextEvent; -import org.apollo.game.event.impl.SetWidgetVisibilityEvent; -import org.apollo.game.event.impl.SwitchTabInterfaceEvent; -import org.apollo.game.event.impl.UpdateItemsEvent; -import org.apollo.game.event.impl.UpdateRunEnergyEvent; -import org.apollo.game.event.impl.UpdateSkillEvent; -import org.apollo.game.event.impl.UpdateSlottedItemsEvent; -import org.apollo.game.event.impl.UpdateTileItemEvent; -import org.apollo.game.event.impl.UpdateWeightEvent; +import org.apollo.game.message.impl.AddGlobalTileItemMessage; +import org.apollo.game.message.impl.AddTileItemMessage; +import org.apollo.game.message.impl.CloseInterfaceMessage; +import org.apollo.game.message.impl.ConfigMessage; +import org.apollo.game.message.impl.DisplayCrossbonesMessage; +import org.apollo.game.message.impl.DisplayTabInterfaceMessage; +import org.apollo.game.message.impl.EnterAmountMessage; +import org.apollo.game.message.impl.ForwardPrivateChatMessage; +import org.apollo.game.message.impl.FriendServerStatusMessage; +import org.apollo.game.message.impl.IdAssignmentMessage; +import org.apollo.game.message.impl.IgnoreListMessage; +import org.apollo.game.message.impl.LogoutMessage; +import org.apollo.game.message.impl.NpcSynchronizationMessage; +import org.apollo.game.message.impl.OpenDialogueInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; +import org.apollo.game.message.impl.PlayerSynchronizationMessage; +import org.apollo.game.message.impl.PositionMessage; +import org.apollo.game.message.impl.PrivacyOptionMessage; +import org.apollo.game.message.impl.RegionChangeMessage; +import org.apollo.game.message.impl.RemoveTileItemMessage; +import org.apollo.game.message.impl.SendFriendMessage; +import org.apollo.game.message.impl.SendObjectMessage; +import org.apollo.game.message.impl.ServerChatMessage; +import org.apollo.game.message.impl.SetPlayerActionMessage; +import org.apollo.game.message.impl.SetWidgetItemModelMessage; +import org.apollo.game.message.impl.SetWidgetModelAnimationMessage; +import org.apollo.game.message.impl.SetWidgetNpcModelMessage; +import org.apollo.game.message.impl.SetWidgetPlayerModelMessage; +import org.apollo.game.message.impl.SetWidgetTextMessage; +import org.apollo.game.message.impl.SetWidgetVisibilityMessage; +import org.apollo.game.message.impl.SwitchTabInterfaceMessage; +import org.apollo.game.message.impl.UpdateItemsMessage; +import org.apollo.game.message.impl.UpdateRunEnergyMessage; +import org.apollo.game.message.impl.UpdateSkillMessage; +import org.apollo.game.message.impl.UpdateSlottedItemsMessage; +import org.apollo.game.message.impl.UpdateTileItemMessage; +import org.apollo.game.message.impl.UpdateWeightMessage; import org.apollo.net.meta.PacketMetaDataGroup; import org.apollo.net.release.Release; @@ -92,109 +92,109 @@ public final class Release377 extends Release { */ private void init() { // register decoders - WalkEventDecoder walkEventDecoder = new WalkEventDecoder(); - register(213, walkEventDecoder); - register(28, walkEventDecoder); - register(247, walkEventDecoder); + WalkMessageDecoder walkMessageDecoder = new WalkMessageDecoder(); + register(213, walkMessageDecoder); + register(28, walkMessageDecoder); + register(247, walkMessageDecoder); - register(248, new KeepAliveEventDecoder()); - register(163, new PlayerDesignEventDecoder()); - register(49, new ChatEventDecoder()); - register(56, new CommandEventDecoder()); - register(123, new SwitchItemEventDecoder()); + register(248, new KeepAliveMessageDecoder()); + register(163, new PlayerDesignMessageDecoder()); + register(49, new ChatMessageDecoder()); + register(56, new CommandMessageDecoder()); + register(123, new SwitchItemMessageDecoder()); - register(181, new FirstObjectActionEventDecoder()); - register(241, new SecondObjectActionEventDecoder()); - register(50, new ThirdObjectActionEventDecoder()); + register(181, new FirstObjectActionMessageDecoder()); + register(241, new SecondObjectActionMessageDecoder()); + register(50, new ThirdObjectActionMessageDecoder()); - register(203, new FirstItemOptionEventDecoder()); - register(24, new SecondItemOptionEventDecoder()); - register(161, new ThirdItemOptionEventDecoder()); - register(228, new FourthItemOptionEventDecoder()); - register(4, new FifthItemOptionEventDecoder()); + register(203, new FirstItemOptionMessageDecoder()); + register(24, new SecondItemOptionMessageDecoder()); + register(161, new ThirdItemOptionMessageDecoder()); + register(228, new FourthItemOptionMessageDecoder()); + register(4, new FifthItemOptionMessageDecoder()); - register(3, new FirstItemActionEventDecoder()); - register(177, new SecondItemActionEventDecoder()); - register(91, new ThirdItemActionEventDecoder()); - register(231, new FourthItemActionEventDecoder()); - register(158, new FifthItemActionEventDecoder()); + register(3, new FirstItemActionMessageDecoder()); + register(177, new SecondItemActionMessageDecoder()); + register(91, new ThirdItemActionMessageDecoder()); + register(231, new FourthItemActionMessageDecoder()); + register(158, new FifthItemActionMessageDecoder()); - register(79, new ButtonEventDecoder()); - register(110, new ClosedInterfaceEventDecoder()); - register(75, new EnteredAmountEventDecoder()); - register(226, new DialogueContinueEventDecoder()); + register(79, new ButtonMessageDecoder()); + register(110, new ClosedInterfaceMessageDecoder()); + register(75, new EnteredAmountMessageDecoder()); + register(226, new DialogueContinueMessageDecoder()); - register(1, new ItemOnItemEventDecoder()); - register(36, new MagicOnItemEventDecoder()); + register(1, new ItemOnItemMessageDecoder()); + register(36, new MagicOnItemMessageDecoder()); - register(187, new FocusUpdateEventDecoder()); - register(19, new MouseClickEventDecoder()); - register(140, new ArrowKeyEventDecoder()); - register(176, new PrivacyOptionEventDecoder()); + register(187, new FocusUpdateMessageDecoder()); + register(19, new MouseClickMessageDecoder()); + register(140, new ArrowKeyMessageDecoder()); + register(176, new PrivacyOptionMessageDecoder()); - SpamPacketEventDecoder spamEventDecoder = new SpamPacketEventDecoder(); - register(40, spamEventDecoder); - register(244, spamEventDecoder); + SpamPacketMessageDecoder spamMessageDecoder = new SpamPacketMessageDecoder(); + register(40, spamMessageDecoder); + register(244, spamMessageDecoder); - register(67, new FirstNpcActionEventDecoder()); - register(112, new SecondNpcActionEventDecoder()); - register(13, new ThirdNpcActionEventDecoder()); - register(71, new TakeTileItemEventDecoder()); - register(152, new ItemOnObjectEventDecoder()); + register(67, new FirstNpcActionMessageDecoder()); + register(112, new SecondNpcActionMessageDecoder()); + register(13, new ThirdNpcActionMessageDecoder()); + register(71, new TakeTileItemMessageDecoder()); + register(152, new ItemOnObjectMessageDecoder()); - register(245, new FirstPlayerActionEventDecoder()); - register(233, new SecondPlayerActionEventDecoder()); - register(194, new ThirdPlayerActionEventDecoder()); - register(116, new FourthPlayerActionEventDecoder()); - register(45, new FifthPlayerActionEventDecoder()); + register(245, new FirstPlayerActionMessageDecoder()); + register(233, new SecondPlayerActionMessageDecoder()); + register(194, new ThirdPlayerActionMessageDecoder()); + register(116, new FourthPlayerActionMessageDecoder()); + register(45, new FifthPlayerActionMessageDecoder()); - register(120, new AddFriendEventDecoder()); - register(217, new AddIgnoreEventDecoder()); - register(141, new RemoveFriendEventDecoder()); - register(160, new RemoveIgnoreEventDecoder()); - register(227, new PrivateMessageEventDecoder()); + register(120, new AddFriendMessageDecoder()); + register(217, new AddIgnoreMessageDecoder()); + register(141, new RemoveFriendMessageDecoder()); + register(160, new RemoveIgnoreMessageDecoder()); + register(227, new PrivateMessageMessageDecoder()); // register encoders - register(IdAssignmentEvent.class, new IdAssignmentEventEncoder()); - register(RegionChangeEvent.class, new RegionChangeEventEncoder()); - register(ServerMessageEvent.class, new ServerMessageEventEncoder()); - register(PlayerSynchronizationEvent.class, new PlayerSynchronizationEventEncoder()); - register(OpenInterfaceEvent.class, new OpenInterfaceEventEncoder()); - register(CloseInterfaceEvent.class, new CloseInterfaceEventEncoder()); - register(SwitchTabInterfaceEvent.class, new SwitchTabInterfaceEventEncoder()); - register(LogoutEvent.class, new LogoutEventEncoder()); - register(UpdateItemsEvent.class, new UpdateItemsEventEncoder()); - register(UpdateSlottedItemsEvent.class, new UpdateSlottedItemsEventEncoder()); - register(UpdateSkillEvent.class, new UpdateSkillEventEncoder()); - register(OpenInterfaceSidebarEvent.class, new OpenInterfaceSidebarEventEncoder()); - register(EnterAmountEvent.class, new EnterAmountEventEncoder()); - register(SetWidgetTextEvent.class, new SetWidgetTextEventEncoder()); - register(NpcSynchronizationEvent.class, new NpcSynchronizationEventEncoder()); - register(SetWidgetVisibilityEvent.class, new SetWidgetVisibilityEventEncoder()); - register(SetWidgetItemModelEvent.class, new SetWidgetItemModelEventEncoder()); - register(SetWidgetNpcModelEvent.class, new SetWidgetNpcModelEventEncoder()); - register(SetWidgetPlayerModelEvent.class, new SetWidgetPlayerModelEventEncoder()); - register(SetWidgetModelAnimationEvent.class, new SetWidgetModelAnimationEventEncoder()); - register(ConfigEvent.class, new ConfigEventEncoder()); - register(DisplayTabInterfaceEvent.class, new DisplayTabInterfaceEventEncoder()); - register(PositionEvent.class, new PositionEventEncoder()); - register(UpdateRunEnergyEvent.class, new UpdateRunEnergyEventEncoder()); - register(PrivacyOptionEvent.class, new PrivacyOptionEventEncoder()); - register(OpenDialogueInterfaceEvent.class, new OpenDialogueInterfaceEventEncoder()); - register(UpdateWeightEvent.class, new UpdateWeightEventEncoder()); - register(SetPlayerActionEvent.class, new SetPlayerActionEventEncoder()); - register(DisplayCrossbonesEvent.class, new DisplayCrossbonesEventEncoder()); + register(IdAssignmentMessage.class, new IdAssignmentMessageEncoder()); + register(RegionChangeMessage.class, new RegionChangeMessageEncoder()); + register(ServerChatMessage.class, new ServerMessageMessageEncoder()); + register(PlayerSynchronizationMessage.class, new PlayerSynchronizationMessageEncoder()); + register(OpenInterfaceMessage.class, new OpenInterfaceMessageEncoder()); + register(CloseInterfaceMessage.class, new CloseInterfaceMessageEncoder()); + register(SwitchTabInterfaceMessage.class, new SwitchTabInterfaceMessageEncoder()); + register(LogoutMessage.class, new LogoutMessageEncoder()); + register(UpdateItemsMessage.class, new UpdateItemsMessageEncoder()); + register(UpdateSlottedItemsMessage.class, new UpdateSlottedItemsMessageEncoder()); + register(UpdateSkillMessage.class, new UpdateSkillMessageEncoder()); + register(OpenInterfaceSidebarMessage.class, new OpenInterfaceSidebarMessageEncoder()); + register(EnterAmountMessage.class, new EnterAmountMessageEncoder()); + register(SetWidgetTextMessage.class, new SetWidgetTexMessageEncoder()); + register(NpcSynchronizationMessage.class, new NpcSynchronizationMessageEncoder()); + register(SetWidgetVisibilityMessage.class, new SetWidgetVisibilityMessageEncoder()); + register(SetWidgetItemModelMessage.class, new SetWidgetItemModelMessageEncoder()); + register(SetWidgetNpcModelMessage.class, new SetWidgetNpcModelMessageEncoder()); + register(SetWidgetPlayerModelMessage.class, new SetWidgetPlayerModelMessageEncoder()); + register(SetWidgetModelAnimationMessage.class, new SetWidgetModelAnimationMessageEncoder()); + register(ConfigMessage.class, new ConfigMessageEncoder()); + register(DisplayTabInterfaceMessage.class, new DisplayTabInterfaceMessageEncoder()); + register(PositionMessage.class, new PositionMessageEncoder()); + register(UpdateRunEnergyMessage.class, new UpdateRunEnergyMessageEncoder()); + register(PrivacyOptionMessage.class, new PrivacyOptionMessageEncoder()); + register(OpenDialogueInterfaceMessage.class, new OpenDialogueInterfaceMessageEncoder()); + register(UpdateWeightMessage.class, new UpdateWeightMessageEncoder()); + register(SetPlayerActionMessage.class, new SetPlayerActionMessageEncoder()); + register(DisplayCrossbonesMessage.class, new DisplayCrossbonesMessageEncoder()); - register(AddGlobalTileItemEvent.class, new AddGlobalTileItemEventEncoder()); - register(AddTileItemEvent.class, new AddTileItemEventEncoder()); - register(UpdateTileItemEvent.class, new UpdateTileItemEventEncoder()); - register(RemoveTileItemEvent.class, new RemoveTileItemEventEncoder()); - register(SendObjectEvent.class, new SendObjectEventEncoder()); + register(AddGlobalTileItemMessage.class, new AddGlobalTileItemMessageEncoder()); + register(AddTileItemMessage.class, new AddTileItemMessageEncoder()); + register(UpdateTileItemMessage.class, new UpdateTileItemMessageEncoder()); + register(RemoveTileItemMessage.class, new RemoveTileItemMessageEncoder()); + register(SendObjectMessage.class, new SendObjectMessageEncoder()); - register(ForwardPrivateMessageEvent.class, new ForwardPrivateMessageEventEncoder()); - register(FriendServerStatusEvent.class, new FriendServerStatusEventEncoder()); - register(IgnoreListEvent.class, new IgnoreListEventEncoder()); - register(SendFriendEvent.class, new SendFriendEventEncoder()); + register(ForwardPrivateChatMessage.class, new ForwardPrivateChatMessageEncoder()); + register(FriendServerStatusMessage.class, new FriendServerStatusMessageEncoder()); + register(IgnoreListMessage.class, new IgnoreListMessageEncoder()); + register(SendFriendMessage.class, new SendFriendMessageEncoder()); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/RemoveFriendEventDecoder.java b/src/org/apollo/net/release/r377/RemoveFriendMessageDecoder.java similarity index 52% rename from src/org/apollo/net/release/r377/RemoveFriendEventDecoder.java rename to src/org/apollo/net/release/r377/RemoveFriendMessageDecoder.java index a24e4144..f7d9fa1d 100644 --- a/src/org/apollo/net/release/r377/RemoveFriendEventDecoder.java +++ b/src/org/apollo/net/release/r377/RemoveFriendMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.RemoveFriendEvent; +import org.apollo.game.message.impl.RemoveFriendMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link RemoveFriendEvent}. + * A {@link MessageDecoder} for the {@link RemoveFriendMessage}. * * @author Major */ -public final class RemoveFriendEventDecoder extends EventDecoder { +public final class RemoveFriendMessageDecoder extends MessageDecoder { @Override - public RemoveFriendEvent decode(GamePacket packet) { + public RemoveFriendMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new RemoveFriendEvent(username); + return new RemoveFriendMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/RemoveIgnoreEventDecoder.java b/src/org/apollo/net/release/r377/RemoveIgnoreMessageDecoder.java similarity index 52% rename from src/org/apollo/net/release/r377/RemoveIgnoreEventDecoder.java rename to src/org/apollo/net/release/r377/RemoveIgnoreMessageDecoder.java index 2c289eea..f2389d9d 100644 --- a/src/org/apollo/net/release/r377/RemoveIgnoreEventDecoder.java +++ b/src/org/apollo/net/release/r377/RemoveIgnoreMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.RemoveIgnoreEvent; +import org.apollo.game.message.impl.RemoveIgnoreMessage; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; import org.apollo.util.NameUtil; /** - * An {@link EventDecoder} for the {@link RemoveIgnoreEvent}. + * A {@link MessageDecoder} for the {@link RemoveIgnoreMessage}. * * @author Major */ -public final class RemoveIgnoreEventDecoder extends EventDecoder { +public final class RemoveIgnoreMessageDecoder extends MessageDecoder { @Override - public RemoveIgnoreEvent decode(GamePacket packet) { + public RemoveIgnoreMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); String username = NameUtil.decodeBase37(reader.getSigned(DataType.LONG)); - return new RemoveIgnoreEvent(username); + return new RemoveIgnoreMessage(username); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/RemoveTileItemEventEncoder.java b/src/org/apollo/net/release/r377/RemoveTileItemEventEncoder.java deleted file mode 100644 index de009b8a..00000000 --- a/src/org/apollo/net/release/r377/RemoveTileItemEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.RemoveTileItemEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link RemoveTileItemEvent}. - * - * @author Major - */ -public final class RemoveTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(RemoveTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(208); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getId()); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getPositionOffset()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/RemoveTileItemMessageEncoder.java b/src/org/apollo/net/release/r377/RemoveTileItemMessageEncoder.java new file mode 100644 index 00000000..451c8810 --- /dev/null +++ b/src/org/apollo/net/release/r377/RemoveTileItemMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.RemoveTileItemMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link RemoveTileItemMessage}. + * + * @author Major + */ +public final class RemoveTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(RemoveTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(208); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getId()); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getPositionOffset()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SecondItemActionEventDecoder.java b/src/org/apollo/net/release/r377/SecondItemActionMessageDecoder.java similarity index 60% rename from src/org/apollo/net/release/r377/SecondItemActionEventDecoder.java rename to src/org/apollo/net/release/r377/SecondItemActionMessageDecoder.java index 2fd9e30c..0d8bacad 100644 --- a/src/org/apollo/net/release/r377/SecondItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/SecondItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SecondItemActionEvent; +import org.apollo.game.message.impl.SecondItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondItemActionEvent}. + * A {@link MessageDecoder} for the {@link SecondItemActionMessage}. * * @author Graham */ -public final class SecondItemActionEventDecoder extends EventDecoder { +public final class SecondItemActionMessageDecoder extends MessageDecoder { @Override - public SecondItemActionEvent decode(GamePacket packet) { + public SecondItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SecondItemActionEvent(interfaceId, id, slot); + return new SecondItemActionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SecondItemOptionEventDecoder.java b/src/org/apollo/net/release/r377/SecondItemOptionMessageDecoder.java similarity index 61% rename from src/org/apollo/net/release/r377/SecondItemOptionEventDecoder.java rename to src/org/apollo/net/release/r377/SecondItemOptionMessageDecoder.java index 583a0137..7c728b21 100644 --- a/src/org/apollo/net/release/r377/SecondItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/SecondItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SecondItemOptionEvent; +import org.apollo.game.message.impl.SecondItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondItemOptionEvent}. + * A {@link MessageDecoder} for the {@link SecondItemOptionMessage}. * * @author Graham */ -final class SecondItemOptionEventDecoder extends EventDecoder { +final class SecondItemOptionMessageDecoder extends MessageDecoder { @Override - public SecondItemOptionEvent decode(GamePacket packet) { + public SecondItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondItemOptionEvent(interfaceId, id, slot); + return new SecondItemOptionMessage(interfaceId, id, slot); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/FourthPlayerActionEventDecoder.java b/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java similarity index 51% rename from src/org/apollo/net/release/r377/FourthPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java index f650a533..6874cf3b 100644 --- a/src/org/apollo/net/release/r377/FourthPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/SecondNpcActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FourthPlayerActionEvent; +import org.apollo.game.message.impl.SecondNpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FourthPlayerActionEvent}. + * The {@link MessageDecoder} for the {@link SecondNpcActionMessage}. * * @author Major */ -public final class FourthPlayerActionEventDecoder extends EventDecoder { +public final class SecondNpcActionMessageDecoder extends MessageDecoder { @Override - public FourthPlayerActionEvent decode(GamePacket packet) { + public SecondNpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new FourthPlayerActionEvent(index); + return new SecondNpcActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SecondObjectActionEventDecoder.java b/src/org/apollo/net/release/r377/SecondObjectActionMessageDecoder.java similarity index 57% rename from src/org/apollo/net/release/r377/SecondObjectActionEventDecoder.java rename to src/org/apollo/net/release/r377/SecondObjectActionMessageDecoder.java index 2b2edb4f..70dc3c3b 100644 --- a/src/org/apollo/net/release/r377/SecondObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/SecondObjectActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SecondObjectActionEvent; +import org.apollo.game.message.impl.SecondObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondObjectActionEvent}. + * A {@link MessageDecoder} for the {@link SecondObjectActionMessage}. * * @author Graham */ -public final class SecondObjectActionEventDecoder extends EventDecoder { +public final class SecondObjectActionMessageDecoder extends MessageDecoder { @Override - public SecondObjectActionEvent decode(GamePacket packet) { + public SecondObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT); int x = (int) reader.getUnsigned(DataType.SHORT); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondObjectActionEvent(id, new Position(x, y)); + return new SecondObjectActionMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SecondPlayerActionEventDecoder.java b/src/org/apollo/net/release/r377/SecondPlayerActionMessageDecoder.java similarity index 51% rename from src/org/apollo/net/release/r377/SecondPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r377/SecondPlayerActionMessageDecoder.java index 11160fcf..f0c58fed 100644 --- a/src/org/apollo/net/release/r377/SecondPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/SecondPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SecondPlayerActionEvent; +import org.apollo.game.message.impl.SecondPlayerActionMessage; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SecondPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link SecondPlayerActionMessage}. * * @author Major */ -public final class SecondPlayerActionEventDecoder extends EventDecoder { +public final class SecondPlayerActionMessageDecoder extends MessageDecoder { @Override - public SecondPlayerActionEvent decode(GamePacket packet) { + public SecondPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new SecondPlayerActionEvent(index); + return new SecondPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SendFriendEventEncoder.java b/src/org/apollo/net/release/r377/SendFriendEventEncoder.java deleted file mode 100644 index efb0f60e..00000000 --- a/src/org/apollo/net/release/r377/SendFriendEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SendFriendEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; -import org.apollo.util.NameUtil; - -/** - * An {@link EventEncoder} for the {@link SendFriendEvent}. - * - * @author Major - */ -public final class SendFriendEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SendFriendEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(78); - builder.put(DataType.LONG, NameUtil.encodeBase37(event.getUsername())); - builder.put(DataType.BYTE, event.getWorld()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SendFriendMessageEncoder.java b/src/org/apollo/net/release/r377/SendFriendMessageEncoder.java new file mode 100644 index 00000000..87cec30a --- /dev/null +++ b/src/org/apollo/net/release/r377/SendFriendMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SendFriendMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; +import org.apollo.util.NameUtil; + +/** + * A {@link MessageEncoder} for the {@link SendFriendMessage}. + * + * @author Major + */ +public final class SendFriendMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SendFriendMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(78); + builder.put(DataType.LONG, NameUtil.encodeBase37(message.getUsername())); + builder.put(DataType.BYTE, message.getWorld()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SendObjectEventEncoder.java b/src/org/apollo/net/release/r377/SendObjectEventEncoder.java deleted file mode 100644 index ac1b51cc..00000000 --- a/src/org/apollo/net/release/r377/SendObjectEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SendObjectEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SendObjectEvent}. - * - * @author Major - */ -public final class SendObjectEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SendObjectEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(152); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getType() << 2 + event.getOrientation()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getId()); - builder.put(DataType.BYTE, DataTransformation.ADD, event.getPositionOffset()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SendObjectMessageEncoder.java b/src/org/apollo/net/release/r377/SendObjectMessageEncoder.java new file mode 100644 index 00000000..533534c3 --- /dev/null +++ b/src/org/apollo/net/release/r377/SendObjectMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SendObjectMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SendObjectMessage}. + * + * @author Major + */ +public final class SendObjectMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SendObjectMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(152); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getType() << 2 + message.getOrientation()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getId()); + builder.put(DataType.BYTE, DataTransformation.ADD, message.getPositionOffset()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ServerMessageEventEncoder.java b/src/org/apollo/net/release/r377/ServerMessageEventEncoder.java deleted file mode 100644 index 4667bb59..00000000 --- a/src/org/apollo/net/release/r377/ServerMessageEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.ServerMessageEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link ServerMessageEvent}. - * - * @author Graham - */ -public final class ServerMessageEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(ServerMessageEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(63, PacketType.VARIABLE_BYTE); - builder.putString(event.getMessage()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ServerMessageMessageEncoder.java b/src/org/apollo/net/release/r377/ServerMessageMessageEncoder.java new file mode 100644 index 00000000..03e64e4a --- /dev/null +++ b/src/org/apollo/net/release/r377/ServerMessageMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.ServerChatMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link ServerChatMessage}. + * + * @author Graham + */ +public final class ServerMessageMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(ServerChatMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(63, PacketType.VARIABLE_BYTE); + builder.putString(message.getMessage()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetPlayerActionEventEncoder.java b/src/org/apollo/net/release/r377/SetPlayerActionEventEncoder.java deleted file mode 100644 index acd89af2..00000000 --- a/src/org/apollo/net/release/r377/SetPlayerActionEventEncoder.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SetPlayerActionEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; - -/** - * The {@link EventEncoder} for the {@link SetPlayerActionEvent}. - * - * @author Major - */ -public final class SetPlayerActionEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetPlayerActionEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(157, PacketType.VARIABLE_BYTE); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getSlot()); - builder.putString(event.getText()); - builder.put(DataType.BYTE, event.isPrimaryAction() ? 0 : 1); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetPlayerActionMessageEncoder.java b/src/org/apollo/net/release/r377/SetPlayerActionMessageEncoder.java new file mode 100644 index 00000000..9822e189 --- /dev/null +++ b/src/org/apollo/net/release/r377/SetPlayerActionMessageEncoder.java @@ -0,0 +1,27 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SetPlayerActionMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.meta.PacketType; +import org.apollo.net.release.MessageEncoder; + +/** + * The {@link MessageEncoder} for the {@link SetPlayerActionMessage}. + * + * @author Major + */ +public final class SetPlayerActionMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetPlayerActionMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(157, PacketType.VARIABLE_BYTE); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getSlot()); + builder.putString(message.getText()); + builder.put(DataType.BYTE, message.isPrimaryAction() ? 0 : 1); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetItemModelEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetItemModelEventEncoder.java deleted file mode 100644 index cfb4a6a6..00000000 --- a/src/org/apollo/net/release/r377/SetWidgetItemModelEventEncoder.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SetWidgetItemModelEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetItemModelEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetItemModelEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetItemModelEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(21); - - builder.put(DataType.SHORT, event.getZoom()); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getModelId()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetItemModelMessageEncoder.java b/src/org/apollo/net/release/r377/SetWidgetItemModelMessageEncoder.java new file mode 100644 index 00000000..e202d9fb --- /dev/null +++ b/src/org/apollo/net/release/r377/SetWidgetItemModelMessageEncoder.java @@ -0,0 +1,29 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SetWidgetItemModelMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetItemModelMessage}. + * + * @author Chris Fletcher + */ +final class SetWidgetItemModelMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetItemModelMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(21); + + builder.put(DataType.SHORT, message.getZoom()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getModelId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetModelAnimationEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetModelAnimationEventEncoder.java deleted file mode 100644 index 4ce751b5..00000000 --- a/src/org/apollo/net/release/r377/SetWidgetModelAnimationEventEncoder.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SetWidgetModelAnimationEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetModelAnimationEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetModelAnimationEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetModelAnimationEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(2); - - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getAnimation() & 0xFFFF); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetModelAnimationMessageEncoder.java b/src/org/apollo/net/release/r377/SetWidgetModelAnimationMessageEncoder.java new file mode 100644 index 00000000..f435ed5b --- /dev/null +++ b/src/org/apollo/net/release/r377/SetWidgetModelAnimationMessageEncoder.java @@ -0,0 +1,28 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SetWidgetModelAnimationMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetModelAnimationMessage}. + * + * @author Chris Fletcher + */ +final class SetWidgetModelAnimationMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetModelAnimationMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(2); + + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getAnimation() & 0xFFFF); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetNpcModelEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetNpcModelEventEncoder.java deleted file mode 100644 index cd65e9f0..00000000 --- a/src/org/apollo/net/release/r377/SetWidgetNpcModelEventEncoder.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SetWidgetNpcModelEvent; -import org.apollo.net.codec.game.DataOrder; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetNpcModelEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetNpcModelEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetNpcModelEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(162); - - builder.put(DataType.SHORT, DataTransformation.ADD, event.getModelId()); - builder.put(DataType.SHORT, DataOrder.LITTLE, event.getInterfaceId()); - - return builder.toGamePacket(); - } - -} diff --git a/src/org/apollo/net/release/r377/SetWidgetNpcModelMessageEncoder.java b/src/org/apollo/net/release/r377/SetWidgetNpcModelMessageEncoder.java new file mode 100644 index 00000000..95c3c109 --- /dev/null +++ b/src/org/apollo/net/release/r377/SetWidgetNpcModelMessageEncoder.java @@ -0,0 +1,28 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SetWidgetNpcModelMessage; +import org.apollo.net.codec.game.DataOrder; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetNpcModelMessage}. + * + * @author Chris Fletcher + */ +final class SetWidgetNpcModelMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetNpcModelMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(162); + + builder.put(DataType.SHORT, DataTransformation.ADD, message.getModelId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getInterfaceId()); + + return builder.toGamePacket(); + } + +} diff --git a/src/org/apollo/net/release/r377/SetWidgetPlayerModelEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetPlayerModelMessageEncoder.java similarity index 55% rename from src/org/apollo/net/release/r377/SetWidgetPlayerModelEventEncoder.java rename to src/org/apollo/net/release/r377/SetWidgetPlayerModelMessageEncoder.java index 449d22f4..ff686f87 100644 --- a/src/org/apollo/net/release/r377/SetWidgetPlayerModelEventEncoder.java +++ b/src/org/apollo/net/release/r377/SetWidgetPlayerModelMessageEncoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SetWidgetPlayerModelEvent; +import org.apollo.game.message.impl.SetWidgetPlayerModelMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link SetWidgetPlayerModelEvent}. + * A {@link MessageEncoder} for the {@link SetWidgetPlayerModelMessage}. * * @author Chris Fletcher */ -final class SetWidgetPlayerModelEventEncoder extends EventEncoder { +final class SetWidgetPlayerModelMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(SetWidgetPlayerModelEvent event) { + public GamePacket encode(SetWidgetPlayerModelMessage message) { GamePacketBuilder builder = new GamePacketBuilder(255); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/SetWidgetTextEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetTexMessageEncoder.java similarity index 57% rename from src/org/apollo/net/release/r377/SetWidgetTextEventEncoder.java rename to src/org/apollo/net/release/r377/SetWidgetTexMessageEncoder.java index c2107777..be38f99f 100644 --- a/src/org/apollo/net/release/r377/SetWidgetTextEventEncoder.java +++ b/src/org/apollo/net/release/r377/SetWidgetTexMessageEncoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SetWidgetTextEvent; +import org.apollo.game.message.impl.SetWidgetTextMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link SetWidgetTextEvent}. + * A {@link MessageEncoder} for the {@link SetWidgetTextMessage}. * * @author Graham */ -public final class SetWidgetTextEventEncoder extends EventEncoder { +public final class SetWidgetTexMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(SetWidgetTextEvent event) { + public GamePacket encode(SetWidgetTextMessage message) { GamePacketBuilder builder = new GamePacketBuilder(232, PacketType.VARIABLE_SHORT); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId()); - builder.putString(event.getText()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getInterfaceId()); + builder.putString(message.getText()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/SetWidgetVisibilityEventEncoder.java b/src/org/apollo/net/release/r377/SetWidgetVisibilityEventEncoder.java deleted file mode 100644 index c1a998f4..00000000 --- a/src/org/apollo/net/release/r377/SetWidgetVisibilityEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SetWidgetVisibilityEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SetWidgetComponentEvent}. - * - * @author Chris Fletcher - */ -final class SetWidgetVisibilityEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SetWidgetVisibilityEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(82); - - builder.put(DataType.BYTE, event.isVisible() ? 0 : 1); - builder.put(DataType.SHORT, event.getWidgetId()); - - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SetWidgetVisibilityMessageEncoder.java b/src/org/apollo/net/release/r377/SetWidgetVisibilityMessageEncoder.java new file mode 100644 index 00000000..c7072df3 --- /dev/null +++ b/src/org/apollo/net/release/r377/SetWidgetVisibilityMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SetWidgetVisibilityMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SetWidgetComponentEvent}. + * + * @author Chris Fletcher + */ +final class SetWidgetVisibilityMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SetWidgetVisibilityMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(82); + + builder.put(DataType.BYTE, message.isVisible() ? 0 : 1); + builder.put(DataType.SHORT, message.getWidgetId()); + + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SpamPacketEventDecoder.java b/src/org/apollo/net/release/r377/SpamPacketEventDecoder.java deleted file mode 100644 index 8aae423b..00000000 --- a/src/org/apollo/net/release/r377/SpamPacketEventDecoder.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SpamPacketEvent; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.release.EventDecoder; - -/** - * An {@link EventDecoder} for the {@link SpamPacketEvent}. - * - * @author Major - */ -public final class SpamPacketEventDecoder extends EventDecoder { - - @Override - public SpamPacketEvent decode(GamePacket packet) { - return new SpamPacketEvent(packet.getPayload().array()); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SpamPacketMessageDecoder.java b/src/org/apollo/net/release/r377/SpamPacketMessageDecoder.java new file mode 100644 index 00000000..5ce36a1e --- /dev/null +++ b/src/org/apollo/net/release/r377/SpamPacketMessageDecoder.java @@ -0,0 +1,19 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SpamPacketMessage; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.release.MessageDecoder; + +/** + * A {@link MessageDecoder} for the {@link SpamPacketMessage}. + * + * @author Major + */ +public final class SpamPacketMessageDecoder extends MessageDecoder { + + @Override + public SpamPacketMessage decode(GamePacket packet) { + return new SpamPacketMessage(packet.getPayload().array()); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/SwitchItemEventDecoder.java b/src/org/apollo/net/release/r377/SwitchItemMessageDecoder.java similarity index 65% rename from src/org/apollo/net/release/r377/SwitchItemEventDecoder.java rename to src/org/apollo/net/release/r377/SwitchItemMessageDecoder.java index 07fcc4cc..d87e65bf 100644 --- a/src/org/apollo/net/release/r377/SwitchItemEventDecoder.java +++ b/src/org/apollo/net/release/r377/SwitchItemMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.SwitchItemEvent; +import org.apollo.game.message.impl.SwitchItemMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link SwitchItemEvent}. + * A {@link MessageDecoder} for the {@link SwitchItemMessage}. * * @author Graham */ -public final class SwitchItemEventDecoder extends EventDecoder { +public final class SwitchItemMessageDecoder extends MessageDecoder { @Override - public SwitchItemEvent decode(GamePacket packet) { + public SwitchItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int newSlot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); boolean inserting = reader.getUnsigned(DataType.BYTE, DataTransformation.ADD) == 1; int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int oldSlot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new SwitchItemEvent(interfaceId, inserting, oldSlot, newSlot); + return new SwitchItemMessage(interfaceId, inserting, oldSlot, newSlot); } } diff --git a/src/org/apollo/net/release/r377/SwitchTabInterfaceEventEncoder.java b/src/org/apollo/net/release/r377/SwitchTabInterfaceEventEncoder.java deleted file mode 100644 index a821dbe8..00000000 --- a/src/org/apollo/net/release/r377/SwitchTabInterfaceEventEncoder.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.SwitchTabInterfaceEvent; -import org.apollo.net.codec.game.DataTransformation; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link SwitchTabInterfaceEvent}. - * - * @author Graham - */ -public final class SwitchTabInterfaceEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(SwitchTabInterfaceEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(10); - builder.put(DataType.BYTE, DataTransformation.SUBTRACT, event.getTabId()); - builder.put(DataType.SHORT, DataTransformation.ADD, event.getInterfaceId()); - return builder.toGamePacket(); - } - -} diff --git a/src/org/apollo/net/release/r377/SwitchTabInterfaceMessageEncoder.java b/src/org/apollo/net/release/r377/SwitchTabInterfaceMessageEncoder.java new file mode 100644 index 00000000..778cc844 --- /dev/null +++ b/src/org/apollo/net/release/r377/SwitchTabInterfaceMessageEncoder.java @@ -0,0 +1,25 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.SwitchTabInterfaceMessage; +import org.apollo.net.codec.game.DataTransformation; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link SwitchTabInterfaceMessage}. + * + * @author Graham + */ +public final class SwitchTabInterfaceMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(SwitchTabInterfaceMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(10); + builder.put(DataType.BYTE, DataTransformation.SUBTRACT, message.getTabId()); + builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); + return builder.toGamePacket(); + } + +} diff --git a/src/org/apollo/net/release/r377/TakeTileItemEventDecoder.java b/src/org/apollo/net/release/r377/TakeTileItemMessageDecoder.java similarity index 64% rename from src/org/apollo/net/release/r377/TakeTileItemEventDecoder.java rename to src/org/apollo/net/release/r377/TakeTileItemMessageDecoder.java index 2234cb2d..344c55c8 100644 --- a/src/org/apollo/net/release/r377/TakeTileItemEventDecoder.java +++ b/src/org/apollo/net/release/r377/TakeTileItemMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.TakeTileItemEvent; +import org.apollo.game.message.impl.TakeTileItemMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link TakeTileItemEvent}. + * A {@link MessageDecoder} for the {@link TakeTileItemMessage}. * * @author Major */ -public final class TakeTileItemEventDecoder extends EventDecoder { +public final class TakeTileItemMessageDecoder extends MessageDecoder { @Override - public TakeTileItemEvent decode(GamePacket packet) { + public TakeTileItemMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); - return new TakeTileItemEvent(id, new Position(x, y)); + return new TakeTileItemMessage(id, new Position(x, y)); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ThirdItemActionEventDecoder.java b/src/org/apollo/net/release/r377/ThirdItemActionMessageDecoder.java similarity index 60% rename from src/org/apollo/net/release/r377/ThirdItemActionEventDecoder.java rename to src/org/apollo/net/release/r377/ThirdItemActionMessageDecoder.java index 80c7c4c6..a4851fa5 100644 --- a/src/org/apollo/net/release/r377/ThirdItemActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/ThirdItemActionMessageDecoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ThirdItemActionEvent; +import org.apollo.game.message.impl.ThirdItemActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdItemActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdItemActionMessage}. * * @author Graham */ -public final class ThirdItemActionEventDecoder extends EventDecoder { +public final class ThirdItemActionMessageDecoder extends MessageDecoder { @Override - public ThirdItemActionEvent decode(GamePacket packet) { + public ThirdItemActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT); - return new ThirdItemActionEvent(interfaceId, id, slot); + return new ThirdItemActionMessage(interfaceId, id, slot); } } diff --git a/src/org/apollo/net/release/r377/ThirdItemOptionEventDecoder.java b/src/org/apollo/net/release/r377/ThirdItemOptionMessageDecoder.java similarity index 63% rename from src/org/apollo/net/release/r377/ThirdItemOptionEventDecoder.java rename to src/org/apollo/net/release/r377/ThirdItemOptionMessageDecoder.java index f106c779..54e6a63e 100644 --- a/src/org/apollo/net/release/r377/ThirdItemOptionEventDecoder.java +++ b/src/org/apollo/net/release/r377/ThirdItemOptionMessageDecoder.java @@ -1,29 +1,29 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ThirdItemOptionEvent; +import org.apollo.game.message.impl.ThirdItemOptionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdItemOptionEvent}. + * A {@link MessageDecoder} for the {@link ThirdItemOptionMessage}. * * @author Chris Fletcher */ -final class ThirdItemOptionEventDecoder extends EventDecoder { +final class ThirdItemOptionMessageDecoder extends MessageDecoder { @Override - public ThirdItemOptionEvent decode(GamePacket packet) { + public ThirdItemOptionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int slot = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); int interfaceId = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdItemOptionEvent(interfaceId, id, slot); + return new ThirdItemOptionMessage(interfaceId, id, slot); } } diff --git a/src/org/apollo/net/release/r377/FirstPlayerActionEventDecoder.java b/src/org/apollo/net/release/r377/ThirdNpcActionMessageDecoder.java similarity index 56% rename from src/org/apollo/net/release/r377/FirstPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r377/ThirdNpcActionMessageDecoder.java index 5531b7e0..c170bf03 100644 --- a/src/org/apollo/net/release/r377/FirstPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/ThirdNpcActionMessageDecoder.java @@ -1,25 +1,25 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.FirstPlayerActionEvent; +import org.apollo.game.message.impl.ThirdNpcActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link FirstPlayerActionEvent}. + * The {@link MessageDecoder} for the {@link ThirdNpcActionMessage}. * * @author Major */ -public final class FirstPlayerActionEventDecoder extends EventDecoder { +public final class ThirdNpcActionMessageDecoder extends MessageDecoder { @Override - public FirstPlayerActionEvent decode(GamePacket packet) { + public ThirdNpcActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new FirstPlayerActionEvent(index); + return new ThirdNpcActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/ThirdObjectActionEventDecoder.java b/src/org/apollo/net/release/r377/ThirdObjectActionMessageDecoder.java similarity index 62% rename from src/org/apollo/net/release/r377/ThirdObjectActionEventDecoder.java rename to src/org/apollo/net/release/r377/ThirdObjectActionMessageDecoder.java index e6b74f2a..abf62ad5 100644 --- a/src/org/apollo/net/release/r377/ThirdObjectActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/ThirdObjectActionMessageDecoder.java @@ -1,28 +1,28 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ThirdObjectActionEvent; +import org.apollo.game.message.impl.ThirdObjectActionMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdObjectActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdObjectActionMessage}. * * @author Graham */ -public final class ThirdObjectActionEventDecoder extends EventDecoder { +public final class ThirdObjectActionMessageDecoder extends MessageDecoder { @Override - public ThirdObjectActionEvent decode(GamePacket packet) { + public ThirdObjectActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int y = (int) reader.getUnsigned(DataType.SHORT, DataTransformation.ADD); int id = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); int x = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD); - return new ThirdObjectActionEvent(id, new Position(x, y)); + return new ThirdObjectActionMessage(id, new Position(x, y)); } } diff --git a/src/org/apollo/net/release/r377/ThirdPlayerActionEventDecoder.java b/src/org/apollo/net/release/r377/ThirdPlayerActionMessageDecoder.java similarity index 50% rename from src/org/apollo/net/release/r377/ThirdPlayerActionEventDecoder.java rename to src/org/apollo/net/release/r377/ThirdPlayerActionMessageDecoder.java index f5d5bb93..40a55528 100644 --- a/src/org/apollo/net/release/r377/ThirdPlayerActionEventDecoder.java +++ b/src/org/apollo/net/release/r377/ThirdPlayerActionMessageDecoder.java @@ -1,24 +1,24 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.ThirdPlayerActionEvent; +import org.apollo.game.message.impl.ThirdPlayerActionMessage; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link ThirdPlayerActionEvent}. + * A {@link MessageDecoder} for the {@link ThirdPlayerActionMessage}. * * @author Major */ -public final class ThirdPlayerActionEventDecoder extends EventDecoder { +public final class ThirdPlayerActionMessageDecoder extends MessageDecoder { @Override - public ThirdPlayerActionEvent decode(GamePacket packet) { + public ThirdPlayerActionMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE); - return new ThirdPlayerActionEvent(index); + return new ThirdPlayerActionMessage(index); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateItemsEventEncoder.java b/src/org/apollo/net/release/r377/UpdateItemsMessageEncoder.java similarity index 71% rename from src/org/apollo/net/release/r377/UpdateItemsEventEncoder.java rename to src/org/apollo/net/release/r377/UpdateItemsMessageEncoder.java index c56db2cb..7ef547b3 100644 --- a/src/org/apollo/net/release/r377/UpdateItemsEventEncoder.java +++ b/src/org/apollo/net/release/r377/UpdateItemsMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.UpdateItemsEvent; +import org.apollo.game.message.impl.UpdateItemsMessage; import org.apollo.game.model.Item; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; @@ -8,22 +8,22 @@ import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateItemsEvent}. + * A {@link MessageEncoder} for the {@link UpdateItemsMessage}. * * @author Graham */ -public final class UpdateItemsEventEncoder extends EventEncoder { +public final class UpdateItemsMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateItemsEvent event) { + public GamePacket encode(UpdateItemsMessage message) { GamePacketBuilder builder = new GamePacketBuilder(206, PacketType.VARIABLE_SHORT); - Item[] items = event.getItems(); + Item[] items = message.getItems(); - builder.put(DataType.SHORT, event.getInterfaceId()); + builder.put(DataType.SHORT, message.getInterfaceId()); builder.put(DataType.SHORT, items.length); for (Item item : items) { diff --git a/src/org/apollo/net/release/r377/UpdateRunEnergyEventEncoder.java b/src/org/apollo/net/release/r377/UpdateRunEnergyEventEncoder.java deleted file mode 100644 index e10d8ca3..00000000 --- a/src/org/apollo/net/release/r377/UpdateRunEnergyEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.UpdateRunEnergyEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateRunEnergyEvent} - * - * @author Major - */ -public final class UpdateRunEnergyEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateRunEnergyEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(125); - builder.put(DataType.BYTE, event.getEnergy()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateRunEnergyMessageEncoder.java b/src/org/apollo/net/release/r377/UpdateRunEnergyMessageEncoder.java new file mode 100644 index 00000000..977e9c02 --- /dev/null +++ b/src/org/apollo/net/release/r377/UpdateRunEnergyMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.UpdateRunEnergyMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateRunEnergyMessage} + * + * @author Major + */ +public final class UpdateRunEnergyMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateRunEnergyMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(125); + builder.put(DataType.BYTE, message.getEnergy()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateSkillEventEncoder.java b/src/org/apollo/net/release/r377/UpdateSkillMessageEncoder.java similarity index 55% rename from src/org/apollo/net/release/r377/UpdateSkillEventEncoder.java rename to src/org/apollo/net/release/r377/UpdateSkillMessageEncoder.java index 53fc23ba..7cbf9437 100644 --- a/src/org/apollo/net/release/r377/UpdateSkillEventEncoder.java +++ b/src/org/apollo/net/release/r377/UpdateSkillMessageEncoder.java @@ -1,26 +1,26 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.UpdateSkillEvent; +import org.apollo.game.message.impl.UpdateSkillMessage; import org.apollo.game.model.entity.Skill; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateSkillEvent}. + * A {@link MessageEncoder} for the {@link UpdateSkillMessage}. * * @author Graham */ -public final class UpdateSkillEventEncoder extends EventEncoder { +public final class UpdateSkillMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateSkillEvent event) { + public GamePacket encode(UpdateSkillMessage message) { GamePacketBuilder builder = new GamePacketBuilder(49); - Skill skill = event.getSkill(); + Skill skill = message.getSkill(); - builder.put(DataType.BYTE, DataTransformation.NEGATE, event.getId()); + builder.put(DataType.BYTE, DataTransformation.NEGATE, message.getId()); builder.put(DataType.BYTE, skill.getCurrentLevel()); builder.put(DataType.INT, (int) skill.getExperience()); diff --git a/src/org/apollo/net/release/r377/UpdateSlottedItemsEventEncoder.java b/src/org/apollo/net/release/r377/UpdateSlottedItemsMessageEncoder.java similarity index 66% rename from src/org/apollo/net/release/r377/UpdateSlottedItemsEventEncoder.java rename to src/org/apollo/net/release/r377/UpdateSlottedItemsMessageEncoder.java index b4e73150..ae48477c 100644 --- a/src/org/apollo/net/release/r377/UpdateSlottedItemsEventEncoder.java +++ b/src/org/apollo/net/release/r377/UpdateSlottedItemsMessageEncoder.java @@ -1,27 +1,27 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.UpdateSlottedItemsEvent; +import org.apollo.game.message.impl.UpdateSlottedItemsMessage; import org.apollo.game.model.Item; import org.apollo.game.model.inv.SlottedItem; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.meta.PacketType; -import org.apollo.net.release.EventEncoder; +import org.apollo.net.release.MessageEncoder; /** - * An {@link EventEncoder} for the {@link UpdateSlottedItemsEvent}. + * A {@link MessageEncoder} for the {@link UpdateSlottedItemsMessage}. * * @author Graham */ -public final class UpdateSlottedItemsEventEncoder extends EventEncoder { +public final class UpdateSlottedItemsMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(UpdateSlottedItemsEvent event) { + public GamePacket encode(UpdateSlottedItemsMessage message) { GamePacketBuilder builder = new GamePacketBuilder(134, PacketType.VARIABLE_SHORT); - SlottedItem[] items = event.getSlottedItems(); + SlottedItem[] items = message.getSlottedItems(); - builder.put(DataType.SHORT, event.getInterfaceId()); + builder.put(DataType.SHORT, message.getInterfaceId()); for (SlottedItem slottedItem : items) { builder.putSmart(slottedItem.getSlot()); diff --git a/src/org/apollo/net/release/r377/UpdateTileItemEventEncoder.java b/src/org/apollo/net/release/r377/UpdateTileItemEventEncoder.java deleted file mode 100644 index f0f62ca5..00000000 --- a/src/org/apollo/net/release/r377/UpdateTileItemEventEncoder.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.UpdateTileItemEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateTileItemEvent}. - * - * @author Major - */ -public final class UpdateTileItemEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateTileItemEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(121); - builder.put(DataType.BYTE, event.getPositionOffset()); - builder.put(DataType.SHORT, event.getId()); - builder.put(DataType.SHORT, event.getPreviousAmount()); - builder.put(DataType.SHORT, event.getAmount()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateTileItemMessageEncoder.java b/src/org/apollo/net/release/r377/UpdateTileItemMessageEncoder.java new file mode 100644 index 00000000..31eb114b --- /dev/null +++ b/src/org/apollo/net/release/r377/UpdateTileItemMessageEncoder.java @@ -0,0 +1,26 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.UpdateTileItemMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateTileItemMessage}. + * + * @author Major + */ +public final class UpdateTileItemMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateTileItemMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(121); + builder.put(DataType.BYTE, message.getPositionOffset()); + builder.put(DataType.SHORT, message.getId()); + builder.put(DataType.SHORT, message.getPreviousAmount()); + builder.put(DataType.SHORT, message.getAmount()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateWeightEventEncoder.java b/src/org/apollo/net/release/r377/UpdateWeightEventEncoder.java deleted file mode 100644 index dcc1d28b..00000000 --- a/src/org/apollo/net/release/r377/UpdateWeightEventEncoder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.apollo.net.release.r377; - -import org.apollo.game.event.impl.UpdateWeightEvent; -import org.apollo.net.codec.game.DataType; -import org.apollo.net.codec.game.GamePacket; -import org.apollo.net.codec.game.GamePacketBuilder; -import org.apollo.net.release.EventEncoder; - -/** - * An {@link EventEncoder} for the {@link UpdateWeightEvent}. - * - * @author Major - */ -public final class UpdateWeightEventEncoder extends EventEncoder { - - @Override - public GamePacket encode(UpdateWeightEvent event) { - GamePacketBuilder builder = new GamePacketBuilder(174); - builder.put(DataType.SHORT, event.getWeight()); - return builder.toGamePacket(); - } - -} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/UpdateWeightMessageEncoder.java b/src/org/apollo/net/release/r377/UpdateWeightMessageEncoder.java new file mode 100644 index 00000000..c2281ff1 --- /dev/null +++ b/src/org/apollo/net/release/r377/UpdateWeightMessageEncoder.java @@ -0,0 +1,23 @@ +package org.apollo.net.release.r377; + +import org.apollo.game.message.impl.UpdateWeightMessage; +import org.apollo.net.codec.game.DataType; +import org.apollo.net.codec.game.GamePacket; +import org.apollo.net.codec.game.GamePacketBuilder; +import org.apollo.net.release.MessageEncoder; + +/** + * A {@link MessageEncoder} for the {@link UpdateWeightMessage}. + * + * @author Major + */ +public final class UpdateWeightMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(UpdateWeightMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(174); + builder.put(DataType.SHORT, message.getWeight()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/WalkEventDecoder.java b/src/org/apollo/net/release/r377/WalkMessageDecoder.java similarity index 79% rename from src/org/apollo/net/release/r377/WalkEventDecoder.java rename to src/org/apollo/net/release/r377/WalkMessageDecoder.java index 1b6f03f8..c2a55f71 100644 --- a/src/org/apollo/net/release/r377/WalkEventDecoder.java +++ b/src/org/apollo/net/release/r377/WalkMessageDecoder.java @@ -1,23 +1,23 @@ package org.apollo.net.release.r377; -import org.apollo.game.event.impl.WalkEvent; +import org.apollo.game.message.impl.WalkMessage; import org.apollo.game.model.Position; import org.apollo.net.codec.game.DataOrder; import org.apollo.net.codec.game.DataTransformation; import org.apollo.net.codec.game.DataType; import org.apollo.net.codec.game.GamePacket; import org.apollo.net.codec.game.GamePacketReader; -import org.apollo.net.release.EventDecoder; +import org.apollo.net.release.MessageDecoder; /** - * An {@link EventDecoder} for the {@link WalkEvent}. + * A {@link MessageDecoder} for the {@link WalkMessage}. * * @author Graham */ -public final class WalkEventDecoder extends EventDecoder { +public final class WalkMessageDecoder extends MessageDecoder { @Override - public WalkEvent decode(GamePacket packet) { + public WalkMessage decode(GamePacket packet) { GamePacketReader reader = new GamePacketReader(packet); int length = packet.getLength(); @@ -43,7 +43,7 @@ public final class WalkEventDecoder extends EventDecoder { positions[i + 1] = new Position(path[i][0] + x, path[i][1] + y); } - return new WalkEvent(positions, run); + return new WalkMessage(positions, run); } } diff --git a/src/org/apollo/net/session/GameSession.java b/src/org/apollo/net/session/GameSession.java index c922c6e5..b5416245 100644 --- a/src/org/apollo/net/session/GameSession.java +++ b/src/org/apollo/net/session/GameSession.java @@ -12,10 +12,10 @@ import java.util.logging.Logger; import org.apollo.ServerContext; import org.apollo.game.GameConstants; import org.apollo.game.GameService; -import org.apollo.game.event.Event; -import org.apollo.game.event.handler.chain.EventHandlerChain; -import org.apollo.game.event.handler.chain.EventHandlerChainGroup; -import org.apollo.game.event.impl.LogoutEvent; +import org.apollo.game.message.Message; +import org.apollo.game.message.handler.MessageHandlerChain; +import org.apollo.game.message.handler.MessageHandlerChainGroup; +import org.apollo.game.message.impl.LogoutMessage; import org.apollo.game.model.entity.Player; /** @@ -36,9 +36,9 @@ public final class GameSession extends Session { private final ServerContext context; /** - * The queue of pending {@link Event}s. + * The queue of pending {@link Message}s. */ - private final BlockingQueue eventQueue = new ArrayBlockingQueue<>(GameConstants.EVENTS_PER_PULSE); + private final BlockingQueue messageQueue = new ArrayBlockingQueue<>(GameConstants.MESSAGES_PER_PULSE); /** * The player. @@ -64,48 +64,48 @@ public final class GameSession extends Session { } /** - * Encodes and dispatches the specified event. + * Encodes and dispatches the specified message. * - * @param event The event. + * @param message The message. */ - public void dispatchEvent(Event event) { + public void dispatchMessage(Message message) { Channel channel = getChannel(); if (channel.isActive() && channel.isOpen()) { - ChannelFuture future = channel.writeAndFlush(event); - if (event.getClass() == LogoutEvent.class) { + ChannelFuture future = channel.writeAndFlush(message); + if (message.getClass() == LogoutMessage.class) { future.addListener(ChannelFutureListener.CLOSE); } } } /** - * Handles pending events for this session. + * Handles pending messages for this session. * - * @param chainGroup The event chain group. + * @param chainGroup The message chain group. */ @SuppressWarnings("unchecked") - public void handlePendingEvents(EventHandlerChainGroup chainGroup) { - Event event; - while ((event = eventQueue.poll()) != null) { + public void handlePendingMessages(MessageHandlerChainGroup chainGroup) { + Message message; + while ((message = messageQueue.poll()) != null) { // this lookup code really sucks! // TODO improve it! - Class eventType = event.getClass(); - EventHandlerChain chain = (EventHandlerChain) chainGroup.getChain(eventType); + Class messageType = message.getClass(); + MessageHandlerChain chain = (MessageHandlerChain) chainGroup.getChain(messageType); - while (chain == null && eventType != null) { - eventType = (Class) eventType.getSuperclass(); - if (eventType == Event.class) { - eventType = null; + while (chain == null && messageType != null) { + messageType = (Class) messageType.getSuperclass(); + if (messageType == Message.class) { + messageType = null; } else { - chain = (EventHandlerChain) chainGroup.getChain(eventType); + chain = (MessageHandlerChain) chainGroup.getChain(messageType); } } if (chain != null) { try { - chain.handle(player, event); + chain.handle(player, message); } catch (Exception ex) { - logger.log(Level.SEVERE, "Error handling event: ", ex); + logger.log(Level.SEVERE, "Error handling message: ", ex); } } } @@ -122,11 +122,10 @@ public final class GameSession extends Session { @Override public void messageReceived(Object message) { - Event event = (Event) message; - if (eventQueue.size() >= GameConstants.EVENTS_PER_PULSE) { - logger.warning("Too many events in queue for game session, dropping..."); + if (messageQueue.size() >= GameConstants.MESSAGES_PER_PULSE) { + logger.warning("Too many messages in queue for game session, dropping..."); } else { - eventQueue.add(event); + messageQueue.add((Message) message); } } diff --git a/src/org/apollo/net/session/LoginSession.java b/src/org/apollo/net/session/LoginSession.java index 875feca7..8f1ee099 100644 --- a/src/org/apollo/net/session/LoginSession.java +++ b/src/org/apollo/net/session/LoginSession.java @@ -13,8 +13,8 @@ import org.apollo.io.player.PlayerLoaderResponse; import org.apollo.login.LoginService; import org.apollo.net.ApolloHandler; import org.apollo.net.NetworkConstants; -import org.apollo.net.codec.game.GameEventDecoder; -import org.apollo.net.codec.game.GameEventEncoder; +import org.apollo.net.codec.game.GameMessageDecoder; +import org.apollo.net.codec.game.GameMessageEncoder; import org.apollo.net.codec.game.GamePacketDecoder; import org.apollo.net.codec.game.GamePacketEncoder; import org.apollo.net.codec.login.LoginConstants; @@ -115,13 +115,13 @@ public final class LoginSession extends Session { IsaacRandomPair randomPair = request.getRandomPair(); Release release = serverContext.getRelease(); - channel.pipeline().addFirst("eventEncoder", new GameEventEncoder(release)); + channel.pipeline().addFirst("eventEncoder", new GameMessageEncoder(release)); channel.pipeline().addBefore("eventEncoder", "gameEncoder", new GamePacketEncoder(randomPair.getEncodingRandom())); channel.pipeline().addBefore("handler", "gameDecoder", new GamePacketDecoder(randomPair.getDecodingRandom(), serverContext.getRelease())); - channel.pipeline().addAfter("gameDecoder", "eventDecoder", new GameEventDecoder(release)); + channel.pipeline().addAfter("gameDecoder", "eventDecoder", new GameMessageDecoder(release)); channel.pipeline().remove("loginDecoder"); channel.pipeline().remove("loginEncoder"); diff --git a/src/org/apollo/util/plugin/PluginContext.java b/src/org/apollo/util/plugin/PluginContext.java index ebc24295..5ed06e4b 100644 --- a/src/org/apollo/util/plugin/PluginContext.java +++ b/src/org/apollo/util/plugin/PluginContext.java @@ -3,17 +3,17 @@ package org.apollo.util.plugin; import org.apollo.ServerContext; import org.apollo.game.GameService; import org.apollo.game.command.CommandListener; -import org.apollo.game.event.Event; -import org.apollo.game.event.handler.EventHandler; -import org.apollo.game.event.handler.chain.EventHandlerChain; -import org.apollo.game.event.handler.chain.EventHandlerChainGroup; import org.apollo.game.login.LoginListener; import org.apollo.game.login.LogoutListener; +import org.apollo.game.message.Message; +import org.apollo.game.message.handler.MessageHandler; +import org.apollo.game.message.handler.MessageHandlerChain; +import org.apollo.game.message.handler.MessageHandlerChainGroup; import org.apollo.game.model.World; /** * The {@link PluginContext} contains methods a plugin can use to interface with the server, for example, by adding - * {@link EventHandler}s to {@link EventHandlerChain}s. + * {@link MessageHandler}s to {@link MessageHandlerChain}s. * * @author Graham */ @@ -44,18 +44,18 @@ public final class PluginContext { } /** - * Adds an {@link EventHandler} to the end of the chain. + * Adds a {@link MessageHandler} to the end of the chain. * - * @param The type of event. - * @param event The event. + * @param The type of message. + * @param message The message. * @param handler The handler. */ - public void addLastEventHandler(Class event, EventHandler handler) { - EventHandlerChainGroup chains = context.getService(GameService.class).getEventHandlerChains(); - EventHandlerChain chain = chains.getChain(event); + public void addLastMessageHandler(Class message, MessageHandler handler) { + MessageHandlerChainGroup chains = context.getService(GameService.class).getMessageHandlerChains(); + MessageHandlerChain chain = chains.getChain(message); if (chain == null) { - chain = new EventHandlerChain<>(handler); - chains.register(event, chain); + chain = new MessageHandlerChain<>(handler); + chains.register(message, chain); } else { chain.addLast(handler); }