diff --git a/GameServer/conf/aliases.xml b/GameServer/conf/aliases.xml index b1ba45c..f7bfb17 100644 --- a/GameServer/conf/aliases.xml +++ b/GameServer/conf/aliases.xml @@ -3,8 +3,8 @@ Stores aliases for the XStream engine - org.moparscape.msc.gs.phandler.PacketHandlerDefinition - org.moparscape.msc.gs.npchandler.NpcHandlerDefinition + org.moparscape.msc.gs.phandler.PacketHandlerDef + org.moparscape.msc.gs.npchandler.NpcHandlerDef org.moparscape.msc.gs.model.Point org.moparscape.msc.gs.model.TelePoint @@ -13,40 +13,40 @@ org.moparscape.msc.gs.model.InvItem - org.moparscape.msc.gs.model.definition.GameObjectLoc - org.moparscape.msc.gs.model.definition.ItemLoc - org.moparscape.msc.gs.model.definition.NPCLoc - org.moparscape.msc.gs.model.definition.GameObjectDefinition - org.moparscape.msc.gs.model.definition.ItemDefinition - org.moparscape.msc.gs.model.definition.NPCDefinition + 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.extra.TileDefinition - org.moparscape.msc.gs.model.definition.extra.DoorDefinition - org.moparscape.msc.gs.model.definition.CerterDefinition - org.moparscape.msc.gs.model.definition.CertDefinition + 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.PrayerDefinition - org.moparscape.msc.gs.model.definition.SpellDefinition - org.moparscape.msc.gs.model.definition.ItemCraftingDefinition - org.moparscape.msc.gs.model.definition.ItemHerbSecondDefinition - org.moparscape.msc.gs.model.definition.ItemDartTipDefinition - org.moparscape.msc.gs.model.definition.ItemGemDefinition - org.moparscape.msc.gs.model.definition.ItemLogCutDefinition - org.moparscape.msc.gs.model.definition.ItemBowStringDefinition - org.moparscape.msc.gs.model.definition.ItemArrowHeadDefinition - org.moparscape.msc.gs.model.definition.FiremakingDefinition - org.moparscape.msc.gs.model.definition.ReqOreDefinition - org.moparscape.msc.gs.model.definition.ItemWieldableDefinition - org.moparscape.msc.gs.model.definition.ItemUnIdentHerbDefinition - org.moparscape.msc.gs.model.definition.ItemHerbDefinition - org.moparscape.msc.gs.model.definition.ItemCookingDefinition - org.moparscape.msc.gs.model.definition.ItemSmeltingDefinition - org.moparscape.msc.gs.model.definition.ItemSmithingDefinition - org.moparscape.msc.gs.model.definition.ObjectMiningDefinition - org.moparscape.msc.gs.model.definition.ObjectWoodcuttingDefinition - org.moparscape.msc.gs.model.definition.ObjectFishingDefinition - org.moparscape.msc.gs.model.definition.ObjectFishDefinition - org.moparscape.msc.gs.model.definition.ItemDropDefinition - org.moparscape.msc.gs.model.definition.AgilityDefinition - org.moparscape.msc.gs.model.definition.AgilityCourseDefinition + 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 diff --git a/GameServer/src/org/moparscape/msc/config/Formulae.java b/GameServer/src/org/moparscape/msc/config/Formulae.java index 3aa6bfb..1f3aa3d 100644 --- a/GameServer/src/org/moparscape/msc/config/Formulae.java +++ b/GameServer/src/org/moparscape/msc/config/Formulae.java @@ -13,14 +13,14 @@ import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishDef; +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.SpellDef; import org.moparscape.msc.gs.tools.DataConversions; public class Formulae { @@ -514,7 +514,7 @@ public class Formulae { /** * Should the spell cast or fail? */ - public static boolean castSpell(SpellDefinition def, int magicLevel, int magicEquip) { + public static boolean castSpell(SpellDef def, int magicLevel, int magicEquip) { int levelDiff = magicLevel - def.getReqLevel(); if (magicEquip >= 30 && levelDiff >= 5) @@ -709,9 +709,9 @@ public class Formulae { /** * Decide what fish, if any, we should get from the water */ - public static ObjectFishDefinition getFish(int waterId, int fishingLevel, int click) { - ArrayList fish = new ArrayList(); - for (ObjectFishDefinition def : EntityHandler.getObjectFishingDef(waterId, + public static ObjectFishDef getFish(int waterId, int fishingLevel, int click) { + ArrayList fish = new ArrayList(); + for (ObjectFishDef def : EntityHandler.getObjectFishingDef(waterId, click).getFishDefs()) { if (fishingLevel >= def.getReqLevel()) { fish.add(def); @@ -720,7 +720,7 @@ public class Formulae { if (fish.size() <= 0) { return null; } - ObjectFishDefinition thisFish = fish.get(DataConversions.random(0, + ObjectFishDef thisFish = fish.get(DataConversions.random(0, fish.size() - 1)); int levelDiff = fishingLevel - thisFish.getReqLevel(); if (levelDiff < 0) { @@ -779,7 +779,7 @@ public class Formulae { /** * Should we get a log from the tree? */ - public static boolean getLog(ObjectWoodcuttingDefinition def, int woodcutLevel, + public static boolean getLog(ObjectWoodcuttingDef def, int woodcutLevel, int axeId) { int levelDiff = woodcutLevel - def.getReqLevel(); if (levelDiff < 0) { @@ -901,7 +901,7 @@ public class Formulae { /** * Should we can get an ore from the rock? */ - public static boolean getOre(ObjectMiningDefinition def, int miningLevel, int axeId) { + public static boolean getOre(ObjectMiningDef def, int miningLevel, int axeId) { int levelDiff = miningLevel - def.getReqLevel(); if (levelDiff > 50) @@ -1137,15 +1137,15 @@ public class Formulae { int y = -1; if (objs.length == 1) { Object obj = objs[0]; - if (obj instanceof GameObjectLocationDefinition) { - x = ((GameObjectLocationDefinition) obj).x; - y = ((GameObjectLocationDefinition) obj).y; - } else if ((obj instanceof ItemLocationDefinition)) { - x = ((ItemLocationDefinition) obj).x; - y = ((ItemLocationDefinition) obj).y; - } else if (obj instanceof NPCLocationDefinition) { - x = ((NPCLocationDefinition) obj).startX; - y = ((NPCLocationDefinition) obj).startY; + if (obj instanceof GameObjectLoc) { + x = ((GameObjectLoc) obj).x; + y = ((GameObjectLoc) obj).y; + } else if ((obj instanceof ItemLoc)) { + x = ((ItemLoc) obj).x; + y = ((ItemLoc) obj).y; + } else if (obj instanceof NPCLoc) { + x = ((NPCLoc) obj).startX; + y = ((NPCLoc) obj).startY; } } else { if (objs[0] instanceof Integer && objs[1] instanceof Integer) { @@ -1190,7 +1190,7 @@ public class Formulae { /** * Should the fire light or fail? */ - public static boolean lightLogs(FiremakingDefinition def, int firemakingLvl) { + public static boolean lightLogs(FiremakingDef def, int firemakingLvl) { int levelDiff = firemakingLvl - def.getRequiredLevel(); if (levelDiff < 0) { return false; diff --git a/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java b/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java index 318bfe0..40e99b2 100644 --- a/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java @@ -4,11 +4,11 @@ import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.model.Mob; import org.moparscape.msc.gs.model.Npc; import org.moparscape.msc.gs.model.Path; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; public abstract class WalkMobToMobEvent extends DelayedEvent { protected Mob affectedMob; - private NPCLocationDefinition loc = null; + private NPCLoc loc = null; protected Mob owner; private int radius; private long startTime = 0L; diff --git a/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java b/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java index c6479e2..b0e2623 100644 --- a/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java +++ b/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java @@ -15,9 +15,9 @@ import org.moparscape.msc.gs.model.Npc; import org.moparscape.msc.gs.model.Shop; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; import org.moparscape.msc.gs.model.landscape.MutableTileValue; import org.moparscape.msc.gs.model.landscape.Sector; import org.moparscape.msc.gs.tools.DataConversions; @@ -167,14 +167,14 @@ public class WorldLoader { public void loadObjects() throws Exception { World world = Instance.getWorld(); - for (GameObjectLocationDefinition gameObject : Instance.getDataStore().loadGameObjectLocs()) { + for (GameObjectLoc gameObject : Instance.getDataStore().loadGameObjectLocs()) { if (Config.f2pWildy && Formulae.isP2P(true, gameObject)) continue; if (Formulae.isP2P(gameObject) && !World.isMembers()) continue; world.registerGameObject(new GameObject(gameObject)); } - for (ItemLocationDefinition item : Instance.getDataStore().loadItemLocs()) { + for (ItemLoc item : Instance.getDataStore().loadItemLocs()) { if (Config.f2pWildy && Formulae.isP2P(true, item)) continue; if (Formulae.isP2P(item) && !World.isMembers()) @@ -182,7 +182,7 @@ public class WorldLoader { world.registerItem(new Item(item)); }// ember - for (NPCLocationDefinition npc : Instance.getDataStore().loadNPCLocs()) { + for (NPCLoc npc : Instance.getDataStore().loadNPCLocs()) { if (Config.f2pWildy && Formulae.isP2P(true, npc)) continue; if (Formulae.isP2P(npc) && !World.isMembers()) diff --git a/GameServer/src/org/moparscape/msc/gs/model/GameObject.java b/GameServer/src/org/moparscape/msc/gs/model/GameObject.java index 4b630ce..d5e7a7d 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/GameObject.java +++ b/GameServer/src/org/moparscape/msc/gs/model/GameObject.java @@ -1,9 +1,9 @@ package org.moparscape.msc.gs.model; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; public class GameObject extends Entity { /** @@ -19,7 +19,7 @@ public class GameObject extends Entity { /** * Location definition of the object */ - private GameObjectLocationDefinition loc = null; + private GameObjectLoc loc = null; /** * Set when the item has been destroyed to alert players */ @@ -30,7 +30,7 @@ public class GameObject extends Entity { */ private int type; - public GameObject(GameObjectLocationDefinition loc) { + public GameObject(GameObjectLoc loc) { direction = loc.direction; type = loc.type; this.loc = loc; @@ -39,7 +39,7 @@ public class GameObject extends Entity { } public GameObject(Point location, int id, int direction, int type) { - this(new GameObjectLocationDefinition(id, location.getX(), location.getY(), direction, + this(new GameObjectLoc(id, location.getX(), location.getY(), direction, type)); } @@ -66,15 +66,15 @@ public class GameObject extends Entity { return direction; } - public DoorDefinition getDoorDef() { + public DoorDef getDoorDef() { return EntityHandler.getDoorDef(super.getID()); } - public GameObjectDefinition getGameObjectDef() { + public GameObjectDef getGameObjectDef() { return EntityHandler.getGameObjectDef(super.getID()); } - public GameObjectLocationDefinition getLoc() { + public GameObjectLoc getLoc() { return loc; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/InvItem.java b/GameServer/src/org/moparscape/msc/gs/model/InvItem.java index db644e1..3b2a41b 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/InvItem.java +++ b/GameServer/src/org/moparscape/msc/gs/model/InvItem.java @@ -1,11 +1,11 @@ package org.moparscape.msc.gs.model; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; public class InvItem extends Entity implements Comparable { @@ -51,23 +51,23 @@ public class InvItem extends Entity implements Comparable { return amount; } - public ItemCookingDefinition getCookingDef() { + public ItemCookingDef getCookingDef() { return EntityHandler.getItemCookingDef(id); } - public ItemDefinition getDef() { + public ItemDef getDef() { return EntityHandler.getItemDef(id); } - public ItemSmeltingDefinition getSmeltingDef() { + public ItemSmeltingDef getSmeltingDef() { return EntityHandler.getItemSmeltingDef(id); } - public ItemUnIdentHerbDefinition getUnIdentHerbDef() { + public ItemUnIdentHerbDef getUnIdentHerbDef() { return EntityHandler.getItemUnIdentHerbDef(id); } - public ItemWieldableDefinition getWieldableDef() { + public ItemWieldableDef getWieldableDef() { return EntityHandler.getItemWieldableDef(id); } diff --git a/GameServer/src/org/moparscape/msc/gs/model/Item.java b/GameServer/src/org/moparscape/msc/gs/model/Item.java index ac2db89..0aa8d50 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/Item.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Item.java @@ -5,8 +5,8 @@ import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.db.DataManager; import org.moparscape.msc.gs.event.DelayedEvent; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; public class Item extends Entity { /** @@ -21,7 +21,7 @@ public class Item extends Entity { /** * Location definition of the item */ - private ItemLocationDefinition loc = null; + private ItemLoc loc = null; /** * Contains the player that the item belongs to, if any @@ -84,7 +84,7 @@ public class Item extends Entity { } } - public Item(ItemLocationDefinition loc) { + public Item(ItemLoc loc) { this.loc = loc; setID(loc.id); setAmount(loc.amount); @@ -125,11 +125,11 @@ public class Item extends Entity { return amount; } - public ItemDefinition getDef() { + public ItemDef getDef() { return EntityHandler.getItemDef(id); } - public ItemLocationDefinition getLoc() { + public ItemLoc getLoc() { return loc; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/Mob.java b/GameServer/src/org/moparscape/msc/gs/model/Mob.java index c522ddc..2396cae 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/Mob.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Mob.java @@ -66,7 +66,7 @@ public abstract class Mob extends Entity { /** * The path we are walking */ - private PathHandler pathHandler = new PathHandler(this); + public PathHandler pathHandler = new PathHandler(this); /** * Set when the mob has been destroyed to alert players */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/Npc.java b/GameServer/src/org/moparscape/msc/gs/model/Npc.java index deb8094..acc7e21 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/Npc.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Npc.java @@ -12,9 +12,9 @@ import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.event.DelayedEvent; import org.moparscape.msc.gs.event.FightEvent; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.ItemDropDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; +import org.moparscape.msc.gs.model.definition.entity.ItemDropDef; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.plugins.dependencies.NpcAI; import org.moparscape.msc.gs.states.Action; @@ -111,13 +111,13 @@ public class Npc extends Mob { /** * The definition of this npc */ - private NPCDefinition def; + private NPCDef def; private Syndicate syndicate = new Syndicate(); private boolean goingToAttack = false; /** * The location of this npc */ - private NPCLocationDefinition loc; + private NPCLoc loc; public boolean hasRan() { return ran; @@ -199,11 +199,11 @@ public class Npc extends Mob { this.weakend = weakend; } - public void setDef(NPCDefinition def) { + public void setDef(NPCDef def) { this.def = def; } - public void setLoc(NPCLocationDefinition loc) { + public void setLoc(NPCLoc loc) { this.loc = loc; } @@ -222,7 +222,7 @@ public class Npc extends Mob { public Npc(int id, int startX, int startY, int minX, int maxX, int minY, int maxY) { - this(new NPCLocationDefinition(id, startX, startY, minX, maxX, minY, maxY)); + this(new NPCLoc(id, startX, startY, minX, maxX, minY, maxY)); } public boolean isScripted() { @@ -233,7 +233,7 @@ public class Npc extends Mob { this.scripted = scripted; } - public Npc(NPCLocationDefinition loc) { + public Npc(NPCLoc loc) { for (int i : Constants.GameServer.UNDEAD_NPCS) { if (loc.getId() == i) { this.undead = true; @@ -384,7 +384,7 @@ public class Npc extends Mob { return 0; } - public NPCDefinition getDef() { + public NPCDef getDef() { return EntityHandler.getNpcDef(getID()); } @@ -396,7 +396,7 @@ public class Npc extends Mob { return curHits; } - public NPCLocationDefinition getLoc() { + public NPCLoc getLoc() { return loc; } @@ -433,10 +433,10 @@ public class Npc extends Mob { Player owner = mob instanceof Player ? (Player) mob : null; - ItemDropDefinition[] drops = def.getDrops(); + ItemDropDef[] drops = def.getDrops(); int total = 0; - for (ItemDropDefinition drop : drops) { + for (ItemDropDef drop : drops) { total += drop.getWeight(); } // @@ -445,15 +445,12 @@ public class Npc extends Mob { if (!this.getDef().name.equalsIgnoreCase("ghost")) { - for (ItemDropDefinition drop : drops) { + for (ItemDropDef drop : drops) { if (drop == null) { continue; } if (drop.getWeight() == 0) { - Item i = new Item(drop.getID(), getX(),getY(), drop.getAmount(), owner); - if(i.getDef().members && !Server.isMembers()) - continue; - world.registerItem(i); + world.registerItem(new Item(drop.getID(), getX(),getY(), drop.getAmount(), owner)); continue; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/Player.java b/GameServer/src/org/moparscape/msc/gs/model/Player.java index 785e642..f25a89b 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/Player.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Player.java @@ -26,8 +26,8 @@ import org.moparscape.msc.gs.event.MiniEvent; import org.moparscape.msc.gs.event.RangeEvent; import org.moparscape.msc.gs.event.ShortEvent; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.PrayerDef; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.client.WieldHandler; import org.moparscape.msc.gs.quest.Quest; @@ -45,6 +45,8 @@ import bsh.Interpreter; */ public final class Player extends Mob { + public int dropTickCount = 0; + /** * Methods to send packets related to actions */ @@ -52,7 +54,7 @@ public final class Player extends Mob { /** * The current agility course the player's doing */ - private AgilityCourseDefinition agilityCourseDef = null; + private AgilityCourseDef agilityCourseDef = null; /** * The Players appearance */ @@ -63,7 +65,7 @@ public final class Player extends Mob { * get a skull for attacking back */ private HashMap attackedBy = new HashMap(); - // teleport + private boolean badClient = false; /** * Bank for banked items @@ -623,7 +625,7 @@ public final class Player extends Mob { public void addPrayerDrain(int prayerID) { drainRate = 0; - PrayerDefinition prayer = EntityHandler.getPrayerDef(prayerID); + PrayerDef prayer = EntityHandler.getPrayerDef(prayerID); for (int x = 0; x <= 13; x++) { prayer = EntityHandler.getPrayerDef(x); if (super.isPrayerActivated(x)) { @@ -876,7 +878,7 @@ public final class Player extends Mob { /** * @return this player's current agility course */ - public AgilityCourseDefinition getAgilityCourseDef() { + public AgilityCourseDef getAgilityCourseDef() { return agilityCourseDef; } @@ -902,9 +904,6 @@ public final class Player extends Mob { return attackedBy; } - /* - * Used for the Infected Blood world event - */ public Bank getBank() { return bank; @@ -914,37 +913,21 @@ public final class Player extends Mob { return bubblesNeedingDisplayed; } - /* - * Informs the server that the player has just used Infected Blood and - * activate the cooldown. - */ public long getCastTimer() { return lastSpellCast; } - /* - * Returns the last time a player used Infected Blood. - */ public List getChatMessagesNeedingDisplayed() { return chatMessagesNeedingDisplayed; } - /* - * Is this player infected? - */ public LinkedList getChatQueue() { return chatQueue; } - /* - * This method is used for the Infected Blood world event - * - * @author Ollie - */ - public String getClassName() { return className; } @@ -2370,7 +2353,7 @@ public final class Player extends Mob { /** * Sets this player's current agility course */ - public void setAgilityCourseDef(AgilityCourseDefinition def) { + public void setAgilityCourseDef(AgilityCourseDef def) { agilityCourseDef = def; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/World.java b/GameServer/src/org/moparscape/msc/gs/model/World.java index 1fc07e2..18cde83 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/World.java +++ b/GameServer/src/org/moparscape/msc/gs/model/World.java @@ -16,8 +16,8 @@ import org.moparscape.msc.gs.core.DelayedEventHandler; import org.moparscape.msc.gs.event.DelayedEvent; import org.moparscape.msc.gs.event.SingleEvent; import org.moparscape.msc.gs.io.WorldLoader; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.landscape.MutableTileValue; import org.moparscape.msc.gs.model.landscape.TileValue; @@ -241,7 +241,7 @@ public final class World { /** * Adds a DelayedEvent that will spawn a GameObject */ - public void delayedSpawnObject(final GameObjectLocationDefinition loc, + public void delayedSpawnObject(final GameObjectLoc loc, final int respawnTime) { delayedEventHandler.add(new SingleEvent(null, respawnTime) { @@ -532,7 +532,7 @@ public final class World { * Registers an npc with the world */ public void registerNpc(Npc n) { - NPCLocationDefinition npc = n.getLoc(); + NPCLoc npc = n.getLoc(); if (npc.startX < npc.minX || npc.startX > npc.maxX || npc.startY < npc.minY || npc.startY > npc.maxY || (getTileValue(npc.startX, npc.startY).mapValue & 64) != 0) { diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/EntityHandler.java b/GameServer/src/org/moparscape/msc/gs/model/definition/EntityHandler.java index bdc1522..215622d 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/EntityHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/EntityHandler.java @@ -7,33 +7,33 @@ import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.TelePoint; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; -import org.moparscape.msc.gs.model.definition.extra.CerterDefinition; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; -import org.moparscape.msc.gs.model.definition.extra.TileDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityDefinition; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemGemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; +import org.moparscape.msc.gs.model.definition.extra.CerterDef; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; +import org.moparscape.msc.gs.model.definition.extra.TileDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityDef; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef; +import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef; +import org.moparscape.msc.gs.model.definition.skill.ItemGemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef; +import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef; +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.persistence.DataStore; /** @@ -41,41 +41,41 @@ import org.moparscape.msc.gs.persistence.DataStore; * methods for relaying these entities to the user. */ public class EntityHandler { - private static Map agilityCourses; - private static Map agilityObjects; - private static Map arrowHeads; - private static Map bowString; - private static Map certers; - private static Map dartTips; + private static Map agilityCourses; + private static Map agilityObjects; + private static Map arrowHeads; + private static Map bowString; + private static Map certers; + private static Map dartTips; - private static DoorDefinition[] doors; - private static Map firemaking; - private static GameObjectDefinition[] gameObjects; - private static Map gems; - private static ItemHerbSecondDefinition[] herbSeconds; + private static DoorDef[] doors; + private static Map firemaking; + private static GameObjectDef[] gameObjects; + private static Map gems; + private static ItemHerbSecondDef[] herbSeconds; private static Map itemAffectedTypes; - private static Map itemCooking; - private static ItemCraftingDefinition[] itemCrafting; + private static Map itemCooking; + private static ItemCraftingDef[] itemCrafting; private static Map itemEdibleHeals; - private static Map itemHerb; - private static ItemDefinition[] items; - private static Map itemSmelting; - private static ItemSmithingDefinition[] itemSmithing; - private static Map itemUnIdentHerb; - private static Map itemWieldable; + private static Map itemHerb; + private static ItemDef[] items; + private static Map itemSmelting; + private static ItemSmithingDef[] itemSmithing; + private static Map itemUnIdentHerb; + private static Map itemWieldable; private static List[] keyChestLoots; - private static Map logCut; + private static Map logCut; - private static NPCDefinition[] npcs; - private static Map objectFishing; + private static NPCDef[] npcs; + private static Map objectFishing; - private static Map objectMining; + private static Map objectMining; private static Map objectTelePoints; - private static Map objectWoodcutting; - private static PrayerDefinition[] prayers; + private static Map objectWoodcutting; + private static PrayerDef[] prayers; private static Map spellAggressiveLvl; - private static SpellDefinition[] spells; - private static TileDefinition[] tiles; + private static SpellDef[] spells; + private static TileDef[] tiles; static { DataStore dataStore = Instance.getDataStore(); @@ -83,7 +83,7 @@ public class EntityHandler { doors = dataStore.loadDoorDefs(); gameObjects = dataStore.loadGameObjectDefs(); npcs = dataStore.loadNPCDefs(); - for (NPCDefinition n : npcs) { + for (NPCDef n : npcs) { if (n.isAttackable()) { n.respawnTime -= (n.respawnTime / 3); } @@ -129,7 +129,7 @@ public class EntityHandler { * the agility courses's start ID * @return the AgilityCourseDef with the given start ID */ - public static AgilityCourseDefinition getAgilityCourseDef(int id) { + public static AgilityCourseDef getAgilityCourseDef(int id) { return agilityCourses.get(id); } @@ -138,7 +138,7 @@ public class EntityHandler { * the agility object's ID * @return the AgilityDef with the given object ID */ - public static AgilityDefinition getAgilityDef(int id) { + public static AgilityDef getAgilityDef(int id) { return agilityObjects.get(id); } @@ -147,14 +147,14 @@ public class EntityHandler { * the npcs ID * @return the CerterDef for the given npc */ - public static CerterDefinition getCerterDef(int id) { + public static CerterDef getCerterDef(int id) { return certers.get(id); } /** * @return the ItemCraftingDef for the requested item */ - public static ItemCraftingDefinition getCraftingDef(int id) { + public static ItemCraftingDef getCraftingDef(int id) { if (id < 0 || id >= itemCrafting.length) { return null; } @@ -166,7 +166,7 @@ public class EntityHandler { * the entities ID * @return the DoorDef with the given ID */ - public static DoorDefinition getDoorDef(int id) { + public static DoorDef getDoorDef(int id) { if (id < 0 || id >= doors.length) { return null; } @@ -176,7 +176,7 @@ public class EntityHandler { /** * @return the FiremakingDef for the given log */ - public static FiremakingDefinition getFiremakingDef(int id) { + public static FiremakingDef getFiremakingDef(int id) { return firemaking.get(id); } @@ -185,7 +185,7 @@ public class EntityHandler { * the entities ID * @return the GameObjectDef with the given ID */ - public static GameObjectDefinition getGameObjectDef(int id) { + public static GameObjectDef getGameObjectDef(int id) { if (id < 0 || id >= gameObjects.length) { return null; } @@ -204,14 +204,14 @@ public class EntityHandler { /** * @return the ItemArrowHeadDef for the given arrow */ - public static ItemArrowHeadDefinition getItemArrowHeadDef(int id) { + public static ItemArrowHeadDef getItemArrowHeadDef(int id) { return arrowHeads.get(id); } /** * @return the ItemBowStringDef for the given bow */ - public static ItemBowStringDefinition getItemBowStringDef(int id) { + public static ItemBowStringDef getItemBowStringDef(int id) { return bowString.get(id); } @@ -220,14 +220,14 @@ public class EntityHandler { * the entities ID * @return the ItemCookingDef with the given ID */ - public static ItemCookingDefinition getItemCookingDef(int id) { + public static ItemCookingDef getItemCookingDef(int id) { return itemCooking.get(id); } /** * @return the ItemDartTipDef for the given tip */ - public static ItemDartTipDefinition getItemDartTipDef(int id) { + public static ItemDartTipDef getItemDartTipDef(int id) { return dartTips.get(id); } @@ -236,7 +236,7 @@ public class EntityHandler { * the entities ID * @return the ItemDef with the given ID */ - public static ItemDefinition getItemDef(int id) { + public static ItemDef getItemDef(int id) { if (id < 0 || id >= items.length) { return null; } @@ -259,7 +259,7 @@ public class EntityHandler { /** * @return the ItemGemDef for the given gem */ - public static ItemGemDefinition getItemGemDef(int id) { + public static ItemGemDef getItemGemDef(int id) { return gems.get(id); } @@ -268,16 +268,16 @@ public class EntityHandler { * the entities ID * @return the ItemHerbDef with the given ID */ - public static ItemHerbDefinition getItemHerbDef(int id) { + public static ItemHerbDef getItemHerbDef(int id) { return itemHerb.get(id); } /** * @return the ItemHerbSecond for the given second ingredient */ - public static ItemHerbSecondDefinition getItemHerbSecond(int secondID, + public static ItemHerbSecondDef getItemHerbSecond(int secondID, int unfinishedID) { - for (ItemHerbSecondDefinition def : herbSeconds) { + for (ItemHerbSecondDef def : herbSeconds) { if (def.getSecondID() == secondID && def.getUnfinishedID() == unfinishedID) { return def; @@ -289,7 +289,7 @@ public class EntityHandler { /** * @return the ItemLogCutDef for the given log */ - public static ItemLogCutDefinition getItemLogCutDef(int id) { + public static ItemLogCutDef getItemLogCutDef(int id) { return logCut.get(id); } @@ -298,7 +298,7 @@ public class EntityHandler { * the entities ID * @return the ItemSmeltingDef with the given ID */ - public static ItemSmeltingDefinition getItemSmeltingDef(int id) { + public static ItemSmeltingDef getItemSmeltingDef(int id) { return itemSmelting.get(id); } @@ -307,7 +307,7 @@ public class EntityHandler { * the entities ID * @return the ItemUnIdentHerbDef with the given ID */ - public static ItemUnIdentHerbDefinition getItemUnIdentHerbDef(int id) { + public static ItemUnIdentHerbDef getItemUnIdentHerbDef(int id) { return itemUnIdentHerb.get(id); } @@ -316,7 +316,7 @@ public class EntityHandler { * the entities ID * @return the ItemWieldableDef with the given ID */ - public static ItemWieldableDefinition getItemWieldableDef(int id) { + public static ItemWieldableDef getItemWieldableDef(int id) { return itemWieldable.get(id); } @@ -329,7 +329,7 @@ public class EntityHandler { * the entities ID * @return the NPCDef with the given ID */ - public static NPCDefinition getNpcDef(int id) { + public static NPCDef getNpcDef(int id) { if (id < 0 || id >= npcs.length) { return null; } @@ -341,8 +341,8 @@ public class EntityHandler { * the entities ID * @return the ObjectFishingDef with the given ID */ - public static ObjectFishingDefinition getObjectFishingDef(int id, int click) { - ObjectFishingDefinition[] defs = objectFishing.get(id); + public static ObjectFishingDef getObjectFishingDef(int id, int click) { + ObjectFishingDef[] defs = objectFishing.get(id); if (defs == null) { return null; } @@ -354,7 +354,7 @@ public class EntityHandler { * the entities ID * @return the ObjectMiningDef with the given ID */ - public static ObjectMiningDefinition getObjectMiningDef(int id) { + public static ObjectMiningDef getObjectMiningDef(int id) { return objectMining.get(id); } @@ -379,7 +379,7 @@ public class EntityHandler { * the entities ID * @return the ObjectWoodcuttingDef with the given ID */ - public static ObjectWoodcuttingDefinition getObjectWoodcuttingDef(int id) { + public static ObjectWoodcuttingDef getObjectWoodcuttingDef(int id) { return objectWoodcutting.get(id); } @@ -388,7 +388,7 @@ public class EntityHandler { * the entities ID * @return the PrayerDef with the given ID */ - public static PrayerDefinition getPrayerDef(int id) { + public static PrayerDef getPrayerDef(int id) { if (id < 0 || id >= prayers.length) { return null; } @@ -398,7 +398,7 @@ public class EntityHandler { /** * @return the ItemSmithingDef for the requested item */ - public static ItemSmithingDefinition getSmithingDef(int id) { + public static ItemSmithingDef getSmithingDef(int id) { if (id < 0 || id >= itemSmithing.length) { return null; } @@ -408,8 +408,8 @@ public class EntityHandler { /** * @return the ItemSmithingDef for the requested item */ - public static ItemSmithingDefinition getSmithingDefbyID(int itemID) { - for (ItemSmithingDefinition i : itemSmithing) { + public static ItemSmithingDef getSmithingDefbyID(int itemID) { + for (ItemSmithingDef i : itemSmithing) { if (i.itemID == itemID) return i; } @@ -434,7 +434,7 @@ public class EntityHandler { * the entities ID * @return the SpellDef with the given ID */ - public static SpellDefinition getSpellDef(int id) { + public static SpellDef getSpellDef(int id) { if (id < 0 || id >= spells.length) { return null; } @@ -446,7 +446,7 @@ public class EntityHandler { * the entities ID * @return the TileDef with the given ID */ - public static TileDefinition getTileDef(int id) { + public static TileDef getTileDef(int id) { if (id < 0 || id >= tiles.length) { return null; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDef.java index dc17268..abafdf3 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectDef.java @@ -5,7 +5,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for game objects */ -public class GameObjectDefinition extends EntityDefinition { +public class GameObjectDef extends EntityDefinition { /** * The first command of the object diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLocationDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLoc.java similarity index 83% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLocationDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLoc.java index 8c6fffa..a2ced57 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLocationDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/GameObjectLoc.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.entity; -public class GameObjectLocationDefinition { +public class GameObjectLoc { /** * The direction it faces */ @@ -22,7 +22,7 @@ public class GameObjectLocationDefinition { */ public int y; - public GameObjectLocationDefinition(int id, int x, int y, int direction, int type) { + public GameObjectLoc(int id, int x, int y, int direction, int type) { this.id = id; this.x = x; this.y = y; diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDef.java similarity index 95% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDef.java index 9424b3a..04fbdc1 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDef.java @@ -5,7 +5,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for items */ -public class ItemDefinition extends EntityDefinition { +public class ItemDef extends EntityDefinition { /** * The base price of the object */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDef.java similarity index 76% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDef.java index ba6ebb9..00931de 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemDropDef.java @@ -1,11 +1,11 @@ package org.moparscape.msc.gs.model.definition.entity; -public class ItemDropDefinition { +public class ItemDropDef { public int amount; public int id; public int weight; - public ItemDropDefinition(int id, int amount, int weight) { + public ItemDropDef(int id, int amount, int weight) { this.id = id; this.amount = amount; this.weight = weight; diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLocationDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLoc.java similarity index 93% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLocationDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLoc.java index cdefc3b..634cdd4 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLocationDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/ItemLoc.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.entity; -public class ItemLocationDefinition { +public class ItemLoc { /** * Amount of item (stackables) */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDef.java index 271bd33..7591fba 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCDef.java @@ -5,7 +5,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for npcs */ -public class NPCDefinition extends EntityDefinition { +public class NPCDef extends EntityDefinition { /** * Whether the npc is aggressive */ @@ -37,7 +37,7 @@ public class NPCDefinition extends EntityDefinition { /** * Possible drops */ - public ItemDropDefinition[] drops; + public ItemDropDef[] drops; /** * Colour of our hair */ @@ -103,7 +103,7 @@ public class NPCDefinition extends EntityDefinition { return defense; } - public ItemDropDefinition[] getDrops() { + public ItemDropDef[] getDrops() { return drops; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLocationDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLoc.java similarity index 87% rename from GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLocationDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLoc.java index a1a5bd7..c210f6d 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLocationDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/entity/NPCLoc.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.entity; -public class NPCLocationDefinition { +public class NPCLoc { /** * The id of the Npc */ @@ -30,7 +30,7 @@ public class NPCLocationDefinition { */ public int startY; - public NPCLocationDefinition(int id, int startX, int startY, int minX, int maxX, int minY, + public NPCLoc(int id, int startX, int startY, int minX, int maxX, int minY, int maxY) { this.id = id; this.startX = startX; diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDef.java index e98a39a..5b5dca9 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CertDef.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.extra; -public class CertDefinition { +public class CertDef { /** * The ID of the certificate */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDef.java similarity index 90% rename from GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDef.java index a935cd0..2aed91e 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/CerterDef.java @@ -1,10 +1,10 @@ package org.moparscape.msc.gs.model.definition.extra; -public class CerterDefinition { +public class CerterDef { /** * Certs this stall can deal with */ - private CertDefinition[] certs; + private CertDef[] certs; /** * Type of stall */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDef.java index b1b4d2a..5533faa 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/DoorDef.java @@ -5,7 +5,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for doors */ -public class DoorDefinition extends EntityDefinition { +public class DoorDef extends EntityDefinition { /** * The first command of the door diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDef.java similarity index 90% rename from GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDef.java index 561191a..b38609b 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/extra/TileDef.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.extra; -public class TileDefinition { +public class TileDef { public int colour; public int objectType; public int unknown; diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDef.java similarity index 96% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDef.java index 27660ef..25e67e4 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityCourseDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * Defines an agility course */ -public class AgilityCourseDefinition { +public class AgilityCourseDef { /** * Ending object ID */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDef.java similarity index 98% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDef.java index fa6149b..a7c2950 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/AgilityDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * Defines an agility course object */ -public class AgilityDefinition { +public class AgilityDef { /** * Can you fail this obstacle? */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDef.java index e2f3ec5..cd6218e 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/FiremakingDef.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.skill; -public class FiremakingDefinition { +public class FiremakingDef { /** * The exp given by these logs */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDef.java index 629a65e..91c44b7 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemArrowHeadDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemArrowHeadDefinition { +public class ItemArrowHeadDef { /** * The ID of the arrow created diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDef.java index 9a807e1..7a29fd9 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemBowStringDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemBowStringDefinition { +public class ItemBowStringDef { /** * The ID of the bow created diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDef.java similarity index 93% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDef.java index 1e4163a..1c99319 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCookingDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemCookingDefinition { +public class ItemCookingDef { /** * The id of the burned version diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDef.java similarity index 91% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDef.java index 40f1bdd..1d35ee1 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemCraftingDef.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.skill; -public class ItemCraftingDefinition { +public class ItemCraftingDef { /** * The exp given */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDef.java index 1b81194..614b1ef 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemDartTipDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemDartTipDefinition { +public class ItemDartTipDef { /** * The ID of the arrow created diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDef.java similarity index 93% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDef.java index 19ea0ee..5fb3ae1 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemGemDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemGemDefinition { +public class ItemGemDef { /** * The exp given by attaching this bow string diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDef.java index f7701b2..69da2a0 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemHerbDefinition { +public class ItemHerbDef { /** * The exp smelting this item gives diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDef.java index e502c1c..efb7945 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemHerbSecondDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemHerbSecondDefinition { +public class ItemHerbSecondDef { /** * The exp given completing this potion diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDef.java similarity index 95% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDef.java index adf83ec..def037c 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemLogCutDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemLogCutDefinition { +public class ItemLogCutDef { public int longbowExp; public int longbowID; diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDef.java similarity index 81% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDef.java index 918f7c8..03c84e5 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmeltingDef.java @@ -4,7 +4,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for items */ -public class ItemSmeltingDefinition { +public class ItemSmeltingDef { /** * The id of the related bar @@ -17,7 +17,7 @@ public class ItemSmeltingDefinition { /** * The ores required in addition to this one */ - public ReqOreDefinition[] reqOres; + public ReqOreDef[] reqOres; /** * The level required to smelt this */ @@ -35,7 +35,7 @@ public class ItemSmeltingDefinition { return requiredLvl; } - public ReqOreDefinition[] getReqOres() { + public ReqOreDef[] getReqOres() { return reqOres; } diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDef.java similarity index 93% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDef.java index 4379233..2ab8f4f 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemSmithingDef.java @@ -1,6 +1,6 @@ package org.moparscape.msc.gs.model.definition.skill; -public class ItemSmithingDefinition { +public class ItemSmithingDef { /** * The amount of the item produced */ diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDef.java similarity index 91% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDef.java index 1919bcb..c7e0a69 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemUnIdentHerbDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for herbs */ -public class ItemUnIdentHerbDefinition { +public class ItemUnIdentHerbDef { /** * How much experience identifying gives diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDef.java similarity index 98% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDef.java index f877baf..35f149a 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ItemWieldableDef.java @@ -9,7 +9,7 @@ import org.moparscape.msc.gs.model.definition.EntityHandler; /** * The definition wrapper for items */ -public class ItemWieldableDefinition { +public class ItemWieldableDef { /** * How many armour points should be given diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDef.java similarity index 92% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDef.java index b7ceedd..2f60e51 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for fish */ -public class ObjectFishDefinition { +public class ObjectFishDef { /** * How much experience this fish should give diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDef.java similarity index 78% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDef.java index 94b2c96..cc864c6 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectFishingDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for fishing spots */ -public class ObjectFishingDefinition { +public class ObjectFishingDef { /** * The If of any bait required to go with the net @@ -12,7 +12,7 @@ public class ObjectFishingDefinition { /** * The fish that can be caught here */ - public ObjectFishDefinition[] defs; + public ObjectFishDef[] defs; /** * The Id of the net required to fish with */ @@ -22,7 +22,7 @@ public class ObjectFishingDefinition { return baitId; } - public ObjectFishDefinition[] getFishDefs() { + public ObjectFishDef[] getFishDefs() { return defs; } @@ -32,7 +32,7 @@ public class ObjectFishingDefinition { public int getReqLevel() { int requiredLevel = 99; - for (ObjectFishDefinition def : defs) { + for (ObjectFishDef def : defs) { if (def.getReqLevel() < requiredLevel) { requiredLevel = def.getReqLevel(); } diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDef.java index b7f2e9a..017d059 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectMiningDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for rocks */ -public class ObjectMiningDefinition { +public class ObjectMiningDef { /** * How much experience identifying gives diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDef.java index 5c165fa..22c8e4f 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ObjectWoodcuttingDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for trees */ -public class ObjectWoodcuttingDefinition { +public class ObjectWoodcuttingDef { /** * How much experience identifying gives diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDef.java similarity index 88% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDef.java index df7d299..d4df711 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/PrayerDef.java @@ -5,7 +5,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for prayers */ -public class PrayerDefinition extends EntityDefinition { +public class PrayerDef extends EntityDefinition { /** * The drain rate of the prayer (perhaps points per min?) diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDef.java similarity index 90% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDef.java index 2628358..72e4e6d 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/ReqOreDef.java @@ -3,7 +3,7 @@ package org.moparscape.msc.gs.model.definition.skill; /** * The definition wrapper for ores */ -public class ReqOreDefinition { +public class ReqOreDef { /** * The amount of the ore required diff --git a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDefinition.java b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDef.java similarity index 94% rename from GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDefinition.java rename to GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDef.java index 6361a56..67ea219 100644 --- a/GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDefinition.java +++ b/GameServer/src/org/moparscape/msc/gs/model/definition/skill/SpellDef.java @@ -9,7 +9,7 @@ import org.moparscape.msc.gs.model.definition.EntityDefinition; /** * The definition wrapper for spells */ -public class SpellDefinition extends EntityDefinition { +public class SpellDef extends EntityDefinition { /** * The amount of experience given by this spell diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java index 39f41ca..186f375 100644 --- a/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java @@ -9,7 +9,7 @@ import org.moparscape.msc.gs.model.Npc; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.extra.CerterDefinition; +import org.moparscape.msc.gs.model.definition.extra.CerterDef; public class Certer implements NpcHandler { /** @@ -18,7 +18,7 @@ public class Certer implements NpcHandler { public static final World world = Instance.getWorld(); public void handleNpc(final Npc npc, Player player) throws Exception { - final CerterDefinition certerDef = EntityHandler.getCerterDef(npc.getID()); + final CerterDef certerDef = EntityHandler.getCerterDef(npc.getID()); if (certerDef == null) { return; } diff --git a/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java b/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java index 9951164..68af74d 100644 --- a/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java +++ b/GameServer/src/org/moparscape/msc/gs/persistence/DataStore.java @@ -8,36 +8,36 @@ import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; import org.moparscape.msc.gs.model.TelePoint; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; -import org.moparscape.msc.gs.model.definition.extra.CerterDefinition; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; -import org.moparscape.msc.gs.model.definition.extra.TileDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityDefinition; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemGemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; +import org.moparscape.msc.gs.model.definition.extra.CerterDef; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; +import org.moparscape.msc.gs.model.definition.extra.TileDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityDef; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef; +import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef; +import org.moparscape.msc.gs.model.definition.skill.ItemGemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef; +import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef; +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; @@ -74,158 +74,158 @@ public abstract interface DataStore { public void saveShops(List shops) throws Exception; - public Map loadCerterDefs() throws Exception; + public Map loadCerterDefs() throws Exception; - public void saveCerterDefs(Map certers) + public void saveCerterDefs(Map certers) throws Exception; - public List loadGameObjectLocs() throws Exception; + public List loadGameObjectLocs() throws Exception; - public void saveGameObjectLocs(List locs) throws Exception; + public void saveGameObjectLocs(List locs) throws Exception; - public List loadItemLocs() throws Exception; + public List loadItemLocs() throws Exception; - public void saveItemLocs(List locs) throws Exception; + public void saveItemLocs(List locs) throws Exception; - public List loadNPCLocs() throws Exception; + public List loadNPCLocs() throws Exception; - public void saveNPCLocs(List locs) throws Exception; + public void saveNPCLocs(List locs) throws Exception; - public TileDefinition[] loadTileDefs() throws Exception; + public TileDef[] loadTileDefs() throws Exception; - public void saveTileDefs(TileDefinition[] defs) throws Exception; + public void saveTileDefs(TileDef[] defs) throws Exception; - public GameObjectDefinition[] loadGameObjectDefs() throws Exception; + public GameObjectDef[] loadGameObjectDefs() throws Exception; - public void saveGameObjectDefs(GameObjectDefinition[] defs) throws Exception; + public void saveGameObjectDefs(GameObjectDef[] defs) throws Exception; - public DoorDefinition[] loadDoorDefs() throws Exception; + public DoorDef[] loadDoorDefs() throws Exception; - public void saveDoorDefs(DoorDefinition[] defs) throws Exception; + public void saveDoorDefs(DoorDef[] defs) throws Exception; - public ItemDefinition[] loadItemDefs() throws Exception; + public ItemDef[] loadItemDefs() throws Exception; - public void saveItemDefs(ItemDefinition[] defs) throws Exception; + public void saveItemDefs(ItemDef[] defs) throws Exception; - public PrayerDefinition[] loadPrayerDefs() throws Exception; + public PrayerDef[] loadPrayerDefs() throws Exception; - public void savePrayerDefs(PrayerDefinition[] defs) throws Exception; + public void savePrayerDefs(PrayerDef[] defs) throws Exception; - public SpellDefinition[] loadSpellDefs() throws Exception; + public SpellDef[] loadSpellDefs() throws Exception; - public void saveSpellDefs(SpellDefinition[] defs) throws Exception; + public void saveSpellDefs(SpellDef[] defs) throws Exception; - public NPCDefinition[] loadNPCDefs() throws Exception; + public NPCDef[] loadNPCDefs() throws Exception; - public void saveNPCDefs(NPCDefinition[] defs) throws Exception; + public void saveNPCDefs(NPCDef[] defs) throws Exception; - public ItemCraftingDefinition[] loadItemCraftingDefs() throws Exception; + public ItemCraftingDef[] loadItemCraftingDefs() throws Exception; - public void saveItemCraftingDefs(ItemCraftingDefinition[] defs) throws Exception; + public void saveItemCraftingDefs(ItemCraftingDef[] defs) throws Exception; - public ItemHerbSecondDefinition[] loadItemHerbSeconds() throws Exception; + public ItemHerbSecondDef[] loadItemHerbSeconds() throws Exception; - public void saveItemHerbSeconds(ItemHerbSecondDefinition[] seconds) throws Exception; + public void saveItemHerbSeconds(ItemHerbSecondDef[] seconds) throws Exception; - public Map loadItemDartTipDefs() throws Exception; + public Map loadItemDartTipDefs() throws Exception; - public void saveItemDartTipDefs(Map defs) + public void saveItemDartTipDefs(Map defs) throws Exception; - public Map loadGemDefs() throws Exception; + public Map loadGemDefs() throws Exception; - public void saveGemDefs(Map defs) throws Exception; + public void saveGemDefs(Map defs) throws Exception; - public Map loadItemLogCutDefs() throws Exception; + public Map loadItemLogCutDefs() throws Exception; - public void saveItemLogCutDefs(Map defs) + public void saveItemLogCutDefs(Map defs) throws Exception; - public Map loadItemBowStringDefs() + public Map loadItemBowStringDefs() throws Exception; - public void saveItemBowStringDefs(Map defs) + public void saveItemBowStringDefs(Map defs) throws Exception; - public Map loadItemArrowHeadDefs() + public Map loadItemArrowHeadDefs() throws Exception; - public void saveItemArrowHeadDefs(Map defs) + public void saveItemArrowHeadDefs(Map defs) throws Exception; - public Map loadFiremakingDefs() throws Exception; + public Map loadFiremakingDefs() throws Exception; - public void saveFiremakingDefs(Map defs) + public void saveFiremakingDefs(Map defs) throws Exception; public Map loadItemAffectedTypes() throws Exception; public void saveItemAffectedTypes(Map types) throws Exception; - public Map loadItemWieldableDefs() + public Map loadItemWieldableDefs() throws Exception; - public void saveItemWieldableDefs(Map defs) throws Exception; + public void saveItemWieldableDefs(Map defs) throws Exception; - public Map loadItemUnIdentHerbDefs() + public Map loadItemUnIdentHerbDefs() throws Exception; - public void saveItemUnIdentHerbDefs(Map defs) throws Exception; + public void saveItemUnIdentHerbDefs(Map defs) throws Exception; - public Map loadItemHerbDefs() throws Exception; + public Map loadItemHerbDefs() throws Exception; - public void saveItemHerbDefs(Map defs) throws Exception; + public void saveItemHerbDefs(Map defs) throws Exception; public Map loadItemEdibleHeals() throws Exception; public void saveItemEdibleHeals(Map defs) throws Exception; - public Map loadItemCookingDefs() throws Exception; + public Map loadItemCookingDefs() throws Exception; - public void saveItemCookingDefs(Map defs) throws Exception; + public void saveItemCookingDefs(Map defs) throws Exception; - public Map loadItemSmeltingDefs() + public Map loadItemSmeltingDefs() throws Exception; - public void saveItemSmeltingDefs(Map defs) throws Exception; + public void saveItemSmeltingDefs(Map defs) throws Exception; - public ItemSmithingDefinition[] loadItemSmithingDefs() throws Exception; + public ItemSmithingDef[] loadItemSmithingDefs() throws Exception; - public void saveItemSmithingDefs(ItemSmithingDefinition[] defs) throws Exception; + public void saveItemSmithingDefs(ItemSmithingDef[] defs) throws Exception; - public Map loadObjectMiningDefs() + public Map loadObjectMiningDefs() throws Exception; - public void saveObjectMiningDefs(Map defs) throws Exception; + public void saveObjectMiningDefs(Map defs) throws Exception; - public Map loadObjectWoodcuttingDefs() + public Map loadObjectWoodcuttingDefs() throws Exception; - public void saveObjectWoodcuttingDefs(Map defs) throws Exception; + public void saveObjectWoodcuttingDefs(Map defs) throws Exception; - public Map loadObjectFishDefs() + public Map loadObjectFishDefs() throws Exception; - public void saveObjectFishingDefs(Map defs) throws Exception; + public void saveObjectFishingDefs(Map defs) throws Exception; public Map loadSpellAgressiveLevel() throws Exception; public void saveSpellAgressiveLevel(Map defs) throws Exception; - public Map loadAgilityDefs() throws Exception; + public Map loadAgilityDefs() throws Exception; - public void saveAgilityDefs(Map defs) throws Exception; + public void saveAgilityDefs(Map defs) throws Exception; - public Map loadAgilityCourseDefs() + public Map loadAgilityCourseDefs() throws Exception; - public void saveAgilityCourseDef(Map defs) throws Exception; + public void saveAgilityCourseDef(Map defs) throws Exception; public List[] loadKeyChestLoots() throws Exception; public void saveKeyChestLoots(List[] loots) throws Exception; - public Map loadDartTips() throws Exception; + public Map loadDartTips() throws Exception; public void dispose(); diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java index 801320f..469d176 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java @@ -1,9 +1,11 @@ package org.moparscape.msc.gs.phandler.client; + import org.apache.mina.common.IoSession; import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.connection.Packet; import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.SingleEvent; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Item; import org.moparscape.msc.gs.model.Player; @@ -37,7 +39,49 @@ public class DropHandler implements PacketHandler { } if (player.isPMod() && !player.isMod()) return; + if (item.getDef().isMembers() && !World.isMembers()) { + player.getActionSender().sendMessage( + "This feature is only avaliable on a members server"); + return; + } + // drop item after a path has finished + if(player.pathHandler != null && !player.pathHandler.finishedPath()) { + waitAndDrop(player, item); + } else { + drop(player, item); + } + + + + } + + public void waitAndDrop(final Player player,final InvItem item) { + Instance.getDelayedEventHandler().add(new SingleEvent(player, 500) { + + @Override + public void action() { + + if(owner.dropTickCount > 20) { // 10 seconds they are allowed to walk for. anything longer won't drop. + owner.dropTickCount = 0; + stop(); + } else { + owner.dropTickCount++; + if(owner.pathHandler != null && !owner.pathHandler.finishedPath()) { + waitAndDrop(owner, item); + } else { + drop(owner, item); + } + } + + + } + }); + + } + + public void drop(Player player, final InvItem item) { + player.getActionSender().sendMessage("Dropping!"); player.setStatus(Action.DROPPING_GITEM); Instance.getDelayedEventHandler().add(new DelayedEvent(player, 500) { public void run() { @@ -52,8 +96,8 @@ public class DropHandler implements PacketHandler { } world.addEntryToSnapshots(new Activity(owner.getUsername(), owner.getUsername() + " dropped ID: " + item.getID() - + " amount: " + item.getAmount() + " at: " - + owner.getX() + "/" + owner.getY())); + + " amount: " + item.getAmount() + " at: " + + owner.getX() + "/" + owner.getY())); owner.getActionSender().sendSound("dropobject"); owner.getInventory().remove(item); @@ -64,4 +108,4 @@ public class DropHandler implements PacketHandler { } }); } -} +} \ No newline at end of file diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java index 42a0d76..3af72e9 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java @@ -15,7 +15,7 @@ import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Inventory; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; import org.moparscape.msc.gs.model.landscape.PathGenerator; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -393,7 +393,7 @@ public class DuelHandler implements PacketHandler { player.setSuspiciousPlayer(true); continue; } - ItemDefinition def = tItem.getDef(); + ItemDef def = tItem.getDef(); if (!def.canTrade()) { player.getActionSender().sendMessage( def.getName() diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java index bb4b31a..f56bcf1 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java @@ -15,7 +15,7 @@ import org.moparscape.msc.gs.model.MenuHandler; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.World; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -88,7 +88,7 @@ public class InvActionHandler implements PacketHandler { "This feature is only avaliable on a members server"); return; } - ItemUnIdentHerbDefinition herb = item.getUnIdentHerbDef(); + ItemUnIdentHerbDef herb = item.getUnIdentHerbDef(); if (herb == null) { return; } @@ -101,7 +101,7 @@ public class InvActionHandler implements PacketHandler { player.setBusy(true); Instance.getDelayedEventHandler().add(new MiniEvent(player) { public void action() { - ItemUnIdentHerbDefinition herb = item.getUnIdentHerbDef(); + ItemUnIdentHerbDef herb = item.getUnIdentHerbDef(); InvItem newItem = new InvItem(herb.getNewId()); owner.getInventory().remove(item); owner.getInventory().add(newItem); diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java index 5acee55..eef1faf 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java @@ -15,7 +15,7 @@ import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -138,7 +138,7 @@ public class InvUseOnGroundItem implements PacketHandler { private void handleFireMaking(int tries) { final int retries = --tries; - final FiremakingDefinition def = EntityHandler + final FiremakingDef def = EntityHandler .getFiremakingDef(item.getID()); if (!itemId(new int[] { 166 }) || def == null) { owner.getActionSender().sendMessage( diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java index 264d30f..855da0b 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java @@ -12,13 +12,13 @@ import org.moparscape.msc.gs.model.MenuHandler; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemGemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDefinition; +import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef; +import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef; +import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef; +import org.moparscape.msc.gs.model.definition.skill.ItemGemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef; +import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; import org.moparscape.msc.gs.tools.DataConversions; @@ -49,7 +49,7 @@ public class InvUseOnItem implements PacketHandler { } InvItem newItem; int exp; - ItemDartTipDefinition tipDef = null; + ItemDartTipDef tipDef = null; if (item.getID() == 280) { newItem = new InvItem(637, amount); exp = amount; @@ -96,7 +96,7 @@ public class InvUseOnItem implements PacketHandler { private boolean doArrowHeads(Player player, final InvItem headlessArrows, final InvItem arrowHeads) { - final ItemArrowHeadDefinition headDef = EntityHandler + final ItemArrowHeadDef headDef = EntityHandler .getItemArrowHeadDef(arrowHeads.getID()); if (!Config.members) { player.getActionSender().sendMessage( @@ -141,7 +141,7 @@ public class InvUseOnItem implements PacketHandler { private boolean doBowString(Player player, final InvItem bowString, final InvItem bow) { - final ItemBowStringDefinition stringDef = EntityHandler + final ItemBowStringDef stringDef = EntityHandler .getItemBowStringDef(bow.getID()); if (!Config.members) { player.getActionSender().sendMessage( @@ -177,7 +177,7 @@ public class InvUseOnItem implements PacketHandler { private boolean doCutGem(Player player, final InvItem chisel, final InvItem gem) { - final ItemGemDefinition gemDef = EntityHandler.getItemGemDef(gem.getID()); + final ItemGemDef gemDef = EntityHandler.getItemGemDef(gem.getID()); if (gemDef == null) { return false; } @@ -288,7 +288,7 @@ public class InvUseOnItem implements PacketHandler { private boolean doHerblaw(Player player, final InvItem vial, final InvItem herb) { - final ItemHerbDefinition herbDef = EntityHandler.getItemHerbDef(herb.getID()); + final ItemHerbDef herbDef = EntityHandler.getItemHerbDef(herb.getID()); if (herbDef == null) { return false; } @@ -322,7 +322,7 @@ public class InvUseOnItem implements PacketHandler { } private boolean doHerbSecond(Player player, final InvItem second, - final InvItem unfinished, final ItemHerbSecondDefinition def) { + final InvItem unfinished, final ItemHerbSecondDef def) { if (!Config.members) { player.getActionSender().sendMessage( "This feature is not avaliable in f2p"); @@ -359,7 +359,7 @@ public class InvUseOnItem implements PacketHandler { private boolean doLogCut(final Player player, final InvItem knife, final InvItem log, int times) { final int retries = --times; - final ItemLogCutDefinition cutDef = EntityHandler + final ItemLogCutDef cutDef = EntityHandler .getItemLogCutDef(log.getID()); if (!Config.members) { player.getActionSender().sendMessage( @@ -455,7 +455,7 @@ public class InvUseOnItem implements PacketHandler { World.getQuestManager().handleUseItemOnItem(item1, item2, player); - ItemHerbSecondDefinition secondDef = null; + ItemHerbSecondDef secondDef = null; if ((secondDef = EntityHandler.getItemHerbSecond(item1.getID(), item2.getID())) != null && doHerbSecond(player, item1, item2, secondDef)) { diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java index 2c6abce..55e9f4e 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java @@ -22,12 +22,12 @@ import org.moparscape.msc.gs.model.Npc; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; -import org.moparscape.msc.gs.model.definition.skill.ReqOreDefinition; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; +import org.moparscape.msc.gs.model.definition.skill.ReqOreDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -62,7 +62,7 @@ public class InvUseOnObject implements PacketHandler { owner.resetAll(); switch (object.getID()) { case 24: // Web - ItemWieldableDefinition def = item.getWieldableDef(); + ItemWieldableDef def = item.getWieldableDef(); if ((def == null || def.getWieldPos() != 4) && item.getID() != 13) { owner.getActionSender().sendMessage( @@ -463,7 +463,7 @@ public class InvUseOnObject implements PacketHandler { + "."); return; } - ItemCraftingDefinition def = EntityHandler + ItemCraftingDef def = EntityHandler .getCraftingDef((option * 3) + craftType); if (def == null) { @@ -1218,13 +1218,13 @@ public class InvUseOnObject implements PacketHandler { private void handleRegularSmelting(int times1) { final int times = --times1; - ItemSmeltingDefinition smeltingDef = item.getSmeltingDef(); + ItemSmeltingDef smeltingDef = item.getSmeltingDef(); if (smeltingDef == null) { owner.getActionSender().sendMessage( "Nothing interesting happens."); return; } - for (ReqOreDefinition reqOre : smeltingDef.getReqOres()) { + for (ReqOreDef reqOre : smeltingDef.getReqOres()) { if (owner.getInventory().countId(reqOre.getId()) < reqOre .getAmount()) { if (item.getID() == 151) { @@ -1264,14 +1264,14 @@ public class InvUseOnObject implements PacketHandler { "You smelt the " + item.getDef().getName() + " in the furnace."); - final ItemSmeltingDefinition def = smeltingDef; + final ItemSmeltingDef def = smeltingDef; Instance.getDelayedEventHandler().add( new ShortEvent(owner) { public void action() { InvItem bar = new InvItem(def .getBarId()); if (owner.getInventory().remove(item) > -1) { - for (ReqOreDefinition reqOre : def + for (ReqOreDef reqOre : def .getReqOres()) { for (int i = 0; i < reqOre .getAmount(); i++) { @@ -1381,7 +1381,7 @@ public class InvUseOnObject implements PacketHandler { } }); } else { - final ItemCookingDefinition cookingDef = item + final ItemCookingDef cookingDef = item .getCookingDef(); if (cookingDef == null) { owner.getActionSender().sendMessage( @@ -1457,7 +1457,7 @@ public class InvUseOnObject implements PacketHandler { private void handleSmithing(int barID, int toMake) { - ItemSmithingDefinition def = EntityHandler.getSmithingDef((Formulae.getBarType(barID) * 21) + toMake); + ItemSmithingDef def = EntityHandler.getSmithingDef((Formulae.getBarType(barID) * 21) + toMake); if(def == null) { owner.getActionSender().sendMessage("Nothing interesting happens."); return; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java index 6ee10e1..586a5e8 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java @@ -27,12 +27,12 @@ import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -128,7 +128,7 @@ public class ObjectAction implements PacketHandler { if (owner.getStatus() != Action.AGILITYING) owner.resetPath(); - GameObjectDefinition def = object.getGameObjectDef(); + GameObjectDef def = object.getGameObjectDef(); if (owner.isBusy() || owner.isRanging() || !owner.nextTo(object) || def == null || owner.getStatus() != Action.USING_OBJECT) { @@ -1025,7 +1025,7 @@ public class ObjectAction implements PacketHandler { "This feature is only avaliable on a members server"); return; } - final AgilityDefinition def = EntityHandler + final AgilityDef def = EntityHandler .getAgilityDef(object.getID()); if (owner.getCurStat(16) < def.getReqLevel()) { owner.getActionSender().sendMessage( @@ -1105,7 +1105,7 @@ public class ObjectAction implements PacketHandler { owner.getActionSender() .sendStat(16); - AgilityCourseDefinition course = EntityHandler + AgilityCourseDef course = EntityHandler .getAgilityCourseDef(object .getID()); @@ -1195,7 +1195,7 @@ public class ObjectAction implements PacketHandler { private void handleFishing(final int click, int passvalue) { final int tries = --passvalue; - final ObjectFishingDefinition def = EntityHandler + final ObjectFishingDef def = EntityHandler .getObjectFishingDef(object.getID(), click); if (owner.isBusy()) { return; @@ -1245,7 +1245,7 @@ public class ObjectAction implements PacketHandler { Instance.getDelayedEventHandler().add( new ShortEvent(owner) { public void action() { - ObjectFishDefinition def = Formulae.getFish( + ObjectFishDef def = Formulae.getFish( object.getID(), owner.getCurStat(10), click); if (def != null) { @@ -1299,7 +1299,7 @@ public class ObjectAction implements PacketHandler { private void handleWoodcutting(final int click, int passedvalue) { final int tries = --passedvalue; - final ObjectWoodcuttingDefinition def = EntityHandler + final ObjectWoodcuttingDef def = EntityHandler .getObjectWoodcuttingDef(object.getID()); if (owner.isBusy()) { return; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java index 0b2e89a..8da58a0 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java @@ -7,7 +7,7 @@ import org.moparscape.msc.gs.connection.RSCPacket; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; +import org.moparscape.msc.gs.model.definition.skill.PrayerDef; import org.moparscape.msc.gs.phandler.PacketHandler; public class PrayerHandler implements PacketHandler { @@ -77,7 +77,7 @@ public class PrayerHandler implements PacketHandler { player.getActionSender().sendPrayers(); return; } - PrayerDefinition prayer = EntityHandler.getPrayerDef(prayerID); + PrayerDef prayer = EntityHandler.getPrayerDef(prayerID); switch (pID) { case 56: if (player.getMaxStat(5) < prayer.getReqLevel()) { diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java index ddf64ce..8d1b278 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java @@ -31,9 +31,9 @@ import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Projectile; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ReqOreDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ReqOreDef; +import org.moparscape.msc.gs.model.definition.skill.SpellDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.landscape.PathGenerator; import org.moparscape.msc.gs.model.mini.Damage; @@ -76,7 +76,7 @@ public class SpellHandler implements PacketHandler { return true; } - private static boolean checkAndRemoveRunes(Player player, SpellDefinition spell) { + private static boolean checkAndRemoveRunes(Player player, SpellDef spell) { for (Entry e : spell.getRunesRequired()) { boolean skipRune = false; for (InvItem staff : getStaffs(e.getKey())) { @@ -135,7 +135,7 @@ public class SpellHandler implements PacketHandler { private Random r = new Random(); - private void finalizeSpell(Player player, SpellDefinition spell) { + private void finalizeSpell(Player player, SpellDef spell) { player.incExp(6, spell.getExp(), true); player.setLastCast(GameEngine.getTime()); player.getActionSender().sendSound("spellok"); @@ -176,7 +176,7 @@ public class SpellHandler implements PacketHandler { } } - private void handleGroundCast(Player player, SpellDefinition spell, int id) { + private void handleGroundCast(Player player, SpellDef spell, int id) { if (player.isAdmin()) { player.getActionSender().sendMessage("Spellid: " + id); } @@ -227,7 +227,7 @@ public class SpellHandler implements PacketHandler { } } - private void handleInvItemCast(Player player, SpellDefinition spell, int id, + private void handleInvItemCast(Player player, SpellDef spell, int id, InvItem affectedItem) { switch (id) { case 3: // Enchant lvl-1 Sapphire amulet @@ -278,13 +278,13 @@ public class SpellHandler implements PacketHandler { } break; case 21: // Superheat item - ItemSmeltingDefinition smeltingDef = affectedItem.getSmeltingDef(); + ItemSmeltingDef smeltingDef = affectedItem.getSmeltingDef(); if (smeltingDef == null) { player.getActionSender().sendMessage( "This spell cannot be used on this kind of item"); return; } - for (ReqOreDefinition reqOre : smeltingDef.getReqOres()) { + for (ReqOreDef reqOre : smeltingDef.getReqOres()) { if (player.getInventory().countId(reqOre.getId()) < reqOre .getAmount()) { if (affectedItem.getID() == 151) { @@ -314,7 +314,7 @@ public class SpellHandler implements PacketHandler { } InvItem bar = new InvItem(smeltingDef.getBarId()); if (player.getInventory().remove(affectedItem) > -1) { - for (ReqOreDefinition reqOre : smeltingDef.getReqOres()) { + for (ReqOreDef reqOre : smeltingDef.getReqOres()) { for (int i = 0; i < reqOre.getAmount(); i++) { player.getInventory().remove( new InvItem(reqOre.getId())); @@ -408,7 +408,7 @@ public class SpellHandler implements PacketHandler { } } - private void handleItemCast(Player player, final SpellDefinition spell, + private void handleItemCast(Player player, final SpellDef spell, final int id, final Item affectedItem) { player.setStatus(Action.CASTING_GITEM); Instance.getDelayedEventHandler().add( @@ -518,7 +518,7 @@ public class SpellHandler implements PacketHandler { player.resetFollowing(); owner.resetPath(); - SpellDefinition spell = EntityHandler.getSpellDef(spellID); + SpellDef spell = EntityHandler.getSpellDef(spellID); if (!canCast(owner) || affectedMob.getHits() <= 0 || !owner.checkAttack(affectedMob, true) || owner.getStatus() != Action.CASTING_MOB) { @@ -1249,7 +1249,7 @@ public class SpellHandler implements PacketHandler { + "): " + player.getX() + "/" + player.getY())); - SpellDefinition spell = EntityHandler.getSpellDef(idx); + SpellDef spell = EntityHandler.getSpellDef(idx); if (player.getCurStat(6) < spell.getReqLevel()) { player.setSuspiciousPlayer(true); player.getActionSender().sendMessage( @@ -1417,7 +1417,7 @@ public class SpellHandler implements PacketHandler { player.getActionSender().sendStat(6); }// System.out - private void handleTeleport(Player player, SpellDefinition spell, int id) { + private void handleTeleport(Player player, SpellDef spell, int id) { if (player.inCombat()) { return; diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java index bd08357..6efe6ad 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java @@ -69,21 +69,22 @@ public class TalkToNpcHandler implements PacketHandler { if (affectedNpc.isBusy()) { owner.getActionSender().sendMessage( affectedNpc.getDef().getName() - + " is currently busy."); + + " is currently busy."); return; } affectedNpc.resetPath(); NpcHandler handler = world.getNpcHandler(affectedNpc .getID()); - if (Formulae.getDirection(owner, affectedNpc) != -1) { - affectedNpc.setSprite(Formulae.getDirection(owner, - affectedNpc)); - owner.setSprite(Formulae.getDirection(affectedNpc, - owner)); - } + if (handler != null) { try { + if (Formulae.getDirection(owner, affectedNpc) != -1) { + affectedNpc.setSprite(Formulae.getDirection(owner, + affectedNpc)); + owner.setSprite(Formulae.getDirection(affectedNpc, + owner)); + } handler.handleNpc(affectedNpc, owner); } catch (Exception e) { Logger.error("Exception with npc[" @@ -96,20 +97,19 @@ public class TalkToNpcHandler implements PacketHandler { } } else { - if (!World.getQuestManager().handleNpcTalk( - affectedNpc, owner)) { + if (!World.getQuestManager().handleNpcTalk(affectedNpc, owner)) { if (affectedNpc.getDef().isAttackable()) - owner.getActionSender() - .sendMessage( - "The " - + affectedNpc - .getDef() - .getName() - + " doesn't appear interested in talking."); + owner.getActionSender().sendMessage("The "+ affectedNpc.getDef().getName() + " doesn't appear interested in talking."); else if (world.npcScripts .containsKey(affectedNpc.getID())) { owner.setBusy(true); affectedNpc.blockedBy(owner); + if (Formulae.getDirection(owner, affectedNpc) != -1) { + affectedNpc.setSprite(Formulae.getDirection(owner, + affectedNpc)); + owner.setSprite(Formulae.getDirection(affectedNpc, + owner)); + } if (owner.getInterpreterThread() != null) { try { owner.getInterpreterThread().stop(); @@ -161,10 +161,17 @@ public class TalkToNpcHandler implements PacketHandler { owner.destroy(false); } } + } else { + if (Formulae.getDirection(owner, affectedNpc) != -1) { + affectedNpc.setSprite(Formulae.getDirection(owner, + affectedNpc)); + owner.setSprite(Formulae.getDirection(affectedNpc, + owner)); + } } } } }); } -} +} \ No newline at end of file diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java index 2ed95d9..d75ebfc 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java @@ -14,7 +14,7 @@ import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Inventory; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; import org.moparscape.msc.gs.model.landscape.PathGenerator; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -374,7 +374,7 @@ public class TradeHandler implements PacketHandler { player.setRequiresOfferUpdate(true); continue; } - ItemDefinition def = tItem.getDef(); + ItemDef def = tItem.getDef(); if (!def.canTrade() && !player.isMod()) { player.getActionSender().sendMessage( def.getName() diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java index 91ba59d..0aa7127 100644 --- a/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java @@ -15,7 +15,7 @@ import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.World; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.model.snapshot.Activity; import org.moparscape.msc.gs.phandler.PacketHandler; @@ -60,7 +60,7 @@ public class WallObjectAction implements PacketHandler { false) { public void arrived() { owner.resetPath(); - DoorDefinition def = object.getDoorDef(); + DoorDef def = object.getDoorDef(); if (owner.isBusy() || owner.isRanging() || !owner.nextTo(object) || def == null || owner.getStatus() != Action.USING_DOOR) { diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java index 7215fe7..c3f8fab 100644 --- a/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java @@ -16,7 +16,7 @@ import org.moparscape.msc.gs.model.Mob; import org.moparscape.msc.gs.model.Npc; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.World; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; import org.moparscape.msc.gs.model.landscape.ActiveTile; import org.moparscape.msc.gs.states.Action; import org.moparscape.msc.gs.util.Logger; @@ -122,7 +122,7 @@ public class Thieving { private int curDoor = -1; // given. private int curStall = -1; - private GameObjectDefinition def; + private GameObjectDef def; // Cur X, Cur Y, New X, New Y, Lvl, Exp private int[][] Doors = { { 586, 581, 585, 581, 10, 13 }, // Nat rune West @@ -1057,11 +1057,11 @@ public class Thieving { } } - public void setDef(GameObjectDefinition def) { + public void setDef(GameObjectDef def) { this.def = def; } - public GameObjectDefinition getDef() { + public GameObjectDef getDef() { return def; } diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java index f5013e6..57bf58b 100644 --- a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java @@ -2,7 +2,6 @@ package org.moparscape.msc.gs.plugins.plugs.skills; import org.moparscape.msc.config.Formulae; import org.moparscape.msc.gs.Instance; -import org.moparscape.msc.gs.core.GameEngine; import org.moparscape.msc.gs.event.ShortEvent; import org.moparscape.msc.gs.event.SingleEvent; import org.moparscape.msc.gs.model.Bubble; @@ -10,7 +9,7 @@ import org.moparscape.msc.gs.model.GameObject; import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Player; import org.moparscape.msc.gs.model.definition.EntityHandler; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; +import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDef; import org.moparscape.msc.gs.plugins.listeners.ObjectListener; import org.moparscape.msc.gs.tools.DataConversions; @@ -53,7 +52,7 @@ public class Mining implements ObjectListener { return; final GameObject newobject = Instance.getWorld() .getTile(object.getX(), object.getY()).getGameObject(); - final ObjectMiningDefinition def = EntityHandler.getObjectMiningDef(newobject + final ObjectMiningDef def = EntityHandler.getObjectMiningDef(newobject .getID()); if (def == null || def.getRespawnTime() < 1) { owner.getActionSender().sendMessage( @@ -70,7 +69,7 @@ public class Mining implements ObjectListener { if (owner.getCurStat(14) < def.getReqLevel()) { owner.getActionSender().sendMessage( "You need a mining level of " + def.getReqLevel() - + " to mine this rock."); + + " to mine this rock."); return; } int axeId = getAxe(owner); @@ -114,6 +113,7 @@ public class Mining implements ObjectListener { return; } owner.setBusy(true); + //owner.isMining(true); owner.getActionSender().sendSound("mine"); Bubble bubble = new Bubble(owner, axeId); @@ -122,15 +122,15 @@ public class Mining implements ObjectListener { } final int retrytime = retrytimes; - owner.setLastMineTimer(GameEngine.getTime()); + //owner.setLastMineTimer(GameEngine.getTime()); owner.getActionSender().sendMessage( "You swing your pick at the rock..."); Instance.getDelayedEventHandler().add(new ShortEvent(owner) { public void action() { - if (!owner.isMining()) { - owner.setBusy(false); - return; - } + //if(!owner.isMining()) { + //owner.setBusy(false); + //return; + //} if (Formulae.getOre(def, owner.getCurStat(14), axeID)) { if (DataConversions.random(0, 200) == 0) { InvItem gem = new InvItem(Formulae.getGem(), 1); @@ -150,10 +150,9 @@ public class Mining implements ObjectListener { world.delayedSpawnObject(newobject.getLoc(), def.getRespawnTime() * 1000); } - owner.isMining(false); - owner.setSkillLoops(0); + //owner.isMining(false); + //owner.setSkillLoops(0); owner.getActionSender().sendInventory(); - owner.setBusy(false); } else { boolean retry = false; if (retrytime - swings > 0) @@ -162,20 +161,24 @@ public class Mining implements ObjectListener { "You only succeed in scratching the rock."); if (retry) { world.getDelayedEventHandler().add( + new SingleEvent(owner, 500) { public void action() { + if(!owner.isMining() || owner.inCombat()) { + return; + } owner.setSkillLoops(swings + 1); handleMining(object, owner, owner.getClick()); } }); } - if (!retry) { - owner.setBusy(false); - owner.isMining(false); - owner.setSkillLoops(0); - } + //if (!retry) { + // owner.isMining(false); + // owner.setSkillLoops(0); + //} } + owner.setBusy(false); } }); } 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 2d73fdf..1eba6ec 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 @@ -11,36 +11,36 @@ import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; import org.moparscape.msc.gs.model.TelePoint; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; -import org.moparscape.msc.gs.model.definition.extra.CerterDefinition; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; -import org.moparscape.msc.gs.model.definition.extra.TileDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityDefinition; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemGemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; +import org.moparscape.msc.gs.model.definition.extra.CerterDef; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; +import org.moparscape.msc.gs.model.definition.extra.TileDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityDef; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef; +import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef; +import org.moparscape.msc.gs.model.definition.skill.ItemGemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef; +import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef; +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.persistence.DataStore; import org.moparscape.msc.gs.persistence.impl.bun.CodecLookupService; @@ -118,236 +118,236 @@ public class BinaryUsingNIO implements DataStore { } @Override - public Map loadCerterDefs() throws Exception { + public Map loadCerterDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveCerterDefs(Map certers) + public void saveCerterDefs(Map certers) throws Exception { // TODO Auto-generated method stub } @Override - public List loadGameObjectLocs() throws Exception { + public List loadGameObjectLocs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveGameObjectLocs(List locs) throws Exception { + public void saveGameObjectLocs(List locs) throws Exception { // TODO Auto-generated method stub } @Override - public List loadItemLocs() throws Exception { + public List loadItemLocs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemLocs(List locs) throws Exception { + public void saveItemLocs(List locs) throws Exception { // TODO Auto-generated method stub } @Override - public List loadNPCLocs() throws Exception { + public List loadNPCLocs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveNPCLocs(List locs) throws Exception { + public void saveNPCLocs(List locs) throws Exception { // TODO Auto-generated method stub } @Override - public TileDefinition[] loadTileDefs() throws Exception { + public TileDef[] loadTileDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveTileDefs(TileDefinition[] defs) throws Exception { + public void saveTileDefs(TileDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public GameObjectDefinition[] loadGameObjectDefs() throws Exception { + public GameObjectDef[] loadGameObjectDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveGameObjectDefs(GameObjectDefinition[] defs) throws Exception { + public void saveGameObjectDefs(GameObjectDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public DoorDefinition[] loadDoorDefs() throws Exception { + public DoorDef[] loadDoorDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveDoorDefs(DoorDefinition[] defs) throws Exception { + public void saveDoorDefs(DoorDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public ItemDefinition[] loadItemDefs() throws Exception { + public ItemDef[] loadItemDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemDefs(ItemDefinition[] defs) throws Exception { + public void saveItemDefs(ItemDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public PrayerDefinition[] loadPrayerDefs() throws Exception { + public PrayerDef[] loadPrayerDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void savePrayerDefs(PrayerDefinition[] defs) throws Exception { + public void savePrayerDefs(PrayerDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public SpellDefinition[] loadSpellDefs() throws Exception { + public SpellDef[] loadSpellDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveSpellDefs(SpellDefinition[] defs) throws Exception { + public void saveSpellDefs(SpellDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public NPCDefinition[] loadNPCDefs() throws Exception { + public NPCDef[] loadNPCDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveNPCDefs(NPCDefinition[] defs) throws Exception { + public void saveNPCDefs(NPCDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public ItemCraftingDefinition[] loadItemCraftingDefs() throws Exception { + public ItemCraftingDef[] loadItemCraftingDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemCraftingDefs(ItemCraftingDefinition[] defs) throws Exception { + public void saveItemCraftingDefs(ItemCraftingDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public ItemHerbSecondDefinition[] loadItemHerbSeconds() throws Exception { + public ItemHerbSecondDef[] loadItemHerbSeconds() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemHerbSeconds(ItemHerbSecondDefinition[] seconds) throws Exception { + public void saveItemHerbSeconds(ItemHerbSecondDef[] seconds) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemDartTipDefs() throws Exception { + public Map loadItemDartTipDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemDartTipDefs(Map defs) + public void saveItemDartTipDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadGemDefs() throws Exception { + public Map loadGemDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveGemDefs(Map defs) throws Exception { + public void saveGemDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemLogCutDefs() throws Exception { + public Map loadItemLogCutDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemLogCutDefs(Map defs) + public void saveItemLogCutDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemBowStringDefs() + public Map loadItemBowStringDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemBowStringDefs(Map defs) + public void saveItemBowStringDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemArrowHeadDefs() + public Map loadItemArrowHeadDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemArrowHeadDefs(Map defs) + public void saveItemArrowHeadDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadFiremakingDefs() throws Exception { + public Map loadFiremakingDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveFiremakingDefs(Map defs) + public void saveFiremakingDefs(Map defs) throws Exception { // TODO Auto-generated method stub @@ -367,41 +367,41 @@ public class BinaryUsingNIO implements DataStore { } @Override - public Map loadItemWieldableDefs() + public Map loadItemWieldableDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemWieldableDefs(Map defs) + public void saveItemWieldableDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemUnIdentHerbDefs() + public Map loadItemUnIdentHerbDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemUnIdentHerbDefs(Map defs) + public void saveItemUnIdentHerbDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemHerbDefs() throws Exception { + public Map loadItemHerbDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemHerbDefs(Map defs) + public void saveItemHerbDefs(Map defs) throws Exception { // TODO Auto-generated method stub @@ -421,60 +421,60 @@ public class BinaryUsingNIO implements DataStore { } @Override - public Map loadItemCookingDefs() throws Exception { + public Map loadItemCookingDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemCookingDefs(Map defs) + public void saveItemCookingDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadItemSmeltingDefs() + public Map loadItemSmeltingDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemSmeltingDefs(Map defs) + public void saveItemSmeltingDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public ItemSmithingDefinition[] loadItemSmithingDefs() throws Exception { + public ItemSmithingDef[] loadItemSmithingDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveItemSmithingDefs(ItemSmithingDefinition[] defs) throws Exception { + public void saveItemSmithingDefs(ItemSmithingDef[] defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadObjectMiningDefs() + public Map loadObjectMiningDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveObjectMiningDefs(Map defs) + public void saveObjectMiningDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadObjectWoodcuttingDefs() + public Map loadObjectWoodcuttingDefs() throws Exception { // TODO Auto-generated method stub return null; @@ -482,20 +482,20 @@ public class BinaryUsingNIO implements DataStore { @Override public void saveObjectWoodcuttingDefs( - Map defs) throws Exception { + Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadObjectFishDefs() + public Map loadObjectFishDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveObjectFishingDefs(Map defs) + public void saveObjectFishingDefs(Map defs) throws Exception { // TODO Auto-generated method stub @@ -515,26 +515,26 @@ public class BinaryUsingNIO implements DataStore { } @Override - public Map loadAgilityDefs() throws Exception { + public Map loadAgilityDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveAgilityDefs(Map defs) throws Exception { + public void saveAgilityDefs(Map defs) throws Exception { // TODO Auto-generated method stub } @Override - public Map loadAgilityCourseDefs() + public Map loadAgilityCourseDefs() throws Exception { // TODO Auto-generated method stub return null; } @Override - public void saveAgilityCourseDef(Map defs) + public void saveAgilityCourseDef(Map defs) throws Exception { // TODO Auto-generated method stub @@ -553,7 +553,7 @@ public class BinaryUsingNIO implements DataStore { } @Override - public Map loadDartTips() throws Exception { + public Map loadDartTips() throws Exception { // TODO Auto-generated method stub return null; } diff --git a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java b/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java index be7219c..2b175c8 100644 --- a/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java +++ b/Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java @@ -2,19 +2,19 @@ package org.moparscape.msc.gs.persistence.impl.bun.codec; import java.nio.ByteBuffer; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; import org.moparscape.msc.gs.persistence.impl.bun.ByteBufferUtil; import org.moparscape.msc.gs.persistence.impl.bun.Codec; -public class NpcDefCodec implements Codec { +public class NpcDefCodec implements Codec { @Override - public ByteBuffer encode(NPCDefinition[] t) { + public ByteBuffer encode(NPCDef[] t) { return null; } - private ByteBuffer encode(NPCDefinition d) { + private ByteBuffer encode(NPCDef d) { ByteBuffer buf = ByteBuffer.allocate(d.getName().length() + 1 + d.getDescription().length() + 1 + d.getCommand().length() + 2 + 4 * 2 + 2 + 13 + 8 + 8); ByteBufferUtil.putString(buf, d.getName()); @@ -25,7 +25,7 @@ public class NpcDefCodec implements Codec { } @Override - public NPCDefinition[] decode(ByteBuffer buf) { + public NPCDef[] decode(ByteBuffer buf) { // TODO Auto-generated method stub return null; } 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 87bb916..1eb5264 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 @@ -24,36 +24,36 @@ import org.moparscape.msc.gs.model.InvItem; import org.moparscape.msc.gs.model.Point; import org.moparscape.msc.gs.model.Shop; import org.moparscape.msc.gs.model.TelePoint; -import org.moparscape.msc.gs.model.definition.entity.GameObjectDefinition; -import org.moparscape.msc.gs.model.definition.entity.GameObjectLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemDefinition; -import org.moparscape.msc.gs.model.definition.entity.ItemLocationDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCDefinition; -import org.moparscape.msc.gs.model.definition.entity.NPCLocationDefinition; -import org.moparscape.msc.gs.model.definition.extra.CerterDefinition; -import org.moparscape.msc.gs.model.definition.extra.DoorDefinition; -import org.moparscape.msc.gs.model.definition.extra.TileDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDefinition; -import org.moparscape.msc.gs.model.definition.skill.AgilityDefinition; -import org.moparscape.msc.gs.model.definition.skill.FiremakingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCookingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemGemDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDefinition; -import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectMiningDefinition; -import org.moparscape.msc.gs.model.definition.skill.ObjectWoodcuttingDefinition; -import org.moparscape.msc.gs.model.definition.skill.PrayerDefinition; -import org.moparscape.msc.gs.model.definition.skill.SpellDefinition; +import org.moparscape.msc.gs.model.definition.entity.GameObjectDef; +import org.moparscape.msc.gs.model.definition.entity.GameObjectLoc; +import org.moparscape.msc.gs.model.definition.entity.ItemDef; +import org.moparscape.msc.gs.model.definition.entity.ItemLoc; +import org.moparscape.msc.gs.model.definition.entity.NPCDef; +import org.moparscape.msc.gs.model.definition.entity.NPCLoc; +import org.moparscape.msc.gs.model.definition.extra.CerterDef; +import org.moparscape.msc.gs.model.definition.extra.DoorDef; +import org.moparscape.msc.gs.model.definition.extra.TileDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityCourseDef; +import org.moparscape.msc.gs.model.definition.skill.AgilityDef; +import org.moparscape.msc.gs.model.definition.skill.FiremakingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemArrowHeadDef; +import org.moparscape.msc.gs.model.definition.skill.ItemBowStringDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCookingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemCraftingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemDartTipDef; +import org.moparscape.msc.gs.model.definition.skill.ItemGemDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemHerbSecondDef; +import org.moparscape.msc.gs.model.definition.skill.ItemLogCutDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmeltingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemSmithingDef; +import org.moparscape.msc.gs.model.definition.skill.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.definition.skill.ItemWieldableDef; +import org.moparscape.msc.gs.model.definition.skill.ObjectFishingDef; +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.persistence.DataStore; import org.moparscape.msc.gs.phandler.PacketHandlerDefinition; @@ -162,98 +162,98 @@ public class XMLUsingXStream implements DataStore { } @Override - public Map loadCerterDefs() { - return (Map) load("defs/extras/NpcCerters.xml.gz"); + public Map loadCerterDefs() { + return (Map) load("defs/extras/NpcCerters.xml.gz"); } @Override - public List loadGameObjectLocs() { - return (List) load("locs/GameObjectLoc.xml.gz"); + public List loadGameObjectLocs() { + return (List) load("locs/GameObjectLoc.xml.gz"); } @Override - public List loadItemLocs() { - return (List) load("locs/ItemLoc.xml.gz"); + public List loadItemLocs() { + return (List) load("locs/ItemLoc.xml.gz"); } @Override - public List loadNPCLocs() { - return (List) load("locs/NpcLoc.xml.gz"); + public List loadNPCLocs() { + return (List) load("locs/NpcLoc.xml.gz"); } @Override - public TileDefinition[] loadTileDefs() { - return (TileDefinition[]) load("defs/TileDef.xml.gz"); + public TileDef[] loadTileDefs() { + return (TileDef[]) load("defs/TileDef.xml.gz"); } @Override - public GameObjectDefinition[] loadGameObjectDefs() { - return (GameObjectDefinition[]) load("defs/GameObjectDef.xml.gz"); + public GameObjectDef[] loadGameObjectDefs() { + return (GameObjectDef[]) load("defs/GameObjectDef.xml.gz"); } @Override - public DoorDefinition[] loadDoorDefs() { - return (DoorDefinition[]) load("defs/DoorDef.xml.gz"); + public DoorDef[] loadDoorDefs() { + return (DoorDef[]) load("defs/DoorDef.xml.gz"); } @Override - public ItemDefinition[] loadItemDefs() { - return (ItemDefinition[]) load("defs/ItemDef.xml.gz"); + public ItemDef[] loadItemDefs() { + return (ItemDef[]) load("defs/ItemDef.xml.gz"); } @Override - public PrayerDefinition[] loadPrayerDefs() { - return (PrayerDefinition[]) load("defs/PrayerDef.xml.gz"); + public PrayerDef[] loadPrayerDefs() { + return (PrayerDef[]) load("defs/PrayerDef.xml.gz"); } @Override - public SpellDefinition[] loadSpellDefs() { - return (SpellDefinition[]) load("defs/SpellDef.xml.gz"); + public SpellDef[] loadSpellDefs() { + return (SpellDef[]) load("defs/SpellDef.xml.gz"); } @Override - public NPCDefinition[] loadNPCDefs() { - return (NPCDefinition[]) load("defs/NPCDef.xml.gz"); + public NPCDef[] loadNPCDefs() { + return (NPCDef[]) load("defs/NPCDef.xml.gz"); } @Override - public ItemCraftingDefinition[] loadItemCraftingDefs() { - return (ItemCraftingDefinition[]) load("defs/extras/ItemCraftingDef.xml.gz"); + public ItemCraftingDef[] loadItemCraftingDefs() { + return (ItemCraftingDef[]) load("defs/extras/ItemCraftingDef.xml.gz"); } @Override - public ItemHerbSecondDefinition[] loadItemHerbSeconds() { - return (ItemHerbSecondDefinition[]) load("defs/extras/ItemHerbSecond.xml.gz"); + public ItemHerbSecondDef[] loadItemHerbSeconds() { + return (ItemHerbSecondDef[]) load("defs/extras/ItemHerbSecond.xml.gz"); } @Override - public Map loadItemDartTipDefs() { - return (Map) load("defs/extras/ItemDartTipDef.xml.gz"); + public Map loadItemDartTipDefs() { + return (Map) load("defs/extras/ItemDartTipDef.xml.gz"); } @Override - public Map loadGemDefs() { - return (Map) load("defs/extras/ItemGemDef.xml.gz"); + public Map loadGemDefs() { + return (Map) load("defs/extras/ItemGemDef.xml.gz"); } @Override - public Map loadItemLogCutDefs() { - return (Map) load("defs/extras/ItemLogCutDef.xml.gz"); + public Map loadItemLogCutDefs() { + return (Map) load("defs/extras/ItemLogCutDef.xml.gz"); } @Override - public Map loadItemBowStringDefs() { - return (Map) load("defs/extras/ItemBowStringDef.xml.gz"); + public Map loadItemBowStringDefs() { + return (Map) load("defs/extras/ItemBowStringDef.xml.gz"); } @Override - public Map loadItemArrowHeadDefs() { - return (Map) load("defs/extras/ItemArrowHeadDef.xml.gz"); + public Map loadItemArrowHeadDefs() { + return (Map) load("defs/extras/ItemArrowHeadDef.xml.gz"); } @Override - public Map loadFiremakingDefs() { - return (Map) load("defs/extras/FiremakingDef.xml.gz"); + public Map loadFiremakingDefs() { + return (Map) load("defs/extras/FiremakingDef.xml.gz"); } @Override @@ -262,18 +262,18 @@ public class XMLUsingXStream implements DataStore { } @Override - public Map loadItemWieldableDefs() { - return (Map) load("defs/extras/ItemWieldableDef.xml.gz"); + public Map loadItemWieldableDefs() { + return (Map) load("defs/extras/ItemWieldableDef.xml.gz"); } @Override - public Map loadItemUnIdentHerbDefs() { - return (Map) load("defs/extras/ItemUnIdentHerbDef.xml.gz"); + public Map loadItemUnIdentHerbDefs() { + return (Map) load("defs/extras/ItemUnIdentHerbDef.xml.gz"); } @Override - public Map loadItemHerbDefs() { - return (Map) load("defs/extras/ItemHerbDef.xml.gz"); + public Map loadItemHerbDefs() { + return (Map) load("defs/extras/ItemHerbDef.xml.gz"); } @Override @@ -282,33 +282,33 @@ public class XMLUsingXStream implements DataStore { } @Override - public Map loadItemCookingDefs() { - return (Map) load("defs/extras/ItemCookingDef.xml.gz"); + public Map loadItemCookingDefs() { + return (Map) load("defs/extras/ItemCookingDef.xml.gz"); } @Override - public Map loadItemSmeltingDefs() { - return (Map) load("defs/extras/ItemSmeltingDef.xml.gz"); + public Map loadItemSmeltingDefs() { + return (Map) load("defs/extras/ItemSmeltingDef.xml.gz"); } @Override - public ItemSmithingDefinition[] loadItemSmithingDefs() { - return (ItemSmithingDefinition[]) load("defs/extras/ItemSmithingDef.xml.gz"); + public ItemSmithingDef[] loadItemSmithingDefs() { + return (ItemSmithingDef[]) load("defs/extras/ItemSmithingDef.xml.gz"); } @Override - public Map loadObjectMiningDefs() { - return (Map) load("defs/extras/ObjectMining.xml.gz"); + public Map loadObjectMiningDefs() { + return (Map) load("defs/extras/ObjectMining.xml.gz"); } @Override - public Map loadObjectWoodcuttingDefs() { - return (Map) load("defs/extras/ObjectWoodcutting.xml.gz"); + public Map loadObjectWoodcuttingDefs() { + return (Map) load("defs/extras/ObjectWoodcutting.xml.gz"); } @Override - public Map loadObjectFishDefs() { - return (Map) load("defs/extras/ObjectFishing.xml.gz"); + public Map loadObjectFishDefs() { + return (Map) load("defs/extras/ObjectFishing.xml.gz"); } @Override @@ -317,13 +317,13 @@ public class XMLUsingXStream implements DataStore { } @Override - public Map loadAgilityDefs() { - return (Map) load("defs/extras/AgilityDef.xml.gz"); + public Map loadAgilityDefs() { + return (Map) load("defs/extras/AgilityDef.xml.gz"); } @Override - public Map loadAgilityCourseDefs() { - return (Map) load("defs/extras/AgilityCourseDef.xml.gz"); + public Map loadAgilityCourseDefs() { + return (Map) load("defs/extras/AgilityCourseDef.xml.gz"); } @Override @@ -332,8 +332,8 @@ public class XMLUsingXStream implements DataStore { } @Override - public Map loadDartTips() { - return (HashMap) load("defs/extras/ItemDartTipDef.xml.gz"); + public Map loadDartTips() { + return (HashMap) load("defs/extras/ItemDartTipDef.xml.gz"); } @Override @@ -368,102 +368,102 @@ public class XMLUsingXStream implements DataStore { } @Override - public void saveCerterDefs(Map certers) + public void saveCerterDefs(Map certers) throws Exception { write("defs/extras/NpcCerters.xml.gz", certers); } @Override - public void saveGameObjectLocs(List locs) throws Exception { + public void saveGameObjectLocs(List locs) throws Exception { write("locs/GameObjectLocs.xml.gz", locs); } @Override - public void saveItemLocs(List locs) throws Exception { + public void saveItemLocs(List locs) throws Exception { write("locs/ItemLoc.xml.gz", locs); } @Override - public void saveNPCLocs(List locs) throws Exception { + public void saveNPCLocs(List locs) throws Exception { write("locs/NpcLoc.xml.gz", locs); } @Override - public void saveTileDefs(TileDefinition[] defs) throws Exception { + public void saveTileDefs(TileDef[] defs) throws Exception { write("defs/TileDef.xml.gz", defs); } @Override - public void saveGameObjectDefs(GameObjectDefinition[] defs) throws Exception { + public void saveGameObjectDefs(GameObjectDef[] defs) throws Exception { write("defs/GameObjectDef.xml.gz", defs); } @Override - public void saveDoorDefs(DoorDefinition[] defs) throws Exception { + public void saveDoorDefs(DoorDef[] defs) throws Exception { write("defs/DoorDef.xml.gz", defs); } @Override - public void saveItemDefs(ItemDefinition[] defs) throws Exception { + public void saveItemDefs(ItemDef[] defs) throws Exception { write("defs/ItemDef.xml.gz", defs); } @Override - public void savePrayerDefs(PrayerDefinition[] defs) throws Exception { + public void savePrayerDefs(PrayerDef[] defs) throws Exception { write("defs/PrayerDef.xml.gz", defs); } @Override - public void saveSpellDefs(SpellDefinition[] defs) throws Exception { + public void saveSpellDefs(SpellDef[] defs) throws Exception { write("defs/SpellDef.xml.gz", defs); } @Override - public void saveNPCDefs(NPCDefinition[] defs) throws Exception { + public void saveNPCDefs(NPCDef[] defs) throws Exception { write("defs/NPCDef.xml.gz", defs); } @Override - public void saveItemCraftingDefs(ItemCraftingDefinition[] defs) throws Exception { + public void saveItemCraftingDefs(ItemCraftingDef[] defs) throws Exception { write("defs/extras/ItemCraftingDef.xml.gz", defs); } @Override - public void saveItemHerbSeconds(ItemHerbSecondDefinition[] seconds) throws Exception { + public void saveItemHerbSeconds(ItemHerbSecondDef[] seconds) throws Exception { write("defs/extras/ItemHerbSecond.xml.gz", seconds); } @Override - public void saveItemDartTipDefs(Map defs) + public void saveItemDartTipDefs(Map defs) throws Exception { write("defs/extras/ItemDartTipDef.xml.gz", defs); } @Override - public void saveGemDefs(Map defs) throws Exception { + public void saveGemDefs(Map defs) throws Exception { write("def/extras/ItemGemDef.xml.gz", defs); } @Override - public void saveItemLogCutDefs(Map defs) + public void saveItemLogCutDefs(Map defs) throws Exception { write("def/extras/ItemLogCutDefs.xml.gz", defs); } @Override - public void saveItemBowStringDefs(Map defs) + public void saveItemBowStringDefs(Map defs) throws Exception { write("defs/extras/ItemBowStringDef.xml.gz", defs); } @Override - public void saveItemArrowHeadDefs(Map defs) + public void saveItemArrowHeadDefs(Map defs) throws Exception { write("defs/extras/ItemArrowHeadDef.xml.gz", defs); } @Override - public void saveFiremakingDefs(Map defs) + public void saveFiremakingDefs(Map defs) throws Exception { write("defs/extras/FiremakingDef.xml.gz", defs); } @@ -475,19 +475,19 @@ public class XMLUsingXStream implements DataStore { } @Override - public void saveItemWieldableDefs(Map defs) + public void saveItemWieldableDefs(Map defs) throws Exception { write("defs/extras/ItemWieldableDef.xml.gz", defs); } @Override - public void saveItemUnIdentHerbDefs(Map defs) + public void saveItemUnIdentHerbDefs(Map defs) throws Exception { write("defs/extras/Item.UnIdentHerbDef.xml.gz", defs); } @Override - public void saveItemHerbDefs(Map defs) + public void saveItemHerbDefs(Map defs) throws Exception { write("defs/extras/ItemHerbDef.xml.gz", defs); } @@ -499,36 +499,36 @@ public class XMLUsingXStream implements DataStore { } @Override - public void saveItemCookingDefs(Map defs) + public void saveItemCookingDefs(Map defs) throws Exception { write("defs/extras/ItemCookingDef.xml.gz", defs); } @Override - public void saveItemSmeltingDefs(Map defs) + public void saveItemSmeltingDefs(Map defs) throws Exception { write("defs/extras/ItemSmeltingDef.xml.gz", defs); } @Override - public void saveItemSmithingDefs(ItemSmithingDefinition[] defs) throws Exception { + public void saveItemSmithingDefs(ItemSmithingDef[] defs) throws Exception { write("defs/extras/ItemSmithingDef.xml.gz", defs); } @Override - public void saveObjectMiningDefs(Map defs) + public void saveObjectMiningDefs(Map defs) throws Exception { write("defs/extras/ObjectMiningDef.xml.gz", defs); } @Override public void saveObjectWoodcuttingDefs( - Map defs) throws Exception { + Map defs) throws Exception { write("defs/extras/ObjectWoodcuttingDef.xml.gz", defs); } @Override - public void saveObjectFishingDefs(Map defs) + public void saveObjectFishingDefs(Map defs) throws Exception { write("defs/extras/ObjectFishingDef.xml.gz", defs); } @@ -540,12 +540,12 @@ public class XMLUsingXStream implements DataStore { } @Override - public void saveAgilityDefs(Map defs) throws Exception { + public void saveAgilityDefs(Map defs) throws Exception { write("defs/extras/AgilityDef.xml.gz", defs); } @Override - public void saveAgilityCourseDef(Map defs) + public void saveAgilityCourseDef(Map defs) throws Exception { write("defs/extras/AgilityCourseDef.xml.gz", defs); }