Merge pull request #1 from CodeForFame/master

Massive Cleanup

.gitignore

@@ -5,3 +5,10 @@
 *.iws
 *.iml
 *.class
+bin
+build
+.*
+!.gitignore
+!.gitmodules
+!.gitkeep
+!.gitattributes

GameServer/build.xml

@@ -1,4 +1,4 @@
-<project default="compile" basedir=".">	
+<project name="GameServer" default="build" basedir=".">
 
 	<property name="src" location="src" />
 	<property name="build" location="build" />
@@ -8,18 +8,18 @@
 	<property name="settings" location="settings.ini" />
 	<property name="quests" location="conf/server/quests" />
 
-	<target name="compile">
+	<target name="build">
 		<delete file="${jar}" />
 		<delete dir="${build}" />
 		<mkdir dir="${build}" />
-		<javac srcdir="${src}" destdir="${build}" debug="on" target="1.5">
+		<javac srcdir="${src}" destdir="${build}" debug="on" target="1.6">
 			<classpath>
 				<pathelement location="${lib}/mina.jar" />
 				<pathelement location="${lib}/xpp3.jar" />
 				<pathelement location="${lib}/slf4j.jar" />
 				<pathelement location="${lib}/pircbot.jar" />
 				<pathelement location="${lib}/bsh.jar" />
-
+				<pathelement location="${lib}/commons-collections-3.2.1.jar" />
 				<pathelement location="${lib}/xstream.jar" />
 				<pathelement location="${lib}/mysql-connector.jar" />
 				<pathelement location="${lib}/hex-string.jar" />
@@ -31,88 +31,12 @@
 
 	</target>
 
-	<target name="doc" depends="compile">
+	<target name="doc" depends="build">
 		<javadoc sourcepath="${src}" destdir="${doc}" verbose="on" />
 	</target>
 
-	<target name="map">
-		<java classname="org.rscdaemon.server.util.MapGenerator" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="map.png" />
-			<arg value="${world}.conf" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/pircbot.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-	
-	<target name="runls">
-		<java classname="rsca.ls.Server" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="ls.conf" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/pircbot.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-	<target name="runls2">
-		<java classname="rsca.ls.Server" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="pets-ls.conf" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/pircbot.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-	
-<target name="runp2p">
-		<java classname="rsca.gs.Server" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="world.xml" />
-			<arg value="p2p" />
-			<arg value="no" />
-			<classpath>
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/pircbot.jar"/>
-				<pathelement location="${lib}/bsh.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement location="quests/" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-
-<target name="runf2p">
-		<java classname="msc.gs.Server" fork="true">
+	<target name="runf2p" depends="build">
+		<java classname="org.moparscape.msc.gs.Server" fork="true">
 			<jvmarg value="-Xms128m" />
 			<jvmarg value="-Xmx512m" />
 			<arg value="world.xml" />
@@ -123,6 +47,7 @@
 				<pathelement location="${lib}/mina.jar" />
 				<pathelement location="${lib}/xpp3.jar" />
 				<pathelement location="${lib}/bsh.jar" />
+				<pathelement location="${lib}/commons-collections-3.2.1.jar" />
 				<pathelement location="${lib}/pircbot.jar" />
 				<pathelement location="${lib}/slf4j.jar" />
 				<pathelement location="${lib}/xstream.jar" />
@@ -132,58 +57,4 @@
 			</classpath>
 		</java>
 	</target>
-<target name="runf2p2">
-		<java classname="rsca.gs.Server" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="pets-server.conf" />
-			<arg value="f2p" />
-			<arg value="no" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/bsh.jar" />
-				<pathelement location="${lib}/pircbot.jar"/>
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement location="quests/" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-	<target name="runclient">
-		<java classname="org.rscdaemon.client.mudclient" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<arg value="${settings}" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement location="${lib}/jmf.jar" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
-	
-	<target name="runspriteeditor">
-		<java classname="org.rscdaemon.spriteeditor.SpriteEditor" fork="true">
-			<jvmarg value="-Xms128m" />
-			<jvmarg value="-Xmx512m" />
-			<classpath>
-				<pathelement location="${lib}/mina.jar" />
-				<pathelement location="${lib}/xpp3.jar" />
-				<pathelement location="${lib}/slf4j.jar" />
-				<pathelement location="${lib}/pircbot.jar" />
-				<pathelement location="${lib}/xstream.jar" />
-				<pathelement location="${lib}/mysql-connector.jar" />
-				<pathelement location="${lib}/hex-string.jar" />
-				<pathelement path="${jar}/" />
-			</classpath>
-		</java>
-	</target>
 </project>

