From d71f9dfd2a601a61164bc4efac53cae1d0bdd5f3 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Sat, 13 Jul 2024 11:54:33 -0400
Subject: [PATCH 01/13] rebase

---
 .../global/skill/construction/BuildHotspot.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/BuildHotspot.java b/Server/src/main/content/global/skill/construction/BuildHotspot.java
index 32a461b9f0..a700f0817c 100644
--- a/Server/src/main/content/global/skill/construction/BuildHotspot.java
+++ b/Server/src/main/content/global/skill/construction/BuildHotspot.java
@@ -59,7 +59,7 @@ public enum BuildHotspot {
 	DINING_BENCH_1(15300, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY, Decoration.BENCH_GILDED),
 	DINING_BENCH_2(15299, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_MID_ANIM, Decoration.BENCH_WOODEN, Decoration.BENCH_OAK, Decoration.BENCH_CARVED_OAK, Decoration.BENCH_TEAK, Decoration.BENCH_CARVED_TEAK, Decoration.BENCH_MAHOGANY,Decoration.BENCH_GILDED),
 	ROPE_BELL_PULL(15304, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ROPE_PULL, Decoration.BELL_PULL, Decoration.FANCY_BELL_PULL),
-	WALL_DECORATION(15303, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
+	WALL_DECORATION(15303, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
 	
 	/**
 	 * Low-level Work shop hotspots.
@@ -67,11 +67,11 @@ public enum BuildHotspot {
 	REPAIR(15448, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.REPAIR_BENCH, Decoration.WHETSTONE, Decoration.ARMOUR_STAND),
 	WORKBENCH(15439, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.WORKBENCH_WOODEN, Decoration.WORKBENCH_OAK,Decoration.WORKBENCH_STEEL_FRAME, Decoration.WORKBENCH_WITH_VICE,Decoration.WORKBENCH_WITH_LATHE),
 	CRAFTING(15441, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.CRAFTING_TABLE_1, Decoration.CRAFTING_TABLE_2,Decoration.CRAFTING_TABLE_3, Decoration.CRAFTING_TABLE_4),
-	TOOL1(15443, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,	Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,	Decoration.TOOL_STORE_5),
-	TOOL2(15444, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
-	TOOL3(15445, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
-	TOOL4(15446, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
-	TOOL5(15447, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+	TOOL1(15443, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,	Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,	Decoration.TOOL_STORE_5),
+	TOOL2(15444, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+	TOOL3(15445, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+	TOOL4(15446, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
+	TOOL5(15447, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.TOOL_STORE_1, Decoration.TOOL_STORE_2,Decoration.TOOL_STORE_3, Decoration.TOOL_STORE_4,Decoration.TOOL_STORE_5),
 	HERALDRY(15450, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.PLUMING_STAND, Decoration.SHIELD_EASEL,Decoration.BANNER_EASEL),
 	
 	/**
@@ -201,7 +201,7 @@ public enum BuildHotspot {
 	/**
 	 * Combat room hotspots.
 	 */
-	WALL_DECORATION2(15297, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
+	WALL_DECORATION2(15297, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.OAK_DECORATION, Decoration.TEAK_DECORATION, Decoration.GILDED_DECORATION),
 	STORAGE_SPACE(15296, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.GLOVE_RACK, Decoration.WEAPONS_RACK, Decoration.EXTRA_WEAPONS_RACK),
 	CR_RING(15277, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2),
 	CR_CORNER(15278, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.BOXING_RING, Decoration.FENCING_RING, Decoration.COMBAT_RING, Decoration.NOTHING, Decoration.NOTHING2),
@@ -238,7 +238,8 @@ public enum BuildHotspot {
 	LECTERN(15420, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_LECTERN, Decoration.EAGLE_LECTERN, Decoration.DEMON_LECTERN, Decoration.TEAK_EAGLE_LECTERN, Decoration.TEAK_DEMON_LECTERN, Decoration.MAHOGANY_EAGLE_LECTERN, Decoration.MAHOGANY_DEMON_LECTERN),
 	CRYSTAL_BALL(15422, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.CRYSTAL_BALL, Decoration.ELEMENTAL_SPHERE, Decoration.CRYSTAL_OF_POWER),
 	BOOKCASE3(15425, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.WOODEN_BOOKCASE, Decoration.OAK_BOOKCASE, Decoration.MAHOGANY_BOOKCASE),
-	WALL_CHART(15423, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ALCHEMICAL_CHART, Decoration.ASTRONOMICAL_CHART, Decoration.INFERNAL_CHART),
+	WALL_CHART(15423, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ALCHEMICAL_CHART, Decoration.ASTRONOMICAL_CHART, Decoration.INFERNAL_CHART),
+>>>>>>> f9a73ae32 (recursive hotspots)
 	TELESCOPE(15424, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.TELESCOPE1, Decoration.TELESCOPE2, Decoration.TELESCOPE3),
 	
 	/**
-- 
GitLab


From bc43772302b5e80ec49a408f56cc1b4f4640dc73 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Mon, 1 Jul 2024 19:05:25 -0400
Subject: [PATCH 02/13] xp and mats

---
 .../global/skill/construction/Decoration.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 058de5a8b8..310f1b4f5b 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -116,11 +116,11 @@ public enum Decoration {
 	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
 
 	/**
-	 * Parlour bookcases
+	 * Bookcases
 	 */
-	WOODEN_BOOKCASE(13597, 8319, 4, 132.0, new Item(Items.PLANK_960, 4)),
-	OAK_BOOKCASE(13598, 8320, 29, 225.0, new Item(Items.OAK_PLANK_8778, 3)),
-	MAHOGANY_BOOKCASE(13599, 8321, 40, 315.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	WOODEN_BOOKCASE(13597, 8319, 4, 115.0, new Item(Items.PLANK_960, 4)),
+	OAK_BOOKCASE(13598, 8320, 29, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
+	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
 
 	
 	/**
@@ -225,7 +225,7 @@ public enum Decoration {
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN(13704, 8375, 17, 145.0, new Item(Items.PLANK_960, 1)),
+	WORKBENCH_WOODEN(13704, 8375, 17, 145.0, new Item(Items.PLANK_960, 5)),
 	WORKBENCH_OAK(13705, 8376, 32, 300.0, new Item(Items.OAK_PLANK_8778, 5)),
 	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
 	WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
@@ -250,10 +250,10 @@ public enum Decoration {
 	 * 	TODO: These are upgradable hotspots, therefore crafting table 3 would require
 	 * 	crafting table 2 to be already built in that spot.
 	 */
-	CRAFTING_TABLE_1(13709, 8380, 16, 50.0, new Item(Items.OAK_PLANK_8778, 4)),
-	CRAFTING_TABLE_2(13710, 8381, 25, 100.0, new Item(Items.MOLTEN_GLASS_1775, 1)),
-	CRAFTING_TABLE_3(13711, 8382, 34, 175.0, new Item(Items.MOLTEN_GLASS_1775, 2)),
-	CRAFTING_TABLE_4(13712, 8383, 42, 240.0, new Item(Items.OAK_PLANK_8778, 2)),
+	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
+	CRAFTING_TABLE_2(13710, 8381, 25, 1.0, new Item(Items.MOLTEN_GLASS_1775, 1)),
+	CRAFTING_TABLE_3(13711, 8382, 34, 2.0, new Item(Items.MOLTEN_GLASS_1775, 2)),
+	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 	
 	/**
 	 * Workshop tool stores
-- 
GitLab


From f880f2102e871b1dc029aca6466985cc3d66ee84 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Mon, 1 Jul 2024 19:17:08 -0400
Subject: [PATCH 03/13] more xp

---
 .../content/global/skill/construction/Decoration.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 310f1b4f5b..c732df8984 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -78,9 +78,9 @@ public enum Decoration {
 	/**
 	 * Parlour chair spot
 	 */
-	CRUDE_CHAIR(13581, 8309, 1, 66.0, new Item(Items.PLANK_960, 2)),
-	WOODEN_CHAIR(13582, 8310, 8, 96.0, new Item(Items.PLANK_960, 3)),
-	ROCKING_CHAIR(13583, 8311, 14, 96.0, new Item(Items.PLANK_960, 3)),
+	CRUDE_CHAIR(13581, 8309, 1, 58.0, new Item(Items.PLANK_960, 2)),
+	WOODEN_CHAIR(13582, 8310, 8, 87.0, new Item(Items.PLANK_960, 3)),
+	ROCKING_CHAIR(13583, 8311, 14, 87.0, new Item(Items.PLANK_960, 3)),
 	OAK_CHAIR(13584, 8312, 19, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 	OAK_ARMCHAIR(13585, 8313, 26, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
 	TEAK_ARMCHAIR(13586, 8314, 35, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
@@ -225,7 +225,7 @@ public enum Decoration {
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN(13704, 8375, 17, 145.0, new Item(Items.PLANK_960, 5)),
+	WORKBENCH_WOODEN(13704, 8375, 17, 143.0, new Item(Items.PLANK_960, 5)),
 	WORKBENCH_OAK(13705, 8376, 32, 300.0, new Item(Items.OAK_PLANK_8778, 5)),
 	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
 	WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
-- 
GitLab


From ada4c0fa95840fb03a2a5fe8a811ac396c30676c Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 16:32:29 -0400
Subject: [PATCH 04/13]  a start but git is screwing with me

---
 .../skill/construction/BuildingUtils.java     |  3 ++-
 .../decoration/questhall/MountedGlory.kt      | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/BuildingUtils.java b/Server/src/main/content/global/skill/construction/BuildingUtils.java
index 424e5aa949..d67a3465a5 100644
--- a/Server/src/main/content/global/skill/construction/BuildingUtils.java
+++ b/Server/src/main/content/global/skill/construction/BuildingUtils.java
@@ -349,7 +349,7 @@ public final class BuildingUtils {
 	 */
 	public static void removeDecoration(Player player, Scenery object) {
 		if (object.getId() == Decoration.PORTAL.getObjectId() && player.getHouseManager().getPortalAmount() <= 1) {
-			player.getPacketDispatch().sendMessage("You need atleast one portal, how else would you leave your house?");
+			sendMessage(player, "You need at least one portal, how else would you leave your house?");
 			return;
 		}
 		Location l = object.getLocation();
@@ -369,6 +369,7 @@ public final class BuildingUtils {
 			if (objectId == object.getId() && hotspot.getCurrentX() == l.getChunkOffsetX() && hotspot.getCurrentY() == l.getChunkOffsetY()) {
 				player.animate(REMOVE_ANIMATION);
 				removeDecoration(player, region, room, hotspot, object, style);
+				// Refund shuizzle here
 				break;
 			}
 		}
diff --git a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
index 4f7ddb15b3..7c68d5f768 100644
--- a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
@@ -27,27 +27,30 @@ class MountedGlory : InteractionListener {
     )
 
     override fun defineListeners() {
-        on(MOUNTED_GLORY, IntType.SCENERY, "Edgeville") { player, _ ->
-            mountedGloryTeleport(player,0)
+        on(MOUNTED_GLORY, IntType.SCENERY, "Edgeville") { player, `object` ->
+            mountedGloryAction(player, `object`, 0)
             return@on true
         }
 
-        on(MOUNTED_GLORY, IntType.SCENERY, "Karamja") { player, _ ->
-            mountedGloryTeleport(player,1)
+        on(MOUNTED_GLORY, IntType.SCENERY, "Karamja") { player, `object` ->
+            mountedGloryAction(player, `object`, 1)
             return@on true
         }
 
-        on(MOUNTED_GLORY, IntType.SCENERY, "Draynor Village") { player, _ ->
-            mountedGloryTeleport(player,2)
+        on(MOUNTED_GLORY, IntType.SCENERY, "Draynor Village") { player, `object` ->
+            mountedGloryAction(player, `object`, 2)
             return@on true
         }
 
-        on(MOUNTED_GLORY, IntType.SCENERY, "Al Kharid") { player, _ ->
-            mountedGloryTeleport(player,3)
+        on(MOUNTED_GLORY, IntType.SCENERY, "Al Kharid") { player, `object` ->
+            mountedGloryAction(player, `object`, 3)
             return@on true
         }
     }
-    private fun mountedGloryTeleport(player : Player, int : Int) {
+    private fun mountedGloryAction(player : Player, `object` : Node, int : Int) {
+        if (player.houseManager.isBuildingMode()) {
+            player.dialogueInterpreter.open("con:removedec", `object` as Scenery)
+        }
         if (!player.zoneMonitor.teleport(1, Item(Items.AMULET_OF_GLORY_1704))) {
             return
         }
-- 
GitLab


From 5e22f64fe5b1205db98f25ac9b6cbb26c936f3bd Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 16:58:52 -0400
Subject: [PATCH 05/13] Decorations.java rework

---
 .../global/skill/construction/Decoration.java | 792 +++++-------------
 1 file changed, 212 insertions(+), 580 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index c732df8984..849aec4a8a 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -13,68 +13,66 @@ import org.rs09.consts.Items;
  *
  */
 public enum Decoration {
-
 	/**
 	 * Garden centrepiece decorations.
 	 */
-	PORTAL(13405, 8168, 1, 100.0, new Item(Items.IRON_BAR_2351, 10)),
-	ROCK(13406, 8169, 5, 100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
-	POND(13407, 8170, 10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
-	IMP_STATUE(13408, 8171, 15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
-	SMALL_OBELISK(42004, 14657, 41, 676, new Item(Items.MARBLE_BLOCK_8786, 1), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
+	PORTAL       (13405, 8168,  1,  100.0, new Item(Items.IRON_BAR_2351, 10)),
+	ROCK         (13406, 8169,  5,  100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
+	POND         (13407, 8170,  10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
+	IMP_STATUE   (13408, 8171,  15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
+	SMALL_OBELISK(42004, 14657, 41, 676, new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
 	DUNGEON_ENTRANCE(13409, 8172, 70, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
 
-	
 	/**
 	 * Garden big tree decorations.
 	 */
-	BIG_DEAD_TREE(13411, 8173, 5, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	BIG_TREE(13412, 8174, 10, 44.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_NICE_TREE_8419)),
-	BIG_OAK_TREE(13413, 8175, 15, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_OAK_TREE_8421)),
-	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	BIG_MAPLE_TREE(13415, 8177, 45, 122.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	BIG_YEW_TREE(13416, 8178, 60, 141.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_YEW_TREE_8427)),
-	BIG_MAGIC_TREE(13417, 8179, 75, 223.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAGIC_TREE_8429)),
-	
+	BIG_DEAD_TREE(13411, 8173, 5, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
+	BIG_TREE(13412, 8174, 10, 44.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
+	BIG_OAK_TREE(13413, 8175, 15, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
+	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
+	BIG_MAPLE_TREE(13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
+	BIG_YEW_TREE(13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
+	BIG_MAGIC_TREE(13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+
 	/**
 	 * Garden tree decorations.
 	 */
-	DEAD_TREE(13418, 8173, 5, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	TREE(13419, 8174, 10, 44.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_NICE_TREE_8419)),
-	OAK_TREE(13420, 8175, 15, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_OAK_TREE_8421)),
-	WILLOW_TREE(13421, 8176, 30, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	MAPLE_TREE(13423, 8177, 45, 122.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	YEW_TREE(13422, 8178, 60, 141.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_YEW_TREE_8427)),
-	MAGIC_TREE(13424, 8179, 75, 223.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MAGIC_TREE_8429)),
-	
+	DEAD_TREE(13418, 8173, 5, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
+	TREE(13419, 8174, 10, 44.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
+	OAK_TREE(13420, 8175, 15, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
+	WILLOW_TREE(13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
+	MAPLE_TREE(13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
+	YEW_TREE(13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
+	MAGIC_TREE(13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+
 	/**
 	 * Garden big plant 1 decorations.
 	 */
-	FERN(13425, 8186, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
-	BUSH(13426, 8187, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
-	TALL_PLANT(13427, 8188, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
-	
+	FERN(13425, 8186, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	BUSH(13426, 8187, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT(13428, 8189, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
-	LARGE_LEAF_PLANT(13429, 8190, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
-	HUGE_PLANT(13430, 8191, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
+	SHORT_PLANT(13428, 8189, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	LARGE_LEAF_PLANT(13429, 8190, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	HUGE_PLANT(13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden small plant 1 decorations.
 	 */
-	PLANT(13431, 8180, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
-	SMALL_FERN(13432, 8181, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
-	FERN_SP(13433, 8182, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
+	PLANT(13431, 8180, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	SMALL_FERN(13432, 8181, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	FERN_SP(13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden small plant 2 decorations.
 	 */
-	DOCK_LEAF(13434, 8183, 1, 31.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_1_8431)),
-	THISTLE(13435, 8184, 6, 70.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_2_8433)),
-	REEDS(13436, 8185, 12, 100.0, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_PLANT_3_8435)),
-	
+	DOCK_LEAF(13434, 8183, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	THISTLE(13435, 8184, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	REEDS(13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+
 	/**
 	 * Parlour chair spot
 	 */
@@ -91,22 +89,22 @@ public enum Decoration {
 	 */
 	BROWN_RUG_CORNER(13588, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	RED_RUG_CORNER(13591, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-	
+	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
+
 	BROWN_RUG_END(13589, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	RED_RUG_END(13592, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_END(13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-	
+	OPULENT_RUG_END(13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
+
 	BROWN_RUG_CENTER(13590, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	RED_RUG_CENTER(13593, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 1)),
+	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
 
 	/**
 	 * Parlour fireplaces
 	 */
 	CLAY_FIREPLACE(13609, 8325, 3, 30.0, new Item(Items.SOFT_CLAY_1761, 3)),
 	STONE_FIREPLACE(13611, 8326, 33, 40.0, new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item(Items.MARBLE_BLOCK_8786, 1)),
+	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
 
 	/**
 	 * Parlour curtain spot
@@ -122,7 +120,6 @@ public enum Decoration {
 	OAK_BOOKCASE(13598, 8320, 29, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
 	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
 
-	
 	/**
 	 * Kitchen Beer Barrels
 	 * TODO: These also require cooking levels!
@@ -135,35 +132,32 @@ public enum Decoration {
 	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8)),
 	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2)),
 	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2)),
-	
-	
+
 	/**
 	 * Kitchen Tables!
 	 */
 	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0, new Item(Items.PLANK_960, 3)),
 	KITCHEN_OAK_TABLE(13578, 8247, 32, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
 	KITCHEN_TEAK_TABLE(13579, 8248, 52, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
-	
-	
+
 	/**
 	 * Kitchen Stoves
 	 */
-	BASIC_FIREPIT(13528, 8216, 5, 40.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 1)),
+	BASIC_FIREPIT(13528, 8216, 5, 40.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353)),
 	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2)),
 	FIREPIT_WITH_POT(13531, 8218, 17, 80.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3)),
 	SMALL_OVEN(13533, 8219, 24, 80.0, new Item(Items.STEEL_BAR_2353, 4)),
 	LARGE_OVEN(13536, 8220, 29, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
 	BASIC_RANGE(13539, 8221, 34, 120.0, new Item(Items.STEEL_BAR_2353, 6)),
 	FANCY_RANGE(13542, 8222, 42, 160.0, new Item(Items.STEEL_BAR_2353, 8)),
-	
+
 	/**
 	 * Kitchen larders
 	 */
 	WOODEN_LARDER(13565, 8233, 9, 228.0, new Item(Items.PLANK_960, 8)),
 	OAK_LARDER(13566, 8234, 33, 480.0, new Item(Items.OAK_PLANK_8778, 8)),
 	TEAK_LARDER(13567, 8235, 43, 750.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	
-	
+
 	/**
 	 * Kitchen shelves
 	 */
@@ -174,23 +168,21 @@ public enum Decoration {
 	OAK_SHELVES_2(13549, 8227, 45, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
 	TEAK_SHELVES_1(13550, 8228, 56, 330.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6)),
 	TEAK_SHELVES_2(13551, 8229, 67, 930.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2)),
-	
+
 	/**
 	 * Kitchen sinks
 	 */
 	PUMP_AND_DRAIN(13559, 8230, 7, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
 	PUMP_AND_TUB(13561, 8231, 27, 200.0, new Item(Items.STEEL_BAR_2353, 10)),
 	SINK(13563, 8232, 47, 300.0, new Item(Items.STEEL_BAR_2353, 15)),
-	
-	
+
 	/**
 	 * Kitchen cat baskets/blankets
 	 */
-	CAT_BLANKET(13574, 8236, 5, 15.0, new Item(Items.BOLT_OF_CLOTH_8790, 1)),
+	CAT_BLANKET(13574, 8236, 5, 15.0, new Item(Items.BOLT_OF_CLOTH_8790)),
 	CAT_BASKET(13575, 8237, 19, 58.0, new Item(Items.PLANK_960, 2)),
 	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2)),
-	
-	
+
 	/**
 	 * Dining room tables
 	 */
@@ -200,9 +192,7 @@ public enum Decoration {
 	DINING_TABLE_TEAK(13296, 8248, 38, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
 	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
 	DINING_TABLE_MAHOGANY(13298, 8120, 52, 840.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
-	DINING_TABLE_OPULENT(13299, 8121, 72, 3100.0, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4),
-			new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
-		
+	DINING_TABLE_OPULENT(13299, 8121, 72, 3100.0, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
 
 	/**
 	 * Dining room benches
@@ -214,47 +204,47 @@ public enum Decoration {
 	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
 	BENCH_MAHOGANY(13305, 8113, 52, 560.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
 	BENCH_GILDED(13306, 8114, 61, 1760.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
-	
+
 	/**
 	 * Dining room bell-pulls
 	 */
-	ROPE_PULL(13307, 8099, 5, 15.0, new Item(Items.ROPE_954, 1), new Item(Items.OAK_PLANK_8778, 1)),
-	BELL_PULL(13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780, 1), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item(Items.TEAK_PLANK_8780, 1), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-	
+	ROPE_PULL(13307, 8099, 5, 15.0, new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778)),
+	BELL_PULL(13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784)),
+
 	/**
 	 * Workshop workbench
 	 */
 	WORKBENCH_WOODEN(13704, 8375, 17, 143.0, new Item(Items.PLANK_960, 5)),
 	WORKBENCH_OAK(13705, 8376, 32, 300.0, new Item(Items.OAK_PLANK_8778, 5)),
 	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
-	WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
-	WORKBENCH_WITH_LATHE(13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376, 1), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353, 1)),
-	
+	WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
+	WORKBENCH_WITH_LATHE(13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
+
 	/**
 	 * Workshop repair benches/stands
 	 */
 	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	WHETSTONE(13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420, 1)),
-	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420, 1)),
-	
+	WHETSTONE(13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420)),
+	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420)),
+
 	/**
 	 * Workshop easels
 	 */
 	PLUMING_STAND(13716, 8392, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 	SHIELD_EASEL(13717, 8393, 41, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
 	BANNER_EASEL(13718, 8394, 66, 510.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	
+
 	/**
 	 * Workshop crafting tables
 	 * 	TODO: These are upgradable hotspots, therefore crafting table 3 would require
 	 * 	crafting table 2 to be already built in that spot.
 	 */
 	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	CRAFTING_TABLE_2(13710, 8381, 25, 1.0, new Item(Items.MOLTEN_GLASS_1775, 1)),
+	CRAFTING_TABLE_2(13710, 8381, 25, 1.0, new Item(Items.MOLTEN_GLASS_1775)),
 	CRAFTING_TABLE_3(13711, 8382, 34, 2.0, new Item(Items.MOLTEN_GLASS_1775, 2)),
 	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	
+
 	/**
 	 * Workshop tool stores
 	 * 	These are also upgradable just like the tables above.
@@ -265,14 +255,13 @@ public enum Decoration {
 	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 
-	
 	/**
 	 * Wall-mounted decorations
 	 */
 	OAK_DECORATION(13606, 8102, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 	TEAK_DECORATION(13606, 8103, 36, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
 	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
-	
+
 	/**
 	 * Staircases.
 	 */
@@ -281,7 +270,7 @@ public enum Decoration {
 	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
 	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
 	MARBLE_SPIRAL(13505, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
-	
+
 	/**
 	 * Staircases going down.
 	 */
@@ -290,7 +279,7 @@ public enum Decoration {
 	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
 	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
 	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
-	
+
 	/**
 	 * Portal room decorations.
 	 */
@@ -298,7 +287,7 @@ public enum Decoration {
 	MAHOGANY_PORTAL(13637, 8329, 65, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
 	MARBLE_PORTAL(13638, 8330, 80, 1500.0, new Item(Items.MARBLE_BLOCK_8786, 3)),
 	TELEPORT_FOCUS(13640, 8331, 50, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	GREATER_TELEPORT_FOCUS(13641, 8332, 65, 500.0, new Item(Items.MARBLE_BLOCK_8786, 1)),
+	GREATER_TELEPORT_FOCUS(13641, 8332, 65, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
 	SCRYING_POOL(13639, 8333, 80, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
 	TEAK_VARROCK_PORTAL(13615, true),
 	MAHOGANY_VARROCK_PORTAL(13622, true),
@@ -321,27 +310,26 @@ public enum Decoration {
 	TEAK_KHARYRLL_PORTAL(13621, true),
 	MAHOGANY_KHARYRLL_PORTAL(13628, true),
 	MARBLE_KHARYRLL_PORTAL(13635, true),
-	
+
 	/**
 	 * Skill hall decorations.
 	 */
-	MITHRIL_ARMOUR(13491, 8270, 28, 135.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1)),
-	ADAMANT_ARMOUR(13492, 8271, 28, 150.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1)),
-	RUNE_ARMOUR(13493, 8272, 28, 165.0, new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1)),
-	CRAWLING_HAND(13481, 8260, 38, 211.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982, 1)),
-	COCKATRICE_HEAD(13482, 8261, 38, 224.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983, 1)),
-	BASILISK_HEAD(13483, 8262, 38, 243.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984, 1)),
-	KURASK_HEAD(13484, 8263, 58, 357.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985, 1)),
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986, 1)),
-	KBD_HEAD(13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987, 1)),
-	KQ_HEAD(13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988, 1)),
-	MOUNTED_BASS(13488, 8267, 36, 151.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990, 1)),
-	MOUNTED_SWORDFISH(13489, 8268, 56, 230.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992, 1)),
-	MOUNTED_SHARK(13490, 8269, 76, 350.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994, 1)),
-	RUNE_CASE1(13507, 8095, 41, 190.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1)),
-	RUNE_CASE2(13508, 8095, 41, 212.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1)),
-			
-	
+	MITHRIL_ARMOUR(13491, 8270, 28, 135.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159), new Item(Items.MITHRIL_PLATEBODY_1121), new Item(Items.MITHRIL_PLATESKIRT_1085)),
+	ADAMANT_ARMOUR(13492, 8271, 28, 150.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161), new Item(Items.ADAMANT_PLATEBODY_1123), new Item(Items.ADAMANT_PLATESKIRT_1091)),
+	RUNE_ARMOUR(13493, 8272, 28, 165.0, new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163), new Item(Items.RUNE_PLATEBODY_1127), new Item(Items.RUNE_PLATESKIRT_1093)),
+	CRAWLING_HAND(13481, 8260, 38, 211.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982)),
+	COCKATRICE_HEAD(13482, 8261, 38, 224.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983)),
+	BASILISK_HEAD(13483, 8262, 38, 243.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984)),
+	KURASK_HEAD(13484, 8263, 58, 357.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985)),
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986)),
+	KBD_HEAD(13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987)),
+	KQ_HEAD(13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988)),
+	MOUNTED_BASS(13488, 8267, 36, 151.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990)),
+	MOUNTED_SWORDFISH(13489, 8268, 56, 230.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992)),
+	MOUNTED_SHARK(13490, 8269, 76, 350.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994)),
+	RUNE_CASE1(13507, 8095, 41, 190.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554), new Item(Items.AIR_RUNE_556), new Item(Items.EARTH_RUNE_557), new Item(Items.WATER_RUNE_555)),
+	RUNE_CASE2(13508, 8095, 41, 212.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559), new Item(Items.COSMIC_RUNE_564), new Item(Items.CHAOS_RUNE_562), new Item(Items.NATURE_RUNE_561)),
+
 	/**
 	 * Games room decorations.
 	 */
@@ -349,19 +337,18 @@ public enum Decoration {
 	LIMESTONE_STONE(13393, 8154, 59, 200.0, new Item(Items.LIMESTONE_BRICK_3420, 10)),
 	MARBLE_STONE(13394, 8155, 79, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
 	HOOP_AND_STICK(13398, 8162, 30, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	DARTBOARD(13400, 8163, 54, 290.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353, 1)),
+	DARTBOARD(13400, 8163, 54, 290.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353)),
 	ARCHERY_TARGET(13402, 8164, 81, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3)),
 	BALANCE_1(13395, 8156, 37, 176.0, new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500)),
 	BALANCE_2(13396, 8157, 57, 252.0, new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000)),
 	BALANCE_3(13397, 8158, 77, 356.0, new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000)),
 	OAK_CHEST(13385, 8165, 34, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_CHEST(13387, 8166, 44, 660.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-	MAHOGANY_CHEST(13389, 8167, 54, 860.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
+	TEAK_CHEST(13387, 8166, 44, 660.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784)),
+	MAHOGANY_CHEST(13389, 8167, 54, 860.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
 	JESTER(13390, 8159, 39, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
 	TREASURE_HUNT(13379, 8160, 49, 800.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4)),
 	HANGMAN(13404, 8161, 59, 1200.0, new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6)),
-	
-	
+
 	/**
 	* Combat room decorations.
 	*/
@@ -390,48 +377,47 @@ public enum Decoration {
 	BOXING_MAT(13127, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
 	FENCING_MAT(13136, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
 	COMBAT_MAT(13140, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	
-	
+
 	/**
 	 * Formal garden decorations
 	 */
 	GAZEBO(13477, 8192, 65, 1200, new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4)),
-	SMALL_FOUNTAIN(13478, 8193, 71, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
+	SMALL_FOUNTAIN(13478, 8193, 71, 500, new Item(Items.MARBLE_BLOCK_8786)),
 	LARGE_FOUNTAIN(13479, 8194, 75, 1000, new Item(Items.MARBLE_BLOCK_8786, 2)),
 	POSH_FOUNTAIN(13480, 8195, 81, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	SUNFLOWER(13446, 8213, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_SUNFLOWER_8457, 1)),
-	MARIGOLDS(13447, 8214, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MARIGOLDS_8459, 1)),
-	ROSES(13448, 8215, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSES_8461, 1)),
-	SUNFLOWER_BIG(13443, 8213, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_SUNFLOWER_8457, 1)),
-	MARIGOLDS_BIG(13444, 8214, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_MARIGOLDS_8459, 1)),
-	ROSES_BIG(13445, 8215, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSES_8461, 1)),
-	ROSEMARY(13440, 8210, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSEMARY_8451, 1)),
-	DAFFODILS(13441, 8211, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DAFFODILS_8453, 1)),
-	BLUEBELLS(13442, 8212, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_BLUEBELLS_8455, 1)),
-	ROSEMARY_BIG(13437, 8210, 66, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_ROSEMARY_8451, 1)),
-	DAFFODILS_BIG(13438, 8211, 71, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_DAFFODILS_8453, 1)),
-	BLUEBELLS_BIG(13439, 8212, 76, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.BAGGED_BLUEBELLS_8455, 1)),
-	THORNY_HEDGE1(13456, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
-	THORNY_HEDGE2(13457, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
-	THORNY_HEDGE3(13458, 8203, 56, 70, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.THORNY_HEDGE_8437, 1)),
-	NICE_HEDGE1(13459, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
-	NICE_HEDGE2(13461, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
-	NICE_HEDGE3(13460, 8204, 60, 100, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.NICE_HEDGE_8439, 1)),
-	SMALL_BOX_HEDGE1(13462, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
-	SMALL_BOX_HEDGE2(13464, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
-	SMALL_BOX_HEDGE3(13463, 8205, 64, 122, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.SMALL_BOX_HEDGE_8441, 1)),
-	TOPIARY_HEDGE1(13465, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
-	TOPIARY_HEDGE2(13467, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
-	TOPIARY_HEDGE3(13466, 8206, 68, 141, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TOPIARY_HEDGE_8443, 1)),
-	FANCY_HEDGE1(13468, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
-	FANCY_HEDGE2(13470, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
-	FANCY_HEDGE3(13469, 8207, 72, 158, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.FANCY_HEDGE_8445, 1)),
-	TALL_FANCY_HEDGE1(13471, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
-	TALL_FANCY_HEDGE2(13473, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
-	TALL_FANCY_HEDGE3(13472, 8208, 76, 223, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_FANCY_HEDGE_8447, 1)),
-	TALL_BOX_HEDGE1(13474, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
-	TALL_BOX_HEDGE2(13476, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
-	TALL_BOX_HEDGE3(13475, 8209, 80, 316, new int[] {BuildingUtils.WATERING_CAN}, new Item(Items.TALL_BOX_HEDGE_8449, 1)),
+	SUNFLOWER(13446, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
+	MARIGOLDS(13447, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
+	ROSES(13448, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
+	SUNFLOWER_BIG(13443, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
+	MARIGOLDS_BIG(13444, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
+	ROSES_BIG(13445, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
+	ROSEMARY(13440, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
+	DAFFODILS(13441, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
+	BLUEBELLS(13442, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
+	ROSEMARY_BIG(13437, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
+	DAFFODILS_BIG(13438, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
+	BLUEBELLS_BIG(13439, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
+	THORNY_HEDGE1(13456, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	THORNY_HEDGE2(13457, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	THORNY_HEDGE3(13458, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	NICE_HEDGE1(13459, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	NICE_HEDGE2(13461, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	NICE_HEDGE3(13460, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	SMALL_BOX_HEDGE1(13462, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	SMALL_BOX_HEDGE2(13464, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	SMALL_BOX_HEDGE3(13463, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	TOPIARY_HEDGE1(13465, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	TOPIARY_HEDGE2(13467, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	TOPIARY_HEDGE3(13466, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	FANCY_HEDGE1(13468, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	FANCY_HEDGE2(13470, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	FANCY_HEDGE3(13469, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	TALL_FANCY_HEDGE1(13471, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_FANCY_HEDGE2(13473, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_FANCY_HEDGE3(13472, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_BOX_HEDGE1(13474, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
+	TALL_BOX_HEDGE2(13476, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
+	TALL_BOX_HEDGE3(13475, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
 	BOUNDARY_STONES(13449, 8196, 55, 100, new Item(Items.SOFT_CLAY_1761, 10)),
 	WOODEN_FENCE(13450, 8197, 59, 280, new Item(Items.PLANK_960, 10)),
 	STONE_WALL(13451, 8198, 63, 200, new Item(Items.LIMESTONE_BRICK_3420, 10)),
@@ -439,8 +425,7 @@ public enum Decoration {
 	PICKET_FENCE(13453, 8200, 71, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
 	GARDEN_FENCE(13454, 8201, 75, 940, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2)),
 	MARBLE_WALL(13455, 8202, 79, 4000, new Item(Items.MARBLE_BLOCK_8786, 10)),
-	
-	
+
 	/**
 	 * Bedroom decorations.
 	 */
@@ -451,435 +436,73 @@ public enum Decoration {
 	LARGE_TEAK_BED(13152, 8035, 45, 480, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	FOUR_POSTER(13153, 8036, 53, 450, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2)),
-	OAK_CLOCK(13169, 8052, 25, 142, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792, 1)),
-	TEAK_CLOCK(13170, 8053, 55, 202, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792, 1)),
-	GILDED_CLOCK(13171, 8054, 85, 602, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792, 1), new Item(Items.GOLD_LEAF_8784, 1)),
-	SHAVING_STAND(13162, 8045, 21, 30, new Item(Items.PLANK_960, 1), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	OAK_SHAVING_STAND(13163, 8046, 29, 61, new Item(Items.OAK_PLANK_8778, 1), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	OAK_DRESSER(13164, 8047, 37, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	TEAK_DRESSER(13165, 8048, 46, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
+	OAK_CLOCK(13169, 8052, 25, 142, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792)),
+	TEAK_CLOCK(13170, 8053, 55, 202, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792)),
+	GILDED_CLOCK(13171, 8054, 85, 602, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784)),
+	SHAVING_STAND(13162, 8045, 21, 30, new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775)),
+	OAK_SHAVING_STAND(13163, 8046, 29, 61, new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775)),
+	OAK_DRESSER(13164, 8047, 37, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TEAK_DRESSER(13165, 8048, 46, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
 	FANCY_TEAK_DRESSER(13166, 8049, 56, 182, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2)),
-	MAHOGANY_DRESSER(13167, 8050, 64, 281, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	GILDED_DRESSER(13168, 8051, 74, 582, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784, 1)),
+	MAHOGANY_DRESSER(13167, 8050, 64, 281, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	GILDED_DRESSER(13168, 8051, 74, 582, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784)),
 	SHOE_BOX(13155, 8038, 20, 58, new Item(Items.PLANK_960, 2)),
 	OAK_DRAWERS(13156, 8039, 27, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	OAK_WARDROBE(13157, 8040, 39, 180, new Item(Items.OAK_PLANK_8778, 3)),
 	TEAK_DRAWERS(13158, 8041, 51, 180, new Item(Items.TEAK_PLANK_8780, 2)),
 	TEAK_WARDROBE(13159, 8042, 63, 270, new Item(Items.TEAK_PLANK_8780, 3)),
 	MAHOGANY_WARDROBE(13160, 8043, 75, 420, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	GILDED_WARDROBE(13161, 8044, 87, 720, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-	
-	
+	GILDED_WARDROBE(13161, 8044, 87, 720, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+
 	/**
 	 * Quest hall decorations.
 	 */
-	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540, 1)),
-	AMULET_OF_GLORY(13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704, 1)),
-	CAPE_OF_LEGENDS(13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052, 1)),
-	KING_ARTHUR(13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995, 1)),
-	ELENA(13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996, 1)),
-	GIANT_DWARF(13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997, 1)),
-	MISCELLANIANS(13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998, 1)),
-	LUMBRIDGE(13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002, 1)),
-	THE_DESERT(13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999, 1)),
-	MORYTANIA(13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003, 1)),
-	KARAMJA(13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001, 1)),
-	ISAFDAR(13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000, 1)),
-	SILVERLIGHT(13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402, 1)),
-	EXCALIBUR(13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35, 1)),
-	DARKLIGHT(13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746, 1)),
-	SMALL_MAP(13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004, 1)),
-	MEDIUM_MAP(13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005, 1)),
-	LARGE_MAP(13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006, 1)),
-
-	/**
-	 * Menagerie Decorations
-	 */
-	//OBELISK
-	MINI_OBELISK(44837, 15236, 41, 676, new Item(Items.MARBLE_BLOCK_8786, 1), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.GOLD_CHARM_12158, 10), new Item(Items.GREEN_CHARM_12159, 10), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10))
-	//PET_FEEDER
-	,
-	OAK_PET_FEEDER(44834, 15233, 37, 240, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_PET_FEEDER(44835, 15234, 52, 380, new Item(Items.TEAK_PLANK_8780, 4)),
-	MAHOGANY_PET_FEEDER(44836, 15235, 67, 880, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1))
-	//PET_HOUSE
-	,
-	OAK_PET_HOUSE(44828, 15227, 37, 240, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_PET_HOUSE(44829, 15228, 52, 380, new Item(Items.TEAK_PLANK_8780, 4)),
-	MAHOGANY_PET_HOUSE(44830, 15229, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	CONSECRATED_PET_HOUSE(44831, 15230, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1)),
-	DESECRATED_PET_HOUSE(44832, 15231, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1)),
-	NATURAL_PET_HOUSE(44833, 15232, 92, 1580, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.MAGIC_STONE_8788, 1))
-	//HABITAT_SPACE
-	,
-	GARDEN_HABITAT(new int[]{
-			4497,
-			4498,
-			44500,
-			44501,
-			44502,
-			44503,
-			44504,
-			44505,
-			44506,
-			44507,
-			44508,
-			44509,
-			44510,
-			44511,
-			44512,
-			44513,
-			44514,
-			44515,
-			44516,
-			44517,
-			44518,
-			44519,
-			44520,
-			44521,
-			44522,
-			44523,
-			44524,
-			44525,
-			44526,
-			44527,
-			44528,
-			44529,
-			44530,
-			44531,
-			44532,
-			44533,
-			44534,
-			44535,
-			44536,
-			44537,
-			44538,
-			44539,
-			44540,
-			44541,
-			44542,
-			44543,
-			44544,
-			44545,
-			44546,
-			44547,
-			44548,
-			44549,
-			44550,
-			44551,
-			44552,
-			44553,
-			44554,
-			44555,
-			44556,
-			44557,
-			44558,
-			44559,
-			44560,
-			44561,
-			44562,
-			44563 }, 15222, 37, 201, new Item(Items.BAGGED_PLANT_1_8431, 1), new Item(Items.BAGGED_PLANT_2_8433, 1), new Item(Items.BAGGED_PLANT_3_8435, 1)),
-	JUNGLE_HABITAT(new int[]
-			{
-					44564,
-					44565,
-					44566,
-					44567,
-					44568,
-					44569,
-					44570,
-					44571,
-					44572,
-					44573,
-					44574,
-					44575,
-					44576,
-					44577,
-					44578,
-					44579,
-					44580,
-					44581,
-					44582,
-					44583,
-					44584,
-					44585,
-					44586,
-					44587,
-					44588,
-					44589,
-					44590,
-					44591,
-					44592,
-					44593,
-					44594,
-					44595,
-					44596,
-					44597,
-					44598,
-					44599,
-					44600,
-					44601,
-					44602,
-					44603,
-					44604,
-					44605,
-					44606,
-					44607,
-					44608,
-					44609,
-					44610,
-					44611,
-					44612,
-					44613,
-					44614,
-					44615,
-					44616,
-					44617,
-					44618,
-					44619,
-					44620,
-					44621,
-					44622,
-					44623,
-					44624,
-					44625,
-					44626,
-					44627,
-					44628,
-					44629 }, 15223, 47, 278, new Item(Items.BAGGED_PLANT_3_8435, 3), new Item(Items.BAGGED_WILLOW_TREE_8423, 1), new Item(Items.BUCKET_OF_WATER_1929, 5)),
-	DESERT_HABITAT(new int[]
-			{
-					44630,
-					44631,
-					44632,
-					44633,
-					44634,
-					44635,
-					44636,
-					44637,
-					44638,
-					44639,
-					44640,
-					44641,
-					44642,
-					44643,
-					44644,
-					44645,
-					44646,
-					44647,
-					44648,
-					44649,
-					44650,
-					44651,
-					44652,
-					44653,
-					44654,
-					44655,
-					44656,
-					44657,
-					44658,
-					44659,
-					44660,
-					44661,
-					44662,
-					44663,
-					44664,
-					44665,
-					44666,
-					44667,
-					44668,
-					44669,
-					44670,
-					44671,
-					44672,
-					44673,
-					44674,
-					44675,
-					44676,
-					44677,
-					44678,
-					44679,
-					44680,
-					44681,
-					44682,
-					44683,
-					44684,
-					44685,
-					44686,
-					44687,
-					44688,
-					44689,
-					44690,
-					44691,
-					44692,
-					44693,
-					44694,
-					44695 }, 15224, 57, 238, new Item(Items.BUCKET_OF_SAND_1783, 10), new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(15237, 1)),
-	POLAR_HABITAT(new int[]
-			{
-					44696,
-					44697,
-					44698,
-					44699,
-					44700,
-					44701,
-					44702,
-					44703,
-					44704,
-					44705,
-					44706,
-					44707,
-					44708,
-					44709,
-					44710,
-					44711,
-					44712,
-					44713,
-					44714,
-					44715,
-					44716,
-					44717,
-					44718,
-					44719,
-					44720,
-					44721,
-					44722,
-					44723,
-					44724,
-					44725,
-					44726,
-					44727,
-					44728,
-					44729,
-					44730,
-					44731,
-					44732,
-					44733,
-					44734,
-					44735,
-					44736,
-					44737,
-					44738,
-					44739,
-					44740,
-					44741,
-					44742,
-					44743,
-					44744,
-					44745,
-					44746,
-					44747,
-					44748,
-					44749,
-					44750,
-					44751,
-					44752,
-					44753,
-					44754,
-					44755,
-					44756,
-					44757,
-					44758,
-					44759,
-					44760,
-					44761 }, 15225, 67, 373, new Item(Items.AIR_RUNE_556, 1000), new Item(Items.WATER_RUNE_555, 1000), new Item(15239, 1)),
-	VOLCANIC_HABITAT(new int[]
-			{
-					44762,
-					44763,
-					44764,
-					44765,
-					44766,
-					44767,
-					44768,
-					44769,
-					44770,
-					44771,
-					44772,
-					44773,
-					44774,
-					44775,
-					44776,
-					44777,
-					44778,
-					44779,
-					44780,
-					44781,
-					44782,
-					44783,
-					44784,
-					44785,
-					44786,
-					44787,
-					44788,
-					44789,
-					44790,
-					44791,
-					44792,
-					44793,
-					44794,
-					44795,
-					44796,
-					44797,
-					44798,
-					44799,
-					44800,
-					44801,
-					44802,
-					44803,
-					44804,
-					44805,
-					44806,
-					44807,
-					44808,
-					44809,
-					44810,
-					44811,
-					44812,
-					44813,
-					44814,
-					44815,
-					44816,
-					44817,
-					44818,
-					44819,
-					44820,
-					44821,
-					44822,
-					44823,
-					44824,
-					44825,
-					44826,
-					44827 }, 15226, 77, 77, new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.BAGGED_DEAD_TREE_8417, 1), new Item(Items.STONE_SLAB_13245, 5)),
-
+	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540)),
+	AMULET_OF_GLORY(13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704)),
+	CAPE_OF_LEGENDS(13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052)),
+	KING_ARTHUR(13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995)),
+	ELENA(13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996)),
+	GIANT_DWARF(13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997)),
+	MISCELLANIANS(13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998)),
+	LUMBRIDGE(13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002)),
+	THE_DESERT(13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999)),
+	MORYTANIA(13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003)),
+	KARAMJA(13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001)),
+	ISAFDAR(13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000)),
+	SILVERLIGHT(13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402)),
+	EXCALIBUR(13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35)),
+	DARKLIGHT(13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746)),
+	SMALL_MAP(13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004)),
+	MEDIUM_MAP(13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005)),
+	LARGE_MAP(13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006)),
 
 	/**
 	 * Study decorations.
 	 */
 	GLOBE(13649, 8341, 41, 180, new Item(Items.OAK_PLANK_8778, 3)),
 	ORNAMENTAL_GLOBE(13650, 8342, 50, 270, new Item(Items.TEAK_PLANK_8780, 3)),
-	LUNAR_GLOBE(13651, 8343, 59, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784, 1)),
-	CELESTIAL_GLOBE(13652, 8344, 68, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784, 1)),
+	LUNAR_GLOBE(13651, 8343, 59, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
+	CELESTIAL_GLOBE(13652, 8344, 68, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
 	ARMILLARY_SPHERE(13653, 8345, 77, 960, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4)),
 	SMALL_ORREY(13654, 8346, 86, 1320, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3)),
 	LARGE_ORREY(13655, 8347, 95, 1420, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5)),
-	OAK_LECTERN(13642, 8334, 40, 60, new Item(Items.OAK_PLANK_8778, 1)),
+	OAK_LECTERN(13642, 8334, 40, 60, new Item(Items.OAK_PLANK_8778)),
 	EAGLE_LECTERN(13643, 8335, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	DEMON_LECTERN(13644, 8336, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	TEAK_EAGLE_LECTERN(13645, 8337, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
 	TEAK_DEMON_LECTERN(13646, 8338, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 1)),
-	CRYSTAL_BALL(13659, 8351, 42, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567, 1)),
-	ELEMENTAL_SPHERE(13660, 8352, 54, 580, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567, 1), new Item(Items.GOLD_LEAF_8784, 1)),
-	CRYSTAL_OF_POWER(13661, 8353, 66, 890, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567, 1), new Item(Items.GOLD_LEAF_8784, 2)),
+	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	CRYSTAL_BALL(13659, 8351, 42, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567)),
+	ELEMENTAL_SPHERE(13660, 8352, 54, 580, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784)),
+	CRYSTAL_OF_POWER(13661, 8353, 66, 890, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2)),
 	ALCHEMICAL_CHART(13662, 8354, 43, 30, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	ASTRONOMICAL_CHART(13663, 8355, 63, 45, new Item(Items.BOLT_OF_CLOTH_8790, 3)),
 	INFERNAL_CHART(13664, 8356, 83, 60, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	TELESCOPE1(13656, 8348, 44, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	TELESCOPE2(13657, 8349, 64, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	TELESCOPE3(13658, 8350, 84, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 1)),
-	
+	TELESCOPE1(13656, 8348, 44, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TELESCOPE2(13657, 8349, 64, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TELESCOPE3(13658, 8350, 84, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
+
 	/**
 	 * Costume room decorations.
 	 */
@@ -894,21 +517,21 @@ public enum Decoration {
 	TEAK_MAGIC_WARDROBE(18788, 9831, 60, 360, new Item(Items.TEAK_PLANK_8780, 4)),
 	C_TEAK_MAGIC_WARDROBE(18790, 9832, 69, 540, new Item(Items.TEAK_PLANK_8780, 6)),
 	MGANY_MAGIC_WARDROBE(18792, 9833, 78, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_MAGIC_WARDROBE(18794, 9834, 87, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-	MARBLE_MAGIC_WARDROBE(18796, 9835, 96, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
+	GILDED_MAGIC_WARDROBE(18794, 9834, 87, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
+	MARBLE_MAGIC_WARDROBE(18796, 9835, 96, 500, new Item(Items.MARBLE_BLOCK_8786)),
 	OAK_CAPE_RACK(18766, 9817, 54, 240, new Item(Items.OAK_PLANK_8778, 4)),
 	TEAK_CAPE_RACK(18767, 9818, 63, 360, new Item(Items.TEAK_PLANK_8780, 4)),
 	MGANY_CAPE_RACK(18768, 9819, 72, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_CAPE_RACK(18769, 9820, 81, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 1)),
-	MARBLE_CAPE_RACK(18770, 9821, 90, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
-	MAGIC_CAPE_RACK(18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788, 1)),
+	GILDED_CAPE_RACK(18769, 9820, 81, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
+	MARBLE_CAPE_RACK(18770, 9821, 90, 500, new Item(Items.MARBLE_BLOCK_8786)),
+	MAGIC_CAPE_RACK(18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788)),
 	OAK_TOY_BOX(18798, 9836, 50, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	TEAK_TOY_BOX(18800, 9837, 68, 180, new Item(Items.TEAK_PLANK_8780, 2)),
 	MAHOGANY_TOY_BOX(18802, 9838, 86, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
 	OAK_COSTUME_BOX(18772, 9823, 44, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	TEAK_COSTUME_BOX(18774, 9824, 62, 180, new Item(Items.TEAK_PLANK_8780, 2)),
 	MAHOGANY_COSTUME_BOX(18776, 9825, 80, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	
+
 	/**
 	 * Chapel decorations.
 	 */
@@ -920,7 +543,7 @@ public enum Decoration {
 	MARBLE_ALTAR(13194, 8067, 70, 1030, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	GILDED_ALTAR(13197, 8068, 75, 2230, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4)),
 	SMALL_STATUE(13271, 8082, 49, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MEDIUM_STATUE(13272, 8083, 69, 500, new Item(Items.MARBLE_BLOCK_8786, 1)),
+	MEDIUM_STATUE(13272, 8083, 69, 500, new Item(Items.MARBLE_BLOCK_8786)),
 	LARGE_STATUE(13282, 8084, 89, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
 	WINDCHIMES(13214, 8079, 49, 323, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4)),
 	BELLS(13215, 8080, 58, 480, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6)),
@@ -946,7 +569,7 @@ public enum Decoration {
 	/**
 	 * Throne room
 	 */
-	OAK_THRONE(13665, 8357, 60, 800, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786, 1)),
+	OAK_THRONE(13665, 8357, 60, 800, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786)),
 	TEAK_THRONE(13666, 8358, 67, 1450, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2)),
 	MAHOGANY_THRONE(13667, 8359, 74, 2200, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3)),
 	GILDED_THRONE(13668, 8360, 81, 1700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3)),
@@ -973,7 +596,7 @@ public enum Decoration {
 	ROUND_SHIELD(13734, 8105, 66, 120, new Item(Items.OAK_PLANK_8778, 2)),
 	SQUARE_SHIELD(13766, 8106, 76, 360, new Item(Items.TEAK_PLANK_8780, 4)),
 	KITE_SHIELD(13750, 8107, 86, 420, new Item(Items.MAHOGANY_PLANK_8782, 3)),
-	
+
 	/**
 	 * Oubliette
 	 */
@@ -1020,7 +643,7 @@ public enum Decoration {
 	CANDLE(13342, 8128, 72, 243, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4)),
 	TORCH(13341, 8129, 84, 244, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4)),
 	SKULL_TORCH(13343, 8130, 94, 246, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4)),
-	
+
 	/**
 	 * Dungeon corridor, junction, stairs & pit
 	 */
@@ -1055,9 +678,9 @@ public enum Decoration {
 	WOODEN_CRATE(13283, 8148, 75, 143, new Item(Items.PLANK_960, 5)),
 	OAK_T_CHEST(13285, 8149, 79, 340, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2)),
 	TEAK_T_CHEST(13287, 8150, 83, 530, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4)),
-	MGANY_T_CHEST(13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784, 1)),
-	MAGIC_CHEST(13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788, 1)),
-	
+	MGANY_T_CHEST(13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784)),
+	MAGIC_CHEST(13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788)),
+
 	/**
 	 * Style related decoration.
 	 */
@@ -1067,13 +690,13 @@ public enum Decoration {
 	FREMENNIK_WINDOW(13112, -1, 1, 0.0),
 	TROPICAL_WOOD_WINDOW(10816, -1, 1, 0.0),
 	FANCY_STONE_WINDOW(13117, -1, 1, 0.0),
-	
+
 	;
 	/**
 	 * The object id.
 	 */
 	private final int objectId;
-	
+
 	/**
 	 * The item id for the interface.
 	 */
@@ -1083,17 +706,17 @@ public enum Decoration {
 	 * The level requirement.
 	 */
 	private final int level;
-	
+
 	/**
 	 * The experience gained for building this decoration.
 	 */
 	private final double experience;
-	
+
 	/**
 	 * The item required.
 	 */
 	private final Item[] items;
-	
+
 	/**
 	 * The tools required.
 	 */
@@ -1103,12 +726,12 @@ public enum Decoration {
 	 * The object ids depending on styling.
 	 */
 	private final int[] objectIds;
-	
+
 	/**
 	 * If this node should be invisible to user build options
 	 */
 	private boolean invisibleNode;
-	
+
 	/**
 	 * Constructs a new {@code Portal} {@code Object}.
 	 * @param objectId The object id.
@@ -1117,10 +740,10 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	private Decoration(int objectId, int interfaceItem, int level, double experience, Item... items) {
+	Decoration(int objectId, int interfaceItem, int level, double experience, Item... items) {
 		this(objectId, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
 	}
-	
+
 	/**
 	 * Constructs a new {@code Portal} {@code Object}.
 	 * @param objectId The object id.
@@ -1129,7 +752,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	private Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item... items) {
 		this.objectId = objectId;
 		this.objectIds = null;
 		this.interfaceItem = interfaceItem;
@@ -1138,17 +761,17 @@ public enum Decoration {
 		this.tools = tools;
 		this.items = items;
 	}
-	
+
 	/**
 	 * Decoration
 	 * @param objectId
 	 * @param invisibleNode
 	 */
-	private Decoration(int objectId, boolean invisibleNode) {
+	Decoration(int objectId, boolean invisibleNode) {
 		this(objectId, -1, -1, -1);
 		this.invisibleNode = true;
 	}
-	
+
 	/**
 	 * Constructs a new {@code Portal} {@code Object}.
 	 * @param objectIds The object id.
@@ -1157,10 +780,10 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	private Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item... items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item... items) {
 		this(objectIds, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
 	}
-	
+
 	/**
 	 * Constructs a new {@code Portal} {@code Object}.
 	 * @param objectIds The object id.
@@ -1169,7 +792,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	private Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item... items) {
 		this.objectId = objectIds[0];
 		this.objectIds = objectIds;
 		this.interfaceItem = interfaceItem;
@@ -1203,7 +826,7 @@ public enum Decoration {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Gets a decoration for the given object id
 	 * @param objectId - the object id of the built object
@@ -1217,7 +840,7 @@ public enum Decoration {
 		}
 		return null;
 	}
-	
+
 	public static Decoration forName(String name) {
 		for (Decoration d : Decoration.values()) {
 			if (d.name().equals(name)) {
@@ -1239,7 +862,7 @@ public enum Decoration {
 		}
 		return 0;
 	}
-	
+
 	/**
 	 * Gets the objectId.
 	 * @param style The current housing style.
@@ -1251,7 +874,7 @@ public enum Decoration {
 		}
 		return objectId;
 	}
-	
+
 	/**
 	 * Gets the objectId.
 	 * @return The objectId.
@@ -1284,6 +907,14 @@ public enum Decoration {
 		return items;
 	}
 
+	/**
+	 * Gets the refundItems.
+	 * @return The refundItems.
+	 */
+	public Item[] getRefundItems() {
+		return refundItems;
+	}
+
 	/**
 	 * Gets the tools.
 	 * @return The tools.
@@ -1308,10 +939,11 @@ public enum Decoration {
 		return objectIds;
 	}
 
+	/**
+	 * If this node should be invisible to user build options
+	 * @return true if so.
+	 */
 	public boolean isInvisibleNode() {
 		return invisibleNode;
 	}
-	
-	
-
 }
-- 
GitLab


From b8fcf5e9939785fafa396e3bc16cc8e07230a485 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 17:53:43 -0400
Subject: [PATCH 06/13] wip

---
 .../global/skill/construction/Decoration.java | 92 +++++++++----------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 849aec4a8a..e57b9e9b77 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -16,101 +16,99 @@ public enum Decoration {
 	/**
 	 * Garden centrepiece decorations.
 	 */
-	PORTAL       (13405, 8168,  1,  100.0, new Item(Items.IRON_BAR_2351, 10)),
-	ROCK         (13406, 8169,  5,  100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
-	POND         (13407, 8170,  10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
-	IMP_STATUE   (13408, 8171,  15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
-	SMALL_OBELISK(42004, 14657, 41, 676, new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
-	DUNGEON_ENTRANCE(13409, 8172, 70, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
+	PORTAL          (13405, 8168,  1,  100.0, new Item(Items.IRON_BAR_2351, 10)),
+	ROCK            (13406, 8169,  5,  100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
+	POND            (13407, 8170,  10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
+	IMP_STATUE      (13408, 8171,  15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
+	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
+	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
 
 	/**
 	 * Garden big tree decorations.
 	 */
-	BIG_DEAD_TREE(13411, 8173, 5, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	BIG_TREE(13412, 8174, 10, 44.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
-	BIG_OAK_TREE(13413, 8175, 15, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
+	BIG_DEAD_TREE  (13411, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
+	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
+	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
 	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	BIG_MAPLE_TREE(13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	BIG_YEW_TREE(13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
-	BIG_MAGIC_TREE(13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
+	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
+	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
 
 	/**
 	 * Garden tree decorations.
 	 */
-	DEAD_TREE(13418, 8173, 5, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	TREE(13419, 8174, 10, 44.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
-	OAK_TREE(13420, 8175, 15, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
+	DEAD_TREE  (13418, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
+	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
+	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
 	WILLOW_TREE(13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	MAPLE_TREE(13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	YEW_TREE(13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
-	MAGIC_TREE(13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
+	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
+	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
 
 	/**
 	 * Garden big plant 1 decorations.
 	 */
-	FERN(13425, 8186, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	BUSH(13426, 8187, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	FERN      (13425, 8186, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	BUSH      (13426, 8187, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
 	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT(13428, 8189, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	LARGE_LEAF_PLANT(13429, 8190, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	HUGE_PLANT(13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	SHORT_PLANT     (13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	LARGE_LEAF_PLANT(13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	HUGE_PLANT      (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden small plant 1 decorations.
 	 */
-	PLANT(13431, 8180, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	SMALL_FERN(13432, 8181, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	FERN_SP(13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	PLANT     (13431, 8180, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	SMALL_FERN(13432, 8181, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden small plant 2 decorations.
 	 */
 	DOCK_LEAF(13434, 8183, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	THISTLE(13435, 8184, 6, 70.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	REEDS(13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	THISTLE(13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	REEDS(13436, 8185, 12, 100.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Parlour chair spot
 	 */
-	CRUDE_CHAIR(13581, 8309, 1, 58.0, new Item(Items.PLANK_960, 2)),
-	WOODEN_CHAIR(13582, 8310, 8, 87.0, new Item(Items.PLANK_960, 3)),
-	ROCKING_CHAIR(13583, 8311, 14, 87.0, new Item(Items.PLANK_960, 3)),
-	OAK_CHAIR(13584, 8312, 19, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	OAK_ARMCHAIR(13585, 8313, 26, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_ARMCHAIR(13586, 8314, 35, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
+	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item(Items.PLANK_960, 2)),
+	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item(Items.PLANK_960, 3)),
+	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item(Items.PLANK_960, 3)),
+	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
+	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
+	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
 	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item(Items.MAHOGANY_PLANK_8782, 2)),
 
 	/**
 	 * Rugs rugs rugs
 	 */
-	BROWN_RUG_CORNER(13588, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_CORNER(13591, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
 	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
-
-	BROWN_RUG_END(13589, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_END(13592, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_END(13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
-
-	BROWN_RUG_CENTER(13590, 8316, 2, 30.0, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_CENTER(13593, 8317, 13, 60.0, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
+	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
 	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
 
 	/**
 	 * Parlour fireplaces
 	 */
-	CLAY_FIREPLACE(13609, 8325, 3, 30.0, new Item(Items.SOFT_CLAY_1761, 3)),
-	STONE_FIREPLACE(13611, 8326, 33, 40.0, new Item(Items.LIMESTONE_BRICK_3420, 2)),
+	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item(Items.SOFT_CLAY_1761, 3)),
+	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item(Items.LIMESTONE_BRICK_3420, 2)),
 	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
 
 	/**
 	 * Parlour curtain spot
 	 */
-	TORN_CURTAINS(13603, 8322, 2, 132.0, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
-	CURTAINS(13604, 8323, 18, 225.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
+	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
+	CURTAINS        (13604, 8323, 18, 225.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
 	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
 
 	/**
-- 
GitLab


From 62a1048dcb92fbe5a0e44e7903b6ec7081b022a2 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 18:27:53 -0400
Subject: [PATCH 07/13] Decoration typographical rivers

---
 .../global/skill/construction/Decoration.java | 838 +++++++++---------
 1 file changed, 414 insertions(+), 424 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index e57b9e9b77..c9b99cbda1 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -29,7 +29,7 @@ public enum Decoration {
 	BIG_DEAD_TREE  (13411, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
 	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
 	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
-	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
+	BIG_WILLOW_TREE                       (13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
 	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
 	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
 	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
@@ -40,7 +40,7 @@ public enum Decoration {
 	DEAD_TREE  (13418, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
 	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
 	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
-	WILLOW_TREE(13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
+	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
 	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
 	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
 	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
@@ -55,9 +55,9 @@ public enum Decoration {
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT     (13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	LARGE_LEAF_PLANT(13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	HUGE_PLANT      (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	SHORT_PLANT(13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	LARGE_LEAF (13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Garden small plant 1 decorations.
@@ -69,9 +69,9 @@ public enum Decoration {
 	/**
 	 * Garden small plant 2 decorations.
 	 */
-	DOCK_LEAF(13434, 8183, 1, 31.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	THISTLE(13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	REEDS(13436, 8185, 12, 100.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	DOCK_LEAF(13434, 8183, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
+	THISTLE  (13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
+	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
 
 	/**
 	 * Parlour chair spot
@@ -114,8 +114,8 @@ public enum Decoration {
 	/**
 	 * Bookcases
 	 */
-	WOODEN_BOOKCASE(13597, 8319, 4, 115.0, new Item(Items.PLANK_960, 4)),
-	OAK_BOOKCASE(13598, 8320, 29, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
+	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item(Items.PLANK_960, 4)),
+	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
 	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
 
 	/**
@@ -124,8 +124,8 @@ public enum Decoration {
 	 * Basic: 1, Cider: 14, Asgarnian: 24, Greenman's: 29, D.Bitter: 39, Chef's: 54
 	 *
 	 */
-	BASIC_BEER_BARREL(13568, 8239, 7, 87.0, new Item(Items.PLANK_960, 3)),
-	CIDER_BARREL(13569, 8240, 12, 91.0, new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8)),
+	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item(Items.PLANK_960, 3)),
+	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8)),
 	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8)),
 	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8)),
 	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2)),
@@ -134,104 +134,104 @@ public enum Decoration {
 	/**
 	 * Kitchen Tables!
 	 */
-	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0, new Item(Items.PLANK_960, 3)),
-	KITCHEN_OAK_TABLE(13578, 8247, 32, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
-	KITCHEN_TEAK_TABLE(13579, 8248, 52, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
+	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item(Items.PLANK_960, 3)),
+	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
+	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
 
 	/**
 	 * Kitchen Stoves
 	 */
-	BASIC_FIREPIT(13528, 8216, 5, 40.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353)),
-	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2)),
-	FIREPIT_WITH_POT(13531, 8218, 17, 80.0, new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3)),
-	SMALL_OVEN(13533, 8219, 24, 80.0, new Item(Items.STEEL_BAR_2353, 4)),
-	LARGE_OVEN(13536, 8220, 29, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
-	BASIC_RANGE(13539, 8221, 34, 120.0, new Item(Items.STEEL_BAR_2353, 6)),
-	FANCY_RANGE(13542, 8222, 42, 160.0, new Item(Items.STEEL_BAR_2353, 8)),
+	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353)),
+	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2)),
+	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3)),
+	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item(Items.STEEL_BAR_2353, 4)),
+	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
+	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item(Items.STEEL_BAR_2353, 6)),
+	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item(Items.STEEL_BAR_2353, 8)),
 
 	/**
 	 * Kitchen larders
 	 */
-	WOODEN_LARDER(13565, 8233, 9, 228.0, new Item(Items.PLANK_960, 8)),
-	OAK_LARDER(13566, 8234, 33, 480.0, new Item(Items.OAK_PLANK_8778, 8)),
-	TEAK_LARDER(13567, 8235, 43, 750.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item(Items.PLANK_960, 8)),
+	OAK_LARDER   (13566, 8234, 33, 480.0, new Item(Items.OAK_PLANK_8778, 8)),
+	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 
 	/**
 	 * Kitchen shelves
 	 */
-	WOODEN_SHELVES_1(13545, 8223, 6, 87.0, new Item(Items.PLANK_960, 3)),
+	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item(Items.PLANK_960, 3)),
 	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
 	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	OAK_SHELVES_1(13548, 8226, 34, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	OAK_SHELVES_2(13549, 8227, 45, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	TEAK_SHELVES_1(13550, 8228, 56, 330.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	TEAK_SHELVES_2(13551, 8229, 67, 930.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2)),
+	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
+	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
+	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6)),
+	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2)),
 
 	/**
 	 * Kitchen sinks
 	 */
-	PUMP_AND_DRAIN(13559, 8230, 7, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
-	PUMP_AND_TUB(13561, 8231, 27, 200.0, new Item(Items.STEEL_BAR_2353, 10)),
-	SINK(13563, 8232, 47, 300.0, new Item(Items.STEEL_BAR_2353, 15)),
+	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item(Items.STEEL_BAR_2353, 5)),
+	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item(Items.STEEL_BAR_2353, 10)),
+	SINK          (13563, 8232, 47, 300.0, new Item(Items.STEEL_BAR_2353, 15)),
 
 	/**
 	 * Kitchen cat baskets/blankets
 	 */
-	CAT_BLANKET(13574, 8236, 5, 15.0, new Item(Items.BOLT_OF_CLOTH_8790)),
-	CAT_BASKET(13575, 8237, 19, 58.0, new Item(Items.PLANK_960, 2)),
+	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item(Items.BOLT_OF_CLOTH_8790)),
+	CAT_BASKET           (13575, 8237, 19, 58.0, new Item(Items.PLANK_960, 2)),
 	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2)),
 
 	/**
 	 * Dining room tables
 	 */
-	DINING_TABLE_WOOD(13293, 8246, 10, 115.0, new Item(Items.PLANK_960, 4)),
-	DINING_TABLE_OAK(13294, 8247, 22, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	DINING_TABLE_CARVED_OAK(13295, 8247, 31, 360.0, new Item(Items.OAK_PLANK_8778, 6)),
-	DINING_TABLE_TEAK(13296, 8248, 38, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
-	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	DINING_TABLE_MAHOGANY(13298, 8120, 52, 840.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
-	DINING_TABLE_OPULENT(13299, 8121, 72, 3100.0, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
+	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item(Items.PLANK_960, 4)),
+	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item(Items.OAK_PLANK_8778, 4)),
+	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item(Items.OAK_PLANK_8778, 6)),
+	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item(Items.TEAK_PLANK_8780, 4)),
+	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item(Items.MAHOGANY_PLANK_8782, 6)),
+	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
 
 	/**
 	 * Dining room benches
 	 */
-	BENCH_WOODEN(13300, 8108, 10, 115.0, new Item(Items.PLANK_960, 4)),
-	BENCH_OAK(13301, 8109, 22, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	BENCH_CARVED_OAK(13302, 8110, 31, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	BENCH_TEAK(13303, 8111, 38, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
-	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
-	BENCH_MAHOGANY(13305, 8113, 52, 560.0, new Item(Items.MAHOGANY_PLANK_8782, 6)),
-	BENCH_GILDED(13306, 8114, 61, 1760.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
+	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item(Items.PLANK_960, 4)),
+	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
+	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
+	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
+	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
+	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item(Items.MAHOGANY_PLANK_8782, 6)),
+	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
 
 	/**
 	 * Dining room bell-pulls
 	 */
-	ROPE_PULL(13307, 8099, 5, 15.0, new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778)),
-	BELL_PULL(13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	ROPE_PULL      (13307, 8099, 5,  15.0, new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778)),
+	BELL_PULL      (13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784)),
 
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN(13704, 8375, 17, 143.0, new Item(Items.PLANK_960, 5)),
-	WORKBENCH_OAK(13705, 8376, 32, 300.0, new Item(Items.OAK_PLANK_8778, 5)),
-	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
-	WORKBENCH_WITH_VICE(13707, 8378, 62, 750.0, new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
-	WORKBENCH_WITH_LATHE(13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
+	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item(Items.PLANK_960, 5)),
+	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item(Items.OAK_PLANK_8778, 5)),
+	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
+	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
+	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
 
 	/**
 	 * Workshop repair benches/stands
 	 */
 	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	WHETSTONE(13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420)),
+	WHETSTONE   (13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420)),
 	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420)),
 
 	/**
 	 * Workshop easels
 	 */
 	PLUMING_STAND(13716, 8392, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	SHIELD_EASEL(13717, 8393, 41, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	BANNER_EASEL(13718, 8394, 66, 510.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
+	BANNER_EASEL (13718, 8394, 66, 510.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 
 	/**
 	 * Workshop crafting tables
@@ -239,8 +239,8 @@ public enum Decoration {
 	 * 	crafting table 2 to be already built in that spot.
 	 */
 	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	CRAFTING_TABLE_2(13710, 8381, 25, 1.0, new Item(Items.MOLTEN_GLASS_1775)),
-	CRAFTING_TABLE_3(13711, 8382, 34, 2.0, new Item(Items.MOLTEN_GLASS_1775, 2)),
+	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item(Items.MOLTEN_GLASS_1775)),
+	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item(Items.MOLTEN_GLASS_1775, 2)),
 	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
 
 	/**
@@ -256,24 +256,24 @@ public enum Decoration {
 	/**
 	 * Wall-mounted decorations
 	 */
-	OAK_DECORATION(13606, 8102, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_DECORATION(13606, 8103, 36, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
+	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
 	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
 
 	/**
 	 * Staircases.
 	 */
-	OAK_STAIRCASE(13497, 8249, 27, 680.0, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	TEAK_STAIRCASE(13499, 8252, 48, 980.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
+	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
+	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
 	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
 	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
-	MARBLE_SPIRAL(13505, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
+	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
 
 	/**
 	 * Staircases going down.
 	 */
-	OAK_STAIRS_DOWN(13498, 8249, 27, 680.0, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	TEAK_STAIRS_DOWN(13500, 8252, 48, 980.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
+	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
+	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
 	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
 	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
 	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
@@ -281,415 +281,413 @@ public enum Decoration {
 	/**
 	 * Portal room decorations.
 	 */
-	TEAK_PORTAL(13636, 8328, 50, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
-	MAHOGANY_PORTAL(13637, 8329, 65, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
-	MARBLE_PORTAL(13638, 8330, 80, 1500.0, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	TELEPORT_FOCUS(13640, 8331, 50, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	GREATER_TELEPORT_FOCUS(13641, 8332, 65, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
-	SCRYING_POOL(13639, 8333, 80, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
-	TEAK_VARROCK_PORTAL(13615, true),
-	MAHOGANY_VARROCK_PORTAL(13622, true),
-	MARBLE_VARROCK_PORTAL(13629, true),
-	TEAK_LUMBRIDGE_PORTAL(13616, true),
+	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item(Items.TEAK_PLANK_8780, 3)),
+	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item(Items.MARBLE_BLOCK_8786, 3)),
+	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item(Items.LIMESTONE_BRICK_3420, 2)),
+	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item(Items.MARBLE_BLOCK_8786)),
+	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
+	TEAK_VARROCK_PORTAL      (13615, true),
+	MAHOGANY_VARROCK_PORTAL  (13622, true),
+	MARBLE_VARROCK_PORTAL    (13629, true),
+	TEAK_LUMBRIDGE_PORTAL    (13616, true),
 	MAHOGANY_LUMBRIDGE_PORTAL(13623, true),
-	MARBLE_LUMBRIDGE_PORTAL(13630, true),
-	TEAK_FALADOR_PORTAL(13617, true),
-	MAHOGANY_FALADOR_PORTAL(13624, true),
-	MARBLE_FALADOR_PORTAL(13631, true),
-	TEAK_CAMELOT_PORTAL(13618, true),
-	MAHOGANY_CAMELOT_PORTAL(13625, true),
-	MARBLE_CAMELOT_PORTAL(13632, true),
-	TEAK_ARDOUGNE_PORTAL(13619, true),
-	MAHOGANY_ARDOUGNE_PORTAL(13626, true),
-	MARBLE_ARDOUGNE_PORTAL(13633, true),
-	TEAK_YANILLE_PORTAL(13620, true),
-	MAHOGANY_YANILLE_PORTAL(13627, true),
-	MARBLE_YANILLE_PORTAL(13634, true),
-	TEAK_KHARYRLL_PORTAL(13621, true),
-	MAHOGANY_KHARYRLL_PORTAL(13628, true),
-	MARBLE_KHARYRLL_PORTAL(13635, true),
+	MARBLE_LUMBRIDGE_PORTAL  (13630, true),
+	TEAK_FALADOR_PORTAL      (13617, true),
+	MAHOGANY_FALADOR_PORTAL  (13624, true),
+	MARBLE_FALADOR_PORTAL    (13631, true),
+	TEAK_CAMELOT_PORTAL      (13618, true),
+	MAHOGANY_CAMELOT_PORTAL  (13625, true),
+	MARBLE_CAMELOT_PORTAL    (13632, true),
+	TEAK_ARDOUGNE_PORTAL     (13619, true),
+	MAHOGANY_ARDOUGNE_PORTAL (13626, true),
+	MARBLE_ARDOUGNE_PORTAL   (13633, true),
+	TEAK_YANILLE_PORTAL      (13620, true),
+	MAHOGANY_YANILLE_PORTAL  (13627, true),
+	MARBLE_YANILLE_PORTAL    (13634, true),
+	TEAK_KHARYRLL_PORTAL     (13621, true),
+	MAHOGANY_KHARYRLL_PORTAL (13628, true),
+	MARBLE_KHARYRLL_PORTAL   (13635, true),
 
 	/**
 	 * Skill hall decorations.
 	 */
-	MITHRIL_ARMOUR(13491, 8270, 28, 135.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159), new Item(Items.MITHRIL_PLATEBODY_1121), new Item(Items.MITHRIL_PLATESKIRT_1085)),
-	ADAMANT_ARMOUR(13492, 8271, 28, 150.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161), new Item(Items.ADAMANT_PLATEBODY_1123), new Item(Items.ADAMANT_PLATESKIRT_1091)),
-	RUNE_ARMOUR(13493, 8272, 28, 165.0, new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163), new Item(Items.RUNE_PLATEBODY_1127), new Item(Items.RUNE_PLATESKIRT_1093)),
-	CRAWLING_HAND(13481, 8260, 38, 211.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982)),
-	COCKATRICE_HEAD(13482, 8261, 38, 224.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983)),
-	BASILISK_HEAD(13483, 8262, 38, 243.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984)),
-	KURASK_HEAD(13484, 8263, 58, 357.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985)),
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986)),
-	KBD_HEAD(13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987)),
-	KQ_HEAD(13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988)),
-	MOUNTED_BASS(13488, 8267, 36, 151.0, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990)),
-	MOUNTED_SWORDFISH(13489, 8268, 56, 230.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992)),
-	MOUNTED_SHARK(13490, 8269, 76, 350.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994)),
-	RUNE_CASE1(13507, 8095, 41, 190.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554), new Item(Items.AIR_RUNE_556), new Item(Items.EARTH_RUNE_557), new Item(Items.WATER_RUNE_555)),
-	RUNE_CASE2(13508, 8095, 41, 212.0, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559), new Item(Items.COSMIC_RUNE_564), new Item(Items.CHAOS_RUNE_562), new Item(Items.NATURE_RUNE_561)),
+	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1)),
+	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1)),
+	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1)),
+	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982)),
+	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983)),
+	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984)),
+	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985)),
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986)),
+	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987)),
+	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988)),
+	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990)),
+	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992)),
+	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994)),
+	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1)),
+	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1)),
 
 	/**
 	 * Games room decorations.
 	 */
-	CLAY_STONE(13392, 8153, 39, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
-	LIMESTONE_STONE(13393, 8154, 59, 200.0, new Item(Items.LIMESTONE_BRICK_3420, 10)),
-	MARBLE_STONE(13394, 8155, 79, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
-	HOOP_AND_STICK(13398, 8162, 30, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	DARTBOARD(13400, 8163, 54, 290.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353)),
-	ARCHERY_TARGET(13402, 8164, 81, 600.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3)),
-	BALANCE_1(13395, 8156, 37, 176.0, new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500)),
-	BALANCE_2(13396, 8157, 57, 252.0, new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000)),
-	BALANCE_3(13397, 8158, 77, 356.0, new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000)),
-	OAK_CHEST(13385, 8165, 34, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_CHEST(13387, 8166, 44, 660.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784)),
-	MAHOGANY_CHEST(13389, 8167, 54, 860.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	JESTER(13390, 8159, 39, 360.0, new Item(Items.TEAK_PLANK_8780, 4)),
-	TREASURE_HUNT(13379, 8160, 49, 800.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4)),
-	HANGMAN(13404, 8161, 59, 1200.0, new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6)),
+	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item(Items.SOFT_CLAY_1761, 10)),
+	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item(Items.LIMESTONE_BRICK_3420, 10)),
+	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
+	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
+	DARTBOARD      (13400, 8163, 54, 290.0,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353)),
+	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3)),
+	BALANCE_1      (13395, 8156, 37, 176.0,  new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500)),
+	BALANCE_2      (13396, 8157, 57, 252.0,  new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000)),
+	BALANCE_3      (13397, 8158, 77, 356.0,  new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000)),
+	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
+	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784)),
+	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
+	JESTER         (13390, 8159, 39, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
+	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4)),
+	HANGMAN        (13404, 8161, 59, 1200.0, new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6)),
 
 	/**
 	* Combat room decorations.
 	*/
-	BOXING_RING(13129, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_RING(13133, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_RING(13137, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BALANCE_BEAM_LEFT(13143, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
+	BOXING_RING        (13129, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	FENCING_RING       (13133, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
 	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	BALANCE_BEAM_RIGHT(13144, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	RANGING_PEDESTALS(13147, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
-	MAGIC_BARRIER(13145, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
-	NOTHING(13721, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	NOTHING2(13721, 8026, 71, 720.0, new Item(Items.TEAK_PLANK_8780, 8)),
-	INVISIBLE_WALL(15283, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	INVISIBLE_WALL2(15284, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	INVISIBLE_WALL3(15285, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	GLOVE_RACK(13381, 8028, 34, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	WEAPONS_RACK(13382, 8029, 44, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
-	EXTRA_WEAPONS_RACK(13383, 8030, 54, 440.0, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4)),
-	BOXING_MAT_CORNER(13126, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT_CORNER(13135, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT_CORNER(13138, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BOXING_MAT_SIDE(13128, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT_SIDE(13134, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT_SIDE(13139, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BOXING_MAT(13127, 8023, 32, 570.0, new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT(13136, 8024, 41, 570.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT(13140, 8025, 51, 630.0, new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
+	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
+	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
+	NOTHING            (13721, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
+	NOTHING2           (13721, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
+	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
+	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
+	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4)),
+	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
 
 	/**
 	 * Formal garden decorations
 	 */
-	GAZEBO(13477, 8192, 65, 1200, new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4)),
-	SMALL_FOUNTAIN(13478, 8193, 71, 500, new Item(Items.MARBLE_BLOCK_8786)),
-	LARGE_FOUNTAIN(13479, 8194, 75, 1000, new Item(Items.MARBLE_BLOCK_8786, 2)),
-	POSH_FOUNTAIN(13480, 8195, 81, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	SUNFLOWER(13446, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
-	MARIGOLDS(13447, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
-	ROSES(13448, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
-	SUNFLOWER_BIG(13443, 8213, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
-	MARIGOLDS_BIG(13444, 8214, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
-	ROSES_BIG(13445, 8215, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
-	ROSEMARY(13440, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
-	DAFFODILS(13441, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
-	BLUEBELLS(13442, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
-	ROSEMARY_BIG(13437, 8210, 66, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
-	DAFFODILS_BIG(13438, 8211, 71, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
-	BLUEBELLS_BIG(13439, 8212, 76, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
-	THORNY_HEDGE1(13456, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	THORNY_HEDGE2(13457, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	THORNY_HEDGE3(13458, 8203, 56, 70, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	NICE_HEDGE1(13459, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	NICE_HEDGE2(13461, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	NICE_HEDGE3(13460, 8204, 60, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	SMALL_BOX_HEDGE1(13462, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	SMALL_BOX_HEDGE2(13464, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	SMALL_BOX_HEDGE3(13463, 8205, 64, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	TOPIARY_HEDGE1(13465, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	TOPIARY_HEDGE2(13467, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	TOPIARY_HEDGE3(13466, 8206, 68, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	FANCY_HEDGE1(13468, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	FANCY_HEDGE2(13470, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	FANCY_HEDGE3(13469, 8207, 72, 158, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	TALL_FANCY_HEDGE1(13471, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_FANCY_HEDGE2(13473, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_FANCY_HEDGE3(13472, 8208, 76, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_BOX_HEDGE1(13474, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	TALL_BOX_HEDGE2(13476, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	TALL_BOX_HEDGE3(13475, 8209, 80, 316, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	BOUNDARY_STONES(13449, 8196, 55, 100, new Item(Items.SOFT_CLAY_1761, 10)),
-	WOODEN_FENCE(13450, 8197, 59, 280, new Item(Items.PLANK_960, 10)),
-	STONE_WALL(13451, 8198, 63, 200, new Item(Items.LIMESTONE_BRICK_3420, 10)),
-	IRON_RAILINGS(13452, 8199, 67, 220, new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6)),
-	PICKET_FENCE(13453, 8200, 71, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	GARDEN_FENCE(13454, 8201, 75, 940, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	MARBLE_WALL(13455, 8202, 79, 4000, new Item(Items.MARBLE_BLOCK_8786, 10)),
+	GAZEBO           (13477, 8192, 65, 1200, new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4)),
+	SMALL_FOUNTAIN   (13478, 8193, 71, 500,  new Item(Items.MARBLE_BLOCK_8786)),
+	LARGE_FOUNTAIN   (13479, 8194, 75, 1000, new Item(Items.MARBLE_BLOCK_8786, 2)),
+	POSH_FOUNTAIN    (13480, 8195, 81, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
+	SUNFLOWER        (13446, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
+	MARIGOLDS        (13447, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
+	ROSES            (13448, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
+	SUNFLOWER_BIG    (13443, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
+	MARIGOLDS_BIG    (13444, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
+	ROSES_BIG        (13445, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
+	ROSEMARY         (13440, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
+	DAFFODILS        (13441, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
+	BLUEBELLS        (13442, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
+	ROSEMARY_BIG     (13437, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
+	DAFFODILS_BIG    (13438, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
+	BLUEBELLS_BIG    (13439, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
+	THORNY_HEDGE1    (13456, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	THORNY_HEDGE2    (13457, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	THORNY_HEDGE3    (13458, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
+	NICE_HEDGE1      (13459, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	NICE_HEDGE2      (13461, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	NICE_HEDGE3      (13460, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
+	SMALL_BOX_HEDGE1 (13462, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	SMALL_BOX_HEDGE2 (13464, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	SMALL_BOX_HEDGE3 (13463, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
+	TOPIARY_HEDGE1   (13465, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	TOPIARY_HEDGE2   (13467, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	TOPIARY_HEDGE3   (13466, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
+	FANCY_HEDGE1     (13468, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	FANCY_HEDGE2     (13470, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	FANCY_HEDGE3     (13469, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
+	TALL_FANCY_HEDGE1(13471, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_FANCY_HEDGE2(13473, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_FANCY_HEDGE3(13472, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
+	TALL_BOX_HEDGE1  (13474, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
+	TALL_BOX_HEDGE2  (13476, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
+	TALL_BOX_HEDGE3  (13475, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
+	BOUNDARY_STONES  (13449, 8196, 55, 100,  new Item(Items.SOFT_CLAY_1761, 10)),
+	WOODEN_FENCE     (13450, 8197, 59, 280,  new Item(Items.PLANK_960, 10)),
+	STONE_WALL       (13451, 8198, 63, 200,  new Item(Items.LIMESTONE_BRICK_3420, 10)),
+	IRON_RAILINGS    (13452, 8199, 67, 220,  new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6)),
+	PICKET_FENCE     (13453, 8200, 71, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
+	GARDEN_FENCE     (13454, 8201, 75, 940,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2)),
+	MARBLE_WALL      (13455, 8202, 79, 4000, new Item(Items.MARBLE_BLOCK_8786, 10)),
 
 	/**
 	 * Bedroom decorations.
 	 */
-	WOODEN_BED(13148, 8031, 20, 117, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	OAK_BED(13149, 8032, 30, 210, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LARGE_OAK_BED(13150, 8033, 34, 330, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	TEAK_BED(13151, 8034, 40, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LARGE_TEAK_BED(13152, 8035, 45, 480, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	FOUR_POSTER(13153, 8036, 53, 450, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	WOODEN_BED        (13148, 8031, 20, 117,  new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	OAK_BED           (13149, 8032, 30, 210,  new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	LARGE_OAK_BED     (13150, 8033, 34, 330,  new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	TEAK_BED          (13151, 8034, 40, 300,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	LARGE_TEAK_BED    (13152, 8035, 45, 480,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	FOUR_POSTER       (13153, 8036, 53, 450,  new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
 	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2)),
-	OAK_CLOCK(13169, 8052, 25, 142, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792)),
-	TEAK_CLOCK(13170, 8053, 55, 202, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792)),
-	GILDED_CLOCK(13171, 8054, 85, 602, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784)),
-	SHAVING_STAND(13162, 8045, 21, 30, new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775)),
-	OAK_SHAVING_STAND(13163, 8046, 29, 61, new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775)),
-	OAK_DRESSER(13164, 8047, 37, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TEAK_DRESSER(13165, 8048, 46, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	FANCY_TEAK_DRESSER(13166, 8049, 56, 182, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2)),
-	MAHOGANY_DRESSER(13167, 8050, 64, 281, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	GILDED_DRESSER(13168, 8051, 74, 582, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784)),
-	SHOE_BOX(13155, 8038, 20, 58, new Item(Items.PLANK_960, 2)),
-	OAK_DRAWERS(13156, 8039, 27, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	OAK_WARDROBE(13157, 8040, 39, 180, new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_DRAWERS(13158, 8041, 51, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	TEAK_WARDROBE(13159, 8042, 63, 270, new Item(Items.TEAK_PLANK_8780, 3)),
-	MAHOGANY_WARDROBE(13160, 8043, 75, 420, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	GILDED_WARDROBE(13161, 8044, 87, 720, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	OAK_CLOCK         (13169, 8052, 25, 142,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792)),
+	TEAK_CLOCK        (13170, 8053, 55, 202,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792)),
+	GILDED_CLOCK      (13171, 8054, 85, 602,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784)),
+	SHAVING_STAND     (13162, 8045, 21, 30,   new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775)),
+	OAK_SHAVING_STAND (13163, 8046, 29, 61,   new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775)),
+	OAK_DRESSER       (13164, 8047, 37, 121,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TEAK_DRESSER      (13165, 8048, 46, 181,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	FANCY_TEAK_DRESSER(13166, 8049, 56, 182,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2)),
+	MAHOGANY_DRESSER  (13167, 8050, 64, 281,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	GILDED_DRESSER    (13168, 8051, 74, 582,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784)),
+	SHOE_BOX          (13155, 8038, 20, 58,   new Item(Items.PLANK_960, 2)),
+	OAK_DRAWERS       (13156, 8039, 27, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	OAK_WARDROBE      (13157, 8040, 39, 180,  new Item(Items.OAK_PLANK_8778, 3)),
+	TEAK_DRAWERS      (13158, 8041, 51, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	TEAK_WARDROBE     (13159, 8042, 63, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
+	MAHOGANY_WARDROBE (13160, 8043, 75, 420,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	GILDED_WARDROBE   (13161, 8044, 87, 720,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
 
 	/**
 	 * Quest hall decorations.
 	 */
 	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540)),
-	AMULET_OF_GLORY(13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704)),
-	CAPE_OF_LEGENDS(13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052)),
-	KING_ARTHUR(13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995)),
-	ELENA(13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996)),
-	GIANT_DWARF(13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997)),
-	MISCELLANIANS(13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998)),
-	LUMBRIDGE(13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002)),
-	THE_DESERT(13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999)),
-	MORYTANIA(13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003)),
-	KARAMJA(13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001)),
-	ISAFDAR(13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000)),
-	SILVERLIGHT(13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402)),
-	EXCALIBUR(13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35)),
-	DARKLIGHT(13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746)),
-	SMALL_MAP(13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004)),
-	MEDIUM_MAP(13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005)),
-	LARGE_MAP(13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006)),
+	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704)),
+	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052)),
+	KING_ARTHUR      (13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995)),
+	ELENA            (13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996)),
+	GIANT_DWARF      (13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997)),
+	MISCELLANIANS    (13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998)),
+	LUMBRIDGE        (13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002)),
+	THE_DESERT       (13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999)),
+	MORYTANIA        (13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003)),
+	KARAMJA          (13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001)),
+	ISAFDAR          (13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000)),
+	SILVERLIGHT      (13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402)),
+	EXCALIBUR        (13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35)),
+	DARKLIGHT        (13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746)),
+	SMALL_MAP        (13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004)),
+	MEDIUM_MAP       (13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005)),
+	LARGE_MAP        (13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006)),
 
 	/**
 	 * Study decorations.
 	 */
-	GLOBE(13649, 8341, 41, 180, new Item(Items.OAK_PLANK_8778, 3)),
-	ORNAMENTAL_GLOBE(13650, 8342, 50, 270, new Item(Items.TEAK_PLANK_8780, 3)),
-	LUNAR_GLOBE(13651, 8343, 59, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
-	CELESTIAL_GLOBE(13652, 8344, 68, 570, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
-	ARMILLARY_SPHERE(13653, 8345, 77, 960, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4)),
-	SMALL_ORREY(13654, 8346, 86, 1320, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3)),
-	LARGE_ORREY(13655, 8347, 95, 1420, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5)),
-	OAK_LECTERN(13642, 8334, 40, 60, new Item(Items.OAK_PLANK_8778)),
-	EAGLE_LECTERN(13643, 8335, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	DEMON_LECTERN(13644, 8336, 47, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_EAGLE_LECTERN(13645, 8337, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	TEAK_DEMON_LECTERN(13646, 8338, 57, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
-	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
-	CRYSTAL_BALL(13659, 8351, 42, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567)),
-	ELEMENTAL_SPHERE(13660, 8352, 54, 580, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784)),
-	CRYSTAL_OF_POWER(13661, 8353, 66, 890, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2)),
-	ALCHEMICAL_CHART(13662, 8354, 43, 30, new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	ASTRONOMICAL_CHART(13663, 8355, 63, 45, new Item(Items.BOLT_OF_CLOTH_8790, 3)),
-	INFERNAL_CHART(13664, 8356, 83, 60, new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	TELESCOPE1(13656, 8348, 44, 121, new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TELESCOPE2(13657, 8349, 64, 181, new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TELESCOPE3(13658, 8350, 84, 580, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	GLOBE                 (13649, 8341, 41, 180,  new Item(Items.OAK_PLANK_8778, 3)),
+	ORNAMENTAL_GLOBE      (13650, 8342, 50, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
+	LUNAR_GLOBE           (13651, 8343, 59, 570,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
+	CELESTIAL_GLOBE       (13652, 8344, 68, 570,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
+	ARMILLARY_SPHERE      (13653, 8345, 77, 960,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4)),
+	SMALL_ORREY           (13654, 8346, 86, 1320, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3)),
+	LARGE_ORREY           (13655, 8347, 95, 1420, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5)),
+	OAK_LECTERN           (13642, 8334, 40, 60,   new Item(Items.OAK_PLANK_8778)),
+	EAGLE_LECTERN         (13643, 8335, 47, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	DEMON_LECTERN         (13644, 8336, 47, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_EAGLE_LECTERN    (13645, 8337, 57, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	TEAK_DEMON_LECTERN    (13646, 8338, 57, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	CRYSTAL_BALL          (13659, 8351, 42, 280,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567)),
+	ELEMENTAL_SPHERE      (13660, 8352, 54, 580,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784)),
+	CRYSTAL_OF_POWER      (13661, 8353, 66, 890,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2)),
+	ALCHEMICAL_CHART      (13662, 8354, 43, 30,   new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	ASTRONOMICAL_CHART    (13663, 8355, 63, 45,   new Item(Items.BOLT_OF_CLOTH_8790, 3)),
+	INFERNAL_CHART        (13664, 8356, 83, 60,   new Item(Items.BOLT_OF_CLOTH_8790, 4)),
+	TELESCOPE1            (13656, 8348, 44, 121,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TELESCOPE2            (13657, 8349, 64, 181,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	TELESCOPE3            (13658, 8350, 84, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
 
 	/**
 	 * Costume room decorations.
 	 */
-	OAK_TREASURE_CHEST(18804, 9839, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_TREASURE_CHEST(18806, 9840, 66, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	OAK_ARMOUR_CASE(18778, 9826, 46, 180, new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_ARMOUR_CASE(18780, 9827, 64, 270, new Item(Items.TEAK_PLANK_8780, 3)),
-	MGANY_ARMOUR_CASE(18782, 9828, 82, 420, new Item(Items.MAHOGANY_PLANK_8782, 3)),
-	OAK_MAGIC_WARDROBE(18784, 9829, 42, 240, new Item(Items.OAK_PLANK_8778, 4)),
-	C_OAK_MAGIC_WARDROBE(18786, 9830, 51, 360, new Item(Items.OAK_PLANK_8778, 6)),
-	TEAK_MAGIC_WARDROBE(18788, 9831, 60, 360, new Item(Items.TEAK_PLANK_8780, 4)),
-	C_TEAK_MAGIC_WARDROBE(18790, 9832, 69, 540, new Item(Items.TEAK_PLANK_8780, 6)),
-	MGANY_MAGIC_WARDROBE(18792, 9833, 78, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_MAGIC_WARDROBE(18794, 9834, 87, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	MARBLE_MAGIC_WARDROBE(18796, 9835, 96, 500, new Item(Items.MARBLE_BLOCK_8786)),
-	OAK_CAPE_RACK(18766, 9817, 54, 240, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_CAPE_RACK(18767, 9818, 63, 360, new Item(Items.TEAK_PLANK_8780, 4)),
-	MGANY_CAPE_RACK(18768, 9819, 72, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_CAPE_RACK(18769, 9820, 81, 860, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	MARBLE_CAPE_RACK(18770, 9821, 90, 500, new Item(Items.MARBLE_BLOCK_8786)),
-	MAGIC_CAPE_RACK(18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788)),
-	OAK_TOY_BOX(18798, 9836, 50, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_TOY_BOX(18800, 9837, 68, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_TOY_BOX(18802, 9838, 86, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	OAK_COSTUME_BOX(18772, 9823, 44, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_COSTUME_BOX(18774, 9824, 62, 180, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_COSTUME_BOX(18776, 9825, 80, 280, new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	OAK_TREASURE_CHEST     (18804, 9839, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_TREASURE_CHEST    (18806, 9840, 66, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	OAK_ARMOUR_CASE        (18778, 9826, 46, 180,  new Item(Items.OAK_PLANK_8778, 3)),
+	TEAK_ARMOUR_CASE       (18780, 9827, 64, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
+	MGANY_ARMOUR_CASE      (18782, 9828, 82, 420,  new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	OAK_MAGIC_WARDROBE     (18784, 9829, 42, 240,  new Item(Items.OAK_PLANK_8778, 4)),
+	C_OAK_MAGIC_WARDROBE   (18786, 9830, 51, 360,  new Item(Items.OAK_PLANK_8778, 6)),
+	TEAK_MAGIC_WARDROBE    (18788, 9831, 60, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
+	C_TEAK_MAGIC_WARDROBE  (18790, 9832, 69, 540,  new Item(Items.TEAK_PLANK_8780, 6)),
+	MGANY_MAGIC_WARDROBE   (18792, 9833, 78, 560,  new Item(Items.MAHOGANY_PLANK_8782, 4)),
+	GILDED_MAGIC_WARDROBE  (18794, 9834, 87, 860,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
+	MARBLE_MAGIC_WARDROBE  (18796, 9835, 96, 500,  new Item(Items.MARBLE_BLOCK_8786)),
+	OAK_CAPE_RACK          (18766, 9817, 54, 240,  new Item(Items.OAK_PLANK_8778, 4)),
+	TEAK_CAPE_RACK         (18767, 9818, 63, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
+	MGANY_CAPE_RACK        (18768, 9819, 72, 560,  new Item(Items.MAHOGANY_PLANK_8782, 4)),
+	GILDED_CAPE_RACK       (18769, 9820, 81, 860,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
+	MARBLE_CAPE_RACK       (18770, 9821, 90, 500,  new Item(Items.MARBLE_BLOCK_8786)),
+	MAGIC_CAPE_RACK        (18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788)),
+	OAK_TOY_BOX            (18798, 9836, 50, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_TOY_BOX           (18800, 9837, 68, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	MAHOGANY_TOY_BOX       (18802, 9838, 86, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	OAK_COSTUME_BOX        (18772, 9823, 44, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_COSTUME_BOX       (18774, 9824, 62, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
+	MAHOGANY_COSTUME_BOX   (18776, 9825, 80, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
 
 	/**
 	 * Chapel decorations.
 	 */
-	OAK_ALTAR(13179, 8062, 45, 240, new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_ALTAR(13182, 8063, 50, 360, new Item(Items.TEAK_PLANK_8780, 4)),
-	CLOTH_ALTAR(13185, 8064, 56, 390, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	MAHOGANY_ALTAR(13188, 8065, 60, 590, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LIMESTONE_ALTAR(13191, 8066, 64, 910, new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MARBLE_ALTAR(13194, 8067, 70, 1030, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	GILDED_ALTAR(13197, 8068, 75, 2230, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4)),
-	SMALL_STATUE(13271, 8082, 49, 40, new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MEDIUM_STATUE(13272, 8083, 69, 500, new Item(Items.MARBLE_BLOCK_8786)),
-	LARGE_STATUE(13282, 8084, 89, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	WINDCHIMES(13214, 8079, 49, 323, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4)),
-	BELLS(13215, 8080, 58, 480, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6)),
-	ORGAN(13216, 8081, 69, 680, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6)),
-	SARADOMIN_SYMBOL(13172, 8055, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	ZAMORAK_SYMBOL(13173, 8056, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	GUTHIX_SYMBOL(13174, 8057, 48, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	SARADOMIN_ICON(13175, 8058, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	ZAMORAK_ICON(13176, 8059, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	GUTHIX_ICON(13177, 8060, 59, 960, new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	ICON_OF_BOB(13178, 8061, 71, 1160, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	STEEL_TORCHES(13202, 8070, 45, 80, new Item(Items.STEEL_BAR_2353, 2)),
-	WOODEN_TORCHES(13200, 8069, 49, 58, new Item(Items.PLANK_960, 2)),
-	STEEL_CANDLESTICKS(13204, 8071, 53, 124, new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6)),
-	GOLD_CANDLESTICKS(13206, 8072, 57, 46, new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6)),
-	INCENSE_BURNERS(13208, 8073, 61, 280, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2)),
-	MAHOGANY_BURNERS(13210, 8074, 65, 600, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2)),
-	MARBLE_BURNERS(13212, 8075, 69, 1600, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2)),
-	SHUTTERED_WINDOW(new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item(Items.PLANK_960, 8)),
-	DECORATIVE_WINDOW(new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item(Items.MOLTEN_GLASS_1775, 8)),
-	STAINED_GLASS(new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item(Items.MOLTEN_GLASS_1775, 16)),
+	OAK_ALTAR         (13179, 8062, 45, 240,  new Item(Items.OAK_PLANK_8778, 4)),
+	TEAK_ALTAR        (13182, 8063, 50, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
+	CLOTH_ALTAR       (13185, 8064, 56, 390,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	MAHOGANY_ALTAR    (13188, 8065, 60, 590,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	LIMESTONE_ALTAR   (13191, 8066, 64, 910,  new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2)),
+	MARBLE_ALTAR      (13194, 8067, 70, 1030, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	GILDED_ALTAR      (13197, 8068, 75, 2230, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4)),
+	SMALL_STATUE      (13271, 8082, 49, 40,   new Item(Items.LIMESTONE_BRICK_3420, 2)),
+	MEDIUM_STATUE     (13272, 8083, 69, 500,  new Item(Items.MARBLE_BLOCK_8786)),
+	LARGE_STATUE      (13282, 8084, 89, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
+	WINDCHIMES        (13214, 8079, 49, 323,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4)),
+	BELLS             (13215, 8080, 58, 480,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6)),
+	ORGAN             (13216, 8081, 69, 680,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6)),
+	SARADOMIN_SYMBOL  (13172, 8055, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	ZAMORAK_SYMBOL    (13173, 8056, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	GUTHIX_SYMBOL     (13174, 8057, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
+	SARADOMIN_ICON    (13175, 8058, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
+	ZAMORAK_ICON      (13176, 8059, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
+	GUTHIX_ICON       (13177, 8060, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
+	ICON_OF_BOB       (13178, 8061, 71, 1160, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2)),
+	STEEL_TORCHES     (13202, 8070, 45, 80,   new Item(Items.STEEL_BAR_2353, 2)),
+	WOODEN_TORCHES    (13200, 8069, 49, 58,   new Item(Items.PLANK_960, 2)),
+	STEEL_CANDLESTICKS(13204, 8071, 53, 124,  new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6)),
+	GOLD_CANDLESTICKS (13206, 8072, 57, 46,   new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6)),
+	INCENSE_BURNERS   (13208, 8073, 61, 280,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2)),
+	MAHOGANY_BURNERS  (13210, 8074, 65, 600,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2)),
+	MARBLE_BURNERS    (13212, 8075, 69, 1600, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2)),
+	SHUTTERED_WINDOW  (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item(Items.PLANK_960, 8)),
+	DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item(Items.MOLTEN_GLASS_1775, 8)),
+	STAINED_GLASS     (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item(Items.MOLTEN_GLASS_1775, 16)),
 
 	/**
 	 * Throne room
 	 */
-	OAK_THRONE(13665, 8357, 60, 800, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786)),
-	TEAK_THRONE(13666, 8358, 67, 1450, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2)),
-	MAHOGANY_THRONE(13667, 8359, 74, 2200, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3)),
-	GILDED_THRONE(13668, 8360, 81, 1700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3)),
-	SKELETON_THRONE(13669, 8361, 88, 7003, new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2)),
-	CRYSTAL_THRONE(13670, 8362, 95, 15000, new Item(Items.MAGIC_STONE_8788, 15)),
-	DEMONIC_THRONE(13671, 8363, 99, 25000, new Item(Items.MAGIC_STONE_8788, 25)),
-	OAK_LEVER(13672, 8364, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_LEVER(13673, 8365, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_LEVER(13674, 8366, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	FLOOR_DECORATION(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	STEEL_CAGE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20)),
-	FLOOR_TRAP(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10)),
-	MAGIC_CIRCLE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2)),
-	MAGIC_CAGE(new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4)),
-	OAK_TRAPDOOR(13675, 8367, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_TRAPDOOR(13676, 8368, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	CARVED_TEAK_BENCH(13694, 8112, 44, 360, new Item(Items.TEAK_PLANK_8780, 4)),
-	MAHOGANY_BENCH(13695, 8113, 52, 560, new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_BENCH(13696, 8114, 61, 1760, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
-	OAK_DECO(13798, 8102, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_DECO(13814, 8103, 36, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
-	GILDED_DECO(13782, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
-	ROUND_SHIELD(13734, 8105, 66, 120, new Item(Items.OAK_PLANK_8778, 2)),
-	SQUARE_SHIELD(13766, 8106, 76, 360, new Item(Items.TEAK_PLANK_8780, 4)),
-	KITE_SHIELD(13750, 8107, 86, 420, new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	OAK_THRONE       (13665, 8357, 60, 800,   new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786)),
+	TEAK_THRONE      (13666, 8358, 67, 1450,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2)),
+	MAHOGANY_THRONE  (13667, 8359, 74, 2200,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3)),
+	GILDED_THRONE    (13668, 8360, 81, 1700,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3)),
+	SKELETON_THRONE  (13669, 8361, 88, 7003,  new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2)),
+	CRYSTAL_THRONE   (13670, 8362, 95, 15000, new Item(Items.MAGIC_STONE_8788, 15)),
+	DEMONIC_THRONE   (13671, 8363, 99, 25000, new Item(Items.MAGIC_STONE_8788, 25)),
+	OAK_LEVER        (13672, 8364, 68, 300,   new Item(Items.OAK_PLANK_8778, 5)),
+	TEAK_LEVER       (13673, 8365, 78, 450,   new Item(Items.TEAK_PLANK_8780, 5)),
+	MAHOGANY_LEVER   (13674, 8366, 88, 700,   new Item(Items.MAHOGANY_PLANK_8782, 5)),
+	FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700,  new Item(Items.MAHOGANY_PLANK_8782, 5)),
+	STEEL_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20)),
+	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10)),
+	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2)),
+	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4)),
+	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item(Items.OAK_PLANK_8778, 5)),
+	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item(Items.TEAK_PLANK_8780, 5)),
+	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item(Items.MAHOGANY_PLANK_8782, 5)),
+	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item(Items.TEAK_PLANK_8780, 4)),
+	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item(Items.MAHOGANY_PLANK_8782, 4)),
+	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
+	OAK_DECO         (13798, 8102, 16, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
+	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
+	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
+	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item(Items.OAK_PLANK_8778, 2)),
+	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item(Items.TEAK_PLANK_8780, 4)),
+	KITE_SHIELD      (13750, 8107, 86, 420,    new Item(Items.MAHOGANY_PLANK_8782, 3)),
 
 	/**
 	 * Oubliette
 	 */
-	SPIKES_MID(13334, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_SIDE(13335, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_CORNER(13336, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_FL(13338, 8302, 65, 623, new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	TENTACLE_MID(13331, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_SIDE(13332, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_CORNER(13333, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_FL(13338, 8303, 71, 326, new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	FP_FLOOR_MID(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FP_FLOOR_SIDE(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FP_FLOOR_CORNER(13371, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FLAME_PIT(13337, 8304, 77, 357, new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	ROCNAR_FLOOR_MID(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
-	ROCNAR_FLOOR_SIDE(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
-	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
-	ROCNAR(13373, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
-	ROCNAR_FL(13338, 8305, 83, 387, new Item(Items.COINS_995, 150000)),
-	OAK_CAGE(13313, 8297, 65, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	OAK_CAGE_DOOR(13314, 8297, 65, 640, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	OAK_STEEL_CAGE(13316, 8298, 70, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	STEEL_CAGE_OU(13319, 8299, 75, 400, new Item(Items.STEEL_BAR_2353, 20)),
-	STEEL_CAGE_DOOR(13320, 8299, 75, 400, new Item(Items.STEEL_BAR_2353, 20)),
-	SPIKED_CAGE(13322, 8300, 80, 500, new Item(Items.STEEL_BAR_2353, 25)),
-	SPIKED_CAGE_DOOR(13323, 8300, 80, 500, new Item(Items.STEEL_BAR_2353, 25)),
-	BONE_CAGE(13325, 8301, 85, 603, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
-	BONE_CAGE_DOOR(13326, 8301, 85, 603, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
-	SKELETON_GUARD(13366, 8131, 70, 223, new Item(Items.COINS_995, 50000)),
-	GUARD_DOG(13367, 8132, 74, 273, new Item(Items.COINS_995, 75000)),
-	HOBGOBLIN(13368, 8133, 78, 316, new Item(Items.COINS_995, 100000)),
-	BABY_RED_DRAGON(13372, 8134, 82, 387, new Item(Items.COINS_995, 150000)),
-	HUGE_SPIDER(13370, 8135, 86, 447, new Item(Items.COINS_995, 200000)),
-	TROLL(13369, 8136, 90, 1000, new Item(Items.COINS_995, 1000000)),
-	HELLHOUND(2715, 8137, 94, 2236, new Item(Items.COINS_995, 5000000)),
-	OAK_LADDER(13328, 8306, 68, 300, new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_LADDER(13329, 8307, 78, 450, new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_LADDER(13330, 8308, 88, 700, new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	DECORATIVE_BLOOD(13312, 8125, 72, 4, new Item(Items.RED_DYE_1763, 4)),
-	DECORATIVE_PIPE(13311, 8126, 83, 120, new Item(Items.STEEL_BAR_2353, 6)),
-	HANGING_SKELETON(13310, 8127, 94, 3, new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6)),
-	CANDLE(13342, 8128, 72, 243, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4)),
-	TORCH(13341, 8129, 84, 244, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4)),
-	SKULL_TORCH(13343, 8130, 94, 246, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4)),
+	SPIKES_MID         (13334, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
+	SPIKES_SIDE        (13335, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
+	SPIKES_CORNER      (13336, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
+	SPIKES_FL          (13338, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
+	TENTACLE_MID       (13331, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
+	TENTACLE_SIDE      (13332, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
+	TENTACLE_CORNER    (13333, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
+	TENTACLE_FL        (13338, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
+	FP_FLOOR_MID       (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
+	FP_FLOOR_SIDE      (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
+	FP_FLOOR_CORNER    (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
+	FLAME_PIT          (13337, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
+	ROCNAR_FLOOR_MID   (13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
+	ROCNAR_FLOOR_SIDE  (13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
+	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
+	ROCNAR             (13373, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
+	ROCNAR_FL          (13338, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
+	OAK_CAGE           (13313, 8297, 65, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
+	OAK_CAGE_DOOR      (13314, 8297, 65, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
+	OAK_STEEL_CAGE     (13316, 8298, 70, 800,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
+	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
+	STEEL_CAGE_OU      (13319, 8299, 75, 400,  new Item(Items.STEEL_BAR_2353, 20)),
+	STEEL_CAGE_DOOR    (13320, 8299, 75, 400,  new Item(Items.STEEL_BAR_2353, 20)),
+	SPIKED_CAGE        (13322, 8300, 80, 500,  new Item(Items.STEEL_BAR_2353, 25)),
+	SPIKED_CAGE_DOOR   (13323, 8300, 80, 500,  new Item(Items.STEEL_BAR_2353, 25)),
+	BONE_CAGE          (13325, 8301, 85, 603,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
+	BONE_CAGE_DOOR     (13326, 8301, 85, 603,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
+	SKELETON_GUARD     (13366, 8131, 70, 223,  new Item(Items.COINS_995, 50000)),
+	GUARD_DOG          (13367, 8132, 74, 273,  new Item(Items.COINS_995, 75000)),
+	HOBGOBLIN          (13368, 8133, 78, 316,  new Item(Items.COINS_995, 100000)),
+	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item(Items.COINS_995, 150000)),
+	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item(Items.COINS_995, 200000)),
+	TROLL              (13369, 8136, 90, 1000, new Item(Items.COINS_995, 1000000)),
+	HELLHOUND          (2715, 8137, 94, 2236,  new Item(Items.COINS_995, 5000000)),
+	OAK_LADDER         (13328, 8306, 68, 300,  new Item(Items.OAK_PLANK_8778, 5)),
+	TEAK_LADDER        (13329, 8307, 78, 450,  new Item(Items.TEAK_PLANK_8780, 5)),
+	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item(Items.MAHOGANY_PLANK_8782, 5)),
+	DECORATIVE_BLOOD   (13312, 8125, 72, 4,    new Item(Items.RED_DYE_1763, 4)),
+	DECORATIVE_PIPE    (13311, 8126, 83, 120,  new Item(Items.STEEL_BAR_2353, 6)),
+	HANGING_SKELETON   (13310, 8127, 94, 3,    new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6)),
+	CANDLE             (13342, 8128, 72, 243,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4)),
+	TORCH              (13341, 8129, 84, 244,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4)),
+	SKULL_TORCH        (13343, 8130, 94, 246,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4)),
 
 	/**
 	 * Dungeon corridor, junction, stairs & pit
 	 */
-	OAK_DOOR_LEFT(13344, 8122, 74, 600, new Item(Items.OAK_PLANK_8778, 10)),
-	OAK_DOOR_RIGHT(13345, 8122, 74, 600, new Item(Items.OAK_PLANK_8778, 10)),
-	STEEL_DOOR_LEFT(13346, 8123, 84, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	STEEL_DOOR_RIGHT(13347, 8123, 84, 800, new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	MARBLE_DOOR_LEFT(13348, 8124, 94, 2000, new Item(Items.MARBLE_BLOCK_8786, 4)),
-	MARBLE_DOOR_RIGHT(13349, 8124, 94, 2000, new Item(Items.MARBLE_BLOCK_8786, 4)),
-	SPIKE_TRAP(13356, 8143, 72, 223, new Item(Items.COINS_995, 50000)),
-	MAN_TRAP(13357, 8144, 76, 273, new Item(Items.COINS_995, 75000)),
-	TANGLE_TRAP(13358, 8145, 80, 316, new Item(Items.COINS_995, 100000)),
-	MARBLE_TRAP(13359, 8146, 84, 387, new Item(Items.COINS_995, 150000)),
-	TELEPORT_TRAP(13360, 8147, 88, 447, new Item(Items.COINS_995, 200000)),
-
-	/*     objID, int, lvl, exp, materials */
-	PIT_DOG(39260, 18791, 70, 200, new Item(Items.COINS_995, 40000)),
-	PIT_OGRE(39261, 18792, 73, 234, new Item(Items.COINS_995, 55000)),
-	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300, new Item(Items.COINS_995, 90000)),
-	PIT_SCABARITE(39263, 18794, 84, 387, new Item(Items.COINS_995, 150000)),
-	PIT_BLACK_DEMON(39264, 18795, 89, 547, new Item(Items.COINS_995, 300000)),
-	PIT_IRON_DRAGON(39265, 18796, 97, 2738, new Item(Items.COINS_995, 7500000)),
+	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item(Items.OAK_PLANK_8778, 10)),
+	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item(Items.OAK_PLANK_8778, 10)),
+	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
+	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
+	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item(Items.MARBLE_BLOCK_8786, 4)),
+	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item(Items.MARBLE_BLOCK_8786, 4)),
+	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item(Items.COINS_995, 50000)),
+	MAN_TRAP          (13357, 8144, 76, 273,   new Item(Items.COINS_995, 75000)),
+	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item(Items.COINS_995, 100000)),
+	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item(Items.COINS_995, 150000)),
+	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item(Items.COINS_995, 200000)),
+	PIT_DOG           (39260, 18791, 70, 200,  new Item(Items.COINS_995, 40000)),
+	PIT_OGRE          (39261, 18792, 73, 234,  new Item(Items.COINS_995, 55000)),
+	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item(Items.COINS_995, 90000)),
+	PIT_SCABARITE     (39263, 18794, 84, 387,  new Item(Items.COINS_995, 150000)),
+	PIT_BLACK_DEMON   (39264, 18795, 89, 547,  new Item(Items.COINS_995, 300000)),
+	PIT_IRON_DRAGON   (39265, 18796, 97, 2738, new Item(Items.COINS_995, 7500000)),
 
 	/**
 	 * Treasure room
 	 */
-	DEMON(13378, 8138, 75, 707, new Item(Items.COINS_995, 500000)),
-	KALPHITE_SOLDIER(13374, 8139, 80, 866, new Item(Items.COINS_995, 750000)),
-	TOK_XIL(13377, 8140, 85, 2236, new Item(Items.COINS_995, 5000000)),
-	DAGANNOTH(13376, 8141, 90, 2738, new Item(Items.COINS_995, 7500000)),
-	STEEL_DRAGON(13375, 8142, 95, 3162, new Item(Items.COINS_995, 1000000)),
-	WOODEN_CRATE(13283, 8148, 75, 143, new Item(Items.PLANK_960, 5)),
-	OAK_T_CHEST(13285, 8149, 79, 340, new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2)),
-	TEAK_T_CHEST(13287, 8150, 83, 530, new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4)),
-	MGANY_T_CHEST(13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784)),
-	MAGIC_CHEST(13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788)),
+	DEMON            (13378, 8138, 75, 707,  new Item(Items.COINS_995, 500000)),
+	KALPHITE_SOLDIER (13374, 8139, 80, 866,  new Item(Items.COINS_995, 750000)),
+	TOK_XIL          (13377, 8140, 85, 2236, new Item(Items.COINS_995, 5000000)),
+	DAGANNOTH        (13376, 8141, 90, 2738, new Item(Items.COINS_995, 7500000)),
+	STEEL_DRAGON     (13375, 8142, 95, 3162, new Item(Items.COINS_995, 1000000)),
+	WOODEN_CRATE     (13283, 8148, 75, 143,  new Item(Items.PLANK_960, 5)),
+	OAK_T_CHEST      (13285, 8149, 79, 340,  new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2)),
+	TEAK_T_CHEST     (13287, 8150, 83, 530,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4)),
+	MGANY_T_CHEST    (13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784)),
+	MAGIC_CHEST      (13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788)),
 
 	/**
 	 * Style related decoration.
 	 */
-	BASIC_WOOD_WINDOW(13099, -1, 1, 0.0),
-	BASIC_STONE_WINDOW(13091, -1, 1, 0.0),
-	WHITEWASHED_STONE_WINDOW(13005, -1, 1, 0.0),
-	FREMENNIK_WINDOW(13112, -1, 1, 0.0),
-	TROPICAL_WOOD_WINDOW(10816, -1, 1, 0.0),
-	FANCY_STONE_WINDOW(13117, -1, 1, 0.0),
-
+	BASIC_WOOD_WINDOW        (13099, -1, 1, 0.0),
+	BASIC_STONE_WINDOW       (13091, -1, 1, 0.0),
+	WHITEWASHED_STONE_WINDOW (13005, -1, 1, 0.0),
+	FREMENNIK_WINDOW         (13112, -1, 1, 0.0),
+	TROPICAL_WOOD_WINDOW     (10816, -1, 1, 0.0),
+	FANCY_STONE_WINDOW       (13117, -1, 1, 0.0),
 	;
+
 	/**
 	 * The object id.
 	 */
@@ -905,14 +903,6 @@ public enum Decoration {
 		return items;
 	}
 
-	/**
-	 * Gets the refundItems.
-	 * @return The refundItems.
-	 */
-	public Item[] getRefundItems() {
-		return refundItems;
-	}
-
 	/**
 	 * Gets the tools.
 	 * @return The tools.
-- 
GitLab


From f7ceaf61842a4ee9e333d0aff0390041a6779523 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 18:37:45 -0400
Subject: [PATCH 08/13] remove varargs

---
 .../global/skill/construction/Decoration.java | 932 +++++++++---------
 1 file changed, 466 insertions(+), 466 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index c9b99cbda1..752daaf797 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -16,107 +16,107 @@ public enum Decoration {
 	/**
 	 * Garden centrepiece decorations.
 	 */
-	PORTAL          (13405, 8168,  1,  100.0, new Item(Items.IRON_BAR_2351, 10)),
-	ROCK            (13406, 8169,  5,  100.0, new Item(Items.LIMESTONE_BRICK_3420, 5)),
-	POND            (13407, 8170,  10, 100.0, new Item(Items.SOFT_CLAY_1761, 10)),
-	IMP_STATUE      (13408, 8171,  15, 150.0, new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5)),
-	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10)),
-	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
+	PORTAL          (13405, 8168,  1,  100.0, new Item[] { new Item(Items.IRON_BAR_2351, 10) },
+	ROCK            (13406, 8169,  5,  100.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) },
+	POND            (13407, 8170,  10, 100.0, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
+	IMP_STATUE      (13408, 8171,  15, 150.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) },
+	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) },
+	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
 
 	/**
 	 * Garden big tree decorations.
 	 */
-	BIG_DEAD_TREE  (13411, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
-	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
-	BIG_WILLOW_TREE                       (13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
-	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+	BIG_DEAD_TREE  (13411, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) },
+	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) },
+	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) },
+	BIG_WILLOW_TREE                       (13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) },
+	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) },
+	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) },
+	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) },
 
 	/**
 	 * Garden tree decorations.
 	 */
-	DEAD_TREE  (13418, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DEAD_TREE_8417)),
-	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_NICE_TREE_8419)),
-	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_OAK_TREE_8421)),
-	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_WILLOW_TREE_8423)),
-	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAPLE_TREE_8425)),
-	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_YEW_TREE_8427)),
-	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MAGIC_TREE_8429)),
+	DEAD_TREE  (13418, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) },
+	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) },
+	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) },
+	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) },
+	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) },
+	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) },
+	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) },
 
 	/**
 	 * Garden big plant 1 decorations.
 	 */
-	FERN      (13425, 8186, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	BUSH      (13426, 8187, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	FERN      (13425, 8186, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
+	BUSH      (13426, 8187, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
+	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
 
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT(13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	LARGE_LEAF (13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	SHORT_PLANT(13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
+	LARGE_LEAF (13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
+	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
 
 	/**
 	 * Garden small plant 1 decorations.
 	 */
-	PLANT     (13431, 8180, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	SMALL_FERN(13432, 8181, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	PLANT     (13431, 8180, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
+	SMALL_FERN(13432, 8181, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
+	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
 
 	/**
 	 * Garden small plant 2 decorations.
 	 */
-	DOCK_LEAF(13434, 8183, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_1_8431)),
-	THISTLE  (13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_2_8433)),
-	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_PLANT_3_8435)),
+	DOCK_LEAF(13434, 8183, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
+	THISTLE  (13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
+	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
 
 	/**
 	 * Parlour chair spot
 	 */
-	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item(Items.PLANK_960, 2)),
-	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item(Items.PLANK_960, 3)),
-	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item(Items.PLANK_960, 3)),
-	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item[] { new Item(Items.PLANK_960, 2) },
+	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
+	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
+	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
 
 	/**
 	 * Rugs rugs rugs
 	 */
-	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
-	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
-	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784)),
+	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
+	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
+	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
 
 	/**
 	 * Parlour fireplaces
 	 */
-	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item(Items.SOFT_CLAY_1761, 3)),
-	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item(Items.MARBLE_BLOCK_8786)),
+	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 3) },
+	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
+	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
 
 	/**
 	 * Parlour curtain spot
 	 */
-	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
-	CURTAINS        (13604, 8323, 18, 225.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
-	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3)),
+	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
+	CURTAINS        (13604, 8323, 18, 225.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
+	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
 
 	/**
 	 * Bookcases
 	 */
-	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item(Items.PLANK_960, 4)),
-	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
-	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item[] { new Item(Items.PLANK_960, 4) },
+	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
 
 	/**
 	 * Kitchen Beer Barrels
@@ -124,169 +124,169 @@ public enum Decoration {
 	 * Basic: 1, Cider: 14, Asgarnian: 24, Greenman's: 29, D.Bitter: 39, Chef's: 54
 	 *
 	 */
-	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item(Items.PLANK_960, 3)),
-	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8)),
-	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8)),
-	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8)),
-	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2)),
-	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2)),
+	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
+	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) },
+	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) },
+	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) },
+	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) },
+	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) },
 
 	/**
 	 * Kitchen Tables!
 	 */
-	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item(Items.PLANK_960, 3)),
-	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item(Items.OAK_PLANK_8778, 3)),
-	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item(Items.TEAK_PLANK_8780, 3)),
+	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
+	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
 
 	/**
 	 * Kitchen Stoves
 	 */
-	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353)),
-	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2)),
-	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3)),
-	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item(Items.STEEL_BAR_2353, 4)),
-	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item(Items.STEEL_BAR_2353, 5)),
-	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item(Items.STEEL_BAR_2353, 6)),
-	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item(Items.STEEL_BAR_2353, 8)),
+	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) },
+	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) },
+	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) },
+	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item[] { new Item(Items.STEEL_BAR_2353, 4) },
+	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) },
+	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item[] { new Item(Items.STEEL_BAR_2353, 6) },
+	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item[] { new Item(Items.STEEL_BAR_2353, 8) },
 
 	/**
 	 * Kitchen larders
 	 */
-	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item(Items.PLANK_960, 8)),
-	OAK_LARDER   (13566, 8234, 33, 480.0, new Item(Items.OAK_PLANK_8778, 8)),
-	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item[] { new Item(Items.PLANK_960, 8) },
+	OAK_LARDER   (13566, 8234, 33, 480.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8) },
+	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
 
 	/**
 	 * Kitchen shelves
 	 */
-	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item(Items.PLANK_960, 3)),
-	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6)),
-	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2)),
+	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
+	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) },
+	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) },
+	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) },
+	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) },
+	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) },
+	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) },
 
 	/**
 	 * Kitchen sinks
 	 */
-	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item(Items.STEEL_BAR_2353, 5)),
-	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item(Items.STEEL_BAR_2353, 10)),
-	SINK          (13563, 8232, 47, 300.0, new Item(Items.STEEL_BAR_2353, 15)),
+	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) },
+	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item[] { new Item(Items.STEEL_BAR_2353, 10) },
+	SINK          (13563, 8232, 47, 300.0, new Item[] { new Item(Items.STEEL_BAR_2353, 15) },
 
 	/**
 	 * Kitchen cat baskets/blankets
 	 */
-	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item(Items.BOLT_OF_CLOTH_8790)),
-	CAT_BASKET           (13575, 8237, 19, 58.0, new Item(Items.PLANK_960, 2)),
-	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2)),
+	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) },
+	CAT_BASKET           (13575, 8237, 19, 58.0, new Item[] { new Item(Items.PLANK_960, 2) },
+	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) },
 
 	/**
 	 * Dining room tables
 	 */
