Refactor of Beer Barrels.

POH Beer Glasses are separate objects from normal beer glasses, and cannot be taken out of the POH, nor any drinks received from the POH. The recipe to make it should use the normal drink, but it will only give a POH-specific version that cannot be taken out.

Server/src/main/content/data/consumables/Consumables.java

@@ -201,6 +201,7 @@ public enum Consumables {
 	/** Ales */
 	ASGOLDIAN_ALE(new FakeConsumable(7508, new String[] {"I don't think I'd like gold in beer thanks. Leave it for the dwarves."})),
 	ASGARNIAN_ALE(new Drink(new int[] {1905, 1919}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
+	ASGARNIAN_ALE_POH(new Drink(new int[] {7744, 7742}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	ASGARNIAN_ALE_KEG(new Drink(new int[] {5785, 5783, 5781, 5779, 5769}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289), "You drink the ale. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	ASGARNIAN_ALE_M(new Drink(new int[] {5739, 1919}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)))),
 	ASGARNIAN_ALE_M_KEG(new Drink(new int[] {5865, 5863, 5861, 5859, 5769}, new MultiEffect(new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), new Animation(2289))),
@@ -210,17 +211,21 @@ public enum Consumables {
 	AXEMANS_FOLLY_M_KEG(new Drink(new int[] {5905, 5903, 5901, 5899, 5769}, new MultiEffect(new SkillEffect(Skills.WOODCUTTING, 2, 0), new HealingEffect(2), new SkillEffect(Skills.STRENGTH, -4, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289))),
 	BANDITS_BREW(new Drink(new int[] {4627, 1919}, new MultiEffect(new SkillEffect(Skills.THIEVING, 1, 0), new SkillEffect(Skills.ATTACK, 1, 0), new SkillEffect(Skills.STRENGTH, -1, 0), new SkillEffect(Skills.DEFENCE, -6, 0), new HealingEffect(1)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	BEER(new Drink(new int[] {1917, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 0, 0.04), new SkillEffect(Skills.ATTACK, 0, -0.07)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
+	BEER_POH(new Drink(new int[] {7740, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 0, 0.04), new SkillEffect(Skills.ATTACK, 0, -0.07)), "You drink the beer. You feel slightly reinvigorated...", "...and slightly dizzy too.")),
 	BEER_TANKARD(new Drink(new int[] {3803, 3805}, new MultiEffect(new SkillEffect(Skills.ATTACK, -9, 0), new SkillEffect(Skills.STRENGTH, 4, 0)), "You quaff the beer. You feel slightly reinvigorated...", "...but very dizzy too.")),
 	KEG_OF_BEER(new Drink(new int[] {3801}, new KegOfBeerEffect(), new Animation(1330), "You chug the keg. You feel reinvigorated...", "...but extremely drunk too.")),
 	CHEFS_DELIGHT(new Drink(new int[] {5755, 1919}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
+	CHEFS_DELIGHT_POH(new Drink(new int[] {7754, 7742}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	CHEFS_DELIGHT_KEG(new Drink(new int[] {5833, 5831, 5829, 5827, 5769}, new MultiEffect(new SkillEffect(Skills.COOKING, 1, 0.05), new HealingEffect(1), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),
 	CHEFS_DELIGHT_M(new Drink(new int[] {5757, 1919}, new MultiEffect(new SkillEffect(Skills.COOKING, 2, 0.05), new HealingEffect(2), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0)))),
 	CHEFS_DELIGHT_M_KEG(new Drink(new int[] {5913, 5911, 5909, 5907, 5769}, new MultiEffect(new SkillEffect(Skills.COOKING, 2, 0.05), new HealingEffect(2), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0)), new Animation(2289))),
 	CIDER(new Drink(new int[] {5763, 1919}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))))),
+	CIDER_POH(new Drink(new int[] {7752, 7742}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))))),
 	CIDER_KEG(new Drink(new int[] {5849, 5847, 5845, 5843, 5769}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 1, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0))), new Animation(2289))),
 	MATURE_CIDER(new Drink(new int[] {5765, 1919}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 2, 0), new SkillEffect(Skills.ATTACK, -5, 0), new SkillEffect(Skills.STRENGTH, -5, 0))))),
 	CIDER_M_KEG(new Drink(new int[] {5929, 5927, 5925, 5923, 5769}, new MultiEffect(new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.FARMING, 2, 0), new SkillEffect(Skills.ATTACK, -5, 0), new SkillEffect(Skills.STRENGTH, -5, 0))), new Animation(2289))),
 	DRAGON_BITTER(new Drink(new int[] {1911, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
+	DRAGON_BITTER_POH(new Drink(new int[] {7748, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)))),
 	DRAGON_BITTER_KEG(new Drink(new int[] {5809, 5807, 5805, 5803, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.STRENGTH, 2, 0), new SkillEffect(Skills.ATTACK, -4, 0)), new Animation(2289))),
 	DRAGON_BITTER_M(new Drink(new int[] {5745, 1919}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)))),
 	DRAGON_BITTER_M_KEG(new Drink(new int[] {5889, 5887, 5885, 5883, 5769}, new MultiEffect(new HealingEffect(2), new SkillEffect(Skills.STRENGTH, 3, 0), new SkillEffect(Skills.ATTACK, -6, 0)), new Animation(2289))),
@@ -229,6 +234,7 @@ public enum Consumables {
 	DWARVEN_STOUT_M(new Drink(new int[] {5747, 1919}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)))),
 	DWARVEN_STOUT_M_KEG(new Drink(new int[] {5857, 5855, 5853, 5851, 5769}, new MultiEffect(new SkillEffect(Skills.MINING, 2, 0), new SkillEffect(Skills.SMITHING, 2 ,0), new SkillEffect(Skills.ATTACK, -7, 0), new SkillEffect(Skills.STRENGTH, -7, 0), new SkillEffect(Skills.DEFENCE, -7, 0), new HealingEffect(1)), new Animation(2289))),
 	GREENMANS_ALE(new Drink(new int[] {1909, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)))),