GameServer/compile.sh

@@ -0,0 +1 @@
+ant

GameServer/conf/ls/FPacketHandlers.xml

@@ -3,36 +3,36 @@
 			<ids>
 				<int>1</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.Logout</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.Logout</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>2</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.Shutdown</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.Shutdown</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>3</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.Update</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.Update</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>5</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.Global</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.Global</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>6</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.Alert</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.Alert</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>7</int>
 			</ids>
-			<className>msc.ls.packethandler.frontend.ListPlayers</className>
+			<className>org.moparscape.msc.ls.packethandler.frontend.ListPlayers</className>
 		</PacketHandler>
 </PacketHandler-array>

GameServer/conf/ls/LSPacketHandlers.xml

@@ -4,44 +4,44 @@
 				<int>1</int>
 				<int>2</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.RegisterWorld</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.RegisterWorld</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>3</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.KillHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.KillHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>4</int>
 				<int>5</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.BanHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.BanHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>6</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.PrivacySettingHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.PrivacySettingHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>7</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.GameSettingHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.GameSettingHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>8</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.PlayerInfoRequestHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.PlayerInfoRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>9</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.SaveProfilesRequestHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.SaveProfilesRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -51,42 +51,42 @@
 				<int>13</int>
 				<int>14</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.FriendHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.FriendHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>15</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.ReportHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.ReportHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>20</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.PlayerSaveHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.PlayerSaveHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>30</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.PlayerLogoutHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.PlayerLogoutHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>31</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.PlayerLoginHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.PlayerLoginHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>32</int>
 			</ids>
-			<className>msc.ls.packethandler.loginserver.LogHandler</className>
+			<className>org.moparscape.msc.ls.packethandler.loginserver.LogHandler</className>
 		</PacketHandler>
                 <PacketHandler>
                         <ids>
                                 <int>33</int>
                         </ids>
-                        <className>msc.ls.packethandler.loginserver.Tradelog</className>
+                        <className>org.moparscape.msc.ls.packethandler.loginserver.Tradelog</className>
                 </PacketHandler>
 </PacketHandler-array>

GameServer/conf/ls/aliases.xml

@@ -3,5 +3,5 @@
 
 <properties>
 	<comment>Stores aliases for the XStream engine</comment>
-	<entry key="PacketHandler">msc.ls.packethandler.PacketHandlerDef</entry>
+	<entry key="PacketHandler">org.moparscape.msc.ls.packethandler.PacketHandlerDef</entry>
 </properties>

GameServer/conf/server/Conf.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<comment>RSCD Config</comment>
-	<entry key="version">27</entry>
-	<entry key="ip">208.110.86.234</entry>
-	<entry key="port">43595</entry>
-	<entry key="name">msc</entry>
-	<entry key="location">London</entry>
-	<entry key="maxplayers">800</entry>
-	<entry key="servernum">1</entry>
-	<entry key="lsip">localhost</entry>
-	<entry key="lsport">34522</entry>
-</properties>

GameServer/conf/server/LSPacketHandlers.xml

@@ -3,73 +3,73 @@
 			<ids>
 				<int>1</int>
 			</ids>
-			<className>msc.gs.phandler.ls.StatRequestHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.StatRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>2</int>
 			</ids>
-			<className>msc.gs.phandler.ls.PlayerListRequestHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.PlayerListRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>3</int>
 			</ids>
-			<className>msc.gs.phandler.ls.ShutdownHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.ShutdownHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>4</int>
 			</ids>
-			<className>msc.gs.phandler.ls.UpdateHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.UpdateHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>5</int>
 			</ids>
-			<className>msc.gs.phandler.ls.GlobalHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.GlobalHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>6</int>
 			</ids>
-			<className>msc.gs.phandler.ls.AlertHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.AlertHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>7</int>
 			</ids>
-			<className>msc.gs.phandler.ls.ForceLogout</className>
+			<className>org.moparscape.msc.gs.phandler.ls.ForceLogout</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>8</int>
 			</ids>
-			<className>msc.gs.phandler.ls.ReportInfoRequestHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.ReportInfoRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>9</int>
 			</ids>
-			<className>msc.gs.phandler.ls.PlayerInfoRequestHandler</className>
+			<className>org.moparscape.msc.gs.phandler.ls.PlayerInfoRequestHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>10</int>
 			</ids>