-	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item(Items.PLANK_960, 4)),
-	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item(Items.OAK_PLANK_8778, 4)),
-	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item(Items.OAK_PLANK_8778, 6)),
-	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item(Items.TEAK_PLANK_8780, 4)),
-	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item(Items.MAHOGANY_PLANK_8782, 6)),
-	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2)),
+	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item[] { new Item(Items.PLANK_960, 4) },
+	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 6) },
+	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) },
+	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) },
 
 	/**
 	 * Dining room benches
 	 */
-	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item(Items.PLANK_960, 4)),
-	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
-	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
-	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
-	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
-	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item(Items.MAHOGANY_PLANK_8782, 6)),
-	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
+	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item[] { new Item(Items.PLANK_960, 4) },
+	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) },
+	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) },
 
 	/**
 	 * Dining room bell-pulls
 	 */
-	ROPE_PULL      (13307, 8099, 5,  15.0, new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778)),
-	BELL_PULL      (13308, 8100, 19, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784)),
+	ROPE_PULL      (13307, 8099, 5,  15.0, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) },
+	BELL_PULL      (13308, 8100, 19, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) },
 
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item(Items.PLANK_960, 5)),
-	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item(Items.OAK_PLANK_8778, 5)),
-	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4)),
-	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
-	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353)),
+	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item[] { new Item(Items.PLANK_960, 5) },
+	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
+	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) },
+	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item[] { new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) },
+	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item[] { new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) },
 
 	/**
 	 * Workshop repair benches/stands
 	 */
