Merge remote-tracking branch 'upstream/master'

Server/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
     implementation files(
             "libs/PrimitiveExtensions-1.0.jar",
-            "libs/ConstLib-1.2.jar",
+            "libs/ConstLib-1.3.jar",
             "libs/json-simple-1.1.1.jar",
             "libs/markdown-jvm-0.2.4.jar",
             "libs/classgraph-4.8.98.jar",

Server/src/main/java/core/cache/def/impl/SceneryDefinition.java

@@ -5,7 +5,7 @@ import core.cache.def.Definition;
 import core.cache.misc.buffer.ByteBufferUtils;
 import core.game.interaction.OptionHandler;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import rs09.game.system.SystemLogger;
 import rs09.game.world.GameWorld;
 

Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java

@@ -16,7 +16,7 @@ import core.game.node.entity.npc.agg.AggressiveHandler;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.ActivityData;
 import core.game.node.entity.skill.summoning.familiar.Familiar;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java

@@ -4,7 +4,7 @@ import core.game.content.global.action.DigAction;
 import core.game.content.global.action.DigSpadeHandler;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java

@@ -5,7 +5,7 @@ import core.game.content.activity.ActivityManager;
 import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;

Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java

@@ -16,8 +16,8 @@ import core.game.node.entity.combat.CombatStyle;
 import core.game.node.entity.impl.PulseManager;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.ConfigurationManager.Configuration;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.communication.ClanEntry;
 import core.game.system.communication.ClanRepository;
 import core.game.system.task.Pulse;

Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java

@@ -4,7 +4,7 @@ import core.game.interaction.Option;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneBuilder;

Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java

@@ -9,8 +9,8 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.impl.ForceMovement;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java

@@ -12,7 +12,7 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/activity/guild/FishingGuild.java

@@ -9,7 +9,7 @@ import core.game.node.entity.skill.Skills;
 import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 

Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java

@@ -11,7 +11,7 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
 import core.plugin.Initializable;

Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java

@@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;

Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java

@@ -28,7 +28,7 @@ import core.game.node.entity.impl.Projectile;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java

@@ -12,7 +12,7 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.skill.Skills;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java

@@ -9,7 +9,7 @@ import core.game.node.Node;
 import core.game.node.entity.impl.ForceMovement;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java

@@ -14,7 +14,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.info.Rights;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java

@@ -11,7 +11,7 @@ import core.game.node.entity.skill.agility.AgilityHandler;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java

@@ -12,8 +12,8 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java

@@ -13,7 +13,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java

@@ -10,8 +10,8 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.combat.ImpactHandler.HitsplatType;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java

@@ -12,8 +12,8 @@ import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java

@@ -18,8 +18,8 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import kotlin.Unit;
 import rs09.game.world.GameWorld;

Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java

@@ -4,7 +4,7 @@ import core.game.interaction.Option;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneRestriction;

Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java

@@ -9,8 +9,8 @@ import core.game.node.entity.player.Player;
 import rs09.game.ai.pvmbots.PvMBotsBuilder;
 import core.game.node.entity.player.info.Rights;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java

@@ -11,7 +11,7 @@ import core.game.content.dialogue.FacialExpression;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.ConfigurationManager.Configuration;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.game.world.map.Point;
 import core.game.world.map.RegionPlane;

Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java

@@ -6,8 +6,8 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java

@@ -8,8 +8,8 @@ import core.game.node.entity.impl.Animator.Priority;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java

@@ -17,8 +17,8 @@ import core.game.node.entity.impl.ForceMovement;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.TeleportManager.TeleportType;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java

@@ -1,7 +1,7 @@
 package core.game.content.activity.pyramidplunder;
 
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 
 /**
  * Object wrapper for pyramid plunder nodes

Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java

@@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.skill.Skills;
 import core.game.node.item.Item;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.LocationLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java

@@ -8,10 +8,8 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
-import kotlin.Unit;
-import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java

@@ -15,7 +15,7 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java

@@ -20,8 +20,8 @@ import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.emote.Emotes;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 

Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java

@@ -4,7 +4,7 @@ import core.game.component.CloseEvent;
 import core.game.component.Component;
 import core.game.component.ComponentPlugin;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.CameraContext;

Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java

@@ -12,7 +12,7 @@ import core.game.node.entity.skill.Skills;
 import core.game.node.entity.skill.slayer.Tasks;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;

Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java

@@ -22,7 +22,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java

@@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 import core.plugin.Initializable;

Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java

@@ -7,7 +7,7 @@ import core.game.node.entity.impl.ForceMovement;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.ItemLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.system.task.Pulse;

Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java

@@ -13,7 +13,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType;
 import core.game.node.entity.lock.Lock;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.zone.MapZone;

Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java

@@ -19,8 +19,8 @@ import core.game.node.entity.impl.Projectile;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.audio.Audio;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java

@@ -17,7 +17,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java

@@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.combat.equipment.WeaponInterface;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java

@@ -16,7 +16,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java

@@ -19,8 +19,8 @@ import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.node.item.ItemPlugin;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java

@@ -4,8 +4,8 @@ import core.game.content.activity.ActivityPlugin;
 import core.game.content.activity.CutscenePlugin;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.build.DynamicRegion;

Server/src/main/java/core/game/content/cutscene/OrganCutScene.java

@@ -4,8 +4,8 @@ import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.content.activity.ActivityPlugin;
 import core.game.content.activity.CutscenePlugin;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java

@@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java

@@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.plugin.Initializable;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 
 /**
  * Represents the door peril dialogue.

Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java

@@ -7,8 +7,7 @@ import core.game.node.entity.skill.runecrafting.EnchantTiaraPulse;
 import core.game.node.entity.skill.runecrafting.Talisman;
 import core.game.interaction.NodeUsageEvent;
 import core.game.node.entity.player.Player;
-import core.game.node.entity.player.link.RunScript;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.Scenery;
 import kotlin.Unit;
 
 /**

Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java

@@ -6,8 +6,8 @@ import core.game.node.entity.impl.Animator.Priority;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java

@@ -2,8 +2,8 @@ package core.game.content.dialogue;
 
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;

Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java

@@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java

@@ -4,8 +4,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/global/GodType.java

@@ -5,7 +5,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java

@@ -5,7 +5,7 @@ import org.rs09.consts.Items;
 import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/global/action/DoorActionHandler.java

@@ -1,13 +1,12 @@
 package core.game.content.global.action;
 
-import core.game.interaction.DestinationFlag;
 import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.audio.Audio;
 import core.game.node.entity.player.link.diary.DiaryType;
-import core.game.node.object.Constructed;
+import core.game.node.scenery.Constructed;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.LocationLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.system.task.Pulse;

Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java

@@ -30,8 +30,8 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType;
 import core.game.node.entity.player.link.emote.Emotes;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java

@@ -33,7 +33,7 @@ import core.game.node.entity.player.link.emote.Emotes;
 import core.game.node.entity.player.link.request.RequestType;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.LocationLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.system.task.Pulse;

Server/src/main/java/core/game/content/quest/PluginInteractionManager.java

@@ -5,7 +5,7 @@ import core.game.interaction.Option;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 
 import java.util.HashMap;
 

Server/src/main/java/core/game/content/quest/free/ImpCatcher.java

@@ -5,8 +5,8 @@ import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java

@@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java

@@ -13,8 +13,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.SpellBookManager.SpellBook;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java

@@ -9,8 +9,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java

@@ -6,8 +6,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java

@@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.entity.skill.Skills;
 import core.game.node.entity.skill.agility.AgilityHandler;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;

Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java

@@ -15,13 +15,12 @@ import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
-import rs09.game.interaction.InteractionListeners;
 
 import java.util.List;
 

Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java

@@ -12,8 +12,8 @@ import core.game.node.entity.impl.Animator.Priority;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItemManager;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java

@@ -9,7 +9,7 @@ import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import rs09.game.world.GameWorld;
 import core.plugin.Plugin;
 import rs09.plugin.PluginManager;

Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java

@@ -12,7 +12,7 @@ import core.game.node.entity.player.link.HintIconManager;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 

Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java

@@ -8,7 +8,7 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.plugin.Initializable;

Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java

@@ -13,8 +13,8 @@ import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.update.flag.context.Animation;

Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java

@@ -10,8 +10,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java

@@ -3,7 +3,7 @@ package core.game.content.quest.free.therestlessghost;
 import core.game.interaction.NodeUsageEvent;
 import core.game.interaction.UseWithHandler;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
 

Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java

@@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java

@@ -4,7 +4,7 @@ import core.game.interaction.MovementPulse;
 import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
 import core.game.content.quest.PluginInteraction;

Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java

@@ -3,7 +3,7 @@ package core.game.content.quest.members.fishingcontest;
 import core.game.interaction.MovementPulse;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java

@@ -5,8 +5,8 @@ import core.game.node.entity.skill.Skills;
 import core.game.node.entity.skill.herblore.Herbs;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import core.game.world.update.flag.context.Animation;
 import rs09.plugin.PluginManager;

Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java

@@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 

Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java

@@ -13,7 +13,7 @@ import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.entity.skill.gather.GatheringSkillPulse;
 import core.game.node.entity.skill.gather.SkillingTool;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.system.task.Pulse;
 import core.game.world.map.Location;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java

@@ -5,8 +5,8 @@ import core.game.content.activity.CutscenePlugin;
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;
 

Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java

@@ -6,7 +6,7 @@ import core.game.node.Node;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.plugin.Plugin;
 
 /**

Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java

@@ -20,8 +20,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java

@@ -5,7 +5,7 @@ import core.game.interaction.MovementPulse;
 import core.game.interaction.NodeUsageEvent;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java

@@ -4,8 +4,8 @@ import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 

Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java

@@ -23,8 +23,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java

@@ -19,8 +19,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.LocationLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.system.task.Pulse;

Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java

@@ -9,8 +9,8 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.impl.Projectile;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java

@@ -11,10 +11,8 @@ import core.game.node.entity.combat.ImpactHandler;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.quest.Quest;
-import core.game.node.item.GroundItem;
-import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
 import core.plugin.Plugin;

Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java

@@ -2,6 +2,7 @@ package core.game.content.quest.miniquest.barcrawl;
 
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
+import core.plugin.Initializable;
 import rs09.game.world.GameWorld;
 import core.game.content.dialogue.DialogueInterpreter;
 import core.game.content.dialogue.DialoguePlugin;
@@ -11,12 +12,13 @@ import core.game.content.dialogue.DialoguePlugin;
  * @author 'Vexia
  * @version 1.0
  */
+@Initializable
 public final class BarcrawlDialogue extends DialoguePlugin {
 
     /**
      * The npc id being used.
      */
-    private BarcrawlPlugin.BarcrawlType type;
+    private BarcrawlType type;
 
     /**
      * The npc id.
@@ -48,7 +50,7 @@ public final class BarcrawlDialogue extends DialoguePlugin {
     @Override
     public boolean open(Object... args) {
         npcId = (Integer) args[0];
-        type = (BarcrawlPlugin.BarcrawlType) args[1];
+        type = (BarcrawlType) args[1];
         player("I'm doing Alfred Grimhand's Barcrawl.");
         return true;
     }

Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java

@@ -1,382 +0,0 @@
-package core.game.content.quest.miniquest.barcrawl;
-
-import core.cache.def.impl.NPCDefinition;
-import core.game.node.entity.skill.Skills;
-import core.game.interaction.OptionHandler;
-import core.game.node.Node;
-import core.game.node.entity.combat.ImpactHandler.HitsplatType;
-import core.game.node.entity.player.Player;
-import core.game.node.item.Item;
-import core.game.system.task.Pulse;
-import rs09.game.world.GameWorld;
-import core.net.packet.PacketRepository;
-import core.net.packet.context.CameraContext;
-import core.net.packet.context.CameraContext.CameraType;
-import core.net.packet.out.CameraViewPacket;
-import core.plugin.Plugin;
-import rs09.plugin.PluginManager;
-import core.plugin.Initializable;
-import core.tools.StringUtils;
-
-/**
- * Handles the barcrawl npc interactions.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class BarcrawlPlugin extends OptionHandler {
-
-	@Override
-	public Plugin<Object> newInstance(Object arg) throws Throwable {
-		for (BarcrawlType type : BarcrawlType.values()) {
-			for (int npc : type.getNpc()) {
-				NPCDefinition.forId(npc).getHandlers().put("option:talk-to", this);
-			}
-		}
-		PluginManager.definePlugin(new BarcrawlDialogue());
-		return this;
-	}
-
-	@Override
-	public boolean handle(Player player, Node node, String option) {
-		final BarcrawlType type = BarcrawlType.forId(node.getId());
-		if (player.getBarcrawlManager().isFinished() || !player.getBarcrawlManager().isStarted() || player.getBarcrawlManager().isCompleted(type.ordinal())) {
-			player.getDialogueInterpreter().open(node.getId(), node);
-		} else {
-			player.getDialogueInterpreter().open("barcrawl dialogue", node.getId(), type);
-		}
-		return true;
-	}
-
-	/**
-	 * A barcrawl type npc.
-	 * @author 'Vexia
-	 * @version 1.0
-	 */
-	public enum BarcrawlType {
-		BLUE_MOON(733, 50, "Uncle Humphrey's Gutrot", new String[] { "Oh no not another of you guys. These barbarian", "barcrawls cause too much damage to my bar." }, new String[] { "You're going to have to pay me 50 gold for the Uncle", "Humphrey's Gutrot." }) {
-			@Override
-			public void effect(final Player player) {
-				player.sendChat("Blearrgh!");
-				player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL);
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.SMITHING);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("Your insides feel terrible.", "The bartender signs your card.");
-				} else {
-					player.getPacketDispatch().sendMessages("You buy some " + getName() + ".", "You drink the " + getName() + ".");
-				}
-			}
-		},
-		BLUEBERRY_BAR(848, 10, "Fire Toad Blast", new String[] { "Ah, you've come to the best stop on your list! I'll give", "you my famous Fire Toad last! It'll cost you 10", "coins." }) {
-			@Override
-			public void effect(final Player player) {
-				player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessage("Blueberry signs your card.");
-				} else {
-					super.message(player, start);
-					player.getPacketDispatch().sendMessage("Your mouth and throat burns as you gulp it down.");
-				}
-			}
-
-		},
-		DEADMAN_CHEST(735, 15, "Supergrog", new String[] { "Haha time to be breaking out the old Supergrog. That'll", "be 15 coins please." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.HERBLORE, Skills.CONSTRUCTION, Skills.PRAYER);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("You stagger backwards.", "You think you see 2 bartenders signing 2 barcrawl cards.");
-				} else {
-					player.getPacketDispatch().sendMessages("The bartender serves you a glass of strange thick dark liquid.", "You wince and drink it.");
-				}
-			}
-
-		},
-		DRAGON_INN(739, 12, "Fire Brandy", new String[] { "I suppose you'll be wanting some Fire Brandy. That'll", "cost you 12 coins." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("Your vision blurs and you stagger slightly.", "You can just about make out the bartender signing your barcrawl card.");
-				} else {
-					player.getPacketDispatch().sendMessages("The bartender hands you a small glass and sets light to the contents.", "You blow out the flame and drink it.");
-				}
-			}
-
-		},
-		FLYING_HORSE_INN(737, 8, "Heart Stopper", new String[] { "Fancy a bit of Heart Stopper then do you? It'll only be", "8 coins." }) {
-			@Override
-			public void effect(final Player player) {
-				player.getImpactHandler().manualHit(player, (int) (player.getSkills().getLevel(Skills.HITPOINTS) * 0.15), HitsplatType.NORMAL);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("You clutch your chest.", "Through your tears you see the bartender...", "signing your barcrawl card.");
-				} else {
-					player.getPacketDispatch().sendMessages("The bartender hands you a shot of Heart Stopper.", "You grimace and drink it.");
-				}
-			}
-		},
-		FORESTERS_ARMS(738, 18, "Liverbane Ale", new String[] { "Oh you're a barbarian then. Now which of these barrels", "contained the Liverbane Ale? That'll be 18 coins please." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, Skills.ATTACK, Skills.DEFENCE, Skills.FLETCHING, Skills.FIREMAKING, Skills.WOODCUTTING);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("The room seems to be swaying.", "The bartender scrawls his signature on your card.");
-				} else {
-					player.getPacketDispatch().sendMessages("The bartender gives you a glass of Liverbane Ale.", "You gulp it down.");
-				}
-			}
-
-		},
-		JOLLY_BOAR(731, 10, "Olde Suspiciouse", new String[] { "Ah, there seems to be a fair few doing that one these", "days. My supply of Olde suspiciouse is starting to run", "low, it'll cost you 10 coins." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.MINING, Skills.CRAFTING, Skills.MAGIC);
-				player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL);
-				player.getDialogueInterpreter().sendDialogues(player, null, "Thanksh very mush...");
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("Your head is spinning.", "The bartender signs your card.");
-				} else {
-					player.getPacketDispatch().sendMessages("You buy a pint of Olde Suspiciouse.", "You gulp it down.");
-				}
-			}
-		},
-		KARAMJA_SPIRITS(568, 7, "Ape Bite Liqueur", new String[] { "Ah, you'll be wanting some Ape Bite Liqueur then. It's", "got a lovely bannana taste, and it'll only cost you 7", "coins." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("Zamo signs your card.");
-					player.getDialogueInterpreter().sendDialogues(player, null, "Mmmmm, dat was luverly...");
-				} else {
-					player.getPacketDispatch().sendMessages("You buy some Ape Bite liqueur.", "You swirl it around and swallow it.");
-				}
-			}
-
-		},
-		RISING_SUNN_INN(new int[] { 3217, 736 }, 70, "Hand of Death Cocktail", new String[] { "Heehee, this'll be fun!" }, new String[] { "You'll be after our Hand of Death cocktail, then. Lots", "of expensive parts to the cocktail, though, so it will cost", "you 70 coins." }) {
-			@Override
-			public void effect(final Player player) {
-				addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.RANGE, Skills.FIREMAKING);
-				player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL);
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					player.getPacketDispatch().sendMessages("The barmaid giggles.", "The barmaid signs your card.");
-				} else {
-					PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.SHAKE, 4, 4, 1, 4, 4));
-					GameWorld.getPulser().submit(new Pulse(3, player) {
-						@Override
-						public boolean pulse() {
-							PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.RESET, 4, 4, 1, 4, 4));
-							return true;
-						}
-					});
-					player.getPacketDispatch().sendMessages("You buy a Hand of Death cocktail.", "You drink the cocktail.", "You stumble around the room.");
-				}
-			}
-		},
-		RUSTY_ANCHOR_INN(734, 8, "Black Skull Ale", new String[] { "Okay, one Black Skull Ale coming up. Eight coins, please." }) {
-			@Override
-			public void effect(final Player player) {
-				player.sendChat("Hiccup!");
-			}
-
-			@Override
-			public void message(final Player player, boolean start) {
-				if (!start) {
-					super.message(player, start);
-				} else {
-					player.getPacketDispatch().sendMessages("You buy a Black Skull Ale...", "You drink your Black Skull Ale...", "Your vision blurs.");
-				}
-			}
-		};
-
-		/**
-		 * The npc id.
-		 */
-		private final int[] npc;
-
-		/**
-		 * The name.
-		 */
-		private final String name;
-
-		/**
-		 * The coin required.
-		 */
-		private final Item coins;
-
-		/**
-		 * The dialogue to use.
-		 */
-		private final String[][] dialogue;
-
-		/**
-		 * Constructs a new {@code BarcrawlType} {@code Object}.
-		 * @param npc the npc.
-		 * @param name the name.
-		 * @param coins the coins.
-		 * @param dialogue the dialogue.
-		 */
-		private BarcrawlType(int npc, Item coins, String name, String[][] dialogue) {
-			this.npc = new int[] { npc };
-			this.name = name;
-			this.coins = coins;
-			this.dialogue = dialogue;
-		}
-
-		/**
-		 * Constructs a new {@code BarcrawlType} {@code Object}.
-		 * @param npc the npc.
-		 * @param coins the coins.
-		 */
-		private BarcrawlType(int npc, int coins, final String name, String[] first, String[] second) {
-			this.npc = new int[] { npc };
-			this.name = name;
-			this.coins = new Item(995, coins);
-			this.dialogue = new String[][] { first, second };
-		}
-
-		/**
-		 * Constructs a new {@code BarcrawlType} {@code Object}.
-		 * @param npc the npc.
-		 * @param coins the coins.
-		 * @param first the first dial.
-		 * @param second the second dial.
-		 */
-		private BarcrawlType(int[] npc, int coins, String name, String[] first, String[] second) {
-			this.npc = npc;
-			this.name = name;
-			this.coins = new Item(995, coins);
-			this.dialogue = new String[][] { first, second };
-		}
-
-		/**
-		 * Constructs a new {@code BarcrawlType} {@code Object}.
-		 * @param npc the npc.
-		 * @param coins the coins.
-		 */
-		private BarcrawlType(int npc, int coins, String name, String[] first) {
-			this.npc = new int[] { npc };
-			this.name = name;
-			this.coins = new Item(995, coins);
-			this.dialogue = new String[][] { first };
-		}
-
-		/**
-		 * Method used to effect the player.
-		 * @param player the player.
-		 */
-		public void effect(final Player player) {
-
-		}
-
-		/**
-		 * Method used to message the player.
-		 * @param player the player.
-		 * @param start or finish.
-		 */
-		public void message(final Player player, boolean start) {
-			if (!start) {
-				player.getPacketDispatch().sendMessage("The bartender signs your card.");
-			} else {
-				player.getPacketDispatch().sendMessage("You buy a " + (StringUtils.isPlusN(getName()) ? "an" : "a") + " " + getName() + ".");
-			}
-		}
-
-		/**
-		 * Method used to a skill bonus.
-		 * @param player the player.
-		 * @param amount the amount.
-		 * @param skills the skills.
-		 */
-		public void addBonus(final Player player, int amount, final int... skills) {
-			for (int i : skills) {
-				player.getSkills().updateLevel(i, -amount, 0);
-			}
-		}
-
-		/**
-		 * Gets the bar crawl type.
-		 * @param id the id.
-		 * @return the type.
-		 */
-		public static BarcrawlType forId(int id) {
-			for (BarcrawlType type : values()) {
-				for (int npc : type.getNpc()) {
-					if (npc == id) {
-						return type;
-					}
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * Gets the npc.
-		 * @return The npc.
-		 */
-		public int[] getNpc() {
-			return npc;
-		}
-
-		/**
-		 * Gets the coins.
-		 * @return The coins.
-		 */
-		public Item getCoins() {
-			return coins;
-		}
-
-		/**
-		 * Gets the dialogue.
-		 * @return The dialogue.
-		 */
-		public String[][] getDialogue() {
-			return dialogue;
-		}
-
-		/**
-		 * Gets the name.
-		 * @return The name.
-		 */
-		public String getName() {
-			return name;
-		}
-
-	}
-}

Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlType.java

@@ -0,0 +1,357 @@
+package core.game.content.quest.miniquest.barcrawl;
+
+import core.game.node.entity.combat.ImpactHandler;
+import core.game.node.entity.player.Player;
+import core.game.node.entity.skill.Skills;
+import core.game.node.item.Item;
+import core.game.system.task.Pulse;
+import core.net.packet.PacketRepository;
+import core.net.packet.context.CameraContext;
+import core.net.packet.out.CameraViewPacket;
+import core.tools.StringUtils;
+import rs09.game.world.GameWorld;
+
+/**
+ * A barcrawl type npc.
+ *
+ * @author 'Vexia
+ * @version 1.0
+ */
+public enum BarcrawlType {
+    BLUE_MOON(733, 50, "Uncle Humphrey's Gutrot", new String[]{"Oh no not another of you guys. These barbarian", "barcrawls cause too much damage to my bar."}, new String[]{"You're going to have to pay me 50 gold for the Uncle", "Humphrey's Gutrot."}) {
+        @Override
+        public void effect(final Player player) {
+            player.sendChat("Blearrgh!");
+            player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL);
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.SMITHING);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("Your insides feel terrible.", "The bartender signs your card.");
+            } else {
+                player.getPacketDispatch().sendMessages("You buy some " + getName() + ".", "You drink the " + getName() + ".");
+            }
+        }
+    },
+    BLUEBERRY_BAR(848, 10, "Fire Toad Blast", new String[]{"Ah, you've come to the best stop on your list! I'll give", "you my famous Fire Toad last! It'll cost you 10", "coins."}) {
+        @Override
+        public void effect(final Player player) {
+            player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessage("Blueberry signs your card.");
+            } else {
+                super.message(player, start);
+                player.getPacketDispatch().sendMessage("Your mouth and throat burns as you gulp it down.");
+            }
+        }
+
+    },
+    DEADMAN_CHEST(735, 15, "Supergrog", new String[]{"Haha time to be breaking out the old Supergrog. That'll", "be 15 coins please."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.HERBLORE, Skills.CONSTRUCTION, Skills.PRAYER);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("You stagger backwards.", "You think you see 2 bartenders signing 2 barcrawl cards.");
+            } else {
+                player.getPacketDispatch().sendMessages("The bartender serves you a glass of strange thick dark liquid.", "You wince and drink it.");
+            }
+        }
+
+    },
+    DRAGON_INN(739, 12, "Fire Brandy", new String[]{"I suppose you'll be wanting some Fire Brandy. That'll", "cost you 12 coins."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("Your vision blurs and you stagger slightly.", "You can just about make out the bartender signing your barcrawl card.");
+            } else {
+                player.getPacketDispatch().sendMessages("The bartender hands you a small glass and sets light to the contents.", "You blow out the flame and drink it.");
+            }
+        }
+
+    },
+    FLYING_HORSE_INN(737, 8, "Heart Stopper", new String[]{"Fancy a bit of Heart Stopper then do you? It'll only be", "8 coins."}) {
+        @Override
+        public void effect(final Player player) {
+            player.getImpactHandler().manualHit(player, (int) (player.getSkills().getLevel(Skills.HITPOINTS) * 0.15), ImpactHandler.HitsplatType.NORMAL);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("You clutch your chest.", "Through your tears you see the bartender...", "signing your barcrawl card.");
+            } else {
+                player.getPacketDispatch().sendMessages("The bartender hands you a shot of Heart Stopper.", "You grimace and drink it.");
+            }
+        }
+    },
+    FORESTERS_ARMS(738, 18, "Liverbane Ale", new String[]{"Oh you're a barbarian then. Now which of these barrels", "contained the Liverbane Ale? That'll be 18 coins please."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, Skills.ATTACK, Skills.DEFENCE, Skills.FLETCHING, Skills.FIREMAKING, Skills.WOODCUTTING);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("The room seems to be swaying.", "The bartender scrawls his signature on your card.");
+            } else {
+                player.getPacketDispatch().sendMessages("The bartender gives you a glass of Liverbane Ale.", "You gulp it down.");
+            }
+        }
+
+    },
+    JOLLY_BOAR(731, 10, "Olde Suspiciouse", new String[]{"Ah, there seems to be a fair few doing that one these", "days. My supply of Olde suspiciouse is starting to run", "low, it'll cost you 10 coins."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.MINING, Skills.CRAFTING, Skills.MAGIC);
+            player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL);
+            player.getDialogueInterpreter().sendDialogues(player, null, "Thanksh very mush...");
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("Your head is spinning.", "The bartender signs your card.");
+            } else {
+                player.getPacketDispatch().sendMessages("You buy a pint of Olde Suspiciouse.", "You gulp it down.");
+            }
+        }
+    },
+    KARAMJA_SPIRITS(568, 7, "Ape Bite Liqueur", new String[]{"Ah, you'll be wanting some Ape Bite Liqueur then. It's", "got a lovely bannana taste, and it'll only cost you 7", "coins."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("Zamo signs your card.");
+                player.getDialogueInterpreter().sendDialogues(player, null, "Mmmmm, dat was luverly...");
+            } else {
+                player.getPacketDispatch().sendMessages("You buy some Ape Bite liqueur.", "You swirl it around and swallow it.");
+            }
+        }
+
+    },
+    RISING_SUNN_INN(new int[]{3217, 736}, 70, "Hand of Death Cocktail", new String[]{"Heehee, this'll be fun!"}, new String[]{"You'll be after our Hand of Death cocktail, then. Lots", "of expensive parts to the cocktail, though, so it will cost", "you 70 coins."}) {
+        @Override
+        public void effect(final Player player) {
+            addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.RANGE, Skills.FIREMAKING);
+            player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL);
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                player.getPacketDispatch().sendMessages("The barmaid giggles.", "The barmaid signs your card.");
+            } else {
+                PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraContext.CameraType.SHAKE, 4, 4, 1, 4, 4));
+                GameWorld.getPulser().submit(new Pulse(3, player) {
+                    @Override
+                    public boolean pulse() {
+                        PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraContext.CameraType.RESET, 4, 4, 1, 4, 4));
+                        return true;
+                    }
+                });
+                player.getPacketDispatch().sendMessages("You buy a Hand of Death cocktail.", "You drink the cocktail.", "You stumble around the room.");
+            }
+        }
+    },
+    RUSTY_ANCHOR_INN(734, 8, "Black Skull Ale", new String[]{"Okay, one Black Skull Ale coming up. Eight coins, please."}) {
+        @Override
+        public void effect(final Player player) {
+            player.sendChat("Hiccup!");
+        }
+
+        @Override
+        public void message(final Player player, boolean start) {
+            if (!start) {
+                super.message(player, start);
+            } else {
+                player.getPacketDispatch().sendMessages("You buy a Black Skull Ale...", "You drink your Black Skull Ale...", "Your vision blurs.");
+            }
+        }
+    };
+
+    /**
+     * The npc id.
+     */
+    private final int[] npc;
+
+    /**
+     * The name.
+     */
+    private final String name;
+
+    /**
+     * The coin required.
+     */
+    private final Item coins;
+
+    /**
+     * The dialogue to use.
+     */
+    private final String[][] dialogue;
+
+    /**
+     * Constructs a new {@code BarcrawlType} {@code Object}.
+     *
+     * @param npc      the npc.
+     * @param name     the name.
+     * @param coins    the coins.
+     * @param dialogue the dialogue.
+     */
+    private BarcrawlType(int npc, Item coins, String name, String[][] dialogue) {
+        this.npc = new int[]{npc};
+        this.name = name;
+        this.coins = coins;
+        this.dialogue = dialogue;
+    }
+
+    /**
+     * Constructs a new {@code BarcrawlType} {@code Object}.
+     *
+     * @param npc   the npc.
+     * @param coins the coins.
+     */
+    private BarcrawlType(int npc, int coins, final String name, String[] first, String[] second) {
+        this.npc = new int[]{npc};
+        this.name = name;
+        this.coins = new Item(995, coins);
+        this.dialogue = new String[][]{first, second};
+    }
+
+    /**
+     * Constructs a new {@code BarcrawlType} {@code Object}.
+     *
+     * @param npc    the npc.
+     * @param coins  the coins.
+     * @param first  the first dial.
+     * @param second the second dial.
+     */
+    private BarcrawlType(int[] npc, int coins, String name, String[] first, String[] second) {
+        this.npc = npc;
+        this.name = name;
+        this.coins = new Item(995, coins);
+        this.dialogue = new String[][]{first, second};
+    }
+
+    /**
+     * Constructs a new {@code BarcrawlType} {@code Object}.
+     *
+     * @param npc   the npc.
+     * @param coins the coins.
+     */
+    private BarcrawlType(int npc, int coins, String name, String[] first) {
+        this.npc = new int[]{npc};
+        this.name = name;
+        this.coins = new Item(995, coins);
+        this.dialogue = new String[][]{first};
+    }
+
+    /**
+     * Method used to effect the player.
+     *
+     * @param player the player.
+     */
+    public void effect(final Player player) {
+
+    }
+
+    /**
+     * Method used to message the player.
+     *
+     * @param player the player.
+     * @param start  or finish.
+     */
+    public void message(final Player player, boolean start) {
+        if (!start) {
+            player.getPacketDispatch().sendMessage("The bartender signs your card.");
+        } else {
+            player.getPacketDispatch().sendMessage("You buy a " + (StringUtils.isPlusN(getName()) ? "an" : "a") + " " + getName() + ".");
+        }
+    }
+
+    /**
+     * Method used to a skill bonus.
+     *
+     * @param player the player.
+     * @param amount the amount.
+     * @param skills the skills.
+     */
+    public void addBonus(final Player player, int amount, final int... skills) {
+        for (int i : skills) {
+            player.getSkills().updateLevel(i, -amount, 0);
+        }
+    }
+
+    /**
+     * Gets the bar crawl type.
+     *
+     * @param id the id.
+     * @return the type.
+     */
+    public static BarcrawlType forId(int id) {
+        for (BarcrawlType type : values()) {
+            for (int npc : type.getNpc()) {
+                if (npc == id) {
+                    return type;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets the npc.
+     *
+     * @return The npc.
+     */
+    public int[] getNpc() {
+        return npc;
+    }
+
+    /**
+     * Gets the coins.
+     *
+     * @return The coins.
+     */
+    public Item getCoins() {
+        return coins;
+    }
+
+    /**
+     * Gets the dialogue.
+     *
+     * @return The dialogue.
+     */
+    public String[][] getDialogue() {
+        return dialogue;
+    }
+
+    /**
+     * Gets the name.
+     *
+     * @return The name.
+     */
+    public String getName() {
+        return name;
+    }
+
+}

Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java

@@ -9,7 +9,7 @@ import core.game.node.Node;
 import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;

Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java

@@ -4,7 +4,7 @@ import core.game.component.Component;
 import core.game.node.entity.combat.equipment.WeaponInterface;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.HintIconManager;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import rs09.game.system.SystemLogger;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;

Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java

@@ -12,7 +12,7 @@ import core.game.node.Node;
 import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import org.json.simple.JSONObject;
 import rs09.ServerStore;
 import rs09.game.world.GameWorld;

Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java

@@ -13,8 +13,8 @@ import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.state.EntityState;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;

Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java

@@ -10,8 +10,8 @@ import core.game.node.entity.player.Player;
 import core.game.node.entity.skill.Skills;
 import core.game.node.entity.skill.agility.AgilityHandler;
 import core.game.node.item.Item;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java

@@ -1,8 +1,6 @@
 package core.game.content.zone.rellekka;
 
-import core.cache.def.impl.NPCDefinition;
 import core.cache.def.impl.SceneryDefinition;
-import core.game.component.Component;
 import core.plugin.Initializable;
 import core.game.node.entity.skill.agility.AgilityHandler;
 import core.game.interaction.Option;
@@ -12,11 +10,7 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.impl.ForceMovement;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
-import core.game.system.task.LocationLogoutTask;
-import core.game.system.task.LogoutTask;
-import core.game.system.task.Pulse;
-import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;

Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java

@@ -17,7 +17,7 @@ import core.game.node.entity.combat.CombatStyle;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.node.object.SceneryBuilder;
+import core.game.node.scenery.SceneryBuilder;
 import core.game.system.task.Pulse;
 import rs09.game.world.GameWorld;
 import core.game.world.map.Location;

Server/src/main/java/core/game/interaction/DestinationFlag.java

@@ -3,7 +3,7 @@ package core.game.interaction;
 import core.game.content.global.action.DoorActionHandler;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
-import core.game.node.object.Scenery;
+import core.game.node.scenery.Scenery;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;