Kotlin/Java split

Server/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'application'
 
 archivesBaseName = 'server'
 
-mainClassName = 'core.Server'
+mainClassName = 'rs09.Server'
 
 compileJava {
     options.encoding = "UTF-8"
@@ -30,10 +30,10 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
 }
 
-sourceSets {
-    main.java.srcDirs = ['src/main/java/Server']
-    main.kotlin.srcDirs = ['src/main/java/Server']
-}
+/*sourceSets {
+    main.java.srcDirs = ['src/main/java']
+    main.kotlin.srcDirs = ['src/main/kotlin']
+}*/
 
 jar {
     manifest {

Server/src/main/java/core/cache/Cache.java

@@ -4,13 +4,13 @@ import java.io.File;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.cache.def.impl.AnimationDefinition;
 import core.cache.def.impl.GraphicDefinition;
 import core.cache.def.impl.ItemDefinition;
 import core.cache.def.impl.NPCDefinition;
 import core.cache.def.impl.ObjectDefinition;
-import core.game.system.SystemLogger;
+import rs09.game.system.SystemLogger;
 
 /**
  * A cache reader.

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

@@ -8,7 +8,7 @@ import java.util.Map;
 
 import core.cache.Cache;
 import core.cache.misc.buffer.ByteBufferUtils;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 
 /**
  * The CS2 mapping.

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

@@ -3,7 +3,7 @@ package core.cache.def.impl;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.cache.Cache;
 
 /**

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

@@ -4,7 +4,7 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.cache.Cache;
 
 /**

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

@@ -1,30 +1,29 @@
 package core.cache.def.impl;
 
+import core.cache.Cache;
+import core.cache.def.Definition;
+import core.cache.misc.buffer.ByteBufferUtils;
+import core.game.container.Container;
+import core.game.content.global.action.DropItemHandler;
+import core.game.ge.GrandExchangeDatabase;
+import core.game.interaction.OptionHandler;
+import core.game.node.Node;
+import core.game.node.entity.player.Player;
+import core.game.node.entity.skill.Skills;
+import core.game.node.item.Item;
+import core.game.node.item.ItemPlugin;
+import core.net.packet.PacketRepository;
+import core.net.packet.out.WeightUpdate;
+import core.plugin.Plugin;
+import core.tools.StringUtils;
+import rs09.game.system.SystemLogger;
+import rs09.game.system.config.ItemConfigParser;
+
 import java.nio.ByteBuffer;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
 
-import core.game.system.SystemLogger;
-import core.game.system.config.ItemConfigParser;
-import core.plugin.Plugin;
-import core.tools.StringUtils;
-import core.cache.Cache;
-import core.cache.def.Definition;
-import core.cache.misc.buffer.ByteBufferUtils;
-import core.game.container.Container;
-import core.game.ge.GrandExchangeDatabase;
-import core.game.content.global.action.DropItemHandler;
-import core.game.content.global.action.EquipHandler;
-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.item.Item;
-import core.game.node.item.ItemPlugin;
-import core.net.packet.PacketRepository;
-import core.net.packet.out.WeightUpdate;
-
 /**
  * Represents an item's definitions.
  * @author Jagex
@@ -279,10 +278,6 @@ public class ItemDefinition extends Definition<Item> {
 		setOptionHandler("destroy", handler);
 		setOptionHandler("dissolve", handler);
 		setOptionHandler("drop", handler);
-		final EquipHandler equipHandler = EquipHandler.SINGLETON;
-		setOptionHandler("wear", equipHandler);
-		setOptionHandler("wield", equipHandler);
-		setOptionHandler("equip", equipHandler);
 	}
 	
 	/**

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

@@ -7,11 +7,11 @@ import core.game.interaction.OptionHandler;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.npc.drop.NPCDropTables;
 import core.game.node.entity.player.Player;
-import core.game.system.config.NPCConfigParser;
-import core.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.tools.StringUtils;
+import rs09.game.system.config.NPCConfigParser;
+import rs09.game.world.GameWorld;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;

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

@@ -6,8 +6,8 @@ import core.cache.misc.buffer.ByteBufferUtils;
 import core.game.interaction.OptionHandler;
 import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
-import core.game.system.SystemLogger;
-import core.game.world.GameWorld;
+import rs09.game.system.SystemLogger;
+import rs09.game.world.GameWorld;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;

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

@@ -1,8 +1,8 @@
 package core.cache.def.impl;
 
 import core.cache.Cache;
-import core.game.system.SystemLogger;
-import core.game.world.GameWorld;
+import rs09.game.system.SystemLogger;
+import rs09.game.world.GameWorld;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;

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

@@ -1,15 +1,13 @@
 package core.cache.def.impl;
 
+import core.cache.Cache;
+import core.game.node.entity.player.Player;
+import rs09.game.world.GameWorld;
+
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
-import core.cache.Cache;
-import core.game.Varbit;
-import core.game.node.entity.player.Player;
-import core.game.system.SystemLogger;
-import core.game.world.GameWorld;
-
 /**
  * Handles config definition reading.
  * @author Emperor

Server/src/main/java/core/game/component/InterfaceType.java

@@ -1,6 +1,7 @@
 package core.game.component;
 
-import static core.tools.Interfaces.*;
+
+import static rs09.tools.Interfaces.*;
 
 /**
  * Represents an interface type.

Server/src/main/java/core/game/container/impl/BankContainer.java

@@ -1,14 +1,14 @@
 package core.game.container.impl;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.component.Component;
 import core.game.container.*;
 import core.game.container.access.BitregisterAssembler;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.IronmanMode;
 import core.game.node.item.Item;
-import core.game.system.config.ItemConfigParser;
-import core.game.world.GameWorld;
+import rs09.game.system.config.ItemConfigParser;
+import rs09.game.world.GameWorld;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.ContainerContext;
 import core.net.packet.out.ContainerPacket;

Server/src/main/java/core/game/container/impl/EquipmentContainer.java

@@ -5,16 +5,16 @@ import core.game.container.ContainerEvent;
 import core.game.container.ContainerListener;
 import core.game.node.entity.combat.equipment.WeaponInterface;
 import core.game.node.entity.player.Player;
+import core.game.node.entity.skill.Skills;
 import core.game.node.item.Item;
-import core.game.system.config.ItemConfigParser;
 import core.game.world.update.flag.player.AppearanceFlag;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.ContainerContext;
 import core.net.packet.out.ContainerPacket;
 import core.net.packet.out.WeightUpdate;
 import core.plugin.Plugin;
-import core.game.node.entity.skill.Skills;
-import core.game.node.entity.skill.skillcapeperks.SkillcapePerks;
+import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks;
+import rs09.game.system.config.ItemConfigParser;
 
 /**
  * Represents the equipment container.

Server/src/main/java/core/game/content/activity/ActivityManager.java

@@ -1,8 +1,8 @@
 package core.game.content.activity;
 
 import core.game.node.entity.player.Player;
-import core.game.system.SystemLogger;
-import core.game.world.GameWorld;
+import rs09.game.system.SystemLogger;
+import rs09.game.world.GameWorld;
 
 import java.util.HashMap;
 import java.util.Map;

Server/src/main/java/core/game/content/activity/ActivityPlugin.java

@@ -1,6 +1,6 @@
 package core.game.content.activity;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.node.entity.Entity;
 import core.game.node.entity.player.Player;
 import core.game.world.map.Location;

Server/src/main/java/core/game/content/activity/CutscenePlugin.java

@@ -5,7 +5,7 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;
 import core.net.packet.PacketRepository;

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

@@ -4,8 +4,6 @@ import core.game.component.Component;
 import core.game.content.activity.ActivityPlugin;
 import core.game.content.global.action.ClimbActionHandler;
 import core.game.content.global.action.DoorActionHandler;
-import core.plugin.Initializable;
-import core.game.node.entity.skill.summoning.familiar.Familiar;
 import core.game.interaction.Option;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
@@ -17,21 +15,24 @@ import core.game.node.entity.npc.agg.AggressiveBehavior;
 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.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.update.flag.context.Graphics;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.CameraContext;
-import core.net.packet.context.MinimapStateContext;
 import core.net.packet.context.CameraContext.CameraType;
+import core.net.packet.context.MinimapStateContext;
 import core.net.packet.out.CameraViewPacket;
 import core.net.packet.out.MinimapState;
-import core.plugin.PluginManager;
+import core.plugin.Initializable;
 import core.tools.RandomFunction;
+import rs09.game.content.activity.barrows.RewardChest;
+import rs09.game.world.GameWorld;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the barrows activity plugin.

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

@@ -7,7 +7,7 @@ import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
 

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

@@ -1,7 +1,7 @@
 package core.game.content.activity.bountyhunter;
 
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 
 /**
  * Holds a player's bounty hunter data.

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

@@ -18,7 +18,7 @@ import core.game.node.entity.player.link.prayer.PrayerType;
 import core.game.node.item.GroundItem;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.Point;
 import core.game.world.map.zone.ZoneBorders;
@@ -28,7 +28,7 @@ import core.game.world.map.zone.impl.WildernessZone;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 import java.util.*;

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

@@ -11,7 +11,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook;
 import core.game.node.entity.player.link.TeleportManager.TeleportType;
 import core.game.node.entity.state.EntityState;
 import core.game.node.item.Item;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.plugin.Plugin;

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

@@ -21,7 +21,7 @@ import core.game.node.object.ObjectBuilder;
 import core.game.system.communication.ClanEntry;
 import core.game.system.communication.ClanRepository;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 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/activity/clanwars/ClanWarsChallengeRoom.java

@@ -12,7 +12,7 @@ import core.game.world.map.zone.ZoneRestriction;
 import core.game.world.map.zone.impl.WildernessZone;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the clan wars challenge room.

Server/src/main/java/core/game/content/activity/duel/DuelArea.java

@@ -3,7 +3,7 @@ package core.game.content.activity.duel;
 import java.util.ArrayList;
 import java.util.List;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.cache.def.impl.ObjectDefinition;
 import core.game.container.Container;
 import core.game.container.impl.EquipmentContainer;
@@ -23,7 +23,7 @@ import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.MapZone;

Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java

@@ -16,7 +16,7 @@ import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneBuilder;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java

@@ -4,7 +4,7 @@ import core.game.component.Component;
 import core.game.component.ComponentDefinition;
 import core.game.component.ComponentPlugin;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.plugin.Plugin;
 
 /**

Server/src/main/java/core/game/content/activity/duel/DuelSession.java

@@ -1,7 +1,5 @@
 package core.game.content.activity.duel;
 
-import java.text.DecimalFormat;
-
 import core.game.component.CloseEvent;
 import core.game.component.Component;
 import core.game.component.ComponentDefinition;
@@ -10,16 +8,18 @@ import core.game.container.Container;
 import core.game.container.ContainerType;
 import core.game.container.access.InterfaceContainer;
 import core.game.container.impl.EquipmentContainer;
-import core.game.content.global.action.EquipHandler;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.info.login.PlayerParser;
 import core.game.node.entity.player.link.RunScript;
 import core.game.node.entity.state.EntityState;
 import core.game.node.item.Item;
-import core.game.system.config.ItemConfigParser;
 import core.game.system.monitor.PlayerMonitor;
 import core.plugin.Plugin;
 import core.tools.RandomFunction;
+import rs09.game.content.global.action.EquipHandler;
+import rs09.game.system.config.ItemConfigParser;
+
+import java.text.DecimalFormat;
 
 /**
  * Represents a duel session.

Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java

@@ -8,7 +8,7 @@ import core.game.node.entity.player.Player;
 import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBorders;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Represents the fist of guthix activity.

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

@@ -12,7 +12,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBorders;

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

@@ -15,7 +15,7 @@ import core.game.node.object.GameObject;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Represents the hero guild.

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

@@ -8,11 +8,11 @@ import core.game.component.ComponentDefinition;
 import core.game.component.ComponentPlugin;
 import core.game.container.impl.EquipmentContainer;
 import core.plugin.Initializable;
-import core.tools.Items;
+import rs09.tools.Items;
 import core.game.node.entity.Entity;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.link.diary.DiaryType;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.content.dialogue.FacialExpression;

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

@@ -2,20 +2,20 @@ package core.game.content.activity.guild;
 
 import core.cache.def.impl.NPCDefinition;
 import core.cache.def.impl.ObjectDefinition;
-import core.plugin.Initializable;
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.content.global.Skillcape;
 import core.game.content.global.action.ClimbActionHandler;
 import core.game.content.global.action.DoorActionHandler;
-import core.game.content.global.travel.EssenceTeleport;
-import core.game.node.entity.skill.Skills;
 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.entity.skill.Skills;
 import core.game.node.object.GameObject;
 import core.game.world.map.Location;
+import core.plugin.Initializable;
 import core.plugin.Plugin;
+import rs09.game.content.global.travel.EssenceTeleport;
 
 /**
  * Represents the wizard guild plugin.

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

@@ -6,7 +6,7 @@ import java.util.List;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.equipment.ArmourSet;
 import core.game.node.entity.impl.Projectile;

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

@@ -6,7 +6,7 @@ import java.util.List;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.equipment.ArmourSet;
 import core.game.node.entity.impl.Projectile;

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

@@ -3,7 +3,7 @@ package core.game.content.activity.gwd;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.equipment.ArmourSet;
 import core.game.node.entity.impl.Projectile;

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

@@ -6,7 +6,7 @@ import java.util.List;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.equipment.ArmourSet;
 import core.game.node.entity.impl.Animator.Priority;

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

@@ -6,7 +6,7 @@ import core.game.node.entity.combat.DeathTask;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.plugin.Initializable;
 import core.game.world.map.Location;
 

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

@@ -3,9 +3,7 @@ package core.game.content.activity.gwd;
 import core.game.content.global.BossKillCounter;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
-import core.game.node.entity.combat.CombatPulse;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.DeathTask;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.npc.NPC;
@@ -13,11 +11,13 @@ import core.game.node.entity.npc.agg.AggressiveBehavior;
 import core.game.node.entity.npc.agg.AggressiveHandler;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.prayer.PrayerType;
-import core.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBorders;
 import core.plugin.Initializable;
 import core.tools.RandomFunction;
+import rs09.game.node.entity.combat.CombatPulse;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.world.GameWorld;
 
 /**
  * Handles a god wars boss NPC.

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

@@ -11,7 +11,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 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/activity/gwd/GodwarsMapzone.java

@@ -16,7 +16,7 @@ import core.game.node.entity.player.info.Rights;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.zone.MapZone;

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

@@ -4,7 +4,7 @@ import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.skill.Skills;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;

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

@@ -4,16 +4,16 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatSpell;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
-import core.game.node.entity.combat.handlers.MagicSwingHandler;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.SpellBookManager.SpellBook;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.tools.RandomFunction;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.handlers.MagicSwingHandler;
+import rs09.game.world.GameWorld;
 
 /**
  * Handles the kolodion npc.

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

@@ -3,7 +3,7 @@ package core.game.content.activity.magearena;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 
 /**

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

@@ -3,7 +3,7 @@ package core.game.content.activity.magearena;
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 
 /**
  * Handles the lundail dialogue.

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

@@ -4,23 +4,23 @@ import core.cache.def.impl.ItemDefinition;
 import core.cache.def.impl.ObjectDefinition;
 import core.game.content.dialogue.DialogueAction;
 import core.game.content.global.GodType;
-import core.game.content.global.action.PickupHandler;
-import core.game.node.entity.skill.agility.AgilityHandler;
 import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
+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.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
-import core.plugin.Plugin;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import core.plugin.Plugin;
+import rs09.game.content.global.action.PickupHandler;
+import rs09.game.world.GameWorld;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the mage arena activity.

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

@@ -5,7 +5,7 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.combat.CombatStyle;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+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/activity/mta/AlchemySpell.java

@@ -2,7 +2,7 @@ package core.game.content.activity.mta;
 
 import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.world.map.zone.ZoneBorders;
-import core.tools.Items;
+import rs09.tools.Items;
 import core.game.node.entity.skill.magic.MagicSpell;
 import core.game.node.entity.skill.magic.Runes;
 import core.game.node.Node;

Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java

@@ -2,7 +2,7 @@ package core.game.content.activity.mta;
 
 import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 
 /**
  * Handles the entrance guardian dialogue.

Server/src/main/java/core/game/content/activity/mta/MTAShop.java

@@ -12,7 +12,7 @@ import core.game.container.access.InterfaceContainer;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.plugin.Plugin;
 
 /**

Server/src/main/java/core/game/content/activity/mta/MTAZone.java

@@ -1,6 +1,6 @@
 package core.game.content.activity.mta;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.interaction.Option;
 import core.game.node.Node;
 import core.game.node.entity.Entity;

Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java

@@ -3,22 +3,22 @@ package core.game.content.activity.mta;
 import core.cache.def.impl.ItemDefinition;
 import core.cache.def.impl.NPCDefinition;
 import core.cache.def.impl.ObjectDefinition;
-import core.plugin.Initializable;
-import core.game.node.entity.skill.Skills;
-import core.game.node.entity.skill.agility.AgilityHandler;
+import core.game.content.activity.mta.impl.TelekineticZone;
 import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 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.GroundItem;
 import core.game.node.item.Item;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBuilder;
 import core.game.world.update.flag.context.Animation;
+import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
-
-import core.game.content.activity.mta.impl.TelekineticZone;
+import rs09.game.content.activity.mta.EnchantSpell;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the mage training area interactions.

Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java

@@ -1,28 +1,27 @@
 package core.game.content.activity.mta;
 
-import core.game.content.global.action.PickupHandler;
-import core.game.node.entity.combat.spell.SpellBlocks;
-import core.game.node.entity.skill.magic.MagicSpell;
-import core.game.node.entity.skill.magic.Runes;
+import core.game.content.activity.mta.impl.TelekineticZone;
 import core.game.interaction.SpecialGroundItems;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.equipment.SpellType;
+import core.game.node.entity.combat.spell.SpellBlocks;
 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.entity.player.link.SpellBookManager.SpellBook;
 import core.game.node.entity.player.link.audio.Audio;
+import core.game.node.entity.skill.magic.MagicSpell;
+import core.game.node.entity.skill.magic.Runes;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.plugin.Plugin;
-
-import core.game.content.activity.mta.impl.TelekineticZone;
+import rs09.game.content.global.action.PickupHandler;
+import rs09.game.world.GameWorld;
 
 /**
  * Represents the telekenitic grab spell.

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

@@ -15,7 +15,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.ZoneBorders;

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

@@ -15,7 +15,7 @@ import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.ZoneBorders;

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

@@ -13,7 +13,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.update.flag.context.Animation;

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

@@ -15,7 +15,7 @@ import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;

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

@@ -15,7 +15,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 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/activity/partyroom/PartyRoomPlugin.java

@@ -21,12 +21,12 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the party room.

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

@@ -1,12 +1,12 @@
 package core.game.content.activity.pestcontrol;
 
 import core.cache.def.impl.ObjectDefinition;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.content.activity.ActivityManager;
 import core.game.interaction.OptionHandler;
 import core.game.node.Node;
 import core.game.node.entity.player.Player;
-import plugin.ai.pvmbots.PvMBotsBuilder;
+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.GameObject;

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

@@ -3,7 +3,7 @@ package core.game.content.activity.pestcontrol;
 import java.util.ArrayList;
 import java.util.List;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.component.Component;
 import core.game.content.activity.ActivityManager;
 import core.game.content.activity.ActivityPlugin;
@@ -17,14 +17,14 @@ import core.game.node.entity.state.EntityState;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;
 import core.game.world.map.zone.RegionZone;
 import core.game.world.map.zone.ZoneBuilder;
 import core.game.world.map.zone.ZoneRestriction;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 import core.tools.StringUtils;
 import core.game.content.activity.pestcontrol.monsters.*;

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

@@ -1,16 +1,16 @@
 package core.game.content.activity.pestcontrol.monsters;
 
+import core.game.content.activity.pestcontrol.PestControlSession;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
-import core.game.node.entity.combat.handlers.RangeSwingHandler;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.world.map.Location;
 import core.game.world.map.MapDistance;
-import core.game.content.activity.pestcontrol.PestControlSession;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.handlers.RangeSwingHandler;
 
 /**
  * Handles the Defiler NPCs.

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

@@ -9,7 +9,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.MapDistance;
 import core.game.world.map.path.Pathfinder;

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

@@ -1,26 +1,26 @@
 package core.game.content.activity.pestcontrol.monsters;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import core.game.content.activity.pestcontrol.PestControlSession;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
-import core.game.node.entity.combat.CombatPulse;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
-import core.game.node.entity.combat.handlers.MeleeSwingHandler;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.tools.RandomFunction;
-import core.game.content.activity.pestcontrol.PestControlSession;
+import rs09.game.node.entity.combat.CombatPulse;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.handlers.MeleeSwingHandler;
+import rs09.game.world.GameWorld;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Handles the pest control shifter NPCs.

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

@@ -10,7 +10,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.state.EntityState;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 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/activity/pestcontrol/monsters/PCSplatterNPC.java

@@ -11,7 +11,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 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/activity/pestcontrol/monsters/PCTorcherNPC.java

@@ -1,15 +1,14 @@
 package core.game.content.activity.pestcontrol.monsters;
 
+import core.game.content.activity.pestcontrol.PestControlSession;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatSpell;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.equipment.SpellType;
-import core.game.node.entity.combat.handlers.MagicSwingHandler;
-import core.game.node.entity.impl.Projectile;
 import core.game.node.entity.impl.Animator.Priority;
+import core.game.node.entity.impl.Projectile;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.SpellBookManager.SpellBook;
@@ -18,7 +17,8 @@ import core.game.world.map.MapDistance;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.plugin.Plugin;
-import core.game.content.activity.pestcontrol.PestControlSession;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.handlers.MagicSwingHandler;
 
 /**
  * Handles the torcher pest control NPC.

Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java

@@ -6,7 +6,7 @@ import core.game.node.Node;
 import core.game.node.entity.player.Player;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Represents the option plugin used to handle the pc island related nodes.

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

@@ -9,7 +9,7 @@ import core.game.node.entity.skill.hunter.bnet.ImplingNode;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 import core.game.content.activity.puropuro.ElnockInquisitorDialogue.ElnockExchangeInterfaceHandler.ElnockExchange;
 

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

@@ -9,7 +9,7 @@ import core.game.node.entity.skill.hunter.bnet.ImplingNode;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.tools.RandomFunction;

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

@@ -20,7 +20,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
@@ -32,7 +32,7 @@ import core.net.packet.PacketRepository;
 import core.net.packet.context.MinimapStateContext;
 import core.net.packet.out.MinimapState;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

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

@@ -1,13 +1,13 @@
 package core.game.content.activity.pyramidplunder;
-import core.game.Varp;
+
 import core.game.content.global.action.ClimbActionHandler;
-import core.game.node.entity.skill.Skills;
 import core.game.interaction.Option;
 import core.game.node.Node;
 import core.game.node.entity.Entity;
-import core.game.node.entity.npc.NPC;
 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.skill.Skills;
 import core.game.node.item.Item;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.LocationLogoutTask;
@@ -20,6 +20,8 @@ import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
 import core.tools.RandomFunction;
+import rs09.game.Varp;
+import rs09.game.content.activity.pyramidplunder.PlunderSession;
 
 /**
  * Defines the zones for the pyramid plunder rooms and their interactions

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

@@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+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/pyramidplunder/PyramidPlunderActivity.java

@@ -6,7 +6,8 @@ import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.game.content.activity.pyramidplunder.PlunderSession;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the Pyramid plunder activity.

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

@@ -5,7 +5,7 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.combat.CombatStyle;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.path.Pathfinder;

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

@@ -17,14 +17,14 @@ import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+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;
 import core.game.world.map.zone.ZoneBuilder;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.plugin.Initializable;
 import core.tools.RandomFunction;
 

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

@@ -5,9 +5,9 @@ import core.game.content.dialogue.DialoguePlugin;
 import core.game.content.dialogue.FacialExpression;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
-import core.game.system.SystemLogger;
+import rs09.game.system.SystemLogger;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 
 /**
  * @author Tyler Telis

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

@@ -12,7 +12,7 @@ import core.net.packet.context.CameraContext.CameraType;
 import core.net.packet.out.CameraViewPacket;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * @author Tyler Telis

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

@@ -3,7 +3,7 @@ package core.game.content.activity.tzhaar;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.CombatSwingHandler;
 import core.game.node.entity.combat.InteractionType;
 import core.game.node.entity.combat.ImpactHandler.HitsplatType;
 import core.game.node.entity.combat.equipment.ArmourSet;

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

@@ -18,11 +18,11 @@ import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;
 import core.game.world.map.zone.ZoneRestriction;
-import core.game.world.repository.Repository;
+import rs09.game.world.repository.Repository;
 import core.plugin.Initializable;
 import core.tools.RandomFunction;
 

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

@@ -24,7 +24,7 @@ import core.game.node.entity.player.link.diary.DiaryType;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.ZoneBorders;

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

@@ -14,7 +14,7 @@ import core.game.node.object.GameObject;
 import core.game.world.map.Location;
 import core.plugin.Plugin;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the warrior guild options.

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

@@ -11,7 +11,7 @@ import core.game.node.object.GameObject;
 import core.game.system.task.ItemLogoutTask;
 import core.game.system.task.LogoutTask;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;

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

@@ -15,7 +15,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.zone.MapZone;
 import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneBuilder;
@@ -23,7 +23,7 @@ import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.plugin.Initializable;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

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

@@ -22,7 +22,7 @@ import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.zone.MapZone;
@@ -30,7 +30,7 @@ import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneBuilder;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.plugin.Initializable;
 import core.tools.RandomFunction;
 

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

@@ -19,7 +19,7 @@ import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.path.Pathfinder;
@@ -28,7 +28,7 @@ import core.game.world.map.zone.ZoneBorders;
 import core.game.world.map.zone.ZoneBuilder;
 import core.game.world.map.zone.ZoneRestriction;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

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

@@ -11,7 +11,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.update.flag.chunk.AnimateObjectUpdateFlag;

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

@@ -18,11 +18,11 @@ import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java

@@ -4,7 +4,7 @@ import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.update.flag.context.Animation;
 import core.game.world.update.flag.context.Graphics;
 import core.plugin.PluginManifest;

Server/src/main/java/core/game/content/ame/AntiMacroHandler.java

@@ -1,13 +1,13 @@
 package core.game.content.ame;
 
 import core.cache.misc.buffer.ByteBufferUtils;
-import core.game.system.SystemLogger;
+import rs09.game.system.SystemLogger;
 import core.game.world.map.zone.impl.WildernessZone;
 import core.game.node.entity.skill.Skills;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.zone.ZoneRestriction;
 import core.tools.RandomFunction;
 

Server/src/main/java/core/game/content/ame/AntiMacroNPC.java

@@ -6,7 +6,7 @@ import core.game.node.entity.combat.CombatStyle;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.map.path.Pathfinder;

Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java

@@ -9,11 +9,11 @@ import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
 import core.game.node.entity.player.Player;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.game.world.map.RegionManager;
 import core.game.world.update.flag.context.Graphics;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the drill demon event.

Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java

@@ -11,7 +11,7 @@ import core.game.node.item.Item;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Animation;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the drunken dward anti macro event.

Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java

@@ -3,8 +3,6 @@ package core.game.content.ame.events.evilchicken;
 import core.game.node.entity.Entity;
 import core.game.node.entity.combat.BattleState;
 import core.game.node.entity.combat.CombatStyle;
-import core.game.node.entity.combat.CombatSwingHandler;
-import core.game.node.entity.combat.handlers.MagicSwingHandler;
 import core.game.node.entity.npc.AbstractNPC;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItem;
@@ -13,6 +11,8 @@ import core.game.node.item.Item;
 import core.game.world.map.Location;
 import core.game.world.update.flag.context.Graphics;
 import core.tools.RandomFunction;
+import rs09.game.node.entity.combat.CombatSwingHandler;
+import rs09.game.node.entity.combat.handlers.MagicSwingHandler;
 
 /**
  * Handles the evil chicken NPC.

Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java

@@ -7,7 +7,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.entity.player.link.HintIconManager;
 import core.game.world.map.Location;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the evil chicken random event.

Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java

@@ -2,7 +2,7 @@ package core.game.content.ame.events.eviltwin;
 
 import java.nio.ByteBuffer;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.component.CloseEvent;
 import core.game.component.Component;
 import core.game.content.ame.AntiMacroEvent;
@@ -15,7 +15,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.object.GameObject;
 import core.game.node.object.ObjectBuilder;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Direction;
 import core.game.world.map.Location;
 import core.game.world.map.build.DynamicRegion;
@@ -25,7 +25,7 @@ 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.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java

@@ -9,7 +9,7 @@ import core.game.content.dialogue.DialoguePlugin;
 import core.game.node.entity.player.Player;
 import core.game.node.item.Item;
 import core.game.world.map.Location;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the genie random event.

Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java

@@ -2,7 +2,7 @@ package core.game.content.ame.events.lostandfound;
 
 import java.nio.ByteBuffer;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.cache.def.impl.ObjectDefinition;
 import core.game.content.ame.AntiMacroEvent;
 import core.game.interaction.Option;
@@ -14,13 +14,13 @@ import core.game.node.entity.player.link.TeleportManager;
 import core.game.node.item.Item;
 import core.game.node.object.GameObject;
 import core.game.system.task.Pulse;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.MinimapStateContext;
 import core.net.packet.out.MinimapState;
 import core.plugin.Plugin;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.tools.RandomFunction;
 
 /**

Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java

@@ -2,7 +2,7 @@ package core.game.content.ame.events.lostpirate;
 
 import java.nio.ByteBuffer;
 
-import core.tools.Items;
+import rs09.tools.Items;
 import core.game.content.ame.AntiMacroDialogue;
 import core.game.content.ame.AntiMacroEvent;
 import core.game.content.dialogue.DialoguePlugin;
@@ -11,7 +11,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.ChanceItem;
 import core.game.node.item.Item;
 import core.game.world.map.Location;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 import core.plugin.Initializable;
 import core.tools.RandomFunction;
 

Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java

@@ -10,7 +10,7 @@ import core.game.content.dialogue.FacialExpression;
 import core.game.node.entity.player.Player;
 import core.game.node.item.GroundItemManager;
 import core.game.node.item.Item;
-import core.game.world.GameWorld;
+import rs09.game.world.GameWorld;
 import core.game.world.map.Location;
 import core.net.packet.PacketRepository;
 import core.net.packet.context.DisplayModelContext;

Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java

@@ -2,7 +2,7 @@ package core.game.content.ame.events.quizmaster;
 
 import java.nio.ByteBuffer;
 
-import core.ServerConstants;
+import rs09.ServerConstants;
 import core.game.content.ame.AntiMacroEvent;
 import core.game.node.entity.Entity;
 import core.game.node.entity.npc.NPC;
@@ -14,7 +14,7 @@ import core.net.packet.context.CameraContext;
 import core.net.packet.context.CameraContext.CameraType;
 import core.net.packet.out.CameraViewPacket;
 import core.plugin.Initializable;
-import core.plugin.PluginManager;
+import rs09.plugin.PluginManager;
 
 /**
  * Handles the quiz master random event.