-	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	WHETSTONE   (13714, 8390, 35, 260.0, new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420)),
-	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420)),
+	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	WHETSTONE   (13714, 8390, 35, 260.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) },
+	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) },
 
 	/**
 	 * Workshop easels
 	 */
-	PLUMING_STAND(13716, 8392, 16, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	BANNER_EASEL (13718, 8394, 66, 510.0, new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
+	PLUMING_STAND(13716, 8392, 16, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	BANNER_EASEL (13718, 8394, 66, 510.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
 
 	/**
 	 * Workshop crafting tables
 	 * 	TODO: These are upgradable hotspots, therefore crafting table 3 would require
 	 * 	crafting table 2 to be already built in that spot.
 	 */
-	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item(Items.OAK_PLANK_8778, 4)),
-	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item(Items.MOLTEN_GLASS_1775)),
-	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item(Items.MOLTEN_GLASS_1775, 2)),
-	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
+	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775) },
+	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) },
+	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
 
 	/**
 	 * Workshop tool stores
 	 * 	These are also upgradable just like the tables above.
 	 */
-	TOOL_STORE_1(13699, 8384, 15, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TOOL_STORE_2(13700, 8385, 25, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TOOL_STORE_3(13701, 8386, 35, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
-	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item(Items.OAK_PLANK_8778, 2)),
+	TOOL_STORE_1(13699, 8384, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TOOL_STORE_2(13700, 8385, 25, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TOOL_STORE_3(13701, 8386, 35, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
 
 	/**
 	 * Wall-mounted decorations
 	 */
-	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
-	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
+	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) },
 
 	/**
 	 * Staircases.
 	 */
-	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
-	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
-	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
+	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) },
+	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) },
+	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) },
+	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) },
+	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) },
 
 	/**
 	 * Staircases going down.
 	 */
