From d60075dcf6831fd88ec0f7b1134de850a7e81fcf Mon Sep 17 00:00:00 2001 From: Major- Date: Fri, 27 Feb 2015 03:21:47 +0000 Subject: [PATCH] Rename previously-named classes from 'Overlay' to 'Sidebar', add actual Overlay interface support. --- ....java => OpenInterfaceSidebarMessage.java} | 24 +++---- .../game/message/impl/OpenOverlayMessage.java | 2 +- .../game/message/impl/OpenSidebarMessage.java | 35 ++++++++++ .../apollo/game/model/inter/InterfaceSet.java | 67 +++++++++++-------- ...> OpenInterfaceSidebarMessageEncoder.java} | 10 +-- .../r317/OpenOverlayMessageEncoder.java | 2 +- .../r317/OpenSidebarMessageEncoder.java | 24 +++++++ .../apollo/net/release/r317/Release317.java | 6 +- ...> OpenInterfaceSidebarMessageEncoder.java} | 10 +-- .../r377/OpenOverlayMessageEncoder.java | 6 +- .../r377/OpenSidebarMessageEncoder.java | 25 +++++++ .../apollo/net/release/r377/Release377.java | 6 +- 12 files changed, 157 insertions(+), 60 deletions(-) rename src/org/apollo/game/message/impl/{OpenInterfaceOverlayMessage.java => OpenInterfaceSidebarMessage.java} (54%) create mode 100644 src/org/apollo/game/message/impl/OpenSidebarMessage.java rename src/org/apollo/net/release/r317/{OpenInterfaceOverlayMessageEncoder.java => OpenInterfaceSidebarMessageEncoder.java} (58%) create mode 100644 src/org/apollo/net/release/r317/OpenSidebarMessageEncoder.java rename src/org/apollo/net/release/r377/{OpenInterfaceOverlayMessageEncoder.java => OpenInterfaceSidebarMessageEncoder.java} (64%) create mode 100644 src/org/apollo/net/release/r377/OpenSidebarMessageEncoder.java diff --git a/src/org/apollo/game/message/impl/OpenInterfaceOverlayMessage.java b/src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java similarity index 54% rename from src/org/apollo/game/message/impl/OpenInterfaceOverlayMessage.java rename to src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java index 1d34521d..66775c5d 100644 --- a/src/org/apollo/game/message/impl/OpenInterfaceOverlayMessage.java +++ b/src/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java @@ -3,11 +3,11 @@ package org.apollo.game.message.impl; import org.apollo.game.message.Message; /** - * A {@link Message} sent to the client to open an interface and temporary overlay. + * A {@link Message} sent to the client to open an interface and a sidebar. * * @author Graham */ -public final class OpenInterfaceOverlayMessage extends Message { +public final class OpenInterfaceSidebarMessage extends Message { /** * The interface id. @@ -15,19 +15,19 @@ public final class OpenInterfaceOverlayMessage extends Message { private final int interfaceId; /** - * The overlay id. + * The sidebar id. */ - private final int overlayId; + private final int sidebarId; /** - * Creates the open interface overlay message. + * Creates the OpenInterfaceSidebarMessage. * * @param interfaceId The interface id. - * @param overlayId The overlay id. + * @param sidebarId The sidebar id. */ - public OpenInterfaceOverlayMessage(int interfaceId, int overlayId) { + public OpenInterfaceSidebarMessage(int interfaceId, int sidebarId) { this.interfaceId = interfaceId; - this.overlayId = overlayId; + this.sidebarId = sidebarId; } /** @@ -40,12 +40,12 @@ public final class OpenInterfaceOverlayMessage extends Message { } /** - * Gets the overlay id. + * Gets the sidebar id. * - * @return The overlay id. + * @return The sidebar id. */ - public int getOverlayId() { - return overlayId; + public int getSidebarId() { + return sidebarId; } } \ No newline at end of file diff --git a/src/org/apollo/game/message/impl/OpenOverlayMessage.java b/src/org/apollo/game/message/impl/OpenOverlayMessage.java index 90ad7dbc..79c029d6 100644 --- a/src/org/apollo/game/message/impl/OpenOverlayMessage.java +++ b/src/org/apollo/game/message/impl/OpenOverlayMessage.java @@ -15,7 +15,7 @@ public final class OpenOverlayMessage extends Message { private final int overlayId; /** - * Creates the open interface overlay message. + * Creates the OpenSidebarMessage. * * @param overlayId The overlay id. */ diff --git a/src/org/apollo/game/message/impl/OpenSidebarMessage.java b/src/org/apollo/game/message/impl/OpenSidebarMessage.java new file mode 100644 index 00000000..1f3a41d8 --- /dev/null +++ b/src/org/apollo/game/message/impl/OpenSidebarMessage.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 open a sidebar interface. + * + * @author Major + */ +public final class OpenSidebarMessage extends Message { + + /** + * The sidebar id. + */ + private final int sidebarId; + + /** + * Creates the OpenSidebarMessage. + * + * @param sidebarId The sidebar id. + */ + public OpenSidebarMessage(int sidebarId) { + this.sidebarId = sidebarId; + } + + /** + * Gets the sidebar id. + * + * @return The sidebar id. + */ + public int getSidebarId() { + return sidebarId; + } + +} \ No newline at end of file diff --git a/src/org/apollo/game/model/inter/InterfaceSet.java b/src/org/apollo/game/model/inter/InterfaceSet.java index b2178eac..6b9dfeec 100644 --- a/src/org/apollo/game/model/inter/InterfaceSet.java +++ b/src/org/apollo/game/model/inter/InterfaceSet.java @@ -8,8 +8,9 @@ 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.OpenInterfaceOverlayMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; import org.apollo.game.message.impl.OpenOverlayMessage; +import org.apollo.game.message.impl.OpenSidebarMessage; import org.apollo.game.model.entity.Player; import org.apollo.game.model.inter.dialogue.DialogueListener; import org.apollo.game.model.inv.InventoryListener; @@ -172,6 +173,42 @@ public final class InterfaceSet { player.send(new EnterAmountMessage()); } + /** + * Opens an overlay interface. + * + * @param overlay The overlay id. + */ + public void openOverlay(int overlay) { + interfaces.put(InterfaceType.OVERLAY, overlay); + player.send(new OpenOverlayMessage(overlay)); + } + + /** + * Opens an sidebar interface. + * + * @param sidebar The sidebar id. + */ + public void openSidebar(int sidebar) { + closeAndNotify(); + interfaces.put(InterfaceType.SIDEBAR, sidebar); + + player.send(new OpenSidebarMessage(sidebar)); + } + + /** + * Opens an sidebar interface with the specified {@link InventoryListener}. + * + * @param listener The listener. + * @param sidebar The sidebar id. + */ + public void openSidebar(InterfaceListener listener, int sidebar) { + closeAndNotify(); + this.listener = Optional.ofNullable(listener); + interfaces.put(InterfaceType.SIDEBAR, sidebar); + + player.send(new OpenSidebarMessage(sidebar)); + } + /** * Opens a window. * @@ -219,33 +256,7 @@ public final class InterfaceSet { interfaces.put(InterfaceType.WINDOW, windowId); interfaces.put(InterfaceType.SIDEBAR, sidebarId); - player.send(new OpenInterfaceOverlayMessage(windowId, sidebarId)); - } - - /** - * Opens an overlay interface. - * - * @param overlay The overlay id. - */ - public void openOverlay(int overlay) { - closeAndNotify(); - interfaces.put(InterfaceType.OVERLAY, overlay); - - player.send(new OpenOverlayMessage(overlay)); - } - - /** - * Opens an overlay interface with the specified {@link InventoryListener}. - * - * @param listener The listener. - * @param overlay The overlay id. - */ - public void openOverlay(InterfaceListener listener, int overlay) { - closeAndNotify(); - this.listener = Optional.ofNullable(listener); - interfaces.put(InterfaceType.OVERLAY, overlay); - - player.send(new OpenOverlayMessage(overlay)); + player.send(new OpenInterfaceSidebarMessage(windowId, sidebarId)); } /** diff --git a/src/org/apollo/net/release/r317/OpenInterfaceOverlayMessageEncoder.java b/src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java similarity index 58% rename from src/org/apollo/net/release/r317/OpenInterfaceOverlayMessageEncoder.java rename to src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java index 1a1d18c9..a13edd65 100644 --- a/src/org/apollo/net/release/r317/OpenInterfaceOverlayMessageEncoder.java +++ b/src/org/apollo/net/release/r317/OpenInterfaceSidebarMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r317; -import org.apollo.game.message.impl.OpenInterfaceOverlayMessage; +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; @@ -8,17 +8,17 @@ import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.release.MessageEncoder; /** - * A {@link MessageEncoder} for the {@link OpenInterfaceOverlayMessage}. + * A {@link MessageEncoder} for the {@link OpenInterfaceSidebarMessage}. * * @author Graham */ -public final class OpenInterfaceOverlayMessageEncoder extends MessageEncoder { +public final class OpenInterfaceSidebarMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(OpenInterfaceOverlayMessage message) { + public GamePacket encode(OpenInterfaceSidebarMessage message) { GamePacketBuilder builder = new GamePacketBuilder(248); builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); - builder.put(DataType.SHORT, message.getOverlayId()); + builder.put(DataType.SHORT, message.getSidebarId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r317/OpenOverlayMessageEncoder.java b/src/org/apollo/net/release/r317/OpenOverlayMessageEncoder.java index f9ff4a8c..73ab99e9 100644 --- a/src/org/apollo/net/release/r317/OpenOverlayMessageEncoder.java +++ b/src/org/apollo/net/release/r317/OpenOverlayMessageEncoder.java @@ -16,7 +16,7 @@ public final class OpenOverlayMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenSidebarMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(142); + builder.put(DataType.SHORT, DataOrder.LITTLE, message.getSidebarId()); + 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 e57d1d9e..0f4d3cc0 100644 --- a/src/org/apollo/net/release/r317/Release317.java +++ b/src/org/apollo/net/release/r317/Release317.java @@ -17,8 +17,9 @@ 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.OpenInterfaceOverlayMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; import org.apollo.game.message.impl.OpenOverlayMessage; +import org.apollo.game.message.impl.OpenSidebarMessage; import org.apollo.game.message.impl.PlayerSynchronizationMessage; import org.apollo.game.message.impl.PositionMessage; import org.apollo.game.message.impl.PrivacyOptionMessage; @@ -179,7 +180,7 @@ public final class Release317 extends Release { register(UpdateItemsMessage.class, new UpdateItemsMessageEncoder()); register(UpdateSlottedItemsMessage.class, new UpdateSlottedItemsMessageEncoder()); register(UpdateSkillMessage.class, new UpdateSkillMessageEncoder()); - register(OpenInterfaceOverlayMessage.class, new OpenInterfaceOverlayMessageEncoder()); + register(OpenInterfaceSidebarMessage.class, new OpenInterfaceSidebarMessageEncoder()); register(EnterAmountMessage.class, new EnterAmountMessageEncoder()); register(SetWidgetTextMessage.class, new SetWidgetTextMessageEncoder()); register(NpcSynchronizationMessage.class, new NpcSynchronizationMessageEncoder()); @@ -210,6 +211,7 @@ public final class Release317 extends Release { register(SendFriendMessage.class, new SendFriendMessageEncoder()); register(HintIconMessage.class, new HintIconMessageEncoder()); register(FlashTabInterfaceMessage.class, new FlashTabInterfaceMessageEncoder()); + register(OpenSidebarMessage.class, new OpenSidebarMessageEncoder()); register(OpenOverlayMessage.class, new OpenOverlayMessageEncoder()); } } \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/OpenInterfaceOverlayMessageEncoder.java b/src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java similarity index 64% rename from src/org/apollo/net/release/r377/OpenInterfaceOverlayMessageEncoder.java rename to src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java index 2a83cc8c..543c509a 100644 --- a/src/org/apollo/net/release/r377/OpenInterfaceOverlayMessageEncoder.java +++ b/src/org/apollo/net/release/r377/OpenInterfaceSidebarMessageEncoder.java @@ -1,6 +1,6 @@ package org.apollo.net.release.r377; -import org.apollo.game.message.impl.OpenInterfaceOverlayMessage; +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; @@ -9,17 +9,17 @@ import org.apollo.net.codec.game.GamePacketBuilder; import org.apollo.net.release.MessageEncoder; /** - * A {@link MessageEncoder} for the {@link OpenInterfaceOverlayMessage}. + * A {@link MessageEncoder} for the {@link OpenInterfaceSidebarMessage}. * * @author Graham */ -public final class OpenInterfaceOverlayMessageEncoder extends MessageEncoder { +public final class OpenInterfaceSidebarMessageEncoder extends MessageEncoder { @Override - public GamePacket encode(OpenInterfaceOverlayMessage message) { + public GamePacket encode(OpenInterfaceSidebarMessage message) { GamePacketBuilder builder = new GamePacketBuilder(128); builder.put(DataType.SHORT, DataTransformation.ADD, message.getInterfaceId()); - builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getOverlayId()); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getSidebarId()); return builder.toGamePacket(); } diff --git a/src/org/apollo/net/release/r377/OpenOverlayMessageEncoder.java b/src/org/apollo/net/release/r377/OpenOverlayMessageEncoder.java index e3364138..45d210af 100644 --- a/src/org/apollo/net/release/r377/OpenOverlayMessageEncoder.java +++ b/src/org/apollo/net/release/r377/OpenOverlayMessageEncoder.java @@ -1,8 +1,6 @@ package org.apollo.net.release.r377; import org.apollo.game.message.impl.OpenOverlayMessage; -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; @@ -17,8 +15,8 @@ public final class OpenOverlayMessageEncoder extends MessageEncoder { + + @Override + public GamePacket encode(OpenSidebarMessage message) { + GamePacketBuilder builder = new GamePacketBuilder(246); + builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, message.getSidebarId()); + return builder.toGamePacket(); + } + +} \ No newline at end of file diff --git a/src/org/apollo/net/release/r377/Release377.java b/src/org/apollo/net/release/r377/Release377.java index 9cee1c14..db4868e7 100644 --- a/src/org/apollo/net/release/r377/Release377.java +++ b/src/org/apollo/net/release/r377/Release377.java @@ -17,8 +17,9 @@ 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.OpenInterfaceOverlayMessage; +import org.apollo.game.message.impl.OpenInterfaceSidebarMessage; import org.apollo.game.message.impl.OpenOverlayMessage; +import org.apollo.game.message.impl.OpenSidebarMessage; import org.apollo.game.message.impl.PlayerSynchronizationMessage; import org.apollo.game.message.impl.PositionMessage; import org.apollo.game.message.impl.PrivacyOptionMessage; @@ -175,7 +176,7 @@ public final class Release377 extends Release { register(UpdateItemsMessage.class, new UpdateItemsMessageEncoder()); register(UpdateSlottedItemsMessage.class, new UpdateSlottedItemsMessageEncoder()); register(UpdateSkillMessage.class, new UpdateSkillMessageEncoder()); - register(OpenInterfaceOverlayMessage.class, new OpenInterfaceOverlayMessageEncoder()); + register(OpenInterfaceSidebarMessage.class, new OpenInterfaceSidebarMessageEncoder()); register(EnterAmountMessage.class, new EnterAmountMessageEncoder()); register(SetWidgetTextMessage.class, new SetWidgetTexMessageEncoder()); register(NpcSynchronizationMessage.class, new NpcSynchronizationMessageEncoder()); @@ -206,6 +207,7 @@ public final class Release377 extends Release { register(SendFriendMessage.class, new SendFriendMessageEncoder()); register(HintIconMessage.class, new HintIconMessageEncoder()); register(FlashTabInterfaceMessage.class, new FlashTabInterfaceMessageEncoder()); + register(OpenSidebarMessage.class, new OpenSidebarMessageEncoder()); register(OpenOverlayMessage.class, new OpenOverlayMessageEncoder()); }