-			<className>msc.gs.phandler.ls.ReceivePM</className>
+			<className>org.moparscape.msc.gs.phandler.ls.ReceivePM</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>11</int>
 			</ids>
-			<className>msc.gs.phandler.ls.FriendLogin</className>
+			<className>org.moparscape.msc.gs.phandler.ls.FriendLogin</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>12</int>
 				<int>13</int>
 			</ids>
-			<className>msc.gs.phandler.ls.FriendLogout</className>
+			<className>org.moparscape.msc.gs.phandler.ls.FriendLogout</className>
 		</PacketHandler>
 </PacketHandler-array>

GameServer/conf/server/NpcHandlers.xml

@@ -9,50 +9,50 @@
 				<int>617</int>
 				<int>792</int>
 			</ids>
-			<className>msc.gs.npchandler.Bankers</className>
+			<className>org.moparscape.msc.gs.npchandler.Bankers</className>
  
 		</NpcHandler>
 <NpcHandler>
 			<ids>
 				<int>125</int>
 			</ids>
-			<className>msc.gs.npchandler.Aggie</className>
+			<className>org.moparscape.msc.gs.npchandler.Aggie</className>
 		</NpcHandler>
 <NpcHandler>
 			<ids>
 				<int>164</int>
 			</ids>
-			<className>msc.gs.npchandler.Bananas</className>
+			<className>org.moparscape.msc.gs.npchandler.Bananas</className>
 		</NpcHandler>
 <NpcHandler>
 			<ids>
 				<int>33</int>
 			</ids>
-			<className>msc.gs.npchandler.Apothecary</className>
+			<className>org.moparscape.msc.gs.npchandler.Apothecary</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
 				<int>172</int>
 			</ids>
-			<className>msc.gs.npchandler.Tanner</className>
+			<className>org.moparscape.msc.gs.npchandler.Tanner</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
 				<int>90</int>
 			</ids>
-			<className>msc.gs.npchandler.KebabSeller</className>
+			<className>org.moparscape.msc.gs.npchandler.KebabSeller</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
 				<int>339</int>
 			</ids>
-			<className>msc.gs.npchandler.MakeOverMage</className>
+			<className>org.moparscape.msc.gs.npchandler.MakeOverMage</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
 				<int>160</int>
 			</ids>
-			<className>msc.gs.npchandler.Thrander</className>
+			<className>org.moparscape.msc.gs.npchandler.Thrander</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
@@ -133,7 +133,7 @@
 				<int>779</int>
 				<int>269</int>
 			</ids>
-			<className>msc.gs.npchandler.ShopKeeper</className>
+			<className>org.moparscape.msc.gs.npchandler.ShopKeeper</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
@@ -155,19 +155,19 @@
 				<int>347</int>
 			
 			</ids>
-			<className>msc.gs.npchandler.Certer</className>
+			<className>org.moparscape.msc.gs.npchandler.Certer</className>
 		</NpcHandler>
 		<NpcHandler>
 			<ids>
 				<int>93</int>
 			</ids>
-			<className>msc.gs.npchandler.MonkHealer</className>
+			<className>org.moparscape.msc.gs.npchandler.MonkHealer</className>
 		</NpcHandler>
 		
 		<NpcHandler>
 			<ids>
 				<int>212</int>
 			</ids>
-			<className>msc.gs.npchandler.EntranaMonks</className>
+			<className>org.moparscape.msc.gs.npchandler.EntranaMonks</className>
 		</NpcHandler>
 </NpcHandler-array>

GameServer/conf/server/PacketHandlers.xml

@@ -3,106 +3,106 @@
 			<ids>
 				<int>0</int>
 			</ids>
-			<className>msc.gs.phandler.client.DummyPacket</className>
+			<className>org.moparscape.msc.gs.phandler.client.DummyPacket</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>77</int>
 			</ids>
-			<className>msc.gs.phandler.client.PlayerLogin</className>
+			<className>org.moparscape.msc.gs.phandler.client.PlayerLogin</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>69</int>
 			</ids>
-			<className>msc.gs.phandler.client.BotHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.BotHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>32</int>
 			</ids>
-			<className>msc.gs.phandler.client.SessionRequest</className>
+			<className>org.moparscape.msc.gs.phandler.client.SessionRequest</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>129</int>
 			</ids>
-			<className>msc.gs.phandler.client.PlayerLogoutRequest</className>
+			<className>org.moparscape.msc.gs.phandler.client.PlayerLogoutRequest</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>39</int>
 			</ids>