-	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4)),
-	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7)),
-	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5)),
-	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7)),
+	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) },
+	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) },
+	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) },
+	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) },
+	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) },
 
 	/**
 	 * Portal room decorations.
 	 */
-	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item(Items.TEAK_PLANK_8780, 3)),
-	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item(Items.MAHOGANY_PLANK_8782, 3)),
-	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item(Items.MARBLE_BLOCK_8786)),
-	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
+	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
+	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
+	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
+	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
+	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
 	TEAK_VARROCK_PORTAL      (13615, true),
 	MAHOGANY_VARROCK_PORTAL  (13622, true),
 	MARBLE_VARROCK_PORTAL    (13629, true),
@@ -312,370 +312,370 @@ public enum Decoration {
 	/**
 	 * Skill hall decorations.
 	 */
-	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1)),
-	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1)),
-	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1)),
-	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982)),
-	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983)),
-	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984)),
-	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985)),
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986)),
-	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987)),
-	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988)),
-	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990)),
-	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992)),
-	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994)),
-	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1)),
-	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1)),
+	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) },
+	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) },
+	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) },
+	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) },
+	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) },
+	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) },
+	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) },
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) },
+	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) },
+	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) },
+	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) },
+	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) },
+	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) },
+	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) },
+	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) },
 
 	/**
 	 * Games room decorations.
 	 */
-	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item(Items.SOFT_CLAY_1761, 10)),
-	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item(Items.LIMESTONE_BRICK_3420, 10)),
-	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item(Items.MARBLE_BLOCK_8786, 4)),
-	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
-	DARTBOARD      (13400, 8163, 54, 290.0,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353)),
-	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3)),
-	BALANCE_1      (13395, 8156, 37, 176.0,  new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500)),
-	BALANCE_2      (13396, 8157, 57, 252.0,  new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000)),
-	BALANCE_3      (13397, 8158, 77, 356.0,  new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000)),
-	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784)),
-	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	JESTER         (13390, 8159, 39, 360.0,  new Item(Items.TEAK_PLANK_8780, 4)),
-	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4)),
-	HANGMAN        (13404, 8161, 59, 1200.0, new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6)),
+	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
+	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) },
+	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
+	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	DARTBOARD      (13400, 8163, 54, 290.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) },
+	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) },
+	BALANCE_1      (13395, 8156, 37, 176.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) },
+	BALANCE_2      (13396, 8157, 57, 252.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) },
+	BALANCE_3      (13397, 8158, 77, 356.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) },
+	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) },
+	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
+	JESTER         (13390, 8159, 39, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) },
+	HANGMAN        (13404, 8161, 59, 1200.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) },
 
 	/**
 	* Combat room decorations.
 	*/
-	BOXING_RING        (13129, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_RING       (13133, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
-	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
-	NOTHING            (13721, 8027, 81, 1000.0, new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5)),
-	NOTHING2           (13721, 8026, 71, 720.0,  new Item(Items.TEAK_PLANK_8780, 8)),
-	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
-	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
-	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4)),
-	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
-	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6)),
+	BOXING_RING        (13129, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	FENCING_RING       (13133, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
+	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
+	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
+	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
+	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
+	NOTHING            (13721, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
+	NOTHING2           (13721, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
+	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) },
+	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
 
 	/**
 	 * Formal garden decorations
 	 */
-	GAZEBO           (13477, 8192, 65, 1200, new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4)),
-	SMALL_FOUNTAIN   (13478, 8193, 71, 500,  new Item(Items.MARBLE_BLOCK_8786)),
-	LARGE_FOUNTAIN   (13479, 8194, 75, 1000, new Item(Items.MARBLE_BLOCK_8786, 2)),
-	POSH_FOUNTAIN    (13480, 8195, 81, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	SUNFLOWER        (13446, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
-	MARIGOLDS        (13447, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
-	ROSES            (13448, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
-	SUNFLOWER_BIG    (13443, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_SUNFLOWER_8457)),
-	MARIGOLDS_BIG    (13444, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_MARIGOLDS_8459)),
-	ROSES_BIG        (13445, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSES_8461)),
-	ROSEMARY         (13440, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
-	DAFFODILS        (13441, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
-	BLUEBELLS        (13442, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
-	ROSEMARY_BIG     (13437, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_ROSEMARY_8451)),
-	DAFFODILS_BIG    (13438, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_DAFFODILS_8453)),
-	BLUEBELLS_BIG    (13439, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.BAGGED_BLUEBELLS_8455)),
-	THORNY_HEDGE1    (13456, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	THORNY_HEDGE2    (13457, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	THORNY_HEDGE3    (13458, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.THORNY_HEDGE_8437)),
-	NICE_HEDGE1      (13459, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	NICE_HEDGE2      (13461, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	NICE_HEDGE3      (13460, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.NICE_HEDGE_8439)),
-	SMALL_BOX_HEDGE1 (13462, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	SMALL_BOX_HEDGE2 (13464, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	SMALL_BOX_HEDGE3 (13463, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.SMALL_BOX_HEDGE_8441)),
-	TOPIARY_HEDGE1   (13465, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	TOPIARY_HEDGE2   (13467, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	TOPIARY_HEDGE3   (13466, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TOPIARY_HEDGE_8443)),
-	FANCY_HEDGE1     (13468, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	FANCY_HEDGE2     (13470, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	FANCY_HEDGE3     (13469, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.FANCY_HEDGE_8445)),
-	TALL_FANCY_HEDGE1(13471, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_FANCY_HEDGE2(13473, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_FANCY_HEDGE3(13472, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_FANCY_HEDGE_8447)),
-	TALL_BOX_HEDGE1  (13474, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	TALL_BOX_HEDGE2  (13476, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	TALL_BOX_HEDGE3  (13475, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item(Items.TALL_BOX_HEDGE_8449)),
-	BOUNDARY_STONES  (13449, 8196, 55, 100,  new Item(Items.SOFT_CLAY_1761, 10)),
-	WOODEN_FENCE     (13450, 8197, 59, 280,  new Item(Items.PLANK_960, 10)),
-	STONE_WALL       (13451, 8198, 63, 200,  new Item(Items.LIMESTONE_BRICK_3420, 10)),
-	IRON_RAILINGS    (13452, 8199, 67, 220,  new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6)),
-	PICKET_FENCE     (13453, 8200, 71, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	GARDEN_FENCE     (13454, 8201, 75, 940,  new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	MARBLE_WALL      (13455, 8202, 79, 4000, new Item(Items.MARBLE_BLOCK_8786, 10)),
+	GAZEBO           (13477, 8192, 65, 1200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4) },
+	SMALL_FOUNTAIN   (13478, 8193, 71, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	LARGE_FOUNTAIN   (13479, 8194, 75, 1000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2) },
+	POSH_FOUNTAIN    (13480, 8195, 81, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
+	SUNFLOWER        (13446, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) },
+	MARIGOLDS        (13447, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) },
+	ROSES            (13448, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) },
+	SUNFLOWER_BIG    (13443, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) },
+	MARIGOLDS_BIG    (13444, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) },
+	ROSES_BIG        (13445, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) },
+	ROSEMARY         (13440, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) },
+	DAFFODILS        (13441, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) },
+	BLUEBELLS        (13442, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) },
+	ROSEMARY_BIG     (13437, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) },
+	DAFFODILS_BIG    (13438, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) },
+	BLUEBELLS_BIG    (13439, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) },
+	THORNY_HEDGE1    (13456, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
+	THORNY_HEDGE2    (13457, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
+	THORNY_HEDGE3    (13458, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
+	NICE_HEDGE1      (13459, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
+	NICE_HEDGE2      (13461, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
+	NICE_HEDGE3      (13460, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
+	SMALL_BOX_HEDGE1 (13462, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
+	SMALL_BOX_HEDGE2 (13464, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
+	SMALL_BOX_HEDGE3 (13463, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
+	TOPIARY_HEDGE1   (13465, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
+	TOPIARY_HEDGE2   (13467, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
+	TOPIARY_HEDGE3   (13466, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
+	FANCY_HEDGE1     (13468, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
+	FANCY_HEDGE2     (13470, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
+	FANCY_HEDGE3     (13469, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
+	TALL_FANCY_HEDGE1(13471, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
+	TALL_FANCY_HEDGE2(13473, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
+	TALL_FANCY_HEDGE3(13472, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
+	TALL_BOX_HEDGE1  (13474, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
+	TALL_BOX_HEDGE2  (13476, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
+	TALL_BOX_HEDGE3  (13475, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
+	BOUNDARY_STONES  (13449, 8196, 55, 100,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
+	WOODEN_FENCE     (13450, 8197, 59, 280,  new Item[] { new Item(Items.PLANK_960, 10) },
+	STONE_WALL       (13451, 8198, 63, 200,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) },
+	IRON_RAILINGS    (13452, 8199, 67, 220,  new Item[] { new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6) },
+	PICKET_FENCE     (13453, 8200, 71, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
+	GARDEN_FENCE     (13454, 8201, 75, 940,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2) },
+	MARBLE_WALL      (13455, 8202, 79, 4000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 10) },
 
 	/**
 	 * Bedroom decorations.
 	 */
-	WOODEN_BED        (13148, 8031, 20, 117,  new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	OAK_BED           (13149, 8032, 30, 210,  new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LARGE_OAK_BED     (13150, 8033, 34, 330,  new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	TEAK_BED          (13151, 8034, 40, 300,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LARGE_TEAK_BED    (13152, 8035, 45, 480,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	FOUR_POSTER       (13153, 8036, 53, 450,  new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2)),
-	OAK_CLOCK         (13169, 8052, 25, 142,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792)),
-	TEAK_CLOCK        (13170, 8053, 55, 202,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792)),
-	GILDED_CLOCK      (13171, 8054, 85, 602,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784)),
-	SHAVING_STAND     (13162, 8045, 21, 30,   new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775)),
-	OAK_SHAVING_STAND (13163, 8046, 29, 61,   new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775)),
-	OAK_DRESSER       (13164, 8047, 37, 121,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TEAK_DRESSER      (13165, 8048, 46, 181,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	FANCY_TEAK_DRESSER(13166, 8049, 56, 182,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2)),
-	MAHOGANY_DRESSER  (13167, 8050, 64, 281,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	GILDED_DRESSER    (13168, 8051, 74, 582,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784)),
-	SHOE_BOX          (13155, 8038, 20, 58,   new Item(Items.PLANK_960, 2)),
-	OAK_DRAWERS       (13156, 8039, 27, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	OAK_WARDROBE      (13157, 8040, 39, 180,  new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_DRAWERS      (13158, 8041, 51, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	TEAK_WARDROBE     (13159, 8042, 63, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
-	MAHOGANY_WARDROBE (13160, 8043, 75, 420,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	GILDED_WARDROBE   (13161, 8044, 87, 720,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
+	WOODEN_BED        (13148, 8031, 20, 117,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	OAK_BED           (13149, 8032, 30, 210,  new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	LARGE_OAK_BED     (13150, 8033, 34, 330,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	TEAK_BED          (13151, 8034, 40, 300,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	LARGE_TEAK_BED    (13152, 8035, 45, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	FOUR_POSTER       (13153, 8036, 53, 450,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2) },
+	OAK_CLOCK         (13169, 8052, 25, 142,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792) },
+	TEAK_CLOCK        (13170, 8053, 55, 202,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792) },
+	GILDED_CLOCK      (13171, 8054, 85, 602,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784) },
+	SHAVING_STAND     (13162, 8045, 21, 30,   new Item[] { new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775) },
+	OAK_SHAVING_STAND (13163, 8046, 29, 61,   new Item[] { new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775) },
+	OAK_DRESSER       (13164, 8047, 37, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	TEAK_DRESSER      (13165, 8048, 46, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	FANCY_TEAK_DRESSER(13166, 8049, 56, 182,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2) },
+	MAHOGANY_DRESSER  (13167, 8050, 64, 281,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	GILDED_DRESSER    (13168, 8051, 74, 582,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784) },
+	SHOE_BOX          (13155, 8038, 20, 58,   new Item[] { new Item(Items.PLANK_960, 2) },
+	OAK_DRAWERS       (13156, 8039, 27, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	OAK_WARDROBE      (13157, 8040, 39, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	TEAK_DRAWERS      (13158, 8041, 51, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	TEAK_WARDROBE     (13159, 8042, 63, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
+	MAHOGANY_WARDROBE (13160, 8043, 75, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
+	GILDED_WARDROBE   (13161, 8044, 87, 720,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
 
 	/**
 	 * Quest hall decorations.
 	 */
-	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540)),
-	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704)),
-	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052)),
-	KING_ARTHUR      (13510, 8285, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995)),
-	ELENA            (13511, 8286, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996)),
-	GIANT_DWARF      (13512, 8287, 35, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997)),
-	MISCELLANIANS    (13513, 8288, 35, 311, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998)),
-	LUMBRIDGE        (13517, 8289, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002)),
-	THE_DESERT       (13514, 8290, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999)),
-	MORYTANIA        (13518, 8291, 44, 314, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003)),
-	KARAMJA          (13516, 8292, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001)),
-	ISAFDAR          (13515, 8293, 65, 464, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000)),
-	SILVERLIGHT      (13519, 8279, 42, 187, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402)),
-	EXCALIBUR        (13521, 8280, 42, 194, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35)),
-	DARKLIGHT        (13520, 8281, 42, 202, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746)),
-	SMALL_MAP        (13525, 8294, 38, 211, new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004)),
-	MEDIUM_MAP       (13526, 8295, 58, 451, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005)),
-	LARGE_MAP        (13527, 8296, 78, 591, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006)),
+	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) },
+	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) },
+	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) },
+	KING_ARTHUR      (13510, 8285, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995) },
+	ELENA            (13511, 8286, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996) },
+	GIANT_DWARF      (13512, 8287, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997) },
+	MISCELLANIANS    (13513, 8288, 35, 311, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998) },
+	LUMBRIDGE        (13517, 8289, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002) },
+	THE_DESERT       (13514, 8290, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999) },
+	MORYTANIA        (13518, 8291, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003) },
+	KARAMJA          (13516, 8292, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001) },
+	ISAFDAR          (13515, 8293, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000) },
+	SILVERLIGHT      (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) },
+	EXCALIBUR        (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) },
+	DARKLIGHT        (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) },
+	SMALL_MAP        (13525, 8294, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004) },
+	MEDIUM_MAP       (13526, 8295, 58, 451, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005) },
+	LARGE_MAP        (13527, 8296, 78, 591, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006) },
 
 	/**
 	 * Study decorations.
 	 */
