Add widget display encoders; bug fixes.

data/plugins/bootstrap.rb

@@ -129,7 +129,7 @@ def on_button(args, proc)
   id = args[0].to_i
 
   on :event, :button do |ctx, player, event|
-    if event.interface_id == id
+    if event.widget_id == id
       proc.call player
     end
   end

src/org/apollo/game/command/CreditsCommandListener.java

@@ -2,7 +2,7 @@ package org.apollo.game.command;
 
 import java.util.Iterator;
 
-import org.apollo.game.event.impl.SetInterfaceTextEvent;
+import org.apollo.game.event.impl.SetWidgetTextEvent;
 import org.apollo.game.model.Player;
 import org.apollo.game.model.World;
 import org.apollo.game.model.inter.quest.QuestConstants;
@@ -30,33 +30,33 @@ public final class CreditsCommandListener implements CommandListener {
 		Iterator<String> it = mgr.createAuthorsIterator();
 
 		int pos = 0;
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Apollo"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Introduction"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Apollo"));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Introduction"));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"This server is based on Apollo, a lightweight, fast, secure"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"and open-source RuneScape emulator. For more"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"information about Apollo, visit the website at:"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"@dbl@https://github.com/apollo-rsps/apollo"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"Apollo is released under the terms of the ISC"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++],
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++],
 				"license, details can be found in the root folder of the "));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], "Apollo distribution."));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Credits"));
-		player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], "Apollo distribution."));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], "@dre@Credits"));
+		player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos++], ""));
 
 		for (; pos < QuestConstants.QUEST_TEXT.length; pos++) {
 			String text = it.hasNext() ? it.next() : "";
-			player.send(new SetInterfaceTextEvent(QuestConstants.QUEST_TEXT[pos], text));
+			player.send(new SetWidgetTextEvent(QuestConstants.QUEST_TEXT[pos], text));
 		}
 
 		player.getInterfaceSet().openWindow(QuestConstants.QUEST_INTERFACE);
 	}
 
-}
+}

src/org/apollo/game/event/handler/impl/WalkEventHandler.java

@@ -3,9 +3,9 @@ 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.Player;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.WalkingQueue;
+import org.apollo.game.model.Player;
 
 /**
  * A handler for the {@link WalkEvent}.
@@ -30,12 +30,12 @@ public final class WalkEventHandler extends EventHandler<WalkEvent> {
 			}
 		}
 
-		queue.setRunningQueue(event.isRunning());
+		queue.setRunningQueue(event.isRunning() || player.isRunning());
 
 		if (queue.size() > 0) {
 			player.stopAction();
-			player.getInterfaceSet().close(); // TODO: should this be done if size == 0?
 		}
+		player.getInterfaceSet().close();
 	}
 
-}
+}

src/org/apollo/game/event/impl/SetWidgetItemModelEvent.java

@@ -0,0 +1,67 @@
+package org.apollo.game.event.impl;
+
+import org.apollo.game.event.Event;
+
+/**
+ * An event sent to the client to change an interface's item model.
+ * 
+ * @author Chris Fletcher
+ */
+public final class SetWidgetItemModelEvent extends Event {
+
+	/**
+	 * The interface's id.
+	 */
+	private final int interfaceId;
+
+	/**
+	 * The model's (item) id.
+	 */
+	private final int modelId;
+
+	/**
+	 * The zoom level.
+	 */
+	private final int zoom;
+
+	/**
+	 * Creates a new set interface item model event.
+	 * 
+	 * @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) {
+		this.interfaceId = interfaceId;
+		this.modelId = modelId;
+		this.zoom = zoom;
+	}
+
+	/**
+	 * Gets the interface's id.
+	 * 
+	 * @return The id.
+	 */
+	public int getInterfaceId() {
+		return interfaceId;
+	}
+
+	/**
+	 * Gets the model's (item) id.
+	 * 
+	 * @return The id.
+	 */
+	public int getModelId() {
+		return modelId;
+	}
+
+	/**
+	 * Gets the zoom level.
+	 * 
+	 * @return The zoom.
+	 */
+	public int getZoom() {
+		return zoom;
+	}
+
+}

src/org/apollo/game/event/impl/SetWidgetModelAnimationEvent.java