-			<className>msc.gs.phandler.client.PlayerLogout</className>
+			<className>org.moparscape.msc.gs.phandler.client.PlayerLogout</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>5</int>
 			</ids>
-			<className>msc.gs.phandler.client.Ping</className>
+			<className>org.moparscape.msc.gs.phandler.client.Ping</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>3</int>
 			</ids>
-			<className>msc.gs.phandler.client.Trap</className>
+			<className>org.moparscape.msc.gs.phandler.client.Trap</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>246</int>
 				<int>132</int>
 			</ids>
-			<className>msc.gs.phandler.client.WalkRequest</className>
+			<className>org.moparscape.msc.gs.phandler.client.WalkRequest</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>145</int>
 			</ids>
-			<className>msc.gs.phandler.client.ChatHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.ChatHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>176</int>
 			</ids>
-			<className>msc.gs.phandler.client.PrivacySettingHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.PrivacySettingHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>157</int>
 			</ids>
-			<className>msc.gs.phandler.client.GameSettingHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.GameSettingHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>147</int>
 			</ids>
-			<className>msc.gs.phandler.client.DropHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.DropHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>56</int>
 				<int>248</int>
 			</ids>
-			<className>msc.gs.phandler.client.PrayerHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.PrayerHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>90</int>
 			</ids>
-			<className>msc.gs.phandler.client.CommandHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.CommandHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>181</int>
 				<int>92</int>
 			</ids>
-			<className>msc.gs.phandler.client.WieldHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.WieldHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>83</int>
 			</ids>
-			<className>msc.gs.phandler.client.PlayerAppearanceIDHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.PlayerAppearanceIDHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -115,13 +115,13 @@
 				<int>104</int>
 				<int>232</int>
 			</ids>
-			<className>msc.gs.phandler.client.SpellHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.SpellHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>218</int>
 			</ids>
-			<className>msc.gs.phandler.client.PlayerAppearanceUpdater</className>
+			<className>org.moparscape.msc.gs.phandler.client.PlayerAppearanceUpdater</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -131,7 +131,7 @@
 				<int>70</int>
 				<int>53</int>
 			</ids>
-			<className>msc.gs.phandler.client.TradeHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.TradeHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -141,71 +141,71 @@
 				<int>108</int>
 				<int>254</int>
 			</ids>
-			<className>msc.gs.phandler.client.FriendHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.FriendHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>89</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvActionHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvActionHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>16</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvUseOnPlayer</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvUseOnPlayer</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>245</int>
 			</ids>
-			<className>msc.gs.phandler.client.PickupItem</className>
+			<className>org.moparscape.msc.gs.phandler.client.PickupItem</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>40</int>
 				<int>51</int>
 			</ids>
-			<className>msc.gs.phandler.client.ObjectAction</className>
+			<className>org.moparscape.msc.gs.phandler.client.ObjectAction</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>235</int>
 				<int>126</int>
 			</ids>
-			<className>msc.gs.phandler.client.WallObjectAction</className>
+			<className>org.moparscape.msc.gs.phandler.client.WallObjectAction</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>7</int>
 			</ids>
-			<className>msc.gs.phandler.client.ReportHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.ReportHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>36</int>
 				<int>94</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvUseOnObject</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvUseOnObject</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>57</int>
 				<int>73</int>
 			</ids>
-			<className>msc.gs.phandler.client.AttackHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.AttackHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>42</int>
 			</ids>
-			<className>msc.gs.phandler.client.StyleHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.StyleHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>177</int>
 			</ids>
-			<className>msc.gs.phandler.client.TalkToNpcHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.TalkToNpcHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -213,31 +213,31 @@
 				<int>183</int>
 				<int>198</int>
 			</ids>
-			<className>msc.gs.phandler.client.BankHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.BankHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>154</int>
 			</ids>
-			<className>msc.gs.phandler.client.MenuReplyHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.MenuReplyHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>156</int>
 			</ids>
-			<className>msc.gs.phandler.client.ExceptionHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.ExceptionHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>34</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvUseOnGroundItem</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvUseOnGroundItem</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>27</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvUseOnItem</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvUseOnItem</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -245,19 +245,19 @@
 				<int>128</int>
 				<int>255</int>
 			</ids>
-			<className>msc.gs.phandler.client.ShopHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.ShopHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>142</int>
 			</ids>
-			<className>msc.gs.phandler.client.InvUseOnNpc</className>
+			<className>org.moparscape.msc.gs.phandler.client.InvUseOnNpc</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>68</int>
 			</ids>