-	GLOBE                 (13649, 8341, 41, 180,  new Item(Items.OAK_PLANK_8778, 3)),
-	ORNAMENTAL_GLOBE      (13650, 8342, 50, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
-	LUNAR_GLOBE           (13651, 8343, 59, 570,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
-	CELESTIAL_GLOBE       (13652, 8344, 68, 570,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784)),
-	ARMILLARY_SPHERE      (13653, 8345, 77, 960,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4)),
-	SMALL_ORREY           (13654, 8346, 86, 1320, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3)),
-	LARGE_ORREY           (13655, 8347, 95, 1420, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5)),
-	OAK_LECTERN           (13642, 8334, 40, 60,   new Item(Items.OAK_PLANK_8778)),
-	EAGLE_LECTERN         (13643, 8335, 47, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	DEMON_LECTERN         (13644, 8336, 47, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_EAGLE_LECTERN    (13645, 8337, 57, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	TEAK_DEMON_LECTERN    (13646, 8338, 57, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
-	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784)),
-	CRYSTAL_BALL          (13659, 8351, 42, 280,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567)),
-	ELEMENTAL_SPHERE      (13660, 8352, 54, 580,  new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784)),
-	CRYSTAL_OF_POWER      (13661, 8353, 66, 890,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2)),
-	ALCHEMICAL_CHART      (13662, 8354, 43, 30,   new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	ASTRONOMICAL_CHART    (13663, 8355, 63, 45,   new Item(Items.BOLT_OF_CLOTH_8790, 3)),
-	INFERNAL_CHART        (13664, 8356, 83, 60,   new Item(Items.BOLT_OF_CLOTH_8790, 4)),
-	TELESCOPE1            (13656, 8348, 44, 121,  new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TELESCOPE2            (13657, 8349, 64, 181,  new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775)),
-	TELESCOPE3            (13658, 8350, 84, 580,  new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775)),
+	GLOBE                 (13649, 8341, 41, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	ORNAMENTAL_GLOBE      (13650, 8342, 50, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
+	LUNAR_GLOBE           (13651, 8343, 59, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) },
+	CELESTIAL_GLOBE       (13652, 8344, 68, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) },
+	ARMILLARY_SPHERE      (13653, 8345, 77, 960,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4) },
+	SMALL_ORREY           (13654, 8346, 86, 1320, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3) },
+	LARGE_ORREY           (13655, 8347, 95, 1420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5) },
+	OAK_LECTERN           (13642, 8334, 40, 60,   new Item[] { new Item(Items.OAK_PLANK_8778) },
+	EAGLE_LECTERN         (13643, 8335, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	DEMON_LECTERN         (13644, 8336, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_EAGLE_LECTERN    (13645, 8337, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	TEAK_DEMON_LECTERN    (13646, 8338, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
+	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
+	CRYSTAL_BALL          (13659, 8351, 42, 280,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567) },
+	ELEMENTAL_SPHERE      (13660, 8352, 54, 580,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784) },
+	CRYSTAL_OF_POWER      (13661, 8353, 66, 890,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2) },
+	ALCHEMICAL_CHART      (13662, 8354, 43, 30,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	ASTRONOMICAL_CHART    (13663, 8355, 63, 45,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 3) },
+	INFERNAL_CHART        (13664, 8356, 83, 60,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
+	TELESCOPE1            (13656, 8348, 44, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	TELESCOPE2            (13657, 8349, 64, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	TELESCOPE3            (13658, 8350, 84, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) },
 
 	/**
 	 * Costume room decorations.
 	 */
-	OAK_TREASURE_CHEST     (18804, 9839, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_TREASURE_CHEST    (18806, 9840, 66, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	OAK_ARMOUR_CASE        (18778, 9826, 46, 180,  new Item(Items.OAK_PLANK_8778, 3)),
-	TEAK_ARMOUR_CASE       (18780, 9827, 64, 270,  new Item(Items.TEAK_PLANK_8780, 3)),
-	MGANY_ARMOUR_CASE      (18782, 9828, 82, 420,  new Item(Items.MAHOGANY_PLANK_8782, 3)),
-	OAK_MAGIC_WARDROBE     (18784, 9829, 42, 240,  new Item(Items.OAK_PLANK_8778, 4)),
-	C_OAK_MAGIC_WARDROBE   (18786, 9830, 51, 360,  new Item(Items.OAK_PLANK_8778, 6)),
-	TEAK_MAGIC_WARDROBE    (18788, 9831, 60, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
-	C_TEAK_MAGIC_WARDROBE  (18790, 9832, 69, 540,  new Item(Items.TEAK_PLANK_8780, 6)),
-	MGANY_MAGIC_WARDROBE   (18792, 9833, 78, 560,  new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_MAGIC_WARDROBE  (18794, 9834, 87, 860,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	MARBLE_MAGIC_WARDROBE  (18796, 9835, 96, 500,  new Item(Items.MARBLE_BLOCK_8786)),
-	OAK_CAPE_RACK          (18766, 9817, 54, 240,  new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_CAPE_RACK         (18767, 9818, 63, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
-	MGANY_CAPE_RACK        (18768, 9819, 72, 560,  new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_CAPE_RACK       (18769, 9820, 81, 860,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784)),
-	MARBLE_CAPE_RACK       (18770, 9821, 90, 500,  new Item(Items.MARBLE_BLOCK_8786)),
-	MAGIC_CAPE_RACK        (18771, 9822, 99, 1000, new Item(Items.MAGIC_STONE_8788)),
-	OAK_TOY_BOX            (18798, 9836, 50, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_TOY_BOX           (18800, 9837, 68, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_TOY_BOX       (18802, 9838, 86, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
-	OAK_COSTUME_BOX        (18772, 9823, 44, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_COSTUME_BOX       (18774, 9824, 62, 180,  new Item(Items.TEAK_PLANK_8780, 2)),
-	MAHOGANY_COSTUME_BOX   (18776, 9825, 80, 280,  new Item(Items.MAHOGANY_PLANK_8782, 2)),
+	OAK_TREASURE_CHEST     (18804, 9839, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_TREASURE_CHEST    (18806, 9840, 66, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
+	OAK_ARMOUR_CASE        (18778, 9826, 46, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
+	TEAK_ARMOUR_CASE       (18780, 9827, 64, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
+	MGANY_ARMOUR_CASE      (18782, 9828, 82, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
+	OAK_MAGIC_WARDROBE     (18784, 9829, 42, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	C_OAK_MAGIC_WARDROBE   (18786, 9830, 51, 360,  new Item[] { new Item(Items.OAK_PLANK_8778, 6) },
+	TEAK_MAGIC_WARDROBE    (18788, 9831, 60, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	C_TEAK_MAGIC_WARDROBE  (18790, 9832, 69, 540,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6) },
+	MGANY_MAGIC_WARDROBE   (18792, 9833, 78, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
+	GILDED_MAGIC_WARDROBE  (18794, 9834, 87, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
+	MARBLE_MAGIC_WARDROBE  (18796, 9835, 96, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	OAK_CAPE_RACK          (18766, 9817, 54, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	TEAK_CAPE_RACK         (18767, 9818, 63, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	MGANY_CAPE_RACK        (18768, 9819, 72, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
+	GILDED_CAPE_RACK       (18769, 9820, 81, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
+	MARBLE_CAPE_RACK       (18770, 9821, 90, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	MAGIC_CAPE_RACK        (18771, 9822, 99, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) },
+	OAK_TOY_BOX            (18798, 9836, 50, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_TOY_BOX           (18800, 9837, 68, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	MAHOGANY_TOY_BOX       (18802, 9838, 86, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
+	OAK_COSTUME_BOX        (18772, 9823, 44, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_COSTUME_BOX       (18774, 9824, 62, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	MAHOGANY_COSTUME_BOX   (18776, 9825, 80, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
 
 	/**
 	 * Chapel decorations.
 	 */
-	OAK_ALTAR         (13179, 8062, 45, 240,  new Item(Items.OAK_PLANK_8778, 4)),
-	TEAK_ALTAR        (13182, 8063, 50, 360,  new Item(Items.TEAK_PLANK_8780, 4)),
-	CLOTH_ALTAR       (13185, 8064, 56, 390,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	MAHOGANY_ALTAR    (13188, 8065, 60, 590,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	LIMESTONE_ALTAR   (13191, 8066, 64, 910,  new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MARBLE_ALTAR      (13194, 8067, 70, 1030, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2)),
-	GILDED_ALTAR      (13197, 8068, 75, 2230, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4)),
-	SMALL_STATUE      (13271, 8082, 49, 40,   new Item(Items.LIMESTONE_BRICK_3420, 2)),
-	MEDIUM_STATUE     (13272, 8083, 69, 500,  new Item(Items.MARBLE_BLOCK_8786)),
-	LARGE_STATUE      (13282, 8084, 89, 1500, new Item(Items.MARBLE_BLOCK_8786, 3)),
-	WINDCHIMES        (13214, 8079, 49, 323,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4)),
-	BELLS             (13215, 8080, 58, 480,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6)),
-	ORGAN             (13216, 8081, 69, 680,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6)),
-	SARADOMIN_SYMBOL  (13172, 8055, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	ZAMORAK_SYMBOL    (13173, 8056, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	GUTHIX_SYMBOL     (13174, 8057, 48, 120,  new Item(Items.OAK_PLANK_8778, 2)),
-	SARADOMIN_ICON    (13175, 8058, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	ZAMORAK_ICON      (13176, 8059, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	GUTHIX_ICON       (13177, 8060, 59, 960,  new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	ICON_OF_BOB       (13178, 8061, 71, 1160, new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2)),
-	STEEL_TORCHES     (13202, 8070, 45, 80,   new Item(Items.STEEL_BAR_2353, 2)),
-	WOODEN_TORCHES    (13200, 8069, 49, 58,   new Item(Items.PLANK_960, 2)),
-	STEEL_CANDLESTICKS(13204, 8071, 53, 124,  new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6)),
-	GOLD_CANDLESTICKS (13206, 8072, 57, 46,   new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6)),
-	INCENSE_BURNERS   (13208, 8073, 61, 280,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2)),
-	MAHOGANY_BURNERS  (13210, 8074, 65, 600,  new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2)),
-	MARBLE_BURNERS    (13212, 8075, 69, 1600, new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2)),
-	SHUTTERED_WINDOW  (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item(Items.PLANK_960, 8)),
-	DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item(Items.MOLTEN_GLASS_1775, 8)),
-	STAINED_GLASS     (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item(Items.MOLTEN_GLASS_1775, 16)),
+	OAK_ALTAR         (13179, 8062, 45, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
+	TEAK_ALTAR        (13182, 8063, 50, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	CLOTH_ALTAR       (13185, 8064, 56, 390,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	MAHOGANY_ALTAR    (13188, 8065, 60, 590,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	LIMESTONE_ALTAR   (13191, 8066, 64, 910,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2) },
+	MARBLE_ALTAR      (13194, 8067, 70, 1030, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	GILDED_ALTAR      (13197, 8068, 75, 2230, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4) },
+	SMALL_STATUE      (13271, 8082, 49, 40,   new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
+	MEDIUM_STATUE     (13272, 8083, 69, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	LARGE_STATUE      (13282, 8084, 89, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
+	WINDCHIMES        (13214, 8079, 49, 323,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4) },
+	BELLS             (13215, 8080, 58, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6) },
+	ORGAN             (13216, 8081, 69, 680,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6) },
+	SARADOMIN_SYMBOL  (13172, 8055, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	ZAMORAK_SYMBOL    (13173, 8056, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	GUTHIX_SYMBOL     (13174, 8057, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	SARADOMIN_ICON    (13175, 8058, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
+	ZAMORAK_ICON      (13176, 8059, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
+	GUTHIX_ICON       (13177, 8060, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
+	ICON_OF_BOB       (13178, 8061, 71, 1160, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2) },
+	STEEL_TORCHES     (13202, 8070, 45, 80,   new Item[] { new Item(Items.STEEL_BAR_2353, 2) },
+	WOODEN_TORCHES    (13200, 8069, 49, 58,   new Item[] { new Item(Items.PLANK_960, 2) },
+	STEEL_CANDLESTICKS(13204, 8071, 53, 124,  new Item[] { new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6) },
+	GOLD_CANDLESTICKS (13206, 8072, 57, 46,   new Item[] { new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6) },
+	INCENSE_BURNERS   (13208, 8073, 61, 280,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2) },
+	MAHOGANY_BURNERS  (13210, 8074, 65, 600,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2) },
+	MARBLE_BURNERS    (13212, 8075, 69, 1600, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2) },
+	SHUTTERED_WINDOW  (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item[] { new Item(Items.PLANK_960, 8) },
+	DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 8) },
+	STAINED_GLASS     (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 16) },
 
 	/**
 	 * Throne room
 	 */
-	OAK_THRONE       (13665, 8357, 60, 800,   new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786)),
-	TEAK_THRONE      (13666, 8358, 67, 1450,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2)),
-	MAHOGANY_THRONE  (13667, 8359, 74, 2200,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3)),
-	GILDED_THRONE    (13668, 8360, 81, 1700,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3)),
-	SKELETON_THRONE  (13669, 8361, 88, 7003,  new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2)),
-	CRYSTAL_THRONE   (13670, 8362, 95, 15000, new Item(Items.MAGIC_STONE_8788, 15)),
-	DEMONIC_THRONE   (13671, 8363, 99, 25000, new Item(Items.MAGIC_STONE_8788, 25)),
-	OAK_LEVER        (13672, 8364, 68, 300,   new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_LEVER       (13673, 8365, 78, 450,   new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_LEVER   (13674, 8366, 88, 700,   new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700,  new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	STEEL_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20)),
-	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10)),
-	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2)),
-	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4)),
-	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item(Items.TEAK_PLANK_8780, 4)),
-	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item(Items.MAHOGANY_PLANK_8782, 4)),
-	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4)),
-	OAK_DECO         (13798, 8102, 16, 120.0,  new Item(Items.OAK_PLANK_8778, 2)),
-	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item(Items.TEAK_PLANK_8780, 2)),
-	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2)),
-	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item(Items.OAK_PLANK_8778, 2)),
-	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item(Items.TEAK_PLANK_8780, 4)),
-	KITE_SHIELD      (13750, 8107, 86, 420,    new Item(Items.MAHOGANY_PLANK_8782, 3)),
+	OAK_THRONE       (13665, 8357, 60, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786) },
+	TEAK_THRONE      (13666, 8358, 67, 1450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2) },
+	MAHOGANY_THRONE  (13667, 8359, 74, 2200,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3) },
+	GILDED_THRONE    (13668, 8360, 81, 1700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3) },
+	SKELETON_THRONE  (13669, 8361, 88, 7003,  new Item[] { new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2) },
+	CRYSTAL_THRONE   (13670, 8362, 95, 15000, new Item[] { new Item(Items.MAGIC_STONE_8788, 15) },
+	DEMONIC_THRONE   (13671, 8363, 99, 25000, new Item[] { new Item(Items.MAGIC_STONE_8788, 25) },
+	OAK_LEVER        (13672, 8364, 68, 300,   new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
+	TEAK_LEVER       (13673, 8365, 78, 450,   new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
+	MAHOGANY_LEVER   (13674, 8366, 88, 700,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
+	FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
+	STEEL_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20) },
+	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10) },
+	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2) },
+	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4) },
+	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
+	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
+	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
+	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
+	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) },
+	OAK_DECO         (13798, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
+	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) },
+	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
+	KITE_SHIELD      (13750, 8107, 86, 420,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
 
 	/**
 	 * Oubliette
 	 */
-	SPIKES_MID         (13334, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_SIDE        (13335, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_CORNER      (13336, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	SPIKES_FL          (13338, 8302, 65, 623,  new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000)),
-	TENTACLE_MID       (13331, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_SIDE      (13332, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_CORNER    (13333, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	TENTACLE_FL        (13338, 8303, 71, 326,  new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000)),
-	FP_FLOOR_MID       (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FP_FLOOR_SIDE      (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FP_FLOOR_CORNER    (13371, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	FLAME_PIT          (13337, 8304, 77, 357,  new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000)),
-	ROCNAR_FLOOR_MID   (13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
-	ROCNAR_FLOOR_SIDE  (13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
-	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
-	ROCNAR             (13373, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
-	ROCNAR_FL          (13338, 8305, 83, 387,  new Item(Items.COINS_995, 150000)),
-	OAK_CAGE           (13313, 8297, 65, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	OAK_CAGE_DOOR      (13314, 8297, 65, 640,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2)),
-	OAK_STEEL_CAGE     (13316, 8298, 70, 800,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	STEEL_CAGE_OU      (13319, 8299, 75, 400,  new Item(Items.STEEL_BAR_2353, 20)),
-	STEEL_CAGE_DOOR    (13320, 8299, 75, 400,  new Item(Items.STEEL_BAR_2353, 20)),
-	SPIKED_CAGE        (13322, 8300, 80, 500,  new Item(Items.STEEL_BAR_2353, 25)),
-	SPIKED_CAGE_DOOR   (13323, 8300, 80, 500,  new Item(Items.STEEL_BAR_2353, 25)),
-	BONE_CAGE          (13325, 8301, 85, 603,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
-	BONE_CAGE_DOOR     (13326, 8301, 85, 603,  new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10)),
-	SKELETON_GUARD     (13366, 8131, 70, 223,  new Item(Items.COINS_995, 50000)),
-	GUARD_DOG          (13367, 8132, 74, 273,  new Item(Items.COINS_995, 75000)),
-	HOBGOBLIN          (13368, 8133, 78, 316,  new Item(Items.COINS_995, 100000)),
-	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item(Items.COINS_995, 150000)),
-	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item(Items.COINS_995, 200000)),
-	TROLL              (13369, 8136, 90, 1000, new Item(Items.COINS_995, 1000000)),
-	HELLHOUND          (2715, 8137, 94, 2236,  new Item(Items.COINS_995, 5000000)),
-	OAK_LADDER         (13328, 8306, 68, 300,  new Item(Items.OAK_PLANK_8778, 5)),
-	TEAK_LADDER        (13329, 8307, 78, 450,  new Item(Items.TEAK_PLANK_8780, 5)),
-	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item(Items.MAHOGANY_PLANK_8782, 5)),
-	DECORATIVE_BLOOD   (13312, 8125, 72, 4,    new Item(Items.RED_DYE_1763, 4)),
-	DECORATIVE_PIPE    (13311, 8126, 83, 120,  new Item(Items.STEEL_BAR_2353, 6)),
-	HANGING_SKELETON   (13310, 8127, 94, 3,    new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6)),
-	CANDLE             (13342, 8128, 72, 243,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4)),
-	TORCH              (13341, 8129, 84, 244,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4)),
-	SKULL_TORCH        (13343, 8130, 94, 246,  new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4)),
+	SPIKES_MID         (13334, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
+	SPIKES_SIDE        (13335, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
+	SPIKES_CORNER      (13336, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
+	SPIKES_FL          (13338, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
+	TENTACLE_MID       (13331, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
+	TENTACLE_SIDE      (13332, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
+	TENTACLE_CORNER    (13333, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
+	TENTACLE_FL        (13338, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
+	FP_FLOOR_MID       (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
+	FP_FLOOR_SIDE      (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
+	FP_FLOOR_CORNER    (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
+	FLAME_PIT          (13337, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
+	ROCNAR_FLOOR_MID   (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	ROCNAR_FLOOR_SIDE  (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	ROCNAR             (13373, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	ROCNAR_FL          (13338, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	OAK_CAGE           (13313, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
+	OAK_CAGE_DOOR      (13314, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
+	OAK_STEEL_CAGE     (13316, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
+	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
+	STEEL_CAGE_OU      (13319, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) },
+	STEEL_CAGE_DOOR    (13320, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) },
+	SPIKED_CAGE        (13322, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) },
+	SPIKED_CAGE_DOOR   (13323, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) },
+	BONE_CAGE          (13325, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) },
+	BONE_CAGE_DOOR     (13326, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) },
+	SKELETON_GUARD     (13366, 8131, 70, 223,  new Item[] { new Item(Items.COINS_995, 50000) },
+	GUARD_DOG          (13367, 8132, 74, 273,  new Item[] { new Item(Items.COINS_995, 75000) },
+	HOBGOBLIN          (13368, 8133, 78, 316,  new Item[] { new Item(Items.COINS_995, 100000) },
+	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item[] { new Item(Items.COINS_995, 200000) },
+	TROLL              (13369, 8136, 90, 1000, new Item[] { new Item(Items.COINS_995, 1000000) },
+	HELLHOUND          (2715, 8137, 94, 2236,  new Item[] { new Item(Items.COINS_995, 5000000) },
+	OAK_LADDER         (13328, 8306, 68, 300,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
+	TEAK_LADDER        (13329, 8307, 78, 450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
+	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
+	DECORATIVE_BLOOD   (13312, 8125, 72, 4,    new Item[] { new Item(Items.RED_DYE_1763, 4) },
+	DECORATIVE_PIPE    (13311, 8126, 83, 120,  new Item[] { new Item(Items.STEEL_BAR_2353, 6) },
+	HANGING_SKELETON   (13310, 8127, 94, 3,    new Item[] { new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6) },
+	CANDLE             (13342, 8128, 72, 243,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4) },
+	TORCH              (13341, 8129, 84, 244,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4) },
+	SKULL_TORCH        (13343, 8130, 94, 246,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4) },
 
 	/**
 	 * Dungeon corridor, junction, stairs & pit
 	 */
-	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item(Items.OAK_PLANK_8778, 10)),
-	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item(Items.OAK_PLANK_8778, 10)),
-	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10)),
-	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item(Items.MARBLE_BLOCK_8786, 4)),
-	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item(Items.MARBLE_BLOCK_8786, 4)),
-	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item(Items.COINS_995, 50000)),
-	MAN_TRAP          (13357, 8144, 76, 273,   new Item(Items.COINS_995, 75000)),
-	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item(Items.COINS_995, 100000)),
-	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item(Items.COINS_995, 150000)),
-	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item(Items.COINS_995, 200000)),
-	PIT_DOG           (39260, 18791, 70, 200,  new Item(Items.COINS_995, 40000)),
-	PIT_OGRE          (39261, 18792, 73, 234,  new Item(Items.COINS_995, 55000)),
-	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item(Items.COINS_995, 90000)),
-	PIT_SCABARITE     (39263, 18794, 84, 387,  new Item(Items.COINS_995, 150000)),
-	PIT_BLACK_DEMON   (39264, 18795, 89, 547,  new Item(Items.COINS_995, 300000)),
-	PIT_IRON_DRAGON   (39265, 18796, 97, 2738, new Item(Items.COINS_995, 7500000)),
+	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) },
+	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) },
+	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
+	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
+	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
+	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
+	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item[] { new Item(Items.COINS_995, 50000) },
+	MAN_TRAP          (13357, 8144, 76, 273,   new Item[] { new Item(Items.COINS_995, 75000) },
+	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item[] { new Item(Items.COINS_995, 100000) },
+	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item[] { new Item(Items.COINS_995, 150000) },
+	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item[] { new Item(Items.COINS_995, 200000) },
+	PIT_DOG           (39260, 18791, 70, 200,  new Item[] { new Item(Items.COINS_995, 40000) },
+	PIT_OGRE          (39261, 18792, 73, 234,  new Item[] { new Item(Items.COINS_995, 55000) },
+	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item[] { new Item(Items.COINS_995, 90000) },
+	PIT_SCABARITE     (39263, 18794, 84, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
+	PIT_BLACK_DEMON   (39264, 18795, 89, 547,  new Item[] { new Item(Items.COINS_995, 300000) },
+	PIT_IRON_DRAGON   (39265, 18796, 97, 2738, new Item[] { new Item(Items.COINS_995, 7500000) },
 
 	/**
 	 * Treasure room
 	 */
-	DEMON            (13378, 8138, 75, 707,  new Item(Items.COINS_995, 500000)),
-	KALPHITE_SOLDIER (13374, 8139, 80, 866,  new Item(Items.COINS_995, 750000)),
-	TOK_XIL          (13377, 8140, 85, 2236, new Item(Items.COINS_995, 5000000)),
-	DAGANNOTH        (13376, 8141, 90, 2738, new Item(Items.COINS_995, 7500000)),
-	STEEL_DRAGON     (13375, 8142, 95, 3162, new Item(Items.COINS_995, 1000000)),
-	WOODEN_CRATE     (13283, 8148, 75, 143,  new Item(Items.PLANK_960, 5)),
-	OAK_T_CHEST      (13285, 8149, 79, 340,  new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2)),
-	TEAK_T_CHEST     (13287, 8150, 83, 530,  new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4)),
-	MGANY_T_CHEST    (13289, 8151, 87, 1000, new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784)),
-	MAGIC_CHEST      (13291, 8152, 91, 1000, new Item(Items.MAGIC_STONE_8788)),
+	DEMON            (13378, 8138, 75, 707,  new Item[] { new Item(Items.COINS_995, 500000) },
+	KALPHITE_SOLDIER (13374, 8139, 80, 866,  new Item[] { new Item(Items.COINS_995, 750000) },
+	TOK_XIL          (13377, 8140, 85, 2236, new Item[] { new Item(Items.COINS_995, 5000000) },
+	DAGANNOTH        (13376, 8141, 90, 2738, new Item[] { new Item(Items.COINS_995, 7500000) },
+	STEEL_DRAGON     (13375, 8142, 95, 3162, new Item[] { new Item(Items.COINS_995, 1000000) },
+	WOODEN_CRATE     (13283, 8148, 75, 143,  new Item[] { new Item(Items.PLANK_960, 5) },
+	OAK_T_CHEST      (13285, 8149, 79, 340,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2) },
+	TEAK_T_CHEST     (13287, 8150, 83, 530,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4) },
+	MGANY_T_CHEST    (13289, 8151, 87, 1000, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784) },
+	MAGIC_CHEST      (13291, 8152, 91, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) },
 
 	/**
 	 * Style related decoration.
@@ -736,8 +736,8 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience, Item... items) {
-		this(objectId, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
+	Decoration(int objectId, int interfaceItem, int level, double experience, Item[] items) {
+		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items);
 	}
 
 	/**
@@ -748,7 +748,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
 		this.objectId = objectId;
 		this.objectIds = null;
 		this.interfaceItem = interfaceItem;
@@ -776,7 +776,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item... items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item[] items) {
 		this(objectIds, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
 	}
 
@@ -788,7 +788,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item... items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
 		this.objectId = objectIds[0];
 		this.objectIds = objectIds;
 		this.interfaceItem = interfaceItem;
-- 
GitLab


From 147bc22b12f42b2bc56c9b2cb7a89f59878cc727 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 19:03:27 -0400
Subject: [PATCH 09/13] refunditems support

---
 .../global/skill/construction/Decoration.java | 983 +++++++++---------
 1 file changed, 515 insertions(+), 468 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 752daaf797..55486da6a2 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -16,107 +16,107 @@ public enum Decoration {
 	/**
 	 * Garden centrepiece decorations.
 	 */
-	PORTAL          (13405, 8168,  1,  100.0, new Item[] { new Item(Items.IRON_BAR_2351, 10) },
-	ROCK            (13406, 8169,  5,  100.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) },
-	POND            (13407, 8170,  10, 100.0, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
-	IMP_STATUE      (13408, 8171,  15, 150.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) },
-	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) },
-	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	PORTAL          (13405, 8168,  1,  100.0, new Item[] { new Item(Items.IRON_BAR_2351, 10) }),
+	ROCK            (13406, 8169,  5,  100.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) }),
+	POND            (13407, 8170,  10, 100.0, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+	IMP_STATUE      (13408, 8171,  15, 150.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) }),
+	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) }),
+	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
 
 	/**
 	 * Garden big tree decorations.
 	 */
-	BIG_DEAD_TREE  (13411, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) },
-	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) },
-	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) },
-	BIG_WILLOW_TREE                       (13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) },
-	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) },
-	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) },
-	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) },
+	BIG_DEAD_TREE  (13411, 8173, 5,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
 
 	/**
 	 * Garden tree decorations.
 	 */
-	DEAD_TREE  (13418, 8173, 5, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) },
-	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) },
-	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) },
-	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) },
-	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) },
-	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) },
-	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) },
+	DEAD_TREE  (13418, 8173, 5,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
 
 	/**
 	 * Garden big plant 1 decorations.
 	 */
-	FERN      (13425, 8186, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
-	BUSH      (13426, 8187, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
-	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
+	FERN      (13425, 8186, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	BUSH      (13426, 8187, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT(13428, 8189, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
-	LARGE_LEAF (13429, 8190, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
-	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
+	SHORT_PLANT(13428, 8189, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	LARGE_LEAF (13429, 8190, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden small plant 1 decorations.
 	 */
-	PLANT     (13431, 8180, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
-	SMALL_FERN(13432, 8181, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
-	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
+	PLANT     (13431, 8180,  1, 31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	SMALL_FERN(13432, 8181,  6, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden small plant 2 decorations.
 	 */
-	DOCK_LEAF(13434, 8183, 1, 31.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) },
-	THISTLE  (13435, 8184, 6, 70.0,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) },
-	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) },
+	DOCK_LEAF(13434, 8183, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	THISTLE  (13435, 8184, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Parlour chair spot
 	 */
-	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item[] { new Item(Items.PLANK_960, 2) },
-	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
-	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
-	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
+	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item[] { new Item(Items.PLANK_960, 2) }),
+	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
 
 	/**
 	 * Rugs rugs rugs
 	 */
-	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
-	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
-	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) },
+	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
 
 	/**
 	 * Parlour fireplaces
 	 */
-	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 3) },
-	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
-	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
+	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 3) }),
+	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
 
 	/**
 	 * Parlour curtain spot
 	 */
-	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
-	CURTAINS        (13604, 8323, 18, 225.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
-	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) },
+	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	CURTAINS        (13604, 8323, 18, 225.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
 
 	/**
 	 * Bookcases
 	 */
-	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item[] { new Item(Items.PLANK_960, 4) },
-	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
+	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item[] { new Item(Items.PLANK_960, 4) }),
+	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
 
 	/**
 	 * Kitchen Beer Barrels
@@ -124,169 +124,169 @@ public enum Decoration {
 	 * Basic: 1, Cider: 14, Asgarnian: 24, Greenman's: 29, D.Bitter: 39, Chef's: 54
 	 *
 	 */
-	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
-	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) },
-	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) },
-	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) },
-	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) },
-	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) },
+	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) }),
+	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) }),
+	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) }),
+	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) }),
+	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) }),
 
 	/**
 	 * Kitchen Tables!
 	 */
-	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
-	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
+	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
 
 	/**
 	 * Kitchen Stoves
 	 */
-	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) },
-	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) },
-	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) },
-	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item[] { new Item(Items.STEEL_BAR_2353, 4) },
-	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) },
-	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item[] { new Item(Items.STEEL_BAR_2353, 6) },
-	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item[] { new Item(Items.STEEL_BAR_2353, 8) },
+	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) }),
+	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) }),
+	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) }),
+	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item[] { new Item(Items.STEEL_BAR_2353, 4) }),
+	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
+	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item[] { new Item(Items.STEEL_BAR_2353, 8) }),
 
 	/**
 	 * Kitchen larders
 	 */
-	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item[] { new Item(Items.PLANK_960, 8) },
-	OAK_LARDER   (13566, 8234, 33, 480.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8) },
-	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item[] { new Item(Items.PLANK_960, 8) }),
+	OAK_LARDER   (13566, 8234, 33, 480.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8) }),
+	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
 
 	/**
 	 * Kitchen shelves
 	 */
-	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) },
-	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) },
-	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) },
-	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) },
-	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) },
-	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) },
-	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) },
+	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) }),
 
 	/**
 	 * Kitchen sinks
 	 */
-	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) },
-	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item[] { new Item(Items.STEEL_BAR_2353, 10) },
-	SINK          (13563, 8232, 47, 300.0, new Item[] { new Item(Items.STEEL_BAR_2353, 15) },
+	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item[] { new Item(Items.STEEL_BAR_2353, 10) }),
+	SINK          (13563, 8232, 47, 300.0, new Item[] { new Item(Items.STEEL_BAR_2353, 15) }),
 
 	/**
 	 * Kitchen cat baskets/blankets
 	 */
-	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) },
-	CAT_BASKET           (13575, 8237, 19, 58.0, new Item[] { new Item(Items.PLANK_960, 2) },
-	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) },
+	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) }),
+	CAT_BASKET           (13575, 8237, 19, 58.0, new Item[] { new Item(Items.PLANK_960, 2) }),
+	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) }),
 
 	/**
 	 * Dining room tables
 	 */
-	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item[] { new Item(Items.PLANK_960, 4) },
-	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 6) },
-	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) },
-	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) },
+	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item[] { new Item(Items.PLANK_960, 4) }),
+	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
+	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) }),
 
 	/**
 	 * Dining room benches
 	 */
-	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item[] { new Item(Items.PLANK_960, 4) },
-	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) },
-	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) },
+	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item[] { new Item(Items.PLANK_960, 4) }),
+	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
 
 	/**
 	 * Dining room bell-pulls
 	 */
-	ROPE_PULL      (13307, 8099, 5,  15.0, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) },
-	BELL_PULL      (13308, 8100, 19, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) },
+	ROPE_PULL      (13307, 8099, 5,  15.0, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) }),
+	BELL_PULL      (13308, 8100, 19, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) }),
 
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item[] { new Item(Items.PLANK_960, 5) },
-	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
-	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) },
-	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item[] { new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) },
-	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item[] { new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) },
+	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item[] { new Item(Items.PLANK_960, 5) }),
+	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) }),
+	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item[] { new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
+	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item[] { new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
 
 	/**
 	 * Workshop repair benches/stands
 	 */
-	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	WHETSTONE   (13714, 8390, 35, 260.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) },
-	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) },
+	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	WHETSTONE   (13714, 8390, 35, 260.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) }),
+	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) }),
 
 	/**
 	 * Workshop easels
 	 */