@@ -0,0 +1,51 @@
+package org.apollo.game.event.impl;
+
+import org.apollo.game.event.Event;
+
+/**
+ * An event which is sent to the client to make a character model on an interface play a certain animation.
+ * 
+ * @author Chris Fletcher
+ */
+public final class SetWidgetModelAnimationEvent extends Event {
+
+	/**
+	 * The model's mood id.
+	 */
+	private final int animation;
+
+	/**
+	 * The interface id.
+	 */
+	private final int interfaceId;
+
+	/**
+	 * Creates a new set interface npc model's animation event.
+	 * 
+	 * @param interfaceId The interface id.
+	 * @param animation The model's animation id.
+	 */
+	public SetWidgetModelAnimationEvent(int interfaceId, int animation) {
+		this.interfaceId = interfaceId;
+		this.animation = animation;
+	}
+
+	/**
+	 * Gets the model's mood id.
+	 * 
+	 * @return The model's mood id.
+	 */
+	public int getAnimation() {
+		return animation;
+	}
+
+	/**
+	 * Gets the interface id.
+	 * 
+	 * @return The interface id.
+	 */
+	public int getInterfaceId() {
+		return interfaceId;
+	}
+
+}

src/org/apollo/game/event/impl/SetWidgetNpcModelEvent.java

@@ -0,0 +1,51 @@
+package org.apollo.game.event.impl;
+
+import org.apollo.game.event.Event;
+
+/**
+ * An event sent to the client to change an interface's NPC model.
+ * 
+ * @author Chris Fletcher
+ */
+public final class SetWidgetNpcModelEvent extends Event {
+
+	/**
+	 * The interface's id.
+	 */
+	private final int interfaceId;
+
+	/**
+	 * The model's (NPC) id.
+	 */
+	private final int modelId;
+
+	/**
+	 * Creates a new set interface NPC model event.
+	 * 
+	 * @param interfaceId The interface's id.
+	 * @param modelId The model's (NPC) id.
+	 */
+	public SetWidgetNpcModelEvent(int interfaceId, int modelId) {
+		this.interfaceId = interfaceId;
+		this.modelId = modelId;
+	}
+
+	/**
+	 * Gets the interface's id.
+	 * 
+	 * @return The id.
+	 */
+	public int getInterfaceId() {
+		return interfaceId;
+	}
+
+	/**
+	 * Gets the model's (NPC) id.
+	 * 
+	 * @return The id.
+	 */
+	public int getModelId() {
+		return modelId;
+	}
+
+}

src/org/apollo/game/event/impl/SetWidgetPlayerModelEvent.java

@@ -0,0 +1,35 @@
+package org.apollo.game.event.impl;
+
+import org.apollo.game.event.Event;
+
+/**
+ * An event sent to the client to set an interface's 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;
+	}
+
+}

src/org/apollo/game/event/impl/SetWidgetTextEvent.java

@@ -7,7 +7,7 @@ import org.apollo.game.event.Event;
  * 
  * @author Graham
  */
