diff --git a/GameServer/compile.bat b/GameServer/compile.bat index 7fa0c1f..90d163a 100644 --- a/GameServer/compile.bat +++ b/GameServer/compile.bat @@ -1,2 +1,2 @@ -ant +ant build pause \ No newline at end of file diff --git a/GameServer/conf/aliases.xml b/GameServer/conf/aliases.xml index f7bfb17..1a6f826 100644 --- a/GameServer/conf/aliases.xml +++ b/GameServer/conf/aliases.xml @@ -13,40 +13,40 @@ org.moparscape.msc.gs.model.InvItem - org.moparscape.msc.gs.model.Def.GameObjectLoc - org.moparscape.msc.gs.model.Def.ItemLoc - org.moparscape.msc.gs.model.Def.NPCLoc - org.moparscape.msc.gs.model.Def.GameObjectDef - org.moparscape.msc.gs.model.Def.ItemDef - org.moparscape.msc.gs.model.Def.NPCDef + org.moparscape.msc.gs.model.definition.entity.GameObjectLoc + org.moparscape.msc.gs.model.definition.entity.ItemLoc + org.moparscape.msc.gs.model.definition.entity.NPCLoc + org.moparscape.msc.gs.model.definition.entity.GameObjectDef + org.moparscape.msc.gs.model.definition.entity.ItemDef + org.moparscape.msc.gs.model.definition.entity.NPCDef + org.moparscape.msc.gs.model.definition.entity.ItemDropDef - org.moparscape.msc.gs.model.Def.extra.TileDef - org.moparscape.msc.gs.model.Def.extra.DoorDef - org.moparscape.msc.gs.model.Def.CerterDef - org.moparscape.msc.gs.model.Def.CertDef + org.moparscape.msc.gs.model.definition.extra.TileDef + org.moparscape.msc.gs.model.definition.extra.DoorDef + org.moparscape.msc.gs.model.definition.extra.CerterDef + org.moparscape.msc.gs.model.definition.extra.CertDef - org.moparscape.msc.gs.model.Def.PrayerDef - org.moparscape.msc.gs.model.Def.SpellDef - org.moparscape.msc.gs.model.Def.ItemCraftingDef - org.moparscape.msc.gs.model.Def.ItemHerbSecondDef - org.moparscape.msc.gs.model.Def.ItemDartTipDef - org.moparscape.msc.gs.model.Def.ItemGemDef - org.moparscape.msc.gs.model.Def.ItemLogCutDef - org.moparscape.msc.gs.model.Def.ItemBowStringDef - org.moparscape.msc.gs.model.Def.ItemArrowHeadDef - org.moparscape.msc.gs.model.Def.FiremakingDef - org.moparscape.msc.gs.model.Def.ReqOreDef - org.moparscape.msc.gs.model.Def.ItemWieldableDef - org.moparscape.msc.gs.model.Def.ItemUnIdentHerbDef - org.moparscape.msc.gs.model.Def.ItemHerbDef - org.moparscape.msc.gs.model.Def.ItemCookingDef - org.moparscape.msc.gs.model.Def.ItemSmeltingDef - org.moparscape.msc.gs.model.Def.ItemSmithingDef - org.moparscape.msc.gs.model.Def.ObjectMiningDef - org.moparscape.msc.gs.model.Def.ObjectWoodcuttingDef - org.moparscape.msc.gs.model.Def.ObjectFishingDef - org.moparscape.msc.gs.model.Def.ObjectFishDef - org.moparscape.msc.gs.model.Def.ItemDropDef - org.moparscape.msc.gs.model.Def.AgilityDef - org.moparscape.msc.gs.model.Def.AgilityCourseDef + org.moparscape.msc.gs.model.definition.skill.PrayerDef + org.moparscape.msc.gs.model.definition.skill.SpellDef + org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef + org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef + org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef + org.moparscape.msc.gs.model.definition.skill.ItemGemDef + org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef + org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef + org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef + org.moparscape.msc.gs.model.definition.skill.FiremakingDef + org.moparscape.msc.gs.model.definition.skill.ReqOreDef + org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef + org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef + org.moparscape.msc.gs.model.definition.skill.ItemHerbDef + org.moparscape.msc.gs.model.definition.skill.ItemCookingDef + org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef + org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef + org.moparscape.msc.gs.model.definition.skill.ObjectMiningDef + org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDef + org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef + org.moparscape.msc.gs.model.definition.skill.ObjectFishDef + org.moparscape.msc.gs.model.definition.skill.AgilityDef + org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef diff --git a/GameServer/module/DataStoreCore.jar b/GameServer/module/DataStoreCore.jar new file mode 100644 index 0000000..bfea6ab Binary files /dev/null and b/GameServer/module/DataStoreCore.jar differ diff --git a/GameServer/module/XMLUsingXStreamDataStore.jar b/GameServer/module/XMLUsingXStream.jar similarity index 88% rename from GameServer/module/XMLUsingXStreamDataStore.jar rename to GameServer/module/XMLUsingXStream.jar index bf66de5..aa9de3f 100644 Binary files a/GameServer/module/XMLUsingXStreamDataStore.jar and b/GameServer/module/XMLUsingXStream.jar differ diff --git a/GameServer/moparclassic.jar b/GameServer/moparclassic.jar index 556866c..6b651aa 100644 Binary files a/GameServer/moparclassic.jar and b/GameServer/moparclassic.jar differ diff --git a/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java index f6dafd2..ae47bcf 100644 --- a/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java @@ -194,7 +194,7 @@ public class StaticPacketBuilder { addByte((byte) val, false); return this; } - + /** * Ensures that the buffer is at least minimumBytes bytes. * diff --git a/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java b/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java index b3fc6dc..e49e66d 100644 --- a/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java +++ b/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java @@ -22,7 +22,7 @@ import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Snapshot; import org.moparscape.msc.gs.phandler.PacketHandler; -import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; import org.moparscape.msc.gs.plugins.dependencies.NpcAI; import org.moparscape.msc.gs.tools.Captcha; import org.moparscape.msc.gs.util.Logger; @@ -154,9 +154,9 @@ public final class GameEngine extends Thread { * @throws Exception */ protected void loadPacketHandlers() throws Exception { - PacketHandlerDefinition[] handlerDefs = Instance.getDataStore() + PacketHandlerDef[] handlerDefs = Instance.getDataStore() .loadPacketHandlerDefs(); - for (PacketHandlerDefinition handlerDef : handlerDefs) { + for (PacketHandlerDef handlerDef : handlerDefs) { try { String className = handlerDef.getClassName(); Class c = Class.forName(className); diff --git a/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java b/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java index ed41d3f..f010a62 100644 --- a/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java +++ b/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java @@ -17,7 +17,7 @@ import org.moparscape.msc.gs.connection.LSConnectionHandler; import org.moparscape.msc.gs.connection.LSPacket; import org.moparscape.msc.gs.connection.PacketQueue; import org.moparscape.msc.gs.phandler.PacketHandler; -import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; import org.moparscape.msc.gs.util.Logger; public class LoginConnector { @@ -144,8 +144,8 @@ public class LoginConnector { } private void loadPacketHandlers() throws Exception { - PacketHandlerDefinition[] handlerDefs = Instance.getDataStore().loadLSPacketHandlerDefs(); - for (PacketHandlerDefinition handlerDef : handlerDefs) { + PacketHandlerDef[] handlerDefs = Instance.getDataStore().loadLSPacketHandlerDefs(); + for (PacketHandlerDef handlerDef : handlerDefs) { try { String className = handlerDef.getClassName(); Class c = Class.forName(className); diff --git a/GameServer/src/org/moparscape/msc/gs/model/World.java b/GameServer/src/org/moparscape/msc/gs/model/World.java index 18cde83..8e2f17b 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/World.java +++ b/GameServer/src/org/moparscape/msc/gs/model/World.java @@ -23,7 +23,7 @@ import org.moparscape.msc.gs.model.landscape.MutableTileValue; import org.moparscape.msc.gs.model.landscape.TileValue; import org.moparscape.msc.gs.model.snapshot.Snapshot; import org.moparscape.msc.gs.npchandler.NpcHandler; -import org.moparscape.msc.gs.npchandler.NpcHandlerDefinition; +import org.moparscape.msc.gs.npchandler.NpcHandlerDef; import org.moparscape.msc.gs.quest.QuestManager; import org.moparscape.msc.gs.states.CombatState; import org.moparscape.msc.gs.util.EntityList; @@ -446,8 +446,8 @@ public final class World { */ private void loadNpcHandlers() throws Exception { - NpcHandlerDefinition[] handlerDefs = Instance.getDataStore().loadNpcHandlers(); - for (NpcHandlerDefinition handlerDef : handlerDefs) { + NpcHandlerDef[] handlerDefs = Instance.getDataStore().loadNpcHandlers(); + for (NpcHandlerDef handlerDef : handlerDefs) { try { String className = handlerDef.getClassName(); Class c = Class.forName(className); diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDefinition.java b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java similarity index 90% rename from GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDefinition.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java index aa1aa9c..8d0e018 100644 --- a/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.npchandler; /** * The definition of a npc handler, for use with XStream. */ -public class NpcHandlerDefinition { +public class NpcHandlerDef { /** * The name of the handler class */ @@ -22,7 +22,7 @@ public class NpcHandlerDefinition { * @param className * The name of the packet handler class */ - public NpcHandlerDefinition(int[] ids, String className) { + public NpcHandlerDef(int[] ids, String className) { this.ids = ids; this.className = className; } diff --git a/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java b/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java index 68af74d..1888f85 100644 --- a/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java +++ b/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java @@ -3,7 +3,6 @@ package org.moparscape.msc.gs.persistence; import java.util.List; import java.util.Map; -import org.moparscape.msc.gs.external.*; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; @@ -38,8 +37,8 @@ import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDef; import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDef; import org.moparscape.msc.gs.model.definition.skill.PrayerDef; import org.moparscape.msc.gs.model.definition.skill.SpellDef; -import org.moparscape.msc.gs.npchandler.NpcHandlerDefinition; -import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; +import org.moparscape.msc.gs.npchandler.NpcHandlerDef; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; /** * Any retrieval of unchanging data should be done through this interface. All @@ -53,18 +52,18 @@ import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; */ public abstract interface DataStore { - public PacketHandlerDefinition[] loadPacketHandlerDefs() throws Exception; + public PacketHandlerDef[] loadPacketHandlerDefs() throws Exception; - public void savePacketHandlerDefs(PacketHandlerDefinition[] defs) throws Exception; + public void savePacketHandlerDefs(PacketHandlerDef[] defs) throws Exception; - public PacketHandlerDefinition[] loadLSPacketHandlerDefs() throws Exception; + public PacketHandlerDef[] loadLSPacketHandlerDefs() throws Exception; - public void saveLSPacketHandlerDefs(PacketHandlerDefinition[] defs) + public void saveLSPacketHandlerDefs(PacketHandlerDef[] defs) throws Exception; - public NpcHandlerDefinition[] loadNpcHandlers() throws Exception; + public NpcHandlerDef[] loadNpcHandlers() throws Exception; - public void saveNpcHandlers(NpcHandlerDefinition[] defs) throws Exception; + public void saveNpcHandlers(NpcHandlerDef[] defs) throws Exception; public Map loadTelePoints() throws Exception; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDefinition.java b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java similarity index 90% rename from GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDefinition.java rename to GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java index d7787d0..ce58f2f 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.phandler; /** * The definition of a packet handler, for use with XStream. */ -public class PacketHandlerDefinition { +public class PacketHandlerDef { /** * The name of the handler class */ @@ -22,7 +22,7 @@ public class PacketHandlerDefinition { * @param className * The name of the packet handler class */ - public PacketHandlerDefinition(int[] ids, String className) { + public PacketHandlerDef(int[] ids, String className) { this.ids = ids; this.className = className; } diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala b/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala index d0634e8..0601622 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.scala @@ -337,7 +337,7 @@ class CommandHandler extends PacketHandler { def item(p: Player, args: Array[String]) { import org.moparscape.msc.gs.model.InvItem - import org.moparscape.msc.gs.external.EntityHandler + import org.moparscape.msc.gs.model.definition.EntityHandler if (args.length < 1 || args.length > 2) { message(p, "Invalid args. Syntax: ITEM id [amount]") return ; diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java b/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java index 1eba6ec..5e35c13 100644 --- a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java +++ b/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java @@ -6,7 +6,6 @@ import java.util.Map; import net.jcip.annotations.ThreadSafe; -import org.moparscape.msc.gs.external.*; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; @@ -41,12 +40,12 @@ import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDef; import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDef; import org.moparscape.msc.gs.model.definition.skill.PrayerDef; import org.moparscape.msc.gs.model.definition.skill.SpellDef; -import org.moparscape.msc.gs.npchandler.NpcHandlerDefinition; +import org.moparscape.msc.gs.npchandler.NpcHandlerDef; import org.moparscape.msc.gs.persistence.DataStore; import org.moparscape.msc.gs.persistence.impl.bun.CodecLookupService; import org.moparscape.msc.gs.persistence.impl.bun.FileLookupService; import org.moparscape.msc.gs.persistence.impl.bun.IO; -import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; @ThreadSafe public class BinaryUsingNIO implements DataStore { @@ -56,39 +55,39 @@ public class BinaryUsingNIO implements DataStore { } @Override - public PacketHandlerDefinition[] loadPacketHandlerDefs() throws Exception { - String cls = PacketHandlerDefinition.class.getName(); + public PacketHandlerDef[] loadPacketHandlerDefs() throws Exception { + String cls = PacketHandlerDef.class.getName(); File f = FileLookupService.lookup(cls); - return (PacketHandlerDefinition[]) CodecLookupService.lookup(cls).decode(IO.read(f)); + return (PacketHandlerDef[]) CodecLookupService.lookup(cls).decode(IO.read(f)); } @Override - public void savePacketHandlerDefs(PacketHandlerDefinition[] defs) throws Exception { + public void savePacketHandlerDefs(PacketHandlerDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public PacketHandlerDefinition[] loadLSPacketHandlerDefs() throws Exception { + public PacketHandlerDef[] loadLSPacketHandlerDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveLSPacketHandlerDefs(PacketHandlerDefinition[] defs) + public void saveLSPacketHandlerDefs(PacketHandlerDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public NpcHandlerDefinition[] loadNpcHandlers() throws Exception { + public NpcHandlerDef[] loadNpcHandlers() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveNpcHandlers(NpcHandlerDefinition[] defs) throws Exception { + public void saveNpcHandlers(NpcHandlerDef[] defs) throws Exception { // TODO Auto-generated method stub } diff --git a/Modules/DataStore/XMLUsingXStream/XMLUsingXStreamDataStore.jar b/Modules/DataStore/XMLUsingXStream/XMLUsingXStreamDataStore.jar deleted file mode 100644 index bf66de5..0000000 Binary files a/Modules/DataStore/XMLUsingXStream/XMLUsingXStreamDataStore.jar and /dev/null differ diff --git a/Modules/DataStore/XMLUsingXStream/build.xml b/Modules/DataStore/XMLUsingXStream/build.xml index d45995a..249f1c4 100644 --- a/Modules/DataStore/XMLUsingXStream/build.xml +++ b/Modules/DataStore/XMLUsingXStream/build.xml @@ -1,13 +1,11 @@ - - - + - + @@ -21,6 +19,10 @@ + + + + @@ -33,6 +35,7 @@ + diff --git a/Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java b/Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java index 1eb5264..1c7ac38 100644 --- a/Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java +++ b/Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java @@ -19,7 +19,6 @@ import java.util.zip.GZIPOutputStream; import net.jcip.annotations.NotThreadSafe; import org.moparscape.msc.config.Config; -import org.moparscape.msc.gs.external.*; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; @@ -54,9 +53,9 @@ import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDef; import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDef; import org.moparscape.msc.gs.model.definition.skill.PrayerDef; import org.moparscape.msc.gs.model.definition.skill.SpellDef; -import org.moparscape.msc.gs.npchandler.NpcHandlerDefinition; +import org.moparscape.msc.gs.npchandler.NpcHandlerDef; import org.moparscape.msc.gs.persistence.DataStore; -import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; import org.moparscape.msc.gs.util.Logger; import com.thoughtworks.xstream.XStream; @@ -137,18 +136,18 @@ public class XMLUsingXStream implements DataStore { } @Override - public PacketHandlerDefinition[] loadPacketHandlerDefs() { - return (PacketHandlerDefinition[]) load("PacketHandlers.xml"); + public PacketHandlerDef[] loadPacketHandlerDefs() { + return (PacketHandlerDef[]) load("PacketHandlers.xml"); } @Override - public PacketHandlerDefinition[] loadLSPacketHandlerDefs() { - return (PacketHandlerDefinition[]) load("LSPacketHandlers.xml"); + public PacketHandlerDef[] loadLSPacketHandlerDefs() { + return (PacketHandlerDef[]) load("LSPacketHandlers.xml"); } @Override - public NpcHandlerDefinition[] loadNpcHandlers() { - return (NpcHandlerDefinition[]) load("NpcHandlers.xml"); + public NpcHandlerDef[] loadNpcHandlers() { + return (NpcHandlerDef[]) load("NpcHandlers.xml"); } @Override @@ -342,18 +341,18 @@ public class XMLUsingXStream implements DataStore { } @Override - public void savePacketHandlerDefs(PacketHandlerDefinition[] defs) throws Exception { + public void savePacketHandlerDefs(PacketHandlerDef[] defs) throws Exception { write("PacketHandlers.xml", defs); } @Override - public void saveLSPacketHandlerDefs(PacketHandlerDefinition[] defs) + public void saveLSPacketHandlerDefs(PacketHandlerDef[] defs) throws Exception { write("LSPacketHanlders.xml", defs); } @Override - public void saveNpcHandlers(NpcHandlerDefinition[] defs) throws Exception { + public void saveNpcHandlers(NpcHandlerDef[] defs) throws Exception { write("NpcHandlers.xml", defs); }