-	PLUMING_STAND(13716, 8392, 16, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	BANNER_EASEL (13718, 8394, 66, 510.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
+	PLUMING_STAND(13716, 8392, 16, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BANNER_EASEL (13718, 8394, 66, 510.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
 
 	/**
 	 * Workshop crafting tables
 	 * 	TODO: These are upgradable hotspots, therefore crafting table 3 would require
 	 * 	crafting table 2 to be already built in that spot.
 	 */
-	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775) },
-	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) },
-	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775) }),
+	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) }),
+	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
 
 	/**
 	 * Workshop tool stores
 	 * 	These are also upgradable just like the tables above.
 	 */
-	TOOL_STORE_1(13699, 8384, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TOOL_STORE_2(13700, 8385, 25, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TOOL_STORE_3(13701, 8386, 35, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
+	TOOL_STORE_1(13699, 8384, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_2(13700, 8385, 25, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_3(13701, 8386, 35, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
 
 	/**
 	 * Wall-mounted decorations
 	 */
-	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) },
+	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
 
 	/**
 	 * Staircases.
 	 */
-	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) },
-	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) },
-	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) },
-	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) },
-	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) },
+	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
 
 	/**
 	 * Staircases going down.
 	 */
-	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) },
-	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) },
-	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) },
-	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) },
-	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) },
+	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
 
 	/**
 	 * Portal room decorations.
 	 */
-	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
-	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
-	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
-	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
-	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
-	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
+	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
 	TEAK_VARROCK_PORTAL      (13615, true),
 	MAHOGANY_VARROCK_PORTAL  (13622, true),
 	MARBLE_VARROCK_PORTAL    (13629, true),
@@ -312,370 +312,370 @@ public enum Decoration {
 	/**
 	 * Skill hall decorations.
 	 */
-	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) },
-	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) },
-	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) },
-	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) },
-	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) },
-	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) },
-	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) },
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) },
-	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) },
-	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) },
-	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) },
-	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) },
-	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) },
-	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) },
-	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) },
+	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }),
+	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }),
+	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }),
+	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }),
+	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }),
+	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }),
+	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }),
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }),
+	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }),
+	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }),
+	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }),
+	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }),
+	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }),
+	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) }),
+	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) }),
 
 	/**
 	 * Games room decorations.
 	 */
-	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
-	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) },
-	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
-	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	DARTBOARD      (13400, 8163, 54, 290.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) },
-	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) },
-	BALANCE_1      (13395, 8156, 37, 176.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) },
-	BALANCE_2      (13396, 8157, 57, 252.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) },
-	BALANCE_3      (13397, 8158, 77, 356.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) },
-	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) },
-	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
-	JESTER         (13390, 8159, 39, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) },
-	HANGMAN        (13404, 8161, 59, 1200.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) },
+	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
+	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	DARTBOARD      (13400, 8163, 54, 290.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) }),
+	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) }),
+	BALANCE_1      (13395, 8156, 37, 176.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) }),
+	BALANCE_2      (13396, 8157, 57, 252.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) }),
+	BALANCE_3      (13397, 8158, 77, 356.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) }),
+	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) }),
+	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+	JESTER         (13390, 8159, 39, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) }),
+	HANGMAN        (13404, 8161, 59, 1200.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) }),
 
 	/**
 	* Combat room decorations.
 	*/
-	BOXING_RING        (13129, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	FENCING_RING       (13133, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
-	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
-	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
-	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
-	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
-	NOTHING            (13721, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) },
-	NOTHING2           (13721, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) },
-	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) },
-	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
-	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) },
+	BOXING_RING        (13129, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_RING       (13133, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	NOTHING            (13721, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	NOTHING2           (13721, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) }),
+	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
 
 	/**
 	 * Formal garden decorations
 	 */
-	GAZEBO           (13477, 8192, 65, 1200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4) },
-	SMALL_FOUNTAIN   (13478, 8193, 71, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
-	LARGE_FOUNTAIN   (13479, 8194, 75, 1000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2) },
-	POSH_FOUNTAIN    (13480, 8195, 81, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
-	SUNFLOWER        (13446, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) },
-	MARIGOLDS        (13447, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) },
-	ROSES            (13448, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) },
-	SUNFLOWER_BIG    (13443, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) },
-	MARIGOLDS_BIG    (13444, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) },
-	ROSES_BIG        (13445, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) },
-	ROSEMARY         (13440, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) },
-	DAFFODILS        (13441, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) },
-	BLUEBELLS        (13442, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) },
-	ROSEMARY_BIG     (13437, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) },
-	DAFFODILS_BIG    (13438, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) },
-	BLUEBELLS_BIG    (13439, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) },
-	THORNY_HEDGE1    (13456, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
-	THORNY_HEDGE2    (13457, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
-	THORNY_HEDGE3    (13458, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) },
-	NICE_HEDGE1      (13459, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
-	NICE_HEDGE2      (13461, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
-	NICE_HEDGE3      (13460, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) },
-	SMALL_BOX_HEDGE1 (13462, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
-	SMALL_BOX_HEDGE2 (13464, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
-	SMALL_BOX_HEDGE3 (13463, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) },
-	TOPIARY_HEDGE1   (13465, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
-	TOPIARY_HEDGE2   (13467, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
-	TOPIARY_HEDGE3   (13466, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) },
-	FANCY_HEDGE1     (13468, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
-	FANCY_HEDGE2     (13470, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
-	FANCY_HEDGE3     (13469, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) },
-	TALL_FANCY_HEDGE1(13471, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
-	TALL_FANCY_HEDGE2(13473, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
-	TALL_FANCY_HEDGE3(13472, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) },
-	TALL_BOX_HEDGE1  (13474, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
-	TALL_BOX_HEDGE2  (13476, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
-	TALL_BOX_HEDGE3  (13475, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) },
-	BOUNDARY_STONES  (13449, 8196, 55, 100,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) },
-	WOODEN_FENCE     (13450, 8197, 59, 280,  new Item[] { new Item(Items.PLANK_960, 10) },
-	STONE_WALL       (13451, 8198, 63, 200,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) },
-	IRON_RAILINGS    (13452, 8199, 67, 220,  new Item[] { new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6) },
-	PICKET_FENCE     (13453, 8200, 71, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
-	GARDEN_FENCE     (13454, 8201, 75, 940,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2) },
-	MARBLE_WALL      (13455, 8202, 79, 4000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 10) },
+	GAZEBO           (13477, 8192, 65, 1200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 8), new Item(Items.STEEL_BAR_2353, 4) }),
+	SMALL_FOUNTAIN   (13478, 8193, 71, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	LARGE_FOUNTAIN   (13479, 8194, 75, 1000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2) }),
+	POSH_FOUNTAIN    (13480, 8195, 81, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+	SUNFLOWER        (13446, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) }),
+	MARIGOLDS        (13447, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) }),
+	ROSES            (13448, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) }),
+	SUNFLOWER_BIG    (13443, 8213, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_SUNFLOWER_8457) }),
+	MARIGOLDS_BIG    (13444, 8214, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MARIGOLDS_8459) }),
+	ROSES_BIG        (13445, 8215, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSES_8461) }),
+	ROSEMARY         (13440, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) }),
+	DAFFODILS        (13441, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) }),
+	BLUEBELLS        (13442, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) }),
+	ROSEMARY_BIG     (13437, 8210, 66, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_ROSEMARY_8451) }),
+	DAFFODILS_BIG    (13438, 8211, 71, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DAFFODILS_8453) }),
+	BLUEBELLS_BIG    (13439, 8212, 76, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_BLUEBELLS_8455) }),
+	THORNY_HEDGE1    (13456, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+	THORNY_HEDGE2    (13457, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+	THORNY_HEDGE3    (13458, 8203, 56, 70,   new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.THORNY_HEDGE_8437) }),
+	NICE_HEDGE1      (13459, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+	NICE_HEDGE2      (13461, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+	NICE_HEDGE3      (13460, 8204, 60, 100,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.NICE_HEDGE_8439) }),
+	SMALL_BOX_HEDGE1 (13462, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+	SMALL_BOX_HEDGE2 (13464, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+	SMALL_BOX_HEDGE3 (13463, 8205, 64, 122,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.SMALL_BOX_HEDGE_8441) }),
+	TOPIARY_HEDGE1   (13465, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+	TOPIARY_HEDGE2   (13467, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+	TOPIARY_HEDGE3   (13466, 8206, 68, 141,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TOPIARY_HEDGE_8443) }),
+	FANCY_HEDGE1     (13468, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+	FANCY_HEDGE2     (13470, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+	FANCY_HEDGE3     (13469, 8207, 72, 158,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.FANCY_HEDGE_8445) }),
+	TALL_FANCY_HEDGE1(13471, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+	TALL_FANCY_HEDGE2(13473, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+	TALL_FANCY_HEDGE3(13472, 8208, 76, 223,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_FANCY_HEDGE_8447) }),
+	TALL_BOX_HEDGE1  (13474, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+	TALL_BOX_HEDGE2  (13476, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+	TALL_BOX_HEDGE3  (13475, 8209, 80, 316,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.TALL_BOX_HEDGE_8449) }),
+	BOUNDARY_STONES  (13449, 8196, 55, 100,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+	WOODEN_FENCE     (13450, 8197, 59, 280,  new Item[] { new Item(Items.PLANK_960, 10) }),
+	STONE_WALL       (13451, 8198, 63, 200,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
+	IRON_RAILINGS    (13452, 8199, 67, 220,  new Item[] { new Item(Items.IRON_BAR_2351, 10), new Item(Items.LIMESTONE_BRICK_3420, 6) }),
+	PICKET_FENCE     (13453, 8200, 71, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+	GARDEN_FENCE     (13454, 8201, 75, 940,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+	MARBLE_WALL      (13455, 8202, 79, 4000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 10) }),
 
 	/**
 	 * Bedroom decorations.
 	 */
-	WOODEN_BED        (13148, 8031, 20, 117,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	OAK_BED           (13149, 8032, 30, 210,  new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	LARGE_OAK_BED     (13150, 8033, 34, 330,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	TEAK_BED          (13151, 8034, 40, 300,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	LARGE_TEAK_BED    (13152, 8035, 45, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	FOUR_POSTER       (13153, 8036, 53, 450,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2) },
-	OAK_CLOCK         (13169, 8052, 25, 142,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792) },
-	TEAK_CLOCK        (13170, 8053, 55, 202,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792) },
-	GILDED_CLOCK      (13171, 8054, 85, 602,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784) },
-	SHAVING_STAND     (13162, 8045, 21, 30,   new Item[] { new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775) },
-	OAK_SHAVING_STAND (13163, 8046, 29, 61,   new Item[] { new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775) },
-	OAK_DRESSER       (13164, 8047, 37, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) },
-	TEAK_DRESSER      (13165, 8048, 46, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) },
-	FANCY_TEAK_DRESSER(13166, 8049, 56, 182,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2) },
-	MAHOGANY_DRESSER  (13167, 8050, 64, 281,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) },
-	GILDED_DRESSER    (13168, 8051, 74, 582,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784) },
-	SHOE_BOX          (13155, 8038, 20, 58,   new Item[] { new Item(Items.PLANK_960, 2) },
-	OAK_DRAWERS       (13156, 8039, 27, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	OAK_WARDROBE      (13157, 8040, 39, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	TEAK_DRAWERS      (13158, 8041, 51, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	TEAK_WARDROBE     (13159, 8042, 63, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
-	MAHOGANY_WARDROBE (13160, 8043, 75, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
-	GILDED_WARDROBE   (13161, 8044, 87, 720,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
+	WOODEN_BED        (13148, 8031, 20, 117,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	OAK_BED           (13149, 8032, 30, 210,  new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	LARGE_OAK_BED     (13150, 8033, 34, 330,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	TEAK_BED          (13151, 8034, 40, 300,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	LARGE_TEAK_BED    (13152, 8035, 45, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	FOUR_POSTER       (13153, 8036, 53, 450,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	GILDED_FOUR_POSTER(13154, 8037, 60, 1330, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 2) }),
+	OAK_CLOCK         (13169, 8052, 25, 142,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.CLOCKWORK_8792) }),
+	TEAK_CLOCK        (13170, 8053, 55, 202,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CLOCKWORK_8792) }),
+	GILDED_CLOCK      (13171, 8054, 85, 602,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.CLOCKWORK_8792), new Item(Items.GOLD_LEAF_8784) }),
+	SHAVING_STAND     (13162, 8045, 21, 30,   new Item[] { new Item(Items.PLANK_960), new Item(Items.MOLTEN_GLASS_1775) }),
+	OAK_SHAVING_STAND (13163, 8046, 29, 61,   new Item[] { new Item(Items.OAK_PLANK_8778), new Item(Items.MOLTEN_GLASS_1775) }),
+	OAK_DRESSER       (13164, 8047, 37, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+	TEAK_DRESSER      (13165, 8048, 46, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+	FANCY_TEAK_DRESSER(13166, 8049, 56, 182,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2) }),
+	MAHOGANY_DRESSER  (13167, 8050, 64, 281,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+	GILDED_DRESSER    (13168, 8051, 74, 582,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.GOLD_LEAF_8784) }),
+	SHOE_BOX          (13155, 8038, 20, 58,   new Item[] { new Item(Items.PLANK_960, 2) }),
+	OAK_DRAWERS       (13156, 8039, 27, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	OAK_WARDROBE      (13157, 8040, 39, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	TEAK_DRAWERS      (13158, 8041, 51, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	TEAK_WARDROBE     (13159, 8042, 63, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	MAHOGANY_WARDROBE (13160, 8043, 75, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+	GILDED_WARDROBE   (13161, 8044, 87, 720,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
 
 	/**
 	 * Quest hall decorations.
 	 */
-	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) },
-	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) },
-	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) },
-	KING_ARTHUR      (13510, 8285, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995) },
-	ELENA            (13511, 8286, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996) },
-	GIANT_DWARF      (13512, 8287, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997) },
-	MISCELLANIANS    (13513, 8288, 35, 311, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998) },
-	LUMBRIDGE        (13517, 8289, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002) },
-	THE_DESERT       (13514, 8290, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999) },
-	MORYTANIA        (13518, 8291, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003) },
-	KARAMJA          (13516, 8292, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001) },
-	ISAFDAR          (13515, 8293, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000) },
-	SILVERLIGHT      (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) },
-	EXCALIBUR        (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) },
-	DARKLIGHT        (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) },
-	SMALL_MAP        (13525, 8294, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004) },
-	MEDIUM_MAP       (13526, 8295, 58, 451, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005) },
-	LARGE_MAP        (13527, 8296, 78, 591, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006) },
+	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) }),
+	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) }),
+	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) }),
+	KING_ARTHUR      (13510, 8285, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995) }),
+	ELENA            (13511, 8286, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996) }),
+	GIANT_DWARF      (13512, 8287, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997) }),
+	MISCELLANIANS    (13513, 8288, 35, 311, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MISC_PORTRAIT_7998) }),
+	LUMBRIDGE        (13517, 8289, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.LUMBRIDGE_PAINTING_8002) }),
+	THE_DESERT       (13514, 8290, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DESERT_PAINTING_7999) }),
+	MORYTANIA        (13518, 8291, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003) }),
+	KARAMJA          (13516, 8292, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001) }),
+	ISAFDAR          (13515, 8293, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000) }),
+	SILVERLIGHT      (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) }),
+	EXCALIBUR        (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) }),
+	DARKLIGHT        (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) }),
+	SMALL_MAP        (13525, 8294, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004) }),
+	MEDIUM_MAP       (13526, 8295, 58, 451, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005) }),
+	LARGE_MAP        (13527, 8296, 78, 591, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006) }),
 
 	/**
 	 * Study decorations.
 	 */
-	GLOBE                 (13649, 8341, 41, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	ORNAMENTAL_GLOBE      (13650, 8342, 50, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
-	LUNAR_GLOBE           (13651, 8343, 59, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) },
-	CELESTIAL_GLOBE       (13652, 8344, 68, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) },
-	ARMILLARY_SPHERE      (13653, 8345, 77, 960,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4) },
-	SMALL_ORREY           (13654, 8346, 86, 1320, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3) },
-	LARGE_ORREY           (13655, 8347, 95, 1420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5) },
-	OAK_LECTERN           (13642, 8334, 40, 60,   new Item[] { new Item(Items.OAK_PLANK_8778) },
-	EAGLE_LECTERN         (13643, 8335, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	DEMON_LECTERN         (13644, 8336, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_EAGLE_LECTERN    (13645, 8337, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	TEAK_DEMON_LECTERN    (13646, 8338, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
-	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) },
-	CRYSTAL_BALL          (13659, 8351, 42, 280,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567) },
-	ELEMENTAL_SPHERE      (13660, 8352, 54, 580,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784) },
-	CRYSTAL_OF_POWER      (13661, 8353, 66, 890,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2) },
-	ALCHEMICAL_CHART      (13662, 8354, 43, 30,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	ASTRONOMICAL_CHART    (13663, 8355, 63, 45,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 3) },
-	INFERNAL_CHART        (13664, 8356, 83, 60,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) },
-	TELESCOPE1            (13656, 8348, 44, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) },
-	TELESCOPE2            (13657, 8349, 64, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) },
-	TELESCOPE3            (13658, 8350, 84, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) },
+	GLOBE                 (13649, 8341, 41, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	ORNAMENTAL_GLOBE      (13650, 8342, 50, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	LUNAR_GLOBE           (13651, 8343, 59, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) }),
+	CELESTIAL_GLOBE       (13652, 8344, 68, 570,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.GOLD_LEAF_8784) }),
+	ARMILLARY_SPHERE      (13653, 8345, 77, 960,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784, 2), new Item(Items.STEEL_BAR_2353, 4) }),
+	SMALL_ORREY           (13654, 8346, 86, 1320, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 3) }),
+	LARGE_ORREY           (13655, 8347, 95, 1420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 5) }),
+	OAK_LECTERN           (13642, 8334, 40, 60,   new Item[] { new Item(Items.OAK_PLANK_8778) }),
+	EAGLE_LECTERN         (13643, 8335, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	DEMON_LECTERN         (13644, 8336, 47, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_EAGLE_LECTERN    (13645, 8337, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	TEAK_DEMON_LECTERN    (13646, 8338, 57, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_EAGLE_LECTERN(13647, 8339, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
+	MAHOGANY_DEMON_LECTERN(13648, 8340, 67, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.GOLD_LEAF_8784) }),
+	CRYSTAL_BALL          (13659, 8351, 42, 280,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567) }),
+	ELEMENTAL_SPHERE      (13660, 8352, 54, 580,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784) }),
+	CRYSTAL_OF_POWER      (13661, 8353, 66, 890,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.UNPOWERED_ORB_567), new Item(Items.GOLD_LEAF_8784, 2) }),
+	ALCHEMICAL_CHART      (13662, 8354, 43, 30,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	ASTRONOMICAL_CHART    (13663, 8355, 63, 45,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	INFERNAL_CHART        (13664, 8356, 83, 60,   new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	TELESCOPE1            (13656, 8348, 44, 121,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+	TELESCOPE2            (13657, 8349, 64, 181,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775) }),
+	TELESCOPE3            (13658, 8350, 84, 580,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.MOLTEN_GLASS_1775) }),
 
 	/**
 	 * Costume room decorations.
 	 */