-public final class SetInterfaceTextEvent extends Event {
+public final class SetWidgetTextEvent extends Event {
 
 	/**
 	 * The interface's id.
@@ -25,7 +25,7 @@ public final class SetInterfaceTextEvent extends Event {
 	 * @param interfaceId The interface's id.
 	 * @param text The interface's text.
 	 */
-	public SetInterfaceTextEvent(int interfaceId, String text) {
+	public SetWidgetTextEvent(int interfaceId, String text) {
 		this.interfaceId = interfaceId;
 		this.text = text;
 	}

src/org/apollo/game/event/impl/SetWidgetVisibilityEvent.java

@@ -0,0 +1,52 @@
+package org.apollo.game.event.impl;
+
+import org.apollo.game.event.Event;
+
+/**
+ * An event which changes the state of a hidden interface component (i.e./e.g. the special attack bar on the weapon
+ * tab).
+ * 
+ * @author Chris Fletcher
+ */
+public final class SetWidgetVisibilityEvent extends Event {
+
+	/**
+	 * The component id.
+	 */
+	private final int component;
+
+	/**
+	 * Visible flag.
+	 */
+	private final boolean visible;
+
+	/**
+	 * Creates the interface component state event.
+	 * 
+	 * @param component The compononent id.
+	 * @param visible The flag for showing or hiding the component.
+	 */
+	public SetWidgetVisibilityEvent(int component, boolean visible) {
+		this.component = component;
+		this.visible = visible;
+	}
+
+	/**
+	 * Gets the id of the interface component.
+	 * 
+	 * @return The component id.
+	 */
+	public int getWidgetId() {
+		return component;
+	}
+
+	/**
+	 * Gets the visible flag.
+	 * 
+	 * @return {@code true} if the component has been set to visible, {@code false} if not.
+	 */
+	public boolean isVisible() {
+		return visible;
+	}
+
+}

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

@@ -43,7 +43,6 @@ public final class WalkingQueue {
 		public String toString() {
 			return Point.class.getName() + " [direction=" + direction + ", position=" + position + "]";
 		}
-
 	}
 
 	/**
@@ -54,17 +53,17 @@ public final class WalkingQueue {
 	/**
 	 * The character whose walking queue this is.
 	 */
-	private Character character;
+	private final Character character;
 
 	/**
 	 * The old queue of directions.
 	 */
-	private Deque<Point> oldPoints = new ArrayDeque<Point>();
+	private final Deque<Point> oldPoints = new ArrayDeque<Point>();
 
 	/**
 	 * The queue of directions.
 	 */
-	private Deque<Point> points = new ArrayDeque<Point>();
+	private final Deque<Point> points = new ArrayDeque<Point>();
 
 	/**
 	 * Flag indicating if this queue (only) should be ran.
@@ -253,4 +252,4 @@ public final class WalkingQueue {
 		return points.size();
 	}
 
-}
+}

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

@@ -10,7 +10,12 @@ import org.apollo.game.event.impl.OpenInterfaceSidebarEvent;
 import org.apollo.game.event.impl.PlayerSynchronizationEvent;
 import org.apollo.game.event.impl.RegionChangeEvent;
 import org.apollo.game.event.impl.ServerMessageEvent;
-import org.apollo.game.event.impl.SetInterfaceTextEvent;
+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.UpdateSkillEvent;
@@ -110,8 +115,13 @@ public final class Release317 extends Release {
 		register(UpdateSkillEvent.class, new UpdateSkillEventEncoder());
 		register(OpenInterfaceSidebarEvent.class, new OpenInterfaceSidebarEventEncoder());
 		register(EnterAmountEvent.class, new EnterAmountEventEncoder());
-		register(SetInterfaceTextEvent.class, new SetInterfaceTextEventEncoder());
+		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());
 	}
 
 }

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

@@ -0,0 +1,28 @@
+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<SetWidgetItemModelEvent> {
+
+	@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();
+	}
+
+}

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

@@ -0,0 +1,26 @@
+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<SetWidgetModelAnimationEvent> {
+
+	@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();
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package org.apollo.net.release.r317;
+
+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<SetWidgetNpcModelEvent> {
+
+	@Override
+	public GamePacket encode(SetWidgetNpcModelEvent event) {
+		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());
+
+		return builder.toGamePacket();
+	}
+
+}

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

@@ -0,0 +1,25 @@
+package org.apollo.net.release.r317;
+
+import org.apollo.game.event.impl.SetWidgetPlayerModelEvent;
+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 SetWidgetPlayerModelEvent}.
+ * 
+ * @author Chris Fletcher
+ */
+final class SetWidgetPlayerModelEventEncoder extends EventEncoder<SetWidgetPlayerModelEvent> {
+
+	@Override
+	public GamePacket encode(SetWidgetPlayerModelEvent event) {
+		GamePacketBuilder builder = new GamePacketBuilder(185);
+		builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId());
+		return builder.toGamePacket();
+	}
+
+}

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

@@ -1,6 +1,6 @@
 package org.apollo.net.release.r317;
 
-import org.apollo.game.event.impl.SetInterfaceTextEvent;
+import org.apollo.game.event.impl.SetWidgetTextEvent;
 import org.apollo.net.codec.game.DataTransformation;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
@@ -9,14 +9,14 @@ import org.apollo.net.meta.PacketType;
 import org.apollo.net.release.EventEncoder;
 
 /**
- * An {@link EventEncoder} for the {@link SetInterfaceTextEvent}.
+ * An {@link EventEncoder} for the {@link SetWidgetTextEvent}.
  * 
  * @author The Wanderer
  */
-public final class SetInterfaceTextEventEncoder extends EventEncoder<SetInterfaceTextEvent> {
+public final class SetWidgetTextEventEncoder extends EventEncoder<SetWidgetTextEvent> {
 
 	@Override
-	public GamePacket encode(SetInterfaceTextEvent event) {
+	public GamePacket encode(SetWidgetTextEvent event) {
 		GamePacketBuilder builder = new GamePacketBuilder(126, PacketType.VARIABLE_SHORT);
 		builder.putString(event.getText());
 		builder.put(DataType.SHORT, DataTransformation.ADD, event.getInterfaceId());

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

@@ -0,0 +1,26 @@
+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<SetWidgetVisibilityEvent> {
+
+	@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();
+	}
+
+}

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

@@ -10,7 +10,12 @@ import org.apollo.game.event.impl.OpenInterfaceSidebarEvent;
 import org.apollo.game.event.impl.PlayerSynchronizationEvent;
 import org.apollo.game.event.impl.RegionChangeEvent;
 import org.apollo.game.event.impl.ServerMessageEvent;
-import org.apollo.game.event.impl.SetInterfaceTextEvent;
+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.UpdateSkillEvent;
@@ -95,7 +100,7 @@ public final class Release377 extends Release {
 		register(110, new ClosedInterfaceEventDecoder());
 		register(75, new EnteredAmountEventDecoder());
 		register(1, new ItemOnItemEventDecoder());
-		
+
 		// register encoders
 		register(IdAssignmentEvent.class, new IdAssignmentEventEncoder());
 		register(RegionChangeEvent.class, new RegionChangeEventEncoder());
@@ -110,8 +115,13 @@ public final class Release377 extends Release {
 		register(UpdateSkillEvent.class, new UpdateSkillEventEncoder());
 		register(OpenInterfaceSidebarEvent.class, new OpenInterfaceSidebarEventEncoder());
 		register(EnterAmountEvent.class, new EnterAmountEventEncoder());
-		register(SetInterfaceTextEvent.class, new SetInterfaceTextEventEncoder());
+		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());
 	}
 
-}
+}

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

@@ -0,0 +1,29 @@
+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<SetWidgetItemModelEvent> {
+
+	@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();
+	}
+
+}

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

@@ -0,0 +1,28 @@
+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<SetWidgetModelAnimationEvent> {
+
+	@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();
+	}
+
+}

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

@@ -0,0 +1,28 @@
+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<SetWidgetNpcModelEvent> {
+
+	@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();
+	}
+
+}

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