-			<className>msc.gs.phandler.client.FollowRequest</className>
+			<className>org.moparscape.msc.gs.phandler.client.FollowRequest</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
@@ -268,19 +268,19 @@
 				<int>225</int>
 				<int>252</int>
 			</ids>
-			<className>msc.gs.phandler.client.DuelHandler</className>
+			<className>org.moparscape.msc.gs.phandler.client.DuelHandler</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>74</int>
 			</ids>
-			<className>msc.gs.phandler.client.NpcCommand</className>
+			<className>org.moparscape.msc.gs.phandler.client.NpcCommand</className>
 		</PacketHandler>
 		<PacketHandler>
 			<ids>
 				<int>200</int>
 			</ids>
-			<className>msc.gs.phandler.client.Sleepword</className>
+			<className>org.moparscape.msc.gs.phandler.client.Sleepword</className>
 		</PacketHandler>
 	
 </PacketHandler-array>

GameServer/conf/server/aliases.xml

@@ -3,50 +3,50 @@
 
 <properties>
 	<comment>Stores aliases for the XStream engine</comment>
-	<entry key="PacketHandler">msc.gs.phandler.PacketHandlerDef</entry>
-	<entry key="NpcHandler">msc.gs.npchandler.NpcHandlerDef</entry>
+	<entry key="PacketHandler">org.moparscape.msc.gs.phandler.PacketHandlerDef</entry>
+	<entry key="NpcHandler">org.moparscape.msc.gs.npchandler.NpcHandlerDef</entry>
 	
-	<entry key="Point">msc.gs.model.Point</entry>
-	<entry key="TelePoint">msc.gs.model.TelePoint</entry>
+	<entry key="Point">org.moparscape.msc.gs.model.Point</entry>
+	<entry key="TelePoint">org.moparscape.msc.gs.model.TelePoint</entry>
 	
-	<entry key="Shop">msc.gs.model.Shop</entry>
-	<entry key="InvItem">msc.gs.model.InvItem</entry>
+	<entry key="Shop">org.moparscape.msc.gs.model.Shop</entry>
+	<entry key="InvItem">org.moparscape.msc.gs.model.InvItem</entry>
 	
-	<entry key="CerterDef">msc.gs.external.CerterDef</entry>
-	<entry key="CertDef">msc.gs.external.CertDef</entry>
+	<entry key="CerterDef">org.moparscape.msc.gs.external.CerterDef</entry>
+	<entry key="CertDef">org.moparscape.msc.gs.external.CertDef</entry>
 
-	<entry key="GameObjectLoc">msc.gs.external.GameObjectLoc</entry>
-	<entry key="ItemLoc">msc.gs.external.ItemLoc</entry>
-	<entry key="NPCLoc">msc.gs.external.NPCLoc</entry>
+	<entry key="GameObjectLoc">org.moparscape.msc.gs.external.GameObjectLoc</entry>
+	<entry key="ItemLoc">org.moparscape.msc.gs.external.ItemLoc</entry>
+	<entry key="NPCLoc">org.moparscape.msc.gs.external.NPCLoc</entry>
 	
-	<entry key="TileDef">msc.gs.external.TileDef</entry>
-	<entry key="GameObjectDef">msc.gs.external.GameObjectDef</entry>
-	<entry key="DoorDef">msc.gs.external.DoorDef</entry>
-	<entry key="ItemDef">msc.gs.external.ItemDef</entry>
-	<entry key="PrayerDef">msc.gs.external.PrayerDef</entry>
-	<entry key="SpellDef">msc.gs.external.SpellDef</entry>
-	<entry key="NPCDef">msc.gs.external.NPCDef</entry>
+	<entry key="TileDef">org.moparscape.msc.gs.external.TileDef</entry>
+	<entry key="GameObjectDef">org.moparscape.msc.gs.external.GameObjectDef</entry>
+	<entry key="DoorDef">org.moparscape.msc.gs.external.DoorDef</entry>
+	<entry key="ItemDef">org.moparscape.msc.gs.external.ItemDef</entry>
+	<entry key="PrayerDef">org.moparscape.msc.gs.external.PrayerDef</entry>
+	<entry key="SpellDef">org.moparscape.msc.gs.external.SpellDef</entry>
+	<entry key="NPCDef">org.moparscape.msc.gs.external.NPCDef</entry>
 	