-	OAK_TREASURE_CHEST     (18804, 9839, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_TREASURE_CHEST    (18806, 9840, 66, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
-	OAK_ARMOUR_CASE        (18778, 9826, 46, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) },
-	TEAK_ARMOUR_CASE       (18780, 9827, 64, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) },
-	MGANY_ARMOUR_CASE      (18782, 9828, 82, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
-	OAK_MAGIC_WARDROBE     (18784, 9829, 42, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	C_OAK_MAGIC_WARDROBE   (18786, 9830, 51, 360,  new Item[] { new Item(Items.OAK_PLANK_8778, 6) },
-	TEAK_MAGIC_WARDROBE    (18788, 9831, 60, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	C_TEAK_MAGIC_WARDROBE  (18790, 9832, 69, 540,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6) },
-	MGANY_MAGIC_WARDROBE   (18792, 9833, 78, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
-	GILDED_MAGIC_WARDROBE  (18794, 9834, 87, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
-	MARBLE_MAGIC_WARDROBE  (18796, 9835, 96, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
-	OAK_CAPE_RACK          (18766, 9817, 54, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	TEAK_CAPE_RACK         (18767, 9818, 63, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	MGANY_CAPE_RACK        (18768, 9819, 72, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
-	GILDED_CAPE_RACK       (18769, 9820, 81, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) },
-	MARBLE_CAPE_RACK       (18770, 9821, 90, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
-	MAGIC_CAPE_RACK        (18771, 9822, 99, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) },
-	OAK_TOY_BOX            (18798, 9836, 50, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_TOY_BOX           (18800, 9837, 68, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	MAHOGANY_TOY_BOX       (18802, 9838, 86, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
-	OAK_COSTUME_BOX        (18772, 9823, 44, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_COSTUME_BOX       (18774, 9824, 62, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	MAHOGANY_COSTUME_BOX   (18776, 9825, 80, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) },
+	OAK_TREASURE_CHEST     (18804, 9839, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_TREASURE_CHEST    (18806, 9840, 66, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_TREASURE_CHEST(18808, 9841, 84, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+	OAK_ARMOUR_CASE        (18778, 9826, 46, 180,  new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	TEAK_ARMOUR_CASE       (18780, 9827, 64, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	MGANY_ARMOUR_CASE      (18782, 9828, 82, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+	OAK_MAGIC_WARDROBE     (18784, 9829, 42, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	C_OAK_MAGIC_WARDROBE   (18786, 9830, 51, 360,  new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
+	TEAK_MAGIC_WARDROBE    (18788, 9831, 60, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	C_TEAK_MAGIC_WARDROBE  (18790, 9832, 69, 540,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6) }),
+	MGANY_MAGIC_WARDROBE   (18792, 9833, 78, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+	GILDED_MAGIC_WARDROBE  (18794, 9834, 87, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+	MARBLE_MAGIC_WARDROBE  (18796, 9835, 96, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	OAK_CAPE_RACK          (18766, 9817, 54, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	TEAK_CAPE_RACK         (18767, 9818, 63, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	MGANY_CAPE_RACK        (18768, 9819, 72, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+	GILDED_CAPE_RACK       (18769, 9820, 81, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+	MARBLE_CAPE_RACK       (18770, 9821, 90, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	MAGIC_CAPE_RACK        (18771, 9822, 99, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) }),
+	OAK_TOY_BOX            (18798, 9836, 50, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_TOY_BOX           (18800, 9837, 68, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_TOY_BOX       (18802, 9838, 86, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+	OAK_COSTUME_BOX        (18772, 9823, 44, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_COSTUME_BOX       (18774, 9824, 62, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_COSTUME_BOX   (18776, 9825, 80, 280,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
 
 	/**
 	 * Chapel decorations.
 	 */
-	OAK_ALTAR         (13179, 8062, 45, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) },
-	TEAK_ALTAR        (13182, 8063, 50, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	CLOTH_ALTAR       (13185, 8064, 56, 390,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	MAHOGANY_ALTAR    (13188, 8065, 60, 590,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	LIMESTONE_ALTAR   (13191, 8066, 64, 910,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2) },
-	MARBLE_ALTAR      (13194, 8067, 70, 1030, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2) },
-	GILDED_ALTAR      (13197, 8068, 75, 2230, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4) },
-	SMALL_STATUE      (13271, 8082, 49, 40,   new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) },
-	MEDIUM_STATUE     (13272, 8083, 69, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) },
-	LARGE_STATUE      (13282, 8084, 89, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) },
-	WINDCHIMES        (13214, 8079, 49, 323,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4) },
-	BELLS             (13215, 8080, 58, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6) },
-	ORGAN             (13216, 8081, 69, 680,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6) },
-	SARADOMIN_SYMBOL  (13172, 8055, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	ZAMORAK_SYMBOL    (13173, 8056, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	GUTHIX_SYMBOL     (13174, 8057, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	SARADOMIN_ICON    (13175, 8058, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
-	ZAMORAK_ICON      (13176, 8059, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
-	GUTHIX_ICON       (13177, 8060, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) },
-	ICON_OF_BOB       (13178, 8061, 71, 1160, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2) },
-	STEEL_TORCHES     (13202, 8070, 45, 80,   new Item[] { new Item(Items.STEEL_BAR_2353, 2) },
-	WOODEN_TORCHES    (13200, 8069, 49, 58,   new Item[] { new Item(Items.PLANK_960, 2) },
-	STEEL_CANDLESTICKS(13204, 8071, 53, 124,  new Item[] { new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6) },
-	GOLD_CANDLESTICKS (13206, 8072, 57, 46,   new Item[] { new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6) },
-	INCENSE_BURNERS   (13208, 8073, 61, 280,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2) },
-	MAHOGANY_BURNERS  (13210, 8074, 65, 600,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2) },
-	MARBLE_BURNERS    (13212, 8075, 69, 1600, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2) },
-	SHUTTERED_WINDOW  (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item[] { new Item(Items.PLANK_960, 8) },
-	DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 8) },
-	STAINED_GLASS     (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 16) },
+	OAK_ALTAR         (13179, 8062, 45, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	TEAK_ALTAR        (13182, 8063, 50, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	CLOTH_ALTAR       (13185, 8064, 56, 390,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	MAHOGANY_ALTAR    (13188, 8065, 60, 590,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	LIMESTONE_ALTAR   (13191, 8066, 64, 910,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	MARBLE_ALTAR      (13194, 8067, 70, 1030, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	GILDED_ALTAR      (13197, 8068, 75, 2230, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784, 4) }),
+	SMALL_STATUE      (13271, 8082, 49, 40,   new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	MEDIUM_STATUE     (13272, 8083, 69, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	LARGE_STATUE      (13282, 8084, 89, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+	WINDCHIMES        (13214, 8079, 49, 323,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 4) }),
+	BELLS             (13215, 8080, 58, 480,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 6) }),
+	ORGAN             (13216, 8081, 69, 680,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 6) }),
+	SARADOMIN_SYMBOL  (13172, 8055, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	ZAMORAK_SYMBOL    (13173, 8056, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	GUTHIX_SYMBOL     (13174, 8057, 48, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	SARADOMIN_ICON    (13175, 8058, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+	ZAMORAK_ICON      (13176, 8059, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+	GUTHIX_ICON       (13177, 8060, 59, 960,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+	ICON_OF_BOB       (13178, 8061, 71, 1160, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 2) }),
+	STEEL_TORCHES     (13202, 8070, 45, 80,   new Item[] { new Item(Items.STEEL_BAR_2353, 2) }),
+	WOODEN_TORCHES    (13200, 8069, 49, 58,   new Item[] { new Item(Items.PLANK_960, 2) }),
+	STEEL_CANDLESTICKS(13204, 8071, 53, 124,  new Item[] { new Item(Items.STEEL_BAR_2353, 6), new Item(Items.CANDLE_36, 6) }),
+	GOLD_CANDLESTICKS (13206, 8072, 57, 46,   new Item[] { new Item(Items.GOLD_BAR_2357, 6), new Item(Items.CANDLE_36, 6) }),
+	INCENSE_BURNERS   (13208, 8073, 61, 280,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.STEEL_BAR_2353, 2) }),
+	MAHOGANY_BURNERS  (13210, 8074, 65, 600,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.STEEL_BAR_2353, 2) }),
+	MARBLE_BURNERS    (13212, 8075, 69, 1600, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.STEEL_BAR_2353, 2) }),
+	SHUTTERED_WINDOW  (new int[] { 13253, 13226, 13235, 13244, 13217, 13262 }, 8076, 49, 228, new Item[] { new Item(Items.PLANK_960, 8) }),
+	DECORATIVE_WINDOW (new int[] { 13254, 13227, 13236, 13245, 13218, 13263 }, 8077, 69, 200, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 8) }),
+	STAINED_GLASS     (new int[] { 13255, 13228, 13237, 13246, 13219, 13264 }, 8078, 89, 400, new Item[] { new Item(Items.MOLTEN_GLASS_1775, 16) }),
 
 	/**
 	 * Throne room
 	 */
-	OAK_THRONE       (13665, 8357, 60, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786) },
-	TEAK_THRONE      (13666, 8358, 67, 1450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2) },
-	MAHOGANY_THRONE  (13667, 8359, 74, 2200,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3) },
-	GILDED_THRONE    (13668, 8360, 81, 1700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3) },
-	SKELETON_THRONE  (13669, 8361, 88, 7003,  new Item[] { new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2) },
-	CRYSTAL_THRONE   (13670, 8362, 95, 15000, new Item[] { new Item(Items.MAGIC_STONE_8788, 15) },
-	DEMONIC_THRONE   (13671, 8363, 99, 25000, new Item[] { new Item(Items.MAGIC_STONE_8788, 25) },
-	OAK_LEVER        (13672, 8364, 68, 300,   new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
-	TEAK_LEVER       (13673, 8365, 78, 450,   new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
-	MAHOGANY_LEVER   (13674, 8366, 88, 700,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
-	FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
-	STEEL_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20) },
-	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10) },
-	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2) },
-	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4) },
-	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
-	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
-	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
-	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) },
-	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) },
-	OAK_DECO         (13798, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) },
-	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) },
-	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item[] { new Item(Items.OAK_PLANK_8778, 2) },
-	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) },
-	KITE_SHIELD      (13750, 8107, 86, 420,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) },
+	OAK_THRONE       (13665, 8357, 60, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.MARBLE_BLOCK_8786) }),
+	TEAK_THRONE      (13666, 8358, 67, 1450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.MARBLE_BLOCK_8786, 2) }),
+	MAHOGANY_THRONE  (13667, 8359, 74, 2200,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 3) }),
+	GILDED_THRONE    (13668, 8360, 81, 1700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 2), new Item(Items.GOLD_LEAF_8784, 3) }),
+	SKELETON_THRONE  (13669, 8361, 88, 7003,  new Item[] { new Item(Items.MAGIC_STONE_8788, 5), new Item(Items.MARBLE_BLOCK_8786, 4), new Item(Items.BONES_526, 5), new Item(Items.SKULL_964, 2) }),
+	CRYSTAL_THRONE   (13670, 8362, 95, 15000, new Item[] { new Item(Items.MAGIC_STONE_8788, 15) }),
+	DEMONIC_THRONE   (13671, 8363, 99, 25000, new Item[] { new Item(Items.MAGIC_STONE_8788, 25) }),
+	OAK_LEVER        (13672, 8364, 68, 300,   new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	TEAK_LEVER       (13673, 8365, 78, 450,   new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+	MAHOGANY_LEVER   (13674, 8366, 88, 700,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+	FLOOR_DECORATION (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8370, 61, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+	STEEL_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8371, 68, 1100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.STEEL_BAR_2353, 20) }),
+	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10) }),
+	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2) }),
+	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4) }),
+	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
+	OAK_DECO         (13798, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
+	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	KITE_SHIELD      (13750, 8107, 86, 420,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
 
 	/**
 	 * Oubliette
 	 */
-	SPIKES_MID         (13334, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
-	SPIKES_SIDE        (13335, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
-	SPIKES_CORNER      (13336, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
-	SPIKES_FL          (13338, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) },
-	TENTACLE_MID       (13331, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
-	TENTACLE_SIDE      (13332, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
-	TENTACLE_CORNER    (13333, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
-	TENTACLE_FL        (13338, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) },
-	FP_FLOOR_MID       (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
-	FP_FLOOR_SIDE      (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
-	FP_FLOOR_CORNER    (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
-	FLAME_PIT          (13337, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) },
-	ROCNAR_FLOOR_MID   (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	ROCNAR_FLOOR_SIDE  (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	ROCNAR             (13373, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	ROCNAR_FL          (13338, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	OAK_CAGE           (13313, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
-	OAK_CAGE_DOOR      (13314, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) },
-	OAK_STEEL_CAGE     (13316, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
-	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
-	STEEL_CAGE_OU      (13319, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) },
-	STEEL_CAGE_DOOR    (13320, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) },
-	SPIKED_CAGE        (13322, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) },
-	SPIKED_CAGE_DOOR   (13323, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) },
-	BONE_CAGE          (13325, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) },
-	BONE_CAGE_DOOR     (13326, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) },
-	SKELETON_GUARD     (13366, 8131, 70, 223,  new Item[] { new Item(Items.COINS_995, 50000) },
-	GUARD_DOG          (13367, 8132, 74, 273,  new Item[] { new Item(Items.COINS_995, 75000) },
-	HOBGOBLIN          (13368, 8133, 78, 316,  new Item[] { new Item(Items.COINS_995, 100000) },
-	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item[] { new Item(Items.COINS_995, 200000) },
-	TROLL              (13369, 8136, 90, 1000, new Item[] { new Item(Items.COINS_995, 1000000) },
-	HELLHOUND          (2715, 8137, 94, 2236,  new Item[] { new Item(Items.COINS_995, 5000000) },
-	OAK_LADDER         (13328, 8306, 68, 300,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) },
-	TEAK_LADDER        (13329, 8307, 78, 450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5) },
-	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) },
-	DECORATIVE_BLOOD   (13312, 8125, 72, 4,    new Item[] { new Item(Items.RED_DYE_1763, 4) },
-	DECORATIVE_PIPE    (13311, 8126, 83, 120,  new Item[] { new Item(Items.STEEL_BAR_2353, 6) },
-	HANGING_SKELETON   (13310, 8127, 94, 3,    new Item[] { new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6) },
-	CANDLE             (13342, 8128, 72, 243,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4) },
-	TORCH              (13341, 8129, 84, 244,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4) },
-	SKULL_TORCH        (13343, 8130, 94, 246,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4) },
+	SPIKES_MID         (13334, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+	SPIKES_SIDE        (13335, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+	SPIKES_CORNER      (13336, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+	SPIKES_FL          (13338, 8302, 65, 623,  new Item[] { new Item(Items.STEEL_BAR_2353, 20), new Item(Items.COINS_995, 50000) }),
+	TENTACLE_MID       (13331, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+	TENTACLE_SIDE      (13332, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+	TENTACLE_CORNER    (13333, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+	TENTACLE_FL        (13338, 8303, 71, 326,  new Item[] { new Item(Items.BUCKET_OF_WATER_1929, 20), new Item(Items.COINS_995, 100000) }),
+	FP_FLOOR_MID       (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+	FP_FLOOR_SIDE      (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+	FP_FLOOR_CORNER    (13371, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+	FLAME_PIT          (13337, 8304, 77, 357,  new Item[] { new Item(Items.TINDERBOX_590, 20), new Item(Items.COINS_995, 125000) }),
+	ROCNAR_FLOOR_MID   (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	ROCNAR_FLOOR_SIDE  (13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	ROCNAR_FLOOR_CORNER(13371, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	ROCNAR             (13373, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	ROCNAR_FL          (13338, 8305, 83, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	OAK_CAGE           (13313, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+	OAK_CAGE_DOOR      (13314, 8297, 65, 640,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 2) }),
+	OAK_STEEL_CAGE     (13316, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	OAK_STEEL_CAGE_DOOR(13317, 8298, 70, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	STEEL_CAGE_OU      (13319, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) }),
+	STEEL_CAGE_DOOR    (13320, 8299, 75, 400,  new Item[] { new Item(Items.STEEL_BAR_2353, 20) }),
+	SPIKED_CAGE        (13322, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) }),
+	SPIKED_CAGE_DOOR   (13323, 8300, 80, 500,  new Item[] { new Item(Items.STEEL_BAR_2353, 25) }),
+	BONE_CAGE          (13325, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) }),
+	BONE_CAGE_DOOR     (13326, 8301, 85, 603,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.BONES_526, 10) }),
+	SKELETON_GUARD     (13366, 8131, 70, 223,  new Item[] { new Item(Items.COINS_995, 50000) }),
+	GUARD_DOG          (13367, 8132, 74, 273,  new Item[] { new Item(Items.COINS_995, 75000) }),
+	HOBGOBLIN          (13368, 8133, 78, 316,  new Item[] { new Item(Items.COINS_995, 100000) }),
+	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item[] { new Item(Items.COINS_995, 200000) }),
+	TROLL              (13369, 8136, 90, 1000, new Item[] { new Item(Items.COINS_995, 1000000) }),
+	HELLHOUND          (2715, 8137, 94, 2236,  new Item[] { new Item(Items.COINS_995, 5000000) }),
+	OAK_LADDER         (13328, 8306, 68, 300,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	TEAK_LADDER        (13329, 8307, 78, 450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+	DECORATIVE_BLOOD   (13312, 8125, 72, 4,    new Item[] { new Item(Items.RED_DYE_1763, 4) }),
+	DECORATIVE_PIPE    (13311, 8126, 83, 120,  new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
+	HANGING_SKELETON   (13310, 8127, 94, 3,    new Item[] { new Item(Items.SKULL_964, 2), new Item(Items.BONES_526, 6) }),
+	CANDLE             (13342, 8128, 72, 243,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_CANDLE_33, 4) }),
+	TORCH              (13341, 8129, 84, 244,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4) }),
+	SKULL_TORCH        (13343, 8130, 94, 246,  new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIT_TORCH_594, 4), new Item(Items.SKULL_964, 4) }),
 
 	/**
 	 * Dungeon corridor, junction, stairs & pit
 	 */
-	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) },
-	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) },
-	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
-	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) },
-	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
-	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) },
-	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item[] { new Item(Items.COINS_995, 50000) },
-	MAN_TRAP          (13357, 8144, 76, 273,   new Item[] { new Item(Items.COINS_995, 75000) },
-	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item[] { new Item(Items.COINS_995, 100000) },
-	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item[] { new Item(Items.COINS_995, 150000) },
-	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item[] { new Item(Items.COINS_995, 200000) },
-	PIT_DOG           (39260, 18791, 70, 200,  new Item[] { new Item(Items.COINS_995, 40000) },
-	PIT_OGRE          (39261, 18792, 73, 234,  new Item[] { new Item(Items.COINS_995, 55000) },
-	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item[] { new Item(Items.COINS_995, 90000) },
-	PIT_SCABARITE     (39263, 18794, 84, 387,  new Item[] { new Item(Items.COINS_995, 150000) },
-	PIT_BLACK_DEMON   (39264, 18795, 89, 547,  new Item[] { new Item(Items.COINS_995, 300000) },
-	PIT_IRON_DRAGON   (39265, 18796, 97, 2738, new Item[] { new Item(Items.COINS_995, 7500000) },
+	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item[] { new Item(Items.COINS_995, 50000) }),
+	MAN_TRAP          (13357, 8144, 76, 273,   new Item[] { new Item(Items.COINS_995, 75000) }),
+	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item[] { new Item(Items.COINS_995, 100000) }),
+	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item[] { new Item(Items.COINS_995, 150000) }),
+	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item[] { new Item(Items.COINS_995, 200000) }),
+	PIT_DOG           (39260, 18791, 70, 200,  new Item[] { new Item(Items.COINS_995, 40000) }),
+	PIT_OGRE          (39261, 18792, 73, 234,  new Item[] { new Item(Items.COINS_995, 55000) }),
+	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item[] { new Item(Items.COINS_995, 90000) }),
+	PIT_SCABARITE     (39263, 18794, 84, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	PIT_BLACK_DEMON   (39264, 18795, 89, 547,  new Item[] { new Item(Items.COINS_995, 300000) }),
+	PIT_IRON_DRAGON   (39265, 18796, 97, 2738, new Item[] { new Item(Items.COINS_995, 7500000) }),
 
 	/**
 	 * Treasure room
 	 */
-	DEMON            (13378, 8138, 75, 707,  new Item[] { new Item(Items.COINS_995, 500000) },
-	KALPHITE_SOLDIER (13374, 8139, 80, 866,  new Item[] { new Item(Items.COINS_995, 750000) },
-	TOK_XIL          (13377, 8140, 85, 2236, new Item[] { new Item(Items.COINS_995, 5000000) },
-	DAGANNOTH        (13376, 8141, 90, 2738, new Item[] { new Item(Items.COINS_995, 7500000) },
-	STEEL_DRAGON     (13375, 8142, 95, 3162, new Item[] { new Item(Items.COINS_995, 1000000) },
-	WOODEN_CRATE     (13283, 8148, 75, 143,  new Item[] { new Item(Items.PLANK_960, 5) },
-	OAK_T_CHEST      (13285, 8149, 79, 340,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2) },
-	TEAK_T_CHEST     (13287, 8150, 83, 530,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4) },
-	MGANY_T_CHEST    (13289, 8151, 87, 1000, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784) },
-	MAGIC_CHEST      (13291, 8152, 91, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) },
+	DEMON            (13378, 8138, 75, 707,  new Item[] { new Item(Items.COINS_995, 500000) }),
+	KALPHITE_SOLDIER (13374, 8139, 80, 866,  new Item[] { new Item(Items.COINS_995, 750000) }),
+	TOK_XIL          (13377, 8140, 85, 2236, new Item[] { new Item(Items.COINS_995, 5000000) }),
+	DAGANNOTH        (13376, 8141, 90, 2738, new Item[] { new Item(Items.COINS_995, 7500000) }),
+	STEEL_DRAGON     (13375, 8142, 95, 3162, new Item[] { new Item(Items.COINS_995, 1000000) }),
+	WOODEN_CRATE     (13283, 8148, 75, 143,  new Item[] { new Item(Items.PLANK_960, 5) }),
+	OAK_T_CHEST      (13285, 8149, 79, 340,  new Item[] { new Item(Items.OAK_PLANK_8778, 5), new Item(Items.STEEL_BAR_2353, 2) }),
+	TEAK_T_CHEST     (13287, 8150, 83, 530,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5), new Item(Items.STEEL_BAR_2353, 4) }),
+	MGANY_T_CHEST    (13289, 8151, 87, 1000, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.GOLD_LEAF_8784) }),
+	MAGIC_CHEST      (13291, 8152, 91, 1000, new Item[] { new Item(Items.MAGIC_STONE_8788) }),
 
 	/**
 	 * Style related decoration.
@@ -713,6 +713,11 @@ public enum Decoration {
 	 */
 	private final Item[] items;
 
+	/**
+	 * The items that will be refunded.
+	 */
+	private final Item[] refundItems;
+
 	/**
 	 * The tools required.
 	 */
@@ -729,7 +734,18 @@ public enum Decoration {
 	private boolean invisibleNode;
 
 	/**
-	 * Constructs a new {@code Portal} {@code Object}.
+	 * Constructs a new object, no items, no tools, no refund items.
+	 * @param objectId The object id.
+	 * @param interfaceItem The item id for the building interface.
+	 * @param level The level required.
+	 * @param experience The experience gained.
+	 */
+	Decoration(int objectId, int interfaceItem, int level, double experience) {
+		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, new Item[] {}, new Item[] {});
+	}
+
+	/**
+	 * Constructs a new object, no tools, no refund items.
 	 * @param objectId The object id.
 	 * @param interfaceItem The item id for the building interface.
 	 * @param level The level required.
@@ -737,18 +753,33 @@ public enum Decoration {
 	 * @param items The items required.
 	 */
 	Decoration(int objectId, int interfaceItem, int level, double experience, Item[] items) {
-		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items);
+		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
 	}
 
 	/**
-	 * Constructs a new {@code Portal} {@code Object}.
+	 * Constructs a new object, no refund items.
 	 * @param objectId The object id.
 	 * @param interfaceItem The item id for the building interface.
 	 * @param level The level required.
 	 * @param experience The experience gained.
+	 * @param tools The tools needed.
 	 * @param items The items required.
 	 */
 	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
+		this(objectId, interfaceItem, level, experience, tools, items, new Item[] {});
+	}
+
+	/**
+	 * Constructs a new object.
+	 * @param objectId The object id.
+	 * @param interfaceItem The item id for the building interface.
+	 * @param level The level required.
+	 * @param experience The experience gained.
+	 * @param tools The tools needed.
+	 * @param items The items required.
+	 * @param refundItems The items to be refunded when the item is removed.
+	 */
+	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item[] items, Item[] refundItems) {
 		this.objectId = objectId;
 		this.objectIds = null;
 		this.interfaceItem = interfaceItem;
@@ -756,6 +787,7 @@ public enum Decoration {
 		this.experience = experience;
 		this.tools = tools;
 		this.items = items;
+		this.refundItems = refundItems;
 	}
 
 	/**
@@ -769,7 +801,7 @@ public enum Decoration {
 	}
 
 	/**
-	 * Constructs a new {@code Portal} {@code Object}.
+	 * Constructs a new object, no tools, no refund items.
 	 * @param objectIds The object id.
 	 * @param interfaceItem The item id for the building interface.
 	 * @param level The level required.
@@ -777,18 +809,32 @@ public enum Decoration {
 	 * @param items The items required.
 	 */
 	Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item[] items) {
-		this(objectIds, interfaceItem, level, experience, new int[] { 2347, 8794 }, items);
+		this(objectIds, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
 	}
-
 	/**
-	 * Constructs a new {@code Portal} {@code Object}.
+	 * Constructs a new object no refund items.
 	 * @param objectIds The object id.
 	 * @param interfaceItem The item id for the building interface.
 	 * @param level The level required.
 	 * @param experience The experience gained.
+	 * @param tools The tools needed.
 	 * @param items The items required.
 	 */
 	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
+		this(objectIds, interfaceItem, level, experience, tools, items, new Item[] {});
+	}
+
+	/**
+	 * Constructs a new object.
+	 * @param objectIds The object id.
+	 * @param interfaceItem The item id for the building interface.
+	 * @param level The level required.
+	 * @param experience The experience gained.
+	 * @param tools The tools needed.
+	 * @param items The items required.
+	 * @param refundItems The items to be refunded when the item is removed.
+	 */
+	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item[] items, Item[] refundItems) {
 		this.objectId = objectIds[0];
 		this.objectIds = objectIds;
 		this.interfaceItem = interfaceItem;
@@ -796,6 +842,7 @@ public enum Decoration {
 		this.experience = experience;
 		this.tools = tools;
 		this.items = items;
+		this.refundItems = refundItems;
 	}
 
 	/**
-- 
GitLab


From 6c9f897b48b66d39d5f1747c8ce40b788ca20a06 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 19:18:37 -0400
Subject: [PATCH 10/13] api (experience always double), rip out Menagerie crap,
 fix misc

---
 .../skill/construction/BuildHotspot.java      |  11 -
 .../global/skill/construction/Decoration.java | 503 +++++++++---------
 2 files changed, 258 insertions(+), 256 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/BuildHotspot.java b/Server/src/main/content/global/skill/construction/BuildHotspot.java
index a700f0817c..4041213862 100644
--- a/Server/src/main/content/global/skill/construction/BuildHotspot.java
+++ b/Server/src/main/content/global/skill/construction/BuildHotspot.java
@@ -188,16 +188,6 @@ public enum BuildHotspot {
 	MAP(15396, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_HIGH_ANIM, Decoration.SMALL_MAP, Decoration.MEDIUM_MAP, Decoration.LARGE_MAP),
 	BOOKCASE2(15397, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.WOODEN_BOOKCASE, Decoration.OAK_BOOKCASE, Decoration.MAHOGANY_BOOKCASE),
 
-	/**
-	 * Manegerie Hotspots
-	 */
-	OBELISK(44911, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.MINI_OBELISK),
-	PET_FEEDER(44910, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_PET_FEEDER, Decoration.TEAK_PET_FEEDER, Decoration.MAHOGANY_PET_FEEDER),
-	PET_HOUSE(44909, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.OAK_PET_HOUSE, Decoration.TEAK_PET_HOUSE, Decoration.MAHOGANY_PET_HOUSE, Decoration.CONSECRATED_PET_HOUSE, Decoration.DESECRATED_PET_HOUSE, Decoration.NATURAL_PET_HOUSE),
-	HABITAT_1(44907, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.GARDEN_HABITAT, Decoration.JUNGLE_HABITAT, Decoration.DESERT_HABITAT, Decoration.POLAR_HABITAT, Decoration.VOLCANIC_HABITAT),
-	HABITAT_2(44908, BuildHotspotType.LINKED, BuildingUtils.BUILD_MID_ANIM, Decoration.GARDEN_HABITAT, Decoration.JUNGLE_HABITAT, Decoration.DESERT_HABITAT, Decoration.POLAR_HABITAT, Decoration.VOLCANIC_HABITAT),
-
-	
 	/**
 	 * Combat room hotspots.
 	 */
@@ -395,7 +385,6 @@ public enum BuildHotspot {
 		linkedHotspots.add(new BuildHotspot[] { PRISON, PRISON_DOOR });
 		linkedHotspots.add(new BuildHotspot[] { DUNGEON_DOOR_LEFT, DUNGEON_DOOR_RIGHT });
 		linkedHotspots.add(new BuildHotspot[] { DUNGEON_DOOR_LEFT2, DUNGEON_DOOR_RIGHT2 });
-		linkedHotspots.add(new BuildHotspot[] { HABITAT_1, HABITAT_2 });
 		linkedHotspots.add(new BuildHotspot[] { SMALL_PLANT_1, SMALL_PLANT1 });
 		linkedHotspots.add(new BuildHotspot[] { SHELVES, SHELVES_2 });
 	}
diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 55486da6a2..093d6b2d11 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -16,107 +16,107 @@ public enum Decoration {
 	/**
 	 * Garden centrepiece decorations.
 	 */
-	PORTAL          (13405, 8168,  1,  100.0, new Item[] { new Item(Items.IRON_BAR_2351, 10) }),
-	ROCK            (13406, 8169,  5,  100.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) }),
-	POND            (13407, 8170,  10, 100.0, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
-	IMP_STATUE      (13408, 8171,  15, 150.0, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) }),
-	SMALL_OBELISK   (42004, 14657, 41, 676,   new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) }),
-	DUNGEON_ENTRANCE(13409, 8172,  70, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	PORTAL          (13405, 8168,  1,  100, new Item[] { new Item(Items.IRON_BAR_2351, 10) }),
+	ROCK            (13406, 8169,  5,  100, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5) }),
+	POND            (13407, 8170,  10, 100, new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+	IMP_STATUE      (13408, 8171,  15, 150, new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 5), new Item(Items.SOFT_CLAY_1761, 5) }),
+	SMALL_OBELISK   (42004, 14657, 41, 676, new Item[] { new Item(Items.MARBLE_BLOCK_8786), new Item(Items.SPIRIT_SHARDS_12183, 1000), new Item(Items.CRIMSON_CHARM_12160, 10), new Item(Items.BLUE_CHARM_12163, 10) }),
+	DUNGEON_ENTRANCE(13409, 8172,  70, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
 
 	/**
 	 * Garden big tree decorations.
 	 */
-	BIG_DEAD_TREE  (13411, 8173, 5,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
-	BIG_TREE       (13412, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
-	BIG_OAK_TREE   (13413, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
-	BIG_WILLOW_TREE(13414, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
-	BIG_MAPLE_TREE (13415, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
-	BIG_YEW_TREE   (13416, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
-	BIG_MAGIC_TREE (13417, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
+	BIG_DEAD_TREE  (13411, 8173, 5,  31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+	BIG_TREE       (13412, 8174, 10, 44,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+	BIG_OAK_TREE   (13413, 8175, 15, 70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+	BIG_WILLOW_TREE(13414, 8176, 30, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+	BIG_MAPLE_TREE (13415, 8177, 45, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+	BIG_YEW_TREE   (13416, 8178, 60, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+	BIG_MAGIC_TREE (13417, 8179, 75, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
 
 	/**
 	 * Garden tree decorations.
 	 */
-	DEAD_TREE  (13418, 8173, 5,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
-	TREE       (13419, 8174, 10, 44.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
-	OAK_TREE   (13420, 8175, 15, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
-	WILLOW_TREE                       (13421, 8176, 30, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
-	MAPLE_TREE (13423, 8177, 45, 122.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
-	YEW_TREE   (13422, 8178, 60, 141.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
-	MAGIC_TREE (13424, 8179, 75, 223.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
+	DEAD_TREE  (13418, 8173, 5,  31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_DEAD_TREE_8417) }),
+	TREE       (13419, 8174, 10, 44,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_NICE_TREE_8419) }),
+	OAK_TREE   (13420, 8175, 15, 70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_OAK_TREE_8421) }),
+	WILLOW_TREE(13421, 8176, 30, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_WILLOW_TREE_8423) }),
+	MAPLE_TREE (13423, 8177, 45, 122, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAPLE_TREE_8425) }),
+	YEW_TREE   (13422, 8178, 60, 141, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_YEW_TREE_8427) }),
+	MAGIC_TREE (13424, 8179, 75, 223, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_MAGIC_TREE_8429) }),
 
 	/**
 	 * Garden big plant 1 decorations.
 	 */
-	FERN      (13425, 8186, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
-	BUSH      (13426, 8187, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
-	TALL_PLANT(13427, 8188, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+	FERN      (13425, 8186, 1,  31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	BUSH      (13426, 8187, 6,  70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	TALL_PLANT(13427, 8188, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden big plant 2 decorations.
 	 */
-	SHORT_PLANT(13428, 8189, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
-	LARGE_LEAF (13429, 8190, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
-	HUGE_PLANT (13430, 8191, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+	SHORT_PLANT     (13428, 8189, 1,  31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	LARGE_LEAF_PLANT(13429, 8190, 6,  70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	HUGE_PLANT      (13430, 8191, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden small plant 1 decorations.
 	 */
-	PLANT     (13431, 8180,  1, 31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
-	SMALL_FERN(13432, 8181,  6, 70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
-	FERN_SP   (13433, 8182, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+	PLANT     (13431, 8180,  1, 31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	SMALL_FERN(13432, 8181,  6, 70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	FERN_SP   (13433, 8182, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Garden small plant 2 decorations.
 	 */
-	DOCK_LEAF(13434, 8183, 1,  31.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
-	THISTLE  (13435, 8184, 6,  70.0,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
-	REEDS    (13436, 8185, 12, 100.0, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
+	DOCK_LEAF(13434, 8183, 1,  31,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_1_8431) }),
+	THISTLE  (13435, 8184, 6,  70,  new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_2_8433) }),
+	REEDS    (13436, 8185, 12, 100, new int[] { BuildingUtils.WATERING_CAN }, new Item[] { new Item(Items.BAGGED_PLANT_3_8435) }),
 
 	/**
 	 * Parlour chair spot
 	 */
-	CRUDE_CHAIR      (13581, 8309, 1,  58.0,  new Item[] { new Item(Items.PLANK_960, 2) }),
-	WOODEN_CHAIR     (13582, 8310, 8,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
-	ROCKING_CHAIR    (13583, 8311, 14, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
-	OAK_CHAIR        (13584, 8312, 19, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	OAK_ARMCHAIR     (13585, 8313, 26, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
-	TEAK_ARMCHAIR    (13586, 8314, 35, 180.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
-	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
+	CRUDE_CHAIR      (13581, 8309, 1,  58,  new Item[] { new Item(Items.PLANK_960, 2) }),
+	WOODEN_CHAIR     (13582, 8310, 8,  87,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	ROCKING_CHAIR    (13583, 8311, 14, 87,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	OAK_CHAIR        (13584, 8312, 19, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	OAK_ARMCHAIR     (13585, 8313, 26, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	TEAK_ARMCHAIR    (13586, 8314, 35, 180, new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	MAHOGANY_ARMCHAIR(13587, 8315, 50, 280, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2) }),
 
 	/**
 	 * Rugs rugs rugs
 	 */
-	BROWN_RUG_CORNER  (13588, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
-	RED_RUG_CORNER    (13591, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	OPULENT_RUG_CORNER(13594, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
-	BROWN_RUG_END     (13589, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
-	RED_RUG_END       (13592, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	OPULENT_RUG_END   (13595, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
-	BROWN_RUG_CENTER  (13590, 8316, 2,  30.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
-	RED_RUG_CENTER    (13593, 8317, 13, 60.0,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	OPULENT_RUG_CENTER(13596, 8318, 65, 360.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+	BROWN_RUG_CORNER  (13588, 8316, 2,  30,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_CORNER    (13591, 8317, 13, 60,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_CORNER(13594, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+	BROWN_RUG_END     (13589, 8316, 2,  30,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_END       (13592, 8317, 13, 60,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_END   (13595, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
+	BROWN_RUG_CENTER  (13590, 8316, 2,  30,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	RED_RUG_CENTER    (13593, 8317, 13, 60,  new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	OPULENT_RUG_CENTER(13596, 8318, 65, 360, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784) }),
 
 	/**
 	 * Parlour fireplaces
 	 */
-	CLAY_FIREPLACE  (13609, 8325, 3,  30.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 3) }),
-	STONE_FIREPLACE (13611, 8326, 33, 40.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
-	MARBLE_FIREPLACE(13613, 8327, 63, 500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	CLAY_FIREPLACE  (13609, 8325, 3,  30,  new Item[] { new Item(Items.SOFT_CLAY_1761, 3) }),
+	STONE_FIREPLACE (13611, 8326, 33, 40,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	MARBLE_FIREPLACE(13613, 8327, 63, 500, new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
 
 	/**
 	 * Parlour curtain spot
 	 */
-	TORN_CURTAINS   (13603, 8322, 2,  132.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
-	CURTAINS        (13604, 8323, 18, 225.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
-	OPULENT_CURTAINS(13605, 8324, 40, 315.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	TORN_CURTAINS   (13603, 8322, 2,  132, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	CURTAINS        (13604, 8323, 18, 225, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
+	OPULENT_CURTAINS(13605, 8324, 40, 315, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.BOLT_OF_CLOTH_8790, 3) }),
 
 	/**
 	 * Bookcases
 	 */
-	WOODEN_BOOKCASE  (13597, 8319, 4,  115.0, new Item[] { new Item(Items.PLANK_960, 4) }),
-	OAK_BOOKCASE     (13598, 8320, 29, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
-	MAHOGANY_BOOKCASE(13599, 8321, 40, 420.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+	WOODEN_BOOKCASE  (13597, 8319, 4,  115, new Item[] { new Item(Items.PLANK_960, 4) }),
+	OAK_BOOKCASE     (13598, 8320, 29, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	MAHOGANY_BOOKCASE(13599, 8321, 40, 420, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
 
 	/**
 	 * Kitchen Beer Barrels
@@ -124,169 +124,169 @@ public enum Decoration {
 	 * Basic: 1, Cider: 14, Asgarnian: 24, Greenman's: 29, D.Bitter: 39, Chef's: 54
 	 *
 	 */
-	BASIC_BEER_BARREL   (13568, 8239, 7,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
-	CIDER_BARREL        (13569, 8240, 12, 91.0,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) }),
-	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) }),
-	GREENMANS_ALE_BARREL(13571, 8242, 26, 184.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) }),
-	DRAGON_BITTER_BARREL(13572, 8243, 36, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) }),
-	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) }),
+	BASIC_BEER_BARREL   (13568, 8239, 7,  87,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	CIDER_BARREL        (13569, 8240, 12, 91,  new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.CIDER_5763, 8) }),
+	ASGARNIAN_ALE_BARREL(13570, 8241, 18, 184, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.ASGARNIAN_ALE_1905, 8) }),
+	GREENMANS_ALE_BARREL(13571, 8242, 26, 184, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.GREENMANS_ALE_1909, 8) }),
+	DRAGON_BITTER_BARREL(13572, 8243, 36, 224, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.DRAGON_BITTER_1911, 8), new Item(Items.STEEL_BAR_2353, 2) }),
+	CHEFS_DELIGHT_BARREL(13573, 8244, 48, 224, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.CHEFS_DELIGHT_5755, 8), new Item(Items.STEEL_BAR_2353, 2) }),
 
 	/**
 	 * Kitchen Tables!
 	 */
-	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
-	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
-	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	KITCHEN_WOODEN_TABLE(13577, 8246, 12, 87,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	KITCHEN_OAK_TABLE   (13578, 8247, 32, 180, new Item[] { new Item(Items.OAK_PLANK_8778, 3) }),
+	KITCHEN_TEAK_TABLE  (13579, 8248, 52, 270, new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
 
 	/**
 	 * Kitchen Stoves
 	 */
-	BASIC_FIREPIT    (13528, 8216, 5,  40.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) }),
-	FIREPIT_WITH_HOOK(13529, 8217, 11, 60.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) }),
-	FIREPIT_WITH_POT (13531, 8218, 17, 80.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) }),
-	SMALL_OVEN       (13533, 8219, 24, 80.0,  new Item[] { new Item(Items.STEEL_BAR_2353, 4) }),
-	LARGE_OVEN       (13536, 8220, 29, 100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
-	BASIC_RANGE      (13539, 8221, 34, 120.0, new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
-	FANCY_RANGE      (13542, 8222, 42, 160.0, new Item[] { new Item(Items.STEEL_BAR_2353, 8) }),
+	BASIC_FIREPIT    (13528, 8216, 5,  40,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353) }),
+	FIREPIT_WITH_HOOK(13529, 8217, 11, 60,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 2) }),
+	FIREPIT_WITH_POT (13531, 8218, 17, 80,  new Item[] { new Item(Items.SOFT_CLAY_1761, 2), new Item(Items.STEEL_BAR_2353, 3) }),
+	SMALL_OVEN       (13533, 8219, 24, 80,  new Item[] { new Item(Items.STEEL_BAR_2353, 4) }),
+	LARGE_OVEN       (13536, 8220, 29, 100, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+	BASIC_RANGE      (13539, 8221, 34, 120, new Item[] { new Item(Items.STEEL_BAR_2353, 6) }),
+	FANCY_RANGE      (13542, 8222, 42, 160, new Item[] { new Item(Items.STEEL_BAR_2353, 8) }),
 
 	/**
 	 * Kitchen larders
 	 */
-	WOODEN_LARDER(13565, 8233, 9,  228.0, new Item[] { new Item(Items.PLANK_960, 8) }),
-	OAK_LARDER   (13566, 8234, 33, 480.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8) }),
-	TEAK_LARDER  (13567, 8235, 43, 750.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	WOODEN_LARDER(13565, 8233, 9,  228, new Item[] { new Item(Items.PLANK_960, 8) }),
+	OAK_LARDER   (13566, 8234, 33, 480, new Item[] { new Item(Items.OAK_PLANK_8778, 8) }),
+	TEAK_LARDER  (13567, 8235, 43, 750, new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
 
 	/**
 	 * Kitchen shelves
 	 */
-	WOODEN_SHELVES_1(13545, 8223, 6,  87.0,  new Item[] { new Item(Items.PLANK_960, 3) }),
-	WOODEN_SHELVES_2(13546, 8224, 12, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
-	WOODEN_SHELVES_3(13547, 8225, 23, 147.0, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
-	OAK_SHELVES_1   (13548, 8226, 34, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
-	OAK_SHELVES_2   (13549, 8227, 45, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
-	TEAK_SHELVES_1  (13550, 8228, 56, 330.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
-	TEAK_SHELVES_2  (13551, 8229, 67, 930.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) }),
+	WOODEN_SHELVES_1(13545, 8223, 6,  87,  new Item[] { new Item(Items.PLANK_960, 3) }),
+	WOODEN_SHELVES_2(13546, 8224, 12, 147, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	WOODEN_SHELVES_3(13547, 8225, 23, 147, new Item[] { new Item(Items.PLANK_960, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	OAK_SHELVES_1   (13548, 8226, 34, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	OAK_SHELVES_2   (13549, 8227, 45, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	TEAK_SHELVES_1  (13550, 8228, 56, 330, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6) }),
+	TEAK_SHELVES_2  (13551, 8229, 67, 930, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SOFT_CLAY_1761, 6), new Item(Items.GOLD_LEAF_8784, 2) }),
 
 	/**
 	 * Kitchen sinks
 	 */
-	PUMP_AND_DRAIN(13559, 8230, 7,  100.0, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
-	PUMP_AND_TUB  (13561, 8231, 27, 200.0, new Item[] { new Item(Items.STEEL_BAR_2353, 10) }),
-	SINK          (13563, 8232, 47, 300.0, new Item[] { new Item(Items.STEEL_BAR_2353, 15) }),
+	PUMP_AND_DRAIN(13559, 8230, 7,  100, new Item[] { new Item(Items.STEEL_BAR_2353, 5) }),
+	PUMP_AND_TUB  (13561, 8231, 27, 200, new Item[] { new Item(Items.STEEL_BAR_2353, 10) }),
+	SINK          (13563, 8232, 47, 300, new Item[] { new Item(Items.STEEL_BAR_2353, 15) }),
 
 	/**
 	 * Kitchen cat baskets/blankets
 	 */
-	CAT_BLANKET          (13574, 8236, 5,  15.0, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) }),
-	CAT_BASKET           (13575, 8237, 19, 58.0, new Item[] { new Item(Items.PLANK_960, 2) }),
-	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58.0, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) }),
+	CAT_BLANKET          (13574, 8236, 5,  15, new Item[] { new Item(Items.BOLT_OF_CLOTH_8790) }),
+	CAT_BASKET           (13575, 8237, 19, 58, new Item[] { new Item(Items.PLANK_960, 2) }),
+	CAST_BASKET_CUSHIONED(13576, 8238, 33, 58, new Item[] { new Item(Items.PLANK_960, 2), new Item(Items.WOOL_1737, 2) }),
 
 	/**
 	 * Dining room tables
 	 */
-	DINING_TABLE_WOOD       (13293, 8246, 10, 115.0,   new Item[] { new Item(Items.PLANK_960, 4) }),
-	DINING_TABLE_OAK        (13294, 8247, 22, 240.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360.0,   new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
-	DINING_TABLE_TEAK       (13296, 8248, 38, 360.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600.0,   new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840.0,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
-	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) }),
+	DINING_TABLE_WOOD       (13293, 8246, 10, 115,  new Item[] { new Item(Items.PLANK_960, 4) }),
+	DINING_TABLE_OAK        (13294, 8247, 22, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	DINING_TABLE_CARVED_OAK (13295, 8247, 31, 360,  new Item[] { new Item(Items.OAK_PLANK_8778, 6) }),
+	DINING_TABLE_TEAK       (13296, 8248, 38, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	DINING_TABLE_CARVED_TEAK(13297, 8248, 45, 600,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	DINING_TABLE_MAHOGANY   (13298, 8120, 52, 840,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+	DINING_TABLE_OPULENT    (13299, 8121, 72, 3100, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4), new Item(Items.GOLD_LEAF_8784, 4), new Item(Items.MARBLE_BLOCK_8786, 2) }),
 
 	/**
 	 * Dining room benches
 	 */
-	BENCH_WOODEN     (13300, 8108, 10, 115.0,  new Item[] { new Item(Items.PLANK_960, 4) }),
-	BENCH_OAK        (13301, 8109, 22, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	BENCH_CARVED_OAK (13302, 8110, 31, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	BENCH_TEAK       (13303, 8111, 38, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	BENCH_CARVED_TEAK(13304, 8112, 44, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	BENCH_MAHOGANY   (13305, 8113, 52, 560.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
-	BENCH_GILDED     (13306, 8114, 61, 1760.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
+	BENCH_WOODEN     (13300, 8108, 10, 115,  new Item[] { new Item(Items.PLANK_960, 4) }),
+	BENCH_OAK        (13301, 8109, 22, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BENCH_CARVED_OAK (13302, 8110, 31, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BENCH_TEAK       (13303, 8111, 38, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	BENCH_CARVED_TEAK(13304, 8112, 44, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	BENCH_MAHOGANY   (13305, 8113, 52, 560,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 6) }),
+	BENCH_GILDED     (13306, 8114, 61, 1760, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
 
 	/**
 	 * Dining room bell-pulls
 	 */
-	ROPE_PULL      (13307, 8099, 5,  15.0, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) }),
-	BELL_PULL      (13308, 8100, 19, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
-	FANCY_BELL_PULL(13309, 8101, 33, 58.0, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) }),
+	ROPE_PULL      (13307, 8099, 5,  15, new Item[] { new Item(Items.ROPE_954), new Item(Items.OAK_PLANK_8778) }),
+	BELL_PULL      (13308, 8100, 19, 58, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	FANCY_BELL_PULL(13309, 8101, 33, 58, new Item[] { new Item(Items.TEAK_PLANK_8780), new Item(Items.BOLT_OF_CLOTH_8790, 2), new Item(Items.GOLD_LEAF_8784) }),
 
 	/**
 	 * Workshop workbench
 	 */
-	WORKBENCH_WOODEN     (13704, 8375, 17, 143.0,  new Item[] { new Item(Items.PLANK_960, 5) }),
-	WORKBENCH_OAK        (13705, 8376, 32, 300.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
-	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) }),
-	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750.0,  new Item[] { new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
-	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000.0, new Item[] { new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
+	WORKBENCH_WOODEN     (13704, 8375, 17, 143,  new Item[] { new Item(Items.PLANK_960, 5) }),
+	WORKBENCH_OAK        (13705, 8376, 32, 300,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	WORKBENCH_STEEL_FRAME(13706, 8377, 46, 440,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.STEEL_BAR_2353, 4) }),
+	WORKBENCH_WITH_VICE  (13707, 8378, 62, 750,  new Item[] { new Item(Items.STEEL_FRAMED_BENCH_8377), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
+	WORKBENCH_WITH_LATHE (13708, 8379, 77, 1000, new Item[] { new Item(Items.OAK_WORKBENCH_8376), new Item(Items.OAK_PLANK_8778, 2), new Item(Items.STEEL_BAR_2353) }),
 
 	/**
 	 * Workshop repair benches/stands
 	 */
-	REPAIR_BENCH(13713, 8389, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	WHETSTONE   (13714, 8390, 35, 260.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) }),
-	ARMOUR_STAND(13715, 8391, 55, 500.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) }),
+	REPAIR_BENCH(13713, 8389, 15, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	WHETSTONE   (13714, 8390, 35, 260, new Item[] { new Item(Items.OAK_PLANK_8778, 4), new Item(Items.LIMESTONE_BRICK_3420) }),
+	ARMOUR_STAND(13715, 8391, 55, 500, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.LIMESTONE_BRICK_3420) }),
 
 	/**
 	 * Workshop easels
 	 */
-	PLUMING_STAND(13716, 8392, 16, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	SHIELD_EASEL (13717, 8393, 41, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	BANNER_EASEL (13718, 8394, 66, 510.0, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
+	PLUMING_STAND(13716, 8392, 16, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	SHIELD_EASEL (13717, 8393, 41, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	BANNER_EASEL (13718, 8394, 66, 510, new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 2) }),
 
 	/**
 	 * Workshop crafting tables
 	 * 	TODO: These are upgradable hotspots, therefore crafting table 3 would require
 	 * 	crafting table 2 to be already built in that spot.
 	 */
-	CRAFTING_TABLE_1(13709, 8380, 16, 240.0, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	CRAFTING_TABLE_2(13710, 8381, 25, 1.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775) }),
-	CRAFTING_TABLE_3(13711, 8382, 34, 2.0,   new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) }),
-	CRAFTING_TABLE_4(13712, 8383, 42, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	CRAFTING_TABLE_1(13709, 8380, 16, 240, new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	CRAFTING_TABLE_2(13710, 8381, 25, 1,   new Item[] { new Item(Items.MOLTEN_GLASS_1775) }),
+	CRAFTING_TABLE_3(13711, 8382, 34, 2,   new Item[] { new Item(Items.MOLTEN_GLASS_1775, 2) }),
+	CRAFTING_TABLE_4(13712, 8383, 42, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
 
 	/**
 	 * Workshop tool stores
 	 * 	These are also upgradable just like the tables above.
 	 */
-	TOOL_STORE_1(13699, 8384, 15, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TOOL_STORE_2(13700, 8385, 25, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TOOL_STORE_3(13701, 8386, 35, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TOOL_STORE_4(13702, 8387, 44, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TOOL_STORE_5(13703, 8388, 55, 120.0, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_1(13699, 8384, 15, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_2(13700, 8385, 25, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_3(13701, 8386, 35, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_4(13702, 8387, 44, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TOOL_STORE_5(13703, 8388, 55, 120, new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
 
 	/**
 	 * Wall-mounted decorations
 	 */
-	OAK_DECORATION   (13606, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TEAK_DECORATION  (13606, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
-	GILDED_DECORATION(13607, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
+	OAK_DECORATION   (13606, 8102, 16, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_DECORATION  (13606, 8103, 36, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	GILDED_DECORATION(13607, 8104, 56, 1020, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
 
 	/**
 	 * Staircases.
 	 */
-	OAK_STAIRCASE   (13497, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
-	TEAK_STAIRCASE  (13499, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
-	SPIRAL_STAIRCASE(13503, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
-	MARBLE_STAIRCASE(13501, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
-	MARBLE_SPIRAL   (13505, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
+	OAK_STAIRCASE   (13497, 8249, 27, 680,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	TEAK_STAIRCASE  (13499, 8252, 48, 980,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	SPIRAL_STAIRCASE(13503, 8258, 67, 1040, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+	MARBLE_STAIRCASE(13501, 8257, 82, 3200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+	MARBLE_SPIRAL   (13505, 8259, 97, 4400, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
 
 	/**
 	 * Staircases going down.
 	 */
-	OAK_STAIRS_DOWN   (13498, 8249, 27, 680.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
-	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
-	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
-	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
-	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
+	OAK_STAIRS_DOWN   (13498, 8249, 27, 680,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	TEAK_STAIRS_DOWN  (13500, 8252, 48, 980,  new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 4) }),
+	SPIRAL_STAIRS_DOWN(13504, 8258, 67, 1040, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.LIMESTONE_BRICK_3420, 7) }),
+	MARBLE_STAIRS_DOWN(13502, 8257, 82, 3200, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MARBLE_BLOCK_8786, 5) }),
+	MARBLE_SPIRAL_DOWN(13506, 8259, 97, 4400, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.MARBLE_BLOCK_8786, 7) }),
 
 	/**
 	 * Portal room decorations.
 	 */
-	TEAK_PORTAL              (13636, 8328, 50, 270.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
-	MAHOGANY_PORTAL          (13637, 8329, 65, 420.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
-	MARBLE_PORTAL            (13638, 8330, 80, 1500.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
-	TELEPORT_FOCUS           (13640, 8331, 50, 40,     new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
-	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500.0,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
-	SCRYING_POOL             (13639, 8333, 80, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	TEAK_PORTAL              (13636, 8328, 50, 270,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3) }),
+	MAHOGANY_PORTAL          (13637, 8329, 65, 420,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+	MARBLE_PORTAL            (13638, 8330, 80, 1500, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 3) }),
+	TELEPORT_FOCUS           (13640, 8331, 50, 40,   new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 2) }),
+	GREATER_TELEPORT_FOCUS   (13641, 8332, 65, 500,  new Item[] { new Item(Items.MARBLE_BLOCK_8786) }),
+	SCRYING_POOL             (13639, 8333, 80, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
 	TEAK_VARROCK_PORTAL      (13615, true),
 	MAHOGANY_VARROCK_PORTAL  (13622, true),
 	MARBLE_VARROCK_PORTAL    (13629, true),
@@ -312,69 +312,69 @@ public enum Decoration {
 	/**
 	 * Skill hall decorations.
 	 */
-	MITHRIL_ARMOUR    (13491, 8270, 28, 135.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }),
-	ADAMANT_ARMOUR    (13492, 8271, 28, 150.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }),
-	RUNE_ARMOUR       (13493, 8272, 28, 165.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2),new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }),
-	CRAWLING_HAND     (13481, 8260, 38, 211.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }),
-	COCKATRICE_HEAD   (13482, 8261, 38, 224.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }),
-	BASILISK_HEAD     (13483, 8262, 38, 243.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }),
-	KURASK_HEAD       (13484, 8263, 58, 357.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }),
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }),
-	KBD_HEAD          (13486, 8265, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }),
-	KQ_HEAD           (13487, 8266, 78, 1103.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }),
-	MOUNTED_BASS      (13488, 8267, 36, 151.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }),
-	MOUNTED_SWORDFISH (13489, 8268, 56, 230.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }),
-	MOUNTED_SHARK     (13490, 8269, 76, 350.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }),
-	RUNE_CASE1        (13507, 8095, 41, 190.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) }),
-	RUNE_CASE2        (13508, 8095, 41, 212.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) }),
+	MITHRIL_ARMOUR    (13491, 8270, 28, 135,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }, new Item[] { new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }),
+	ADAMANT_ARMOUR    (13492, 8271, 28, 150,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }, new Item[] { new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }),
+	RUNE_ARMOUR       (13493, 8272, 28, 165,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }, new Item[] { new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }),
+	CRAWLING_HAND     (13481, 8260, 38, 211,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }, new Item[] { new Item(Items.CRAWLING_HAND_7982) }),
+	COCKATRICE_HEAD   (13482, 8261, 38, 224,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }, new Item[] { new Item(Items.COCKATRICE_HEAD_7983) }),
+	BASILISK_HEAD     (13483, 8262, 38, 243,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }, new Item[] { new Item(Items.BASILISK_HEAD_7984) }),
+	KURASK_HEAD       (13484, 8263, 58, 357,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }, new Item[] { new Item(Items.KURASK_HEAD_7985) }),
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }, new Item[] { new Item(Items.ABYSSAL_HEAD_7986) }),
+	KBD_HEAD          (13486, 8265, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }, new Item[] { new Item(Items.KBD_HEADS_7987) }),
+	KQ_HEAD           (13487, 8266, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }, new Item[] { new Item(Items.KQ_HEAD_7988) }),
+	MOUNTED_BASS      (13488, 8267, 36, 151,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }, new Item[] { new Item(Items.BIG_BASS_7990) }),
+	MOUNTED_SWORDFISH (13489, 8268, 56, 230,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }, new Item[] { new Item(Items.BIG_SWORDFISH_7992) }),
+	MOUNTED_SHARK     (13490, 8269, 76, 350,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }, new Item[] { new Item(Items.BIG_SHARK_7994) }),
+	RUNE_CASE1        (13507, 8095, 41, 190,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) }),
+	RUNE_CASE2        (13508, 8095, 41, 212,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) }),
 
 	/**
 	 * Games room decorations.
 	 */
-	CLAY_STONE     (13392, 8153, 39, 100.0,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
-	LIMESTONE_STONE(13393, 8154, 59, 200.0,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
-	MARBLE_STONE   (13394, 8155, 79, 2000.0, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
-	HOOP_AND_STICK (13398, 8162, 30, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	DARTBOARD      (13400, 8163, 54, 290.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) }),
-	ARCHERY_TARGET (13402, 8164, 81, 600.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) }),
-	BALANCE_1      (13395, 8156, 37, 176.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) }),
-	BALANCE_2      (13396, 8157, 57, 252.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) }),
-	BALANCE_3      (13397, 8158, 77, 356.0,  new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) }),
-	OAK_CHEST      (13385, 8165, 34, 240.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
-	TEAK_CHEST     (13387, 8166, 44, 660.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) }),
-	MAHOGANY_CHEST (13389, 8167, 54, 860.0,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
-	JESTER         (13390, 8159, 39, 360.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	TREASURE_HUNT  (13379, 8160, 49, 800.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) }),
-	HANGMAN        (13404, 8161, 59, 1200.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) }),
+	CLAY_STONE     (13392, 8153, 39, 100,  new Item[] { new Item(Items.SOFT_CLAY_1761, 10) }),
+	LIMESTONE_STONE(13393, 8154, 59, 200,  new Item[] { new Item(Items.LIMESTONE_BRICK_3420, 10) }),
+	MARBLE_STONE   (13394, 8155, 79, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	HOOP_AND_STICK (13398, 8162, 30, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	DARTBOARD      (13400, 8163, 54, 290,  new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.STEEL_BAR_2353) }),
+	ARCHERY_TARGET (13402, 8164, 81, 600,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.STEEL_BAR_2353, 3) }),
+	BALANCE_1      (13395, 8156, 37, 176,  new Item[] { new Item(Items.FIRE_RUNE_554, 500), new Item(Items.AIR_RUNE_556, 500), new Item(Items.EARTH_RUNE_557, 500), new Item(Items.WATER_RUNE_555, 500) }),
+	BALANCE_2      (13396, 8157, 57, 252,  new Item[] { new Item(Items.FIRE_RUNE_554, 1000), new Item(Items.AIR_RUNE_556, 1000), new Item(Items.EARTH_RUNE_557, 1000), new Item(Items.WATER_RUNE_555, 1000) }),
+	BALANCE_3      (13397, 8158, 77, 356,  new Item[] { new Item(Items.FIRE_RUNE_554, 2000), new Item(Items.AIR_RUNE_556, 2000), new Item(Items.EARTH_RUNE_557, 2000), new Item(Items.WATER_RUNE_555, 2000) }),
+	OAK_CHEST      (13385, 8165, 34, 240,  new Item[] { new Item(Items.OAK_PLANK_8778, 4) }),
+	TEAK_CHEST     (13387, 8166, 44, 660,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.GOLD_LEAF_8784) }),
+	MAHOGANY_CHEST (13389, 8167, 54, 860,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784) }),
+	JESTER         (13390, 8159, 39, 360,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	TREASURE_HUNT  (13379, 8160, 49, 800,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8), new Item(Items.STEEL_BAR_2353, 4) }),
+	HANGMAN        (13404, 8161, 59, 1200, new Item[] { new Item(Items.TEAK_PLANK_8780, 12), new Item(Items.STEEL_BAR_2353, 6) }),
 
 	/**
 	* Combat room decorations.
 	*/
-	BOXING_RING        (13129, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	FENCING_RING       (13133, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	COMBAT_RING        (13137, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
-	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
-	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
-	RANGING_PEDESTALS  (13147, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
-	MAGIC_BARRIER      (13145, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
-	NOTHING            (13721, 8027, 81, 1000.0, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
-	NOTHING2           (13721, 8026, 71, 720.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
-	INVISIBLE_WALL     (15283, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	INVISIBLE_WALL2    (15284, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	INVISIBLE_WALL3    (15285, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	GLOVE_RACK         (13381, 8028, 34, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	WEAPONS_RACK       (13382, 8029, 44, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
-	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) }),
-	BOXING_MAT_CORNER  (13126, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	FENCING_MAT_CORNER (13135, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	COMBAT_MAT_CORNER  (13138, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	BOXING_MAT_SIDE    (13128, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	FENCING_MAT_SIDE   (13134, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	COMBAT_MAT_SIDE    (13139, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	BOXING_MAT         (13127, 8023, 32, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
-	FENCING_MAT        (13136, 8024, 41, 570.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
-	COMBAT_MAT         (13140, 8025, 51, 630.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BOXING_RING        (13129, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_RING       (13133, 8024, 41, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_RING        (13137, 8025, 51, 630,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BALANCE_BEAM_LEFT  (13143, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	BALANCE_BEAM_CENTER(13142, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	BALANCE_BEAM_RIGHT (13144, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	RANGING_PEDESTALS  (13147, 8026, 71, 720,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	MAGIC_BARRIER      (13145, 8026, 71, 720,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	NOTHING            (13721, 8027, 81, 1000, new Item[] { new Item(Items.TEAK_PLANK_8780, 10), new Item(Items.STEEL_BAR_2353, 5) }),
+	NOTHING2           (13721, 8026, 71, 720,  new Item[] { new Item(Items.TEAK_PLANK_8780, 8) }),
+	INVISIBLE_WALL     (15283, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	INVISIBLE_WALL2    (15284, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	INVISIBLE_WALL3    (15285, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	GLOVE_RACK         (13381, 8028, 34, 120,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	WEAPONS_RACK       (13382, 8029, 44, 180,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	EXTRA_WEAPONS_RACK (13383, 8030, 54, 440,  new Item[] { new Item(Items.TEAK_PLANK_8780, 4), new Item(Items.STEEL_BAR_2353, 4) }),
+	BOXING_MAT_CORNER  (13126, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT_CORNER (13135, 8024, 41, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT_CORNER  (13138, 8025, 51, 630,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BOXING_MAT_SIDE    (13128, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT_SIDE   (13134, 8024, 41, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT_SIDE    (13139, 8025, 51, 630,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	BOXING_MAT         (13127, 8023, 32, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 6), new Item(Items.BOLT_OF_CLOTH_8790, 4) }),
+	FENCING_MAT        (13136, 8024, 41, 570,  new Item[] { new Item(Items.OAK_PLANK_8778, 8), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
+	COMBAT_MAT         (13140, 8025, 51, 630,  new Item[] { new Item(Items.TEAK_PLANK_8780, 6), new Item(Items.BOLT_OF_CLOTH_8790, 6) }),
 
 	/**
 	 * Formal garden decorations
@@ -455,9 +455,9 @@ public enum Decoration {
 	/**
 	 * Quest hall decorations.
 	 */
-	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) }),
-	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) }),
-	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) }),
+	ANTIDRAGON_SHIELD(13522, 8282, 47, 280, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ANTI_DRAGON_SHIELD_1540) }, new Item[] { new Item(Items.ANTI_DRAGON_SHIELD_1540) }),
+	AMULET_OF_GLORY  (13523, 8283, 47, 290, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.AMULET_OF_GLORY_1704) }, new Item[] { new Item(Items.AMULET_OF_GLORY_1704) }),
+	CAPE_OF_LEGENDS  (13524, 8284, 47, 300, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.CAPE_OF_LEGENDS_1052) }, new Item[] { new Item(Items.CAPE_OF_LEGENDS_1052) }),
 	KING_ARTHUR      (13510, 8285, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ARTHUR_PORTRAIT_7995) }),
 	ELENA            (13511, 8286, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.ELENA_PORTRAIT_7996) }),
 	GIANT_DWARF      (13512, 8287, 35, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.KELDAGRIM_PORTRAIT_7997) }),
@@ -467,9 +467,9 @@ public enum Decoration {
 	MORYTANIA        (13518, 8291, 44, 314, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.MORYTANIA_PAINTING_8003) }),
 	KARAMJA          (13516, 8292, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.KARAMJA_PAINTING_8001) }),
 	ISAFDAR          (13515, 8293, 65, 464, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.ISAFDAR_PAINTING_8000) }),
-	SILVERLIGHT      (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) }),
-	EXCALIBUR        (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) }),
-	DARKLIGHT        (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) }),
+	SILVERLIGHT      (13519, 8279, 42, 187, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SILVERLIGHT_2402) }, new Item[] { new Item(Items.SILVERLIGHT_2402) }),
+	EXCALIBUR        (13521, 8280, 42, 194, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.EXCALIBUR_35) }, new Item[] { new Item(Items.EXCALIBUR_35) }),
+	DARKLIGHT        (13520, 8281, 42, 202, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.DARKLIGHT_6746) }, new Item[] { new Item(Items.DARKLIGHT_6746) }),
 	SMALL_MAP        (13525, 8294, 38, 211, new Item[] { new Item(Items.TEAK_PLANK_8780, 3), new Item(Items.SMALL_MAP_8004) }),
 	MEDIUM_MAP       (13526, 8295, 58, 451, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.MEDIUM_MAP_8005) }),
 	LARGE_MAP        (13527, 8296, 78, 591, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.LARGE_MAP_8006) }),
@@ -582,18 +582,18 @@ public enum Decoration {
 	FLOOR_TRAP       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8372, 74, 770,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.CLOCKWORK_8792, 10) }),
 	MAGIC_CIRCLE     (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8373, 82, 2700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 2) }),
 	MAGIC_CAGE       (new int[] { 13689, 13686, 13687, 13688, 13684, 13685 }, 8374, 89, 4700, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5), new Item(Items.MAGIC_STONE_8788, 4) }),