+	GREENMANS_ALE_POH(new Drink(new int[] {7746, 7742}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)))),
 	GREENMANS_ALE_KEG(new Drink(new int[] {5793, 5791, 5789, 5787, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 1, 0), new SkillEffect(Skills.ATTACK, -3, 0), new SkillEffect(Skills.STRENGTH, -3, 0), new SkillEffect(Skills.DEFENCE, -3, 0)), new Animation(2289))),
 	GREENMANS_ALE_M(new Drink(new int[] {5743, 1919}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)))),
 	GREENMANS_ALE_M_KEG(new Drink(new int[] {5873, 5871, 5869, 5867, 5769}, new MultiEffect(new HealingEffect(1), new SkillEffect(Skills.HERBLORE, 2, 0), new SkillEffect(Skills.ATTACK, -2, 0), new SkillEffect(Skills.STRENGTH, -2, 0)), new Animation(2289))),

Server/src/main/content/global/skill/construction/HouseZone.java

@@ -158,6 +158,13 @@ public final class HouseZone extends MapZone {
             Items.FULL_KETTLE_7690,
             Items.HOT_KETTLE_7691,
             Items.TEA_LEAVES_7738,
+            Items.BEER_GLASS_7742,
+            Items.BEER_7740,
+            Items.CIDER_7752,
+            Items.ASGARNIAN_ALE_7744,
+            Items.GREENMANS_ALE_7746,
+            Items.DRAGON_BITTER_7748,
+            Items.CHEFS_DELIGHT_7754
     };
 
     private void remove_items(Player p) {

Server/src/main/content/global/skill/construction/decoration/BeerBarrelPlugin.java

@@ -1,76 +0,0 @@
-package content.global.skill.construction.decoration;
-
-import core.game.interaction.NodeUsageEvent;
-import core.game.interaction.UseWithHandler;
-import core.game.node.entity.player.Player;
-import core.game.node.item.Item;
-import core.game.node.scenery.Scenery;
-import core.game.world.update.flag.context.Animation;
-import core.plugin.Initializable;
-import core.plugin.Plugin;
-import org.rs09.consts.Items;
-
-/**
- * Handles the Construction beer barrels.
- * @author Splinter
- */
-@Initializable
-public class BeerBarrelPlugin extends UseWithHandler {
-
-	/**
-	 * The object ids
-	 */
-	private static final int[] OBJECTS = new int[] { 
-		13568, 13569, 13570, 13571, 13572, 13573
-	};
-
-	/**
-	 * Constructs a new {@Code BeerBarrelPlugin} {@Code Object}
-	 */
-	public BeerBarrelPlugin() {
-		super(1919);
-	}
-
-	@Override
-	public Plugin<Object> newInstance(Object arg) throws Throwable {
-		for (int id : OBJECTS) {
-			addHandler(id, OBJECT_TYPE, this);
-		}
-		return this;
-	}
-
-	@Override
-	public boolean handle(NodeUsageEvent event) {
-		Player player = event.getPlayer();
-		final Scenery object = (Scenery) event.getUsedWith();
-
-		if (player.getInventory().remove(new Item(Items.BEER_GLASS_1919))) {
-			player.animate(Animation.create(833));
-			player.sendMessage("You fill up your glass.");
-			player.getInventory().add(new Item(getReward(object.getId()), 1));
-		}
-		return true;
-	}
-
-	/**
-	 * Get the beer reward based on the interaced barrel.
-	 * @return the item to give.
-	 */
-	public int getReward(int barrelId) {
-		switch (barrelId) {
-		case 13568:
-			return 1917;
-		case 13569:
-			return 5763;
-		case 13570:
-			return 1905;
-		case 13571:
-			return 1909;
-		case 13572:
-			return 1911;
-		case 13573:
-			return 5755;
-		}
-		return 1917;
-	}
-}

Server/src/main/content/global/skill/construction/decoration/kitchen/BeerBarrelInteraction.kt

@@ -1,77 +1,72 @@
-package content.global.skill.construction.decoration.kitchen;
+package content.global.skill.construction.decoration.kitchen
 
+import core.api.*
+import core.game.interaction.InteractionListener
+import org.rs09.consts.Items
 
-import core.game.interaction.NodeUsageEvent;
+class BeerBarrelInteraction : InteractionListener {
-import core.game.interaction.UseWithHandler;
-import core.game.node.entity.player.Player;
-import core.game.node.item.Item;
-import core.game.node.scenery.Scenery;
-import core.game.world.update.flag.context.Animation;
-import core.plugin.Initializable;
-import core.plugin.Plugin;
-import org.rs09.consts.Items;
 
-/**
+    // Imagine if these indexes incremented logically...
- * Handles the Construction beer barrels.
+    companion object{
- * @author Splinter
+        private val barrelMap = mapOf(
- */
+            org.rs09.consts.Scenery.BEER_BARREL_13568 to Items.BEER_7740,
-@Initializable
+            org.rs09.consts.Scenery.CIDER_BARREL_13569 to Items.CIDER_7752,
-public class BeerBarrelPlugin extends UseWithHandler {
+            org.rs09.consts.Scenery.ASGARNIAN_ALE_13570 to Items.ASGARNIAN_ALE_7744,
-
+            org.rs09.consts.Scenery.GREENMAN_S_ALE_13571 to Items.GREENMANS_ALE_7746,
-	/**
+            org.rs09.consts.Scenery.DRAGON_BITTER_13572 to Items.DRAGON_BITTER_7748,
-	 * The object ids
+            org.rs09.consts.Scenery.CHEF_S_DELIGHT_13573 to Items.CHEFS_DELIGHT_7754,
-	 */
+        )
-	private static final int[] OBJECTS = new int[] { 
+    }
-		13568, 13569, 13570, 13571, 13572, 13573
+    override fun defineListeners() {
-	};
+        onUseWith(SCENERY, Items.BEER_GLASS_7742, *barrelMap.keys.toIntArray()){ player, used, with ->
-
+            val drinkName  = with.name.lowercase().replace("barrel", "").trim()+"."
-	/**
+            if (removeItem(player, used)){
-	 * Constructs a new {@Code BeerBarrelPlugin} {@Code Object}
+                sendMessage(player, "You fill up your glass with $drinkName")
-	 */
+                addItem(player, barrelMap[with.id]!!)
-	public BeerBarrelPlugin() {
+            }
-		super(1919);
+            return@onUseWith true
+        }
+    }
 }
 