-	<entry key="ItemCraftingDef">msc.gs.external.ItemCraftingDef</entry>
-	<entry key="ItemHerbSecond">msc.gs.external.ItemHerbSecond</entry>
-	<entry key="ItemDartTipDef">msc.gs.external.ItemDartTipDef</entry>
-	<entry key="ItemGemDef">msc.gs.external.ItemGemDef</entry>
-	<entry key="ItemLogCutDef">msc.gs.external.ItemLogCutDef</entry>
-	<entry key="ItemBowStringDef">msc.gs.external.ItemBowStringDef</entry>
-	<entry key="ItemArrowHeadDef">msc.gs.external.ItemArrowHeadDef</entry>
-	<entry key="FiremakingDef">msc.gs.external.FiremakingDef</entry>
-	<entry key="ReqOreDef">msc.gs.external.ReqOreDef</entry>
-	<entry key="ItemWieldableDef">msc.gs.external.ItemWieldableDef</entry>
-	<entry key="ItemUnIdentHerbDef">msc.gs.external.ItemUnIdentHerbDef</entry>
-	<entry key="ItemHerbDef">msc.gs.external.ItemHerbDef</entry>
-	<entry key="ItemCookingDef">msc.gs.external.ItemCookingDef</entry>
-	<entry key="ItemSmeltingDef">msc.gs.external.ItemSmeltingDef</entry>
-	<entry key="ItemSmithingDef">msc.gs.external.ItemSmithingDef</entry>
-	<entry key="ObjectMiningDef">msc.gs.external.ObjectMiningDef</entry>
-	<entry key="ObjectWoodcuttingDef">msc.gs.external.ObjectWoodcuttingDef</entry>
-	<entry key="ObjectFishingDef">msc.gs.external.ObjectFishingDef</entry>
-	<entry key="ObjectFishDef">msc.gs.external.ObjectFishDef</entry>
-	<entry key="ItemDropDef">msc.gs.external.ItemDropDef</entry>
-	<entry key="AgilityDef">msc.gs.external.AgilityDef</entry>
-	<entry key="AgilityCourseDef">msc.gs.external.AgilityCourseDef</entry>
+	<entry key="ItemCraftingDef">org.moparscape.msc.gs.external.ItemCraftingDef</entry>
+	<entry key="ItemHerbSecond">org.moparscape.msc.gs.external.ItemHerbSecond</entry>
+	<entry key="ItemDartTipDef">org.moparscape.msc.gs.external.ItemDartTipDef</entry>
+	<entry key="ItemGemDef">org.moparscape.msc.gs.external.ItemGemDef</entry>
+	<entry key="ItemLogCutDef">org.moparscape.msc.gs.external.ItemLogCutDef</entry>
+	<entry key="ItemBowStringDef">org.moparscape.msc.gs.external.ItemBowStringDef</entry>
+	<entry key="ItemArrowHeadDef">org.moparscape.msc.gs.external.ItemArrowHeadDef</entry>
+	<entry key="FiremakingDef">org.moparscape.msc.gs.external.FiremakingDef</entry>
+	<entry key="ReqOreDef">org.moparscape.msc.gs.external.ReqOreDef</entry>
+	<entry key="ItemWieldableDef">org.moparscape.msc.gs.external.ItemWieldableDef</entry>
+	<entry key="ItemUnIdentHerbDef">org.moparscape.msc.gs.external.ItemUnIdentHerbDef</entry>
+	<entry key="ItemHerbDef">org.moparscape.msc.gs.external.ItemHerbDef</entry>
+	<entry key="ItemCookingDef">org.moparscape.msc.gs.external.ItemCookingDef</entry>
+	<entry key="ItemSmeltingDef">org.moparscape.msc.gs.external.ItemSmeltingDef</entry>
+	<entry key="ItemSmithingDef">org.moparscape.msc.gs.external.ItemSmithingDef</entry>
+	<entry key="ObjectMiningDef">org.moparscape.msc.gs.external.ObjectMiningDef</entry>
+	<entry key="ObjectWoodcuttingDef">org.moparscape.msc.gs.external.ObjectWoodcuttingDef</entry>
+	<entry key="ObjectFishingDef">org.moparscape.msc.gs.external.ObjectFishingDef</entry>
+	<entry key="ObjectFishDef">org.moparscape.msc.gs.external.ObjectFishDef</entry>
+	<entry key="ItemDropDef">org.moparscape.msc.gs.external.ItemDropDef</entry>
+	<entry key="AgilityDef">org.moparscape.msc.gs.external.AgilityDef</entry>
+	<entry key="AgilityCourseDef">org.moparscape.msc.gs.external.AgilityCourseDef</entry>
 </properties>