-	OAK_TRAPDOOR     (13675, 8367, 68, 300,    new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
-	TEAK_TRAPDOOR    (13676, 8368, 78, 450,    new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
-	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
-	CARVED_TEAK_BENCH(13694, 8112, 44, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	MAHOGANY_BENCH   (13695, 8113, 52, 560,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
-	GILDED_BENCH     (13696, 8114, 61, 1760,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
-	OAK_DECO         (13798, 8102, 16, 120.0,  new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	TEAK_DECO        (13814, 8103, 36, 180.0,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
-	GILDED_DECO      (13782, 8104, 56, 1020.0, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
-	ROUND_SHIELD     (13734, 8105, 66, 120,    new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
-	SQUARE_SHIELD    (13766, 8106, 76, 360,    new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
-	KITE_SHIELD      (13750, 8107, 86, 420,    new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
+	OAK_TRAPDOOR     (13675, 8367, 68, 300,   new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
+	TEAK_TRAPDOOR    (13676, 8368, 78, 450,   new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
+	MAHOGANY_TRAPDOOR(13677, 8369, 88, 700,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
+	CARVED_TEAK_BENCH(13694, 8112, 44, 360,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	MAHOGANY_BENCH   (13695, 8113, 52, 560,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4) }),
+	GILDED_BENCH     (13696, 8114, 61, 1760,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 4), new Item(Items.GOLD_LEAF_8784, 4) }),
+	OAK_DECO         (13798, 8102, 16, 120,   new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	TEAK_DECO        (13814, 8103, 36, 180,   new Item[] { new Item(Items.TEAK_PLANK_8780, 2) }),
+	GILDED_DECO      (13782, 8104, 56, 1020,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3), new Item(Items.GOLD_LEAF_8784, 2) }),
+	ROUND_SHIELD     (13734, 8105, 66, 120,   new Item[] { new Item(Items.OAK_PLANK_8778, 2) }),
+	SQUARE_SHIELD    (13766, 8106, 76, 360,   new Item[] { new Item(Items.TEAK_PLANK_8780, 4) }),
+	KITE_SHIELD      (13750, 8107, 86, 420,   new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 3) }),
 
 	/**
 	 * Oubliette
@@ -631,7 +631,7 @@ public enum Decoration {
 	BABY_RED_DRAGON    (13372, 8134, 82, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
 	HUGE_SPIDER        (13370, 8135, 86, 447,  new Item[] { new Item(Items.COINS_995, 200000) }),
 	TROLL              (13369, 8136, 90, 1000, new Item[] { new Item(Items.COINS_995, 1000000) }),
-	HELLHOUND          (2715, 8137, 94, 2236,  new Item[] { new Item(Items.COINS_995, 5000000) }),
+	HELLHOUND          (2715,  8137, 94, 2236, new Item[] { new Item(Items.COINS_995, 5000000) }),
 	OAK_LADDER         (13328, 8306, 68, 300,  new Item[] { new Item(Items.OAK_PLANK_8778, 5) }),
 	TEAK_LADDER        (13329, 8307, 78, 450,  new Item[] { new Item(Items.TEAK_PLANK_8780, 5) }),
 	MAHOGANY_LADDER    (13330, 8308, 88, 700,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 5) }),
@@ -645,17 +645,17 @@ public enum Decoration {
 	/**
 	 * Dungeon corridor, junction, stairs & pit
 	 */
-	OAK_DOOR_LEFT     (13344, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
-	OAK_DOOR_RIGHT    (13345, 8122, 74, 600,   new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
-	STEEL_DOOR_LEFT   (13346, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
-	STEEL_DOOR_RIGHT  (13347, 8123, 84, 800,   new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
-	MARBLE_DOOR_LEFT  (13348, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
-	MARBLE_DOOR_RIGHT (13349, 8124, 94, 2000,  new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
-	SPIKE_TRAP        (13356, 8143, 72, 223,   new Item[] { new Item(Items.COINS_995, 50000) }),
-	MAN_TRAP          (13357, 8144, 76, 273,   new Item[] { new Item(Items.COINS_995, 75000) }),
-	TANGLE_TRAP       (13358, 8145, 80, 316,   new Item[] { new Item(Items.COINS_995, 100000) }),
-	MARBLE_TRAP       (13359, 8146, 84, 387,   new Item[] { new Item(Items.COINS_995, 150000) }),
-	TELEPORT_TRAP     (13360, 8147, 88, 447,   new Item[] { new Item(Items.COINS_995, 200000) }),
+	OAK_DOOR_LEFT     (13344, 8122,  74, 600,  new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+	OAK_DOOR_RIGHT    (13345, 8122,  74, 600,  new Item[] { new Item(Items.OAK_PLANK_8778, 10) }),
+	STEEL_DOOR_LEFT   (13346, 8123,  84, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	STEEL_DOOR_RIGHT  (13347, 8123,  84, 800,  new Item[] { new Item(Items.OAK_PLANK_8778, 10), new Item(Items.STEEL_BAR_2353, 10) }),
+	MARBLE_DOOR_LEFT  (13348, 8124,  94, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	MARBLE_DOOR_RIGHT (13349, 8124,  94, 2000, new Item[] { new Item(Items.MARBLE_BLOCK_8786, 4) }),
+	SPIKE_TRAP        (13356, 8143,  72, 223,  new Item[] { new Item(Items.COINS_995, 50000) }),
+	MAN_TRAP          (13357, 8144,  76, 273,  new Item[] { new Item(Items.COINS_995, 75000) }),
+	TANGLE_TRAP       (13358, 8145,  80, 316,  new Item[] { new Item(Items.COINS_995, 100000) }),
+	MARBLE_TRAP       (13359, 8146,  84, 387,  new Item[] { new Item(Items.COINS_995, 150000) }),
+	TELEPORT_TRAP     (13360, 8147,  88, 447,  new Item[] { new Item(Items.COINS_995, 200000) }),
 	PIT_DOG           (39260, 18791, 70, 200,  new Item[] { new Item(Items.COINS_995, 40000) }),
 	PIT_OGRE          (39261, 18792, 73, 234,  new Item[] { new Item(Items.COINS_995, 55000) }),
 	PIT_ROCK_PROTECTOR(39262, 18793, 79, 300,  new Item[] { new Item(Items.COINS_995, 90000) }),
@@ -680,12 +680,12 @@ public enum Decoration {
 	/**
 	 * Style related decoration.
 	 */
-	BASIC_WOOD_WINDOW        (13099, -1, 1, 0.0),
-	BASIC_STONE_WINDOW       (13091, -1, 1, 0.0),
-	WHITEWASHED_STONE_WINDOW (13005, -1, 1, 0.0),
-	FREMENNIK_WINDOW         (13112, -1, 1, 0.0),
-	TROPICAL_WOOD_WINDOW     (10816, -1, 1, 0.0),
-	FANCY_STONE_WINDOW       (13117, -1, 1, 0.0),
+	BASIC_WOOD_WINDOW        (13099, -1, 1, 0),
+	BASIC_STONE_WINDOW       (13091, -1, 1, 0),
+	WHITEWASHED_STONE_WINDOW (13005, -1, 1, 0),
+	FREMENNIK_WINDOW         (13112, -1, 1, 0),
+	TROPICAL_WOOD_WINDOW     (10816, -1, 1, 0),
+	FANCY_STONE_WINDOW       (13117, -1, 1, 0),
 	;
 
 	/**
@@ -706,7 +706,7 @@ public enum Decoration {
 	/**
 	 * The experience gained for building this decoration.
 	 */
-	private final double experience;
+	private final int experience;
 
 	/**
 	 * The item required.
@@ -740,7 +740,7 @@ public enum Decoration {
 	 * @param level The level required.
 	 * @param experience The experience gained.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience) {
+	Decoration(int objectId, int interfaceItem, int level, int experience) {
 		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, new Item[] {}, new Item[] {});
 	}
 
@@ -752,7 +752,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience, Item[] items) {
+	Decoration(int objectId, int interfaceItem, int level, int experience, Item[] items) {
 		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
 	}
 
@@ -765,10 +765,23 @@ public enum Decoration {
 	 * @param tools The tools needed.
 	 * @param items The items required.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
+	Decoration(int objectId, int interfaceItem, int level, int experience, int[] tools, Item[] items) {
 		this(objectId, interfaceItem, level, experience, tools, items, new Item[] {});
 	}
 
+	/**
+	 * Constructs a new object, no tools.
+	 * @param objectId The object id.
+	 * @param interfaceItem The item id for the building interface.
+	 * @param level The level required.
+	 * @param experience The experience gained.
+	 * @param items The items required.
+	 * @param refundItems The items to be refunded when the item is removed.
+	 */
+	Decoration(int objectId, int interfaceItem, int level, int experience, Item[] items, Item[] refundItems) {
+		this(objectId, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, refundItems);
+	}
+
 	/**
 	 * Constructs a new object.
 	 * @param objectId The object id.
@@ -779,7 +792,7 @@ public enum Decoration {
 	 * @param items The items required.
 	 * @param refundItems The items to be refunded when the item is removed.
 	 */
-	Decoration(int objectId, int interfaceItem, int level, double experience, int[] tools, Item[] items, Item[] refundItems) {
+	Decoration(int objectId, int interfaceItem, int level, int experience, int[] tools, Item[] items, Item[] refundItems) {
 		this.objectId = objectId;
 		this.objectIds = null;
 		this.interfaceItem = interfaceItem;
@@ -808,7 +821,7 @@ public enum Decoration {
 	 * @param experience The experience gained.
 	 * @param items The items required.
 	 */
-	Decoration(int[] objectIds, int interfaceItem, int level, double experience, Item[] items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, int experience, Item[] items) {
 		this(objectIds, interfaceItem, level, experience, new int[] { Items.HAMMER_2347, Items.SAW_8794 }, items, new Item[] {});
 	}
 	/**
@@ -820,7 +833,7 @@ public enum Decoration {
 	 * @param tools The tools needed.
 	 * @param items The items required.
 	 */
-	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item[] items) {
+	Decoration(int[] objectIds, int interfaceItem, int level, int experience, int[] tools, Item[] items) {
 		this(objectIds, interfaceItem, level, experience, tools, items, new Item[] {});
 	}
 
@@ -834,7 +847,7 @@ public enum Decoration {
 	 * @param items The items required.
 	 * @param refundItems The items to be refunded when the item is removed.
 	 */
-	Decoration(int[] objectIds, int interfaceItem, int level, double experience, int[] tools, Item[] items, Item[] refundItems) {
+	Decoration(int[] objectIds, int interfaceItem, int level, int experience, int[] tools, Item[] items, Item[] refundItems) {
 		this.objectId = objectIds[0];
 		this.objectIds = objectIds;
 		this.interfaceItem = interfaceItem;
@@ -938,7 +951,7 @@ public enum Decoration {
 	 * Gets the experience.
 	 * @return The experience.
 	 */
-	public double getExperience() {
+	public int getExperience() {
 		return experience;
 	}
 
-- 
GitLab


From 18c04b7ddf285b5d10d8eed35468b80eda4de055 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 19:25:32 -0400
Subject: [PATCH 11/13] Hook up refund stuff

---
 .../global/skill/construction/BuildingUtils.java     |  5 ++++-
 .../global/skill/construction/Decoration.java        | 12 +++++++++---
 .../decoration/questhall/MountedGlory.kt             |  5 ++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/BuildingUtils.java b/Server/src/main/content/global/skill/construction/BuildingUtils.java
index d67a3465a5..02bfbd9c28 100644
--- a/Server/src/main/content/global/skill/construction/BuildingUtils.java
+++ b/Server/src/main/content/global/skill/construction/BuildingUtils.java
@@ -369,7 +369,10 @@ public final class BuildingUtils {
 			if (objectId == object.getId() && hotspot.getCurrentX() == l.getChunkOffsetX() && hotspot.getCurrentY() == l.getChunkOffsetY()) {
 				player.animate(REMOVE_ANIMATION);
 				removeDecoration(player, region, room, hotspot, object, style);
-				// Refund shuizzle here
+				Decoration decoration = Decoration.forObjectId(object.getId());
+				for (Item item : decoration.getRefundItems()) {
+					addItemOrDrop(player, item.getId(), item.getAmount());
+				}
 				break;
 			}
 		}
diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 093d6b2d11..14f2616c12 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -1,6 +1,4 @@
 package content.global.skill.construction;
-
-
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.game.node.scenery.Scenery;
@@ -9,7 +7,7 @@ import org.rs09.consts.Items;
 
 /**
  * Represents the decorations.
- * @author Emperor
+ * @author Emperor, Player Name
  *
  */
 public enum Decoration {
@@ -963,6 +961,14 @@ public enum Decoration {
 		return items;
 	}
 
+	/**
+	 * Gets the refund items.
+	 * @return The refund items.
+	 */
+	public Item[] getRefundItems() {
+		return refundItems;
+	}
+
 	/**
 	 * Gets the tools.
 	 * @return The tools.
diff --git a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
index 7c68d5f768..47051e46f1 100644
--- a/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/questhall/MountedGlory.kt
@@ -4,8 +4,10 @@ import core.api.playGlobalAudio
 import core.api.teleport
 import core.game.interaction.IntType
 import core.game.interaction.InteractionListener
+import core.game.node.Node
 import core.game.node.entity.player.Player
 import core.game.node.item.Item
+import core.game.node.scenery.Scenery
 import core.game.system.task.Pulse
 import core.game.world.map.Location
 import core.game.world.update.flag.context.Animation
@@ -48,8 +50,9 @@ class MountedGlory : InteractionListener {
         }
     }
     private fun mountedGloryAction(player : Player, `object` : Node, int : Int) {
-        if (player.houseManager.isBuildingMode()) {
+        if (player.houseManager.isBuildingMode) {
             player.dialogueInterpreter.open("con:removedec", `object` as Scenery)
+            return
         }
         if (!player.zoneMonitor.teleport(1, Item(Items.AMULET_OF_GLORY_1704))) {
             return
-- 
GitLab


From 8663ccb362646ba9bcc3b0fdbad5b1d788c079bf Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Tue, 2 Jul 2024 19:51:41 -0400
Subject: [PATCH 12/13] do not give back fish and heads

---
 .../global/skill/construction/Decoration.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/Decoration.java b/Server/src/main/content/global/skill/construction/Decoration.java
index 14f2616c12..6229dff82d 100644
--- a/Server/src/main/content/global/skill/construction/Decoration.java
+++ b/Server/src/main/content/global/skill/construction/Decoration.java
@@ -313,16 +313,16 @@ public enum Decoration {
 	MITHRIL_ARMOUR    (13491, 8270, 28, 135,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }, new Item[] { new Item(Items.MITHRIL_FULL_HELM_1159, 1), new Item(Items.MITHRIL_PLATEBODY_1121, 1), new Item(Items.MITHRIL_PLATESKIRT_1085, 1) }),
 	ADAMANT_ARMOUR    (13492, 8271, 28, 150,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }, new Item[] { new Item(Items.ADAMANT_FULL_HELM_1161, 1), new Item(Items.ADAMANT_PLATEBODY_1123, 1), new Item(Items.ADAMANT_PLATESKIRT_1091, 1) }),
 	RUNE_ARMOUR       (13493, 8272, 28, 165,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }, new Item[] { new Item(Items.RUNE_FULL_HELM_1163, 1), new Item(Items.RUNE_PLATEBODY_1127, 1), new Item(Items.RUNE_PLATESKIRT_1093, 1) }),
-	CRAWLING_HAND     (13481, 8260, 38, 211,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }, new Item[] { new Item(Items.CRAWLING_HAND_7982) }),
-	COCKATRICE_HEAD   (13482, 8261, 38, 224,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }, new Item[] { new Item(Items.COCKATRICE_HEAD_7983) }),
-	BASILISK_HEAD     (13483, 8262, 38, 243,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }, new Item[] { new Item(Items.BASILISK_HEAD_7984) }),
-	KURASK_HEAD       (13484, 8263, 58, 357,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }, new Item[] { new Item(Items.KURASK_HEAD_7985) }),
-	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }, new Item[] { new Item(Items.ABYSSAL_HEAD_7986) }),
-	KBD_HEAD          (13486, 8265, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }, new Item[] { new Item(Items.KBD_HEADS_7987) }),
-	KQ_HEAD           (13487, 8266, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }, new Item[] { new Item(Items.KQ_HEAD_7988) }),
-	MOUNTED_BASS      (13488, 8267, 36, 151,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }, new Item[] { new Item(Items.BIG_BASS_7990) }),
-	MOUNTED_SWORDFISH (13489, 8268, 56, 230,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }, new Item[] { new Item(Items.BIG_SWORDFISH_7992) }),
-	MOUNTED_SHARK     (13490, 8269, 76, 350,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }, new Item[] { new Item(Items.BIG_SHARK_7994) }),
+	CRAWLING_HAND     (13481, 8260, 38, 211,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.CRAWLING_HAND_7982) }),
+	COCKATRICE_HEAD   (13482, 8261, 38, 224,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.COCKATRICE_HEAD_7983) }),
+	BASILISK_HEAD     (13483, 8262, 38, 243,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BASILISK_HEAD_7984) }),
+	KURASK_HEAD       (13484, 8263, 58, 357,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KURASK_HEAD_7985) }),
+	ABYSSAL_DEMON_HEAD(13485, 8264, 58, 389,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.ABYSSAL_HEAD_7986) }),
+	KBD_HEAD          (13486, 8265, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KBD_HEADS_7987) }),
+	KQ_HEAD           (13487, 8266, 78, 1103, new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.KQ_HEAD_7988) }),
+	MOUNTED_BASS      (13488, 8267, 36, 151,  new Item[] { new Item(Items.OAK_PLANK_8778, 2), new Item(Items.BIG_BASS_7990) }),
+	MOUNTED_SWORDFISH (13489, 8268, 56, 230,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.BIG_SWORDFISH_7992) }),
+	MOUNTED_SHARK     (13490, 8269, 76, 350,  new Item[] { new Item(Items.MAHOGANY_PLANK_8782, 2), new Item(Items.BIG_SHARK_7994) }),
 	RUNE_CASE1        (13507, 8095, 41, 190,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.FIRE_RUNE_554, 1), new Item(Items.AIR_RUNE_556, 1), new Item(Items.EARTH_RUNE_557, 1), new Item(Items.WATER_RUNE_555, 1) }),
 	RUNE_CASE2        (13508, 8095, 41, 212,  new Item[] { new Item(Items.TEAK_PLANK_8780, 2), new Item(Items.MOLTEN_GLASS_1775, 2), new Item(Items.BODY_RUNE_559, 1), new Item(Items.COSMIC_RUNE_564, 1), new Item(Items.CHAOS_RUNE_562, 1), new Item(Items.NATURE_RUNE_561, 1) }),
 
-- 
GitLab


From 2da34203b365706f74f0ef7c6055b4f869e66c84 Mon Sep 17 00:00:00 2001
From: Player Name <none>
Date: Sat, 13 Jul 2024 14:41:45 -0400
Subject: [PATCH 13/13] what the fuck

---
 .../src/main/content/global/skill/construction/BuildHotspot.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Server/src/main/content/global/skill/construction/BuildHotspot.java b/Server/src/main/content/global/skill/construction/BuildHotspot.java
index 4041213862..c5ca6c8e7b 100644
--- a/Server/src/main/content/global/skill/construction/BuildHotspot.java
+++ b/Server/src/main/content/global/skill/construction/BuildHotspot.java
@@ -229,7 +229,6 @@ public enum BuildHotspot {
 	CRYSTAL_BALL(15422, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.CRYSTAL_BALL, Decoration.ELEMENTAL_SPHERE, Decoration.CRYSTAL_OF_POWER),
 	BOOKCASE3(15425, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.WOODEN_BOOKCASE, Decoration.OAK_BOOKCASE, Decoration.MAHOGANY_BOOKCASE),
 	WALL_CHART(15423, BuildHotspotType.RECURSIVE, BuildingUtils.BUILD_HIGH_ANIM, Decoration.ALCHEMICAL_CHART, Decoration.ASTRONOMICAL_CHART, Decoration.INFERNAL_CHART),
->>>>>>> f9a73ae32 (recursive hotspots)
 	TELESCOPE(15424, BuildHotspotType.INDIVIDUAL, BuildingUtils.BUILD_MID_ANIM, Decoration.TELESCOPE1, Decoration.TELESCOPE2, Decoration.TELESCOPE3),
 	
 	/**
-- 
GitLab