-	@Override
+/*
-	public Plugin<Object> newInstance(Object arg) throws Throwable {
-		for (int id : OBJECTS) {
-			addHandler(id, OBJECT_TYPE, this);
-		}
-		return this;
-	}
 
-	@Override
+    override fun handle(event: NodeUsageEvent): Boolean {
-	public boolean handle(NodeUsageEvent event) {
+        val player = event.player
-		Player player = event.getPlayer();
+        val `object` = event.usedWith as Scenery
-		final Scenery object = (Scenery) event.getUsedWith();
 
-		if (player.getInventory().remove(new Item(Items.BEER_GLASS_1919))) {
+        if (player.inventory.remove(Item(BEER_GLASS_1919))) {
-			player.animate(Animation.create(3661 + (object.getId() - 13569)));
+            player.animate(Animation.create(3661 + (`object`.id - 13569)))
-			player.sendMessage("You fill up your glass with " + object.getName().toLowerCase().replace("barrel", "").trim() + ".");
+            player.sendMessage(
-			player.getInventory().add(new Item(getReward(object.getId()), 1));
+                "You fill up your glass with " + `object`.name.lowercase(Locale.getDefault()).replace("barrel", "")
+                    .trim { it <= ' ' } + ".")
+            player.inventory.add(Item(getReward(`object`.id), 1))
         }
-		return true;
+        return true
     }
 
     /**
      * Get the beer reward based on the interacted barrel.
      * @return the item to give.
      */
-	public int getReward(int barrelId) {
+    fun getReward(barrelId: Int): Int {
-		switch (barrelId) {
+        when (barrelId) {
-		case 13568:
+            13568 -> return 1917
-			return 1917;
+            13569 -> return 5763
-		case 13569:
+            13570 -> return 1905
-			return 5763;
+            13571 -> return 1909
-		case 13570:
+            13572 -> return 1911
-			return 1905;
+            13573 -> return 5755
-		case 13571:
-			return 1909;
-		case 13572:
-			return 1911;
-		case 13573:
-			return 5755;
         }
-		return 1917;
+        return 1917
     }
+
+    companion object {
+        /**
+         * The object ids
+         */
+        private val OBJECTS = intArrayOf(
+            13568, 13569, 13570, 13571, 13572, 13573
+        )
     }
+}*/

Server/src/main/content/global/skill/construction/decoration/kitchen/ShelfListener.kt

@@ -18,7 +18,7 @@ class ShelfListener : InteractionListener {
         )
 
         private val woodshelf_2_items = woodshelf_1_items + listOf(
-            "Beer glass" to Items.BEER_GLASS_1919
+            "Beer glass" to Items.BEER_GLASS_7742
         )
 
         private val woodshelf_3_items = woodshelf_2_items.map { (name, itemId) ->