From 2c7ecdad80ca485d9383e435fd8f46636b6040c1 Mon Sep 17 00:00:00 2001
From: Major- <major@emulate.rs>
Date: Mon, 12 Jan 2015 02:44:08 +0000
Subject: [PATCH] Support dynamic addition of valid interfaces in
 ItemVerificationHandler, for plugins.

---
 .../handler/impl/ItemVerificationHandler.java | 63 ++++++++++++++-----
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java b/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java
index 31773b17..4429bdfd 100644
--- a/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java
+++ b/src/org/apollo/game/message/handler/impl/ItemVerificationHandler.java
@@ -1,5 +1,8 @@
 package org.apollo.game.message.handler.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apollo.game.message.handler.MessageHandler;
 import org.apollo.game.message.handler.MessageHandlerContext;
 import org.apollo.game.message.impl.InventoryItemMessage;
@@ -13,29 +16,61 @@ import org.apollo.game.model.inv.SynchronizationInventoryListener;
  * A {@link MessageHandler} that verifies {@link InventoryItemMessage}s.
  * 
  * @author Chris Fletcher
+ * @author Major
  */
 public final class ItemVerificationHandler extends MessageHandler<InventoryItemMessage> {
 
+	/**
+	 * A supplier for an {@link Inventory}.
+	 * 
+	 * @author Major
+	 */
+	@FunctionalInterface
+	public static interface InventorySupplier {
+
+		/**
+		 * Gets the appropriate {@link Inventory}.
+		 * 
+		 * @param player The {@link Player} who prompted the verification call.
+		 * @return The inventory. Must not be {@code null}.
+		 */
+		public Inventory getInventory(Player player);
+
+	}
+
+	/**
+	 * The map of interface ids to inventories.
+	 */
+	private static final Map<Integer, InventorySupplier> inventories = new HashMap<>();
+
+	static {
+		inventories.put(SynchronizationInventoryListener.INVENTORY_ID, Player::getInventory);
+		inventories.put(BankConstants.SIDEBAR_INVENTORY_ID, Player::getInventory);
+		inventories.put(SynchronizationInventoryListener.EQUIPMENT_ID, Player::getEquipment);
+		inventories.put(BankConstants.BANK_INVENTORY_ID, Player::getBank);
+	}
+
+	/**
+	 * Adds an {@link Inventory} with the specified interface id to the {@link Map} of supported ones,
+	 * <strong>iff</strong> the specified id does <strong>not</strong> already have a mapping.
+	 * 
+	 * @param id The id of the interface.
+	 * @param supplier The {@link InventorySupplier}.
+	 */
+	public static void addInventory(int id, InventorySupplier supplier) {
+		inventories.putIfAbsent(id, supplier);
+	}
+
 	@Override
 	public void handle(MessageHandlerContext ctx, Player player, InventoryItemMessage message) {
-		Inventory inventory;
-
-		switch (message.getInterfaceId()) {
-		case SynchronizationInventoryListener.INVENTORY_ID:
-		case BankConstants.SIDEBAR_INVENTORY_ID:
-			inventory = player.getInventory();
-			break;
-		case SynchronizationInventoryListener.EQUIPMENT_ID:
-			inventory = player.getEquipment();
-			break;
-		case BankConstants.BANK_INVENTORY_ID:
-			inventory = player.getBank();
-			break;
-		default:
+		InventorySupplier supplier = inventories.get(message.getInterfaceId());
+		if (supplier == null) {
 			ctx.breakHandlerChain();
 			return;
 		}
 
+		Inventory inventory = supplier.getInventory(player);
+
 		int slot = message.getSlot();
 		if (slot < 0 || slot >= inventory.capacity()) {
 			ctx.breakHandlerChain();