@@ -0,0 +1,25 @@
+package org.apollo.net.release.r377;
+
+import org.apollo.game.event.impl.SetWidgetPlayerModelEvent;
+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 SetWidgetPlayerModelEvent}.
+ * 
+ * @author Chris Fletcher
+ */
+final class SetWidgetPlayerModelEventEncoder extends EventEncoder<SetWidgetPlayerModelEvent> {
+
+	@Override
+	public GamePacket encode(SetWidgetPlayerModelEvent event) {
+		GamePacketBuilder builder = new GamePacketBuilder(255);
+		builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId());
+		return builder.toGamePacket();
+	}
+
+}

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

@@ -1,6 +1,6 @@
 package org.apollo.net.release.r377;
 
-import org.apollo.game.event.impl.SetInterfaceTextEvent;
+import org.apollo.game.event.impl.SetWidgetTextEvent;
 import org.apollo.net.codec.game.DataOrder;
 import org.apollo.net.codec.game.DataTransformation;
 import org.apollo.net.codec.game.DataType;
@@ -10,14 +10,14 @@ import org.apollo.net.meta.PacketType;
 import org.apollo.net.release.EventEncoder;
 
 /**
- * An {@link EventEncoder} for the {@link SetInterfaceTextEvent}.
+ * An {@link EventEncoder} for the {@link SetWidgetTextEvent}.
  * 
  * @author Graham
  */
-public final class SetInterfaceTextEventEncoder extends EventEncoder<SetInterfaceTextEvent> {
+public final class SetWidgetTextEventEncoder extends EventEncoder<SetWidgetTextEvent> {
 
 	@Override
-	public GamePacket encode(SetInterfaceTextEvent event) {
+	public GamePacket encode(SetWidgetTextEvent event) {
 		GamePacketBuilder builder = new GamePacketBuilder(232, PacketType.VARIABLE_SHORT);
 		builder.put(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD, event.getInterfaceId());
 		builder.putString(event.getText());

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

@@ -0,0 +1,26 @@
+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<SetWidgetVisibilityEvent> {
+
+	@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();
+	}
+
+}

src/org/apollo/util/plugin/PluginManager.java

@@ -114,6 +114,8 @@ public final class PluginManager {
 		//
 		// Thank you!
 		authors.add("Graham");
+		authors.add("Major");
+		authors.add("Chris Fletcher");
 		authors.add("Blake");
 	}