diff --git a/src/org/rev317/api/wrappers/Player.java b/src/org/rev317/api/wrappers/Player.java deleted file mode 100644 index cdedb53..0000000 --- a/src/org/rev317/api/wrappers/Player.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.rev317.api.wrappers; - -/** - * - * @author Everel - * - */ -public class Player extends Character { - - public Player(org.rev317.accessors.Player accessor, int index) { - super(accessor, index); - } -} diff --git a/src/org/rev317/Loader.java b/src/org/rev317/min/Loader.java similarity index 90% rename from src/org/rev317/Loader.java rename to src/org/rev317/min/Loader.java index a950859..7558e62 100644 --- a/src/org/rev317/Loader.java +++ b/src/org/rev317/min/Loader.java @@ -1,4 +1,4 @@ -package org.rev317; +package org.rev317.min; import java.applet.Applet; import java.io.File; @@ -15,9 +15,9 @@ import org.parabot.environment.scripts.Script; import org.parabot.environment.servers.ServerManifest; import org.parabot.environment.servers.ServerProvider; import org.parabot.environment.servers.Type; -import org.rev317.accessors.Client; -import org.rev317.script.ScriptEngine; -import org.rev317.ui.BotMenu; +import org.rev317.min.accessors.Client; +import org.rev317.min.script.ScriptEngine; +import org.rev317.min.ui.BotMenu; /** * diff --git a/src/org/rev317/accessors/Character.java b/src/org/rev317/min/accessors/Character.java similarity index 82% rename from src/org/rev317/accessors/Character.java rename to src/org/rev317/min/accessors/Character.java index 946aca6..5f69ae0 100644 --- a/src/org/rev317/accessors/Character.java +++ b/src/org/rev317/min/accessors/Character.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Character { diff --git a/src/org/rev317/accessors/Client.java b/src/org/rev317/min/accessors/Client.java similarity index 91% rename from src/org/rev317/accessors/Client.java rename to src/org/rev317/min/accessors/Client.java index 9c8a245..666c9b7 100644 --- a/src/org/rev317/accessors/Client.java +++ b/src/org/rev317/min/accessors/Client.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Client { diff --git a/src/org/rev317/accessors/CollisionMap.java b/src/org/rev317/min/accessors/CollisionMap.java similarity index 61% rename from src/org/rev317/accessors/CollisionMap.java rename to src/org/rev317/min/accessors/CollisionMap.java index 258583f..71a13b9 100644 --- a/src/org/rev317/accessors/CollisionMap.java +++ b/src/org/rev317/min/accessors/CollisionMap.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface CollisionMap { diff --git a/src/org/rev317/accessors/Deque.java b/src/org/rev317/min/accessors/Deque.java similarity index 66% rename from src/org/rev317/accessors/Deque.java rename to src/org/rev317/min/accessors/Deque.java index ffd4f66..6418ef1 100644 --- a/src/org/rev317/accessors/Deque.java +++ b/src/org/rev317/min/accessors/Deque.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Deque { diff --git a/src/org/rev317/accessors/Ground.java b/src/org/rev317/min/accessors/Ground.java similarity index 84% rename from src/org/rev317/accessors/Ground.java rename to src/org/rev317/min/accessors/Ground.java index 2cad588..a9fcc2a 100644 --- a/src/org/rev317/accessors/Ground.java +++ b/src/org/rev317/min/accessors/Ground.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Ground { diff --git a/src/org/rev317/accessors/Interface.java b/src/org/rev317/min/accessors/Interface.java similarity index 68% rename from src/org/rev317/accessors/Interface.java rename to src/org/rev317/min/accessors/Interface.java index 846ea2d..a7b2c06 100644 --- a/src/org/rev317/accessors/Interface.java +++ b/src/org/rev317/min/accessors/Interface.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Interface { diff --git a/src/org/rev317/accessors/Item.java b/src/org/rev317/min/accessors/Item.java similarity index 55% rename from src/org/rev317/accessors/Item.java rename to src/org/rev317/min/accessors/Item.java index 3e39ffb..7826b32 100644 --- a/src/org/rev317/accessors/Item.java +++ b/src/org/rev317/min/accessors/Item.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Item { diff --git a/src/org/rev317/accessors/Node.java b/src/org/rev317/min/accessors/Node.java similarity index 56% rename from src/org/rev317/accessors/Node.java rename to src/org/rev317/min/accessors/Node.java index 90289d4..4e4bf00 100644 --- a/src/org/rev317/accessors/Node.java +++ b/src/org/rev317/min/accessors/Node.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Node { diff --git a/src/org/rev317/accessors/Npc.java b/src/org/rev317/min/accessors/Npc.java similarity index 63% rename from src/org/rev317/accessors/Npc.java rename to src/org/rev317/min/accessors/Npc.java index 3ab0c66..b903abf 100644 --- a/src/org/rev317/accessors/Npc.java +++ b/src/org/rev317/min/accessors/Npc.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Npc extends Character { diff --git a/src/org/rev317/accessors/NpcDef.java b/src/org/rev317/min/accessors/NpcDef.java similarity index 56% rename from src/org/rev317/accessors/NpcDef.java rename to src/org/rev317/min/accessors/NpcDef.java index b751dee..9a08e5e 100644 --- a/src/org/rev317/accessors/NpcDef.java +++ b/src/org/rev317/min/accessors/NpcDef.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface NpcDef { diff --git a/src/org/rev317/accessors/Player.java b/src/org/rev317/min/accessors/Player.java similarity index 55% rename from src/org/rev317/accessors/Player.java rename to src/org/rev317/min/accessors/Player.java index 0628eac..0910477 100644 --- a/src/org/rev317/accessors/Player.java +++ b/src/org/rev317/min/accessors/Player.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Player extends Character { diff --git a/src/org/rev317/accessors/Scene.java b/src/org/rev317/min/accessors/Scene.java similarity index 63% rename from src/org/rev317/accessors/Scene.java rename to src/org/rev317/min/accessors/Scene.java index 10ea2a9..f496e06 100644 --- a/src/org/rev317/accessors/Scene.java +++ b/src/org/rev317/min/accessors/Scene.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface Scene { diff --git a/src/org/rev317/accessors/SceneObjectTile.java b/src/org/rev317/min/accessors/SceneObjectTile.java similarity index 61% rename from src/org/rev317/accessors/SceneObjectTile.java rename to src/org/rev317/min/accessors/SceneObjectTile.java index 0cee4e8..80028d7 100644 --- a/src/org/rev317/accessors/SceneObjectTile.java +++ b/src/org/rev317/min/accessors/SceneObjectTile.java @@ -1,4 +1,4 @@ -package org.rev317.accessors; +package org.rev317.min.accessors; public interface SceneObjectTile { diff --git a/src/org/rev317/api/interfaces/Locatable.java b/src/org/rev317/min/api/interfaces/Locatable.java similarity index 74% rename from src/org/rev317/api/interfaces/Locatable.java rename to src/org/rev317/min/api/interfaces/Locatable.java index b67ff93..fa019b4 100644 --- a/src/org/rev317/api/interfaces/Locatable.java +++ b/src/org/rev317/min/api/interfaces/Locatable.java @@ -1,6 +1,6 @@ -package org.rev317.api.interfaces; +package org.rev317.min.api.interfaces; -import org.rev317.api.wrappers.Tile; +import org.rev317.min.api.wrappers.Tile; /** * diff --git a/src/org/rev317/api/interfaces/TileFlags.java b/src/org/rev317/min/api/interfaces/TileFlags.java similarity index 90% rename from src/org/rev317/api/interfaces/TileFlags.java rename to src/org/rev317/min/api/interfaces/TileFlags.java index bc00b85..8d6a109 100644 --- a/src/org/rev317/api/interfaces/TileFlags.java +++ b/src/org/rev317/min/api/interfaces/TileFlags.java @@ -1,4 +1,4 @@ -package org.rev317.api.interfaces; +package org.rev317.min.api.interfaces; public interface TileFlags { diff --git a/src/org/rev317/api/methods/Bank.java b/src/org/rev317/min/api/methods/Bank.java similarity index 92% rename from src/org/rev317/api/methods/Bank.java rename to src/org/rev317/min/api/methods/Bank.java index f2f015a..29c1122 100644 --- a/src/org/rev317/api/methods/Bank.java +++ b/src/org/rev317/min/api/methods/Bank.java @@ -1,14 +1,14 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import org.parabot.environment.api.utils.Filter; import org.parabot.environment.api.utils.Time; import org.parabot.environment.input.Keyboard; -import org.rev317.Loader; -import org.rev317.api.wrappers.Item; -import org.rev317.api.wrappers.Npc; -import org.rev317.api.wrappers.SceneObject; +import org.rev317.min.Loader; +import org.rev317.min.api.wrappers.Item; +import org.rev317.min.api.wrappers.Npc; +import org.rev317.min.api.wrappers.SceneObject; /** * diff --git a/src/org/rev317/api/methods/Calculations.java b/src/org/rev317/min/api/methods/Calculations.java similarity index 95% rename from src/org/rev317/api/methods/Calculations.java rename to src/org/rev317/min/api/methods/Calculations.java index e6a61c2..1b04a72 100644 --- a/src/org/rev317/api/methods/Calculations.java +++ b/src/org/rev317/min/api/methods/Calculations.java @@ -1,6 +1,6 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; -import org.rev317.api.wrappers.Tile; +import org.rev317.min.api.wrappers.Tile; /** * diff --git a/src/org/rev317/api/methods/Game.java b/src/org/rev317/min/api/methods/Game.java similarity index 88% rename from src/org/rev317/api/methods/Game.java rename to src/org/rev317/min/api/methods/Game.java index f1f1f94..7d31832 100644 --- a/src/org/rev317/api/methods/Game.java +++ b/src/org/rev317/min/api/methods/Game.java @@ -1,6 +1,6 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; -import org.rev317.Loader; +import org.rev317.min.Loader; /** * diff --git a/src/org/rev317/api/methods/GroundItems.java b/src/org/rev317/min/api/methods/GroundItems.java similarity index 87% rename from src/org/rev317/api/methods/GroundItems.java rename to src/org/rev317/min/api/methods/GroundItems.java index 84bf894..b366420 100644 --- a/src/org/rev317/api/methods/GroundItems.java +++ b/src/org/rev317/min/api/methods/GroundItems.java @@ -1,15 +1,15 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import org.parabot.environment.api.utils.Filter; -import org.rev317.Loader; -import org.rev317.accessors.Client; -import org.rev317.accessors.Deque; -import org.rev317.accessors.Node; -import org.rev317.api.wrappers.GroundItem; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Client; +import org.rev317.min.accessors.Deque; +import org.rev317.min.accessors.Node; +import org.rev317.min.api.wrappers.GroundItem; /** * @@ -89,7 +89,7 @@ public class GroundItems { if (list == null) { list = new ArrayList(); } - final org.rev317.accessors.Item groundItem = (org.rev317.accessors.Item) curNode; + final org.rev317.min.accessors.Item groundItem = (org.rev317.min.accessors.Item) curNode; list.add(new GroundItem(groundItem, x, y)); curNode = curNode.getNext(); } diff --git a/src/org/rev317/api/methods/Inventory.java b/src/org/rev317/min/api/methods/Inventory.java similarity index 92% rename from src/org/rev317/api/methods/Inventory.java rename to src/org/rev317/min/api/methods/Inventory.java index 7b3f80c..f588357 100644 --- a/src/org/rev317/api/methods/Inventory.java +++ b/src/org/rev317/min/api/methods/Inventory.java @@ -1,12 +1,12 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import org.parabot.environment.api.utils.Filter; import org.parabot.environment.api.utils.Time; -import org.rev317.Loader; -import org.rev317.accessors.Interface; -import org.rev317.api.wrappers.Item; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Interface; +import org.rev317.min.api.wrappers.Item; /** diff --git a/src/org/rev317/api/methods/Menu.java b/src/org/rev317/min/api/methods/Menu.java similarity index 88% rename from src/org/rev317/api/methods/Menu.java rename to src/org/rev317/min/api/methods/Menu.java index 30574fb..9df4489 100644 --- a/src/org/rev317/api/methods/Menu.java +++ b/src/org/rev317/min/api/methods/Menu.java @@ -1,14 +1,14 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.HashMap; import org.parabot.core.Context; -import org.rev317.Loader; -import org.rev317.accessors.Client; -import org.rev317.api.wrappers.Character; -import org.rev317.api.wrappers.GroundItem; -import org.rev317.api.wrappers.Item; -import org.rev317.api.wrappers.SceneObject; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Client; +import org.rev317.min.api.wrappers.Character; +import org.rev317.min.api.wrappers.GroundItem; +import org.rev317.min.api.wrappers.Item; +import org.rev317.min.api.wrappers.SceneObject; /** * diff --git a/src/org/rev317/api/methods/Npcs.java b/src/org/rev317/min/api/methods/Npcs.java similarity index 86% rename from src/org/rev317/api/methods/Npcs.java rename to src/org/rev317/min/api/methods/Npcs.java index 91a695f..cacb3db 100644 --- a/src/org/rev317/api/methods/Npcs.java +++ b/src/org/rev317/min/api/methods/Npcs.java @@ -1,13 +1,13 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import org.parabot.environment.api.utils.Filter; -import org.rev317.Loader; -import org.rev317.accessors.Client; -import org.rev317.api.wrappers.Npc; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Client; +import org.rev317.min.api.wrappers.Npc; /** * @@ -43,7 +43,7 @@ public class Npcs { public static final Npc[] getNpcs(final Filter filter) { final Client client = Loader.getClient(); ArrayList npcList = new ArrayList(); - final org.rev317.accessors.Npc[] accNpcs = client.getNpcs(); + final org.rev317.min.accessors.Npc[] accNpcs = client.getNpcs(); for (int i = 0; i < accNpcs.length; i++) { if(accNpcs[i] == null) { continue; diff --git a/src/org/rev317/api/methods/Players.java b/src/org/rev317/min/api/methods/Players.java similarity index 85% rename from src/org/rev317/api/methods/Players.java rename to src/org/rev317/min/api/methods/Players.java index 440b961..3dc9453 100644 --- a/src/org/rev317/api/methods/Players.java +++ b/src/org/rev317/min/api/methods/Players.java @@ -1,13 +1,13 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import org.parabot.environment.api.utils.Filter; -import org.rev317.Loader; -import org.rev317.accessors.Client; -import org.rev317.api.wrappers.Player; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Client; +import org.rev317.min.api.wrappers.Player; /** * @@ -42,7 +42,7 @@ public class Players { public static final Player[] getPlayers(final Filter filter) { final Client client = Loader.getClient(); ArrayList playerList = new ArrayList(); - final org.rev317.accessors.Player[] accPlayers = client.getPlayers(); + final org.rev317.min.accessors.Player[] accPlayers = client.getPlayers(); for(int i = 0; i < accPlayers.length; i++) { if(accPlayers[i] == null) { continue; diff --git a/src/org/rev317/api/methods/SceneObjects.java b/src/org/rev317/min/api/methods/SceneObjects.java similarity index 93% rename from src/org/rev317/api/methods/SceneObjects.java rename to src/org/rev317/min/api/methods/SceneObjects.java index 4121735..144f038 100644 --- a/src/org/rev317/api/methods/SceneObjects.java +++ b/src/org/rev317/min/api/methods/SceneObjects.java @@ -1,4 +1,4 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; import java.util.ArrayList; import java.util.Arrays; @@ -6,10 +6,10 @@ import java.util.Collection; import java.util.Comparator; import org.parabot.environment.api.utils.Filter; -import org.rev317.Loader; -import org.rev317.accessors.Ground; -import org.rev317.accessors.SceneObjectTile; -import org.rev317.api.wrappers.SceneObject; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Ground; +import org.rev317.min.accessors.SceneObjectTile; +import org.rev317.min.api.wrappers.SceneObject; /** * diff --git a/src/org/rev317/api/methods/Skill.java b/src/org/rev317/min/api/methods/Skill.java similarity index 95% rename from src/org/rev317/api/methods/Skill.java rename to src/org/rev317/min/api/methods/Skill.java index b9f4f30..0ef7864 100644 --- a/src/org/rev317/api/methods/Skill.java +++ b/src/org/rev317/min/api/methods/Skill.java @@ -1,6 +1,6 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; -import org.rev317.Loader; +import org.rev317.min.Loader; /** * diff --git a/src/org/rev317/api/methods/Walking.java b/src/org/rev317/min/api/methods/Walking.java similarity index 72% rename from src/org/rev317/api/methods/Walking.java rename to src/org/rev317/min/api/methods/Walking.java index 569ed63..638dd14 100644 --- a/src/org/rev317/api/methods/Walking.java +++ b/src/org/rev317/min/api/methods/Walking.java @@ -1,8 +1,8 @@ -package org.rev317.api.methods; +package org.rev317.min.api.methods; -import org.rev317.Loader; -import org.rev317.api.wrappers.Tile; -import org.rev317.api.wrappers.TilePath; +import org.rev317.min.Loader; +import org.rev317.min.api.wrappers.Tile; +import org.rev317.min.api.wrappers.TilePath; /** * diff --git a/src/org/rev317/api/wrappers/Character.java b/src/org/rev317/min/api/wrappers/Character.java similarity index 83% rename from src/org/rev317/api/wrappers/Character.java rename to src/org/rev317/min/api/wrappers/Character.java index d1f2bb9..bff063a 100644 --- a/src/org/rev317/api/wrappers/Character.java +++ b/src/org/rev317/min/api/wrappers/Character.java @@ -1,11 +1,11 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; -import org.rev317.Loader; -import org.rev317.api.interfaces.Locatable; -import org.rev317.api.methods.Calculations; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Menu; -import org.rev317.api.methods.Players; +import org.rev317.min.Loader; +import org.rev317.min.api.interfaces.Locatable; +import org.rev317.min.api.methods.Calculations; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Menu; +import org.rev317.min.api.methods.Players; /** * @@ -14,10 +14,10 @@ import org.rev317.api.methods.Players; */ public class Character implements Locatable { - private org.rev317.accessors.Character accessor; + private org.rev317.min.accessors.Character accessor; private int index; - public Character(org.rev317.accessors.Character accessor, int index) { + public Character(org.rev317.min.accessors.Character accessor, int index) { this.accessor = accessor; this.index = index; } diff --git a/src/org/rev317/api/wrappers/GroundItem.java b/src/org/rev317/min/api/wrappers/GroundItem.java similarity index 70% rename from src/org/rev317/api/wrappers/GroundItem.java rename to src/org/rev317/min/api/wrappers/GroundItem.java index c073b0e..dc6dafa 100644 --- a/src/org/rev317/api/wrappers/GroundItem.java +++ b/src/org/rev317/min/api/wrappers/GroundItem.java @@ -1,9 +1,9 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; -import org.rev317.api.interfaces.Locatable; -import org.rev317.api.methods.Calculations; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Menu; +import org.rev317.min.api.interfaces.Locatable; +import org.rev317.min.api.methods.Calculations; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Menu; /** * @@ -11,11 +11,11 @@ import org.rev317.api.methods.Menu; * */ public class GroundItem implements Locatable { - private org.rev317.accessors.Item accessor; + private org.rev317.min.accessors.Item accessor; private int x; private int y; - public GroundItem(org.rev317.accessors.Item accessor, int x, int y) { + public GroundItem(org.rev317.min.accessors.Item accessor, int x, int y) { this.accessor = accessor; this.x = x; this.y = y; diff --git a/src/org/rev317/api/wrappers/Item.java b/src/org/rev317/min/api/wrappers/Item.java similarity index 85% rename from src/org/rev317/api/wrappers/Item.java rename to src/org/rev317/min/api/wrappers/Item.java index b90e4bf..3112dd8 100644 --- a/src/org/rev317/api/wrappers/Item.java +++ b/src/org/rev317/min/api/wrappers/Item.java @@ -1,6 +1,6 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; -import org.rev317.api.methods.Menu; +import org.rev317.min.api.methods.Menu; /** * diff --git a/src/org/rev317/api/wrappers/Npc.java b/src/org/rev317/min/api/wrappers/Npc.java similarity index 62% rename from src/org/rev317/api/wrappers/Npc.java rename to src/org/rev317/min/api/wrappers/Npc.java index ba6c23f..ecff3dc 100644 --- a/src/org/rev317/api/wrappers/Npc.java +++ b/src/org/rev317/min/api/wrappers/Npc.java @@ -1,4 +1,4 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; /** * @@ -6,9 +6,9 @@ package org.rev317.api.wrappers; * */ public final class Npc extends Character { - private org.rev317.accessors.Npc accessor; + private org.rev317.min.accessors.Npc accessor; - public Npc(org.rev317.accessors.Npc accessor, int index) { + public Npc(org.rev317.min.accessors.Npc accessor, int index) { super(accessor, index); this.accessor = accessor; } diff --git a/src/org/rev317/api/wrappers/NpcDef.java b/src/org/rev317/min/api/wrappers/NpcDef.java similarity index 55% rename from src/org/rev317/api/wrappers/NpcDef.java rename to src/org/rev317/min/api/wrappers/NpcDef.java index 832acd4..5524e23 100644 --- a/src/org/rev317/api/wrappers/NpcDef.java +++ b/src/org/rev317/min/api/wrappers/NpcDef.java @@ -1,4 +1,4 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; /** * @@ -6,9 +6,9 @@ package org.rev317.api.wrappers; * */ public class NpcDef { - private org.rev317.accessors.NpcDef accessor; + private org.rev317.min.accessors.NpcDef accessor; - public NpcDef(org.rev317.accessors.NpcDef accessor) { + public NpcDef(org.rev317.min.accessors.NpcDef accessor) { this.accessor = accessor; } diff --git a/src/org/rev317/min/api/wrappers/Player.java b/src/org/rev317/min/api/wrappers/Player.java new file mode 100644 index 0000000..b5a21ab --- /dev/null +++ b/src/org/rev317/min/api/wrappers/Player.java @@ -0,0 +1,13 @@ +package org.rev317.min.api.wrappers; + +/** + * + * @author Everel + * + */ +public class Player extends Character { + + public Player(org.rev317.min.accessors.Player accessor, int index) { + super(accessor, index); + } +} diff --git a/src/org/rev317/api/wrappers/SceneObject.java b/src/org/rev317/min/api/wrappers/SceneObject.java similarity index 83% rename from src/org/rev317/api/wrappers/SceneObject.java rename to src/org/rev317/min/api/wrappers/SceneObject.java index 7f0bb2f..6222618 100644 --- a/src/org/rev317/api/wrappers/SceneObject.java +++ b/src/org/rev317/min/api/wrappers/SceneObject.java @@ -1,10 +1,10 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; -import org.rev317.accessors.SceneObjectTile; -import org.rev317.api.interfaces.Locatable; -import org.rev317.api.methods.Calculations; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Menu; +import org.rev317.min.accessors.SceneObjectTile; +import org.rev317.min.api.interfaces.Locatable; +import org.rev317.min.api.methods.Calculations; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Menu; /** * diff --git a/src/org/rev317/api/wrappers/Tile.java b/src/org/rev317/min/api/wrappers/Tile.java similarity index 86% rename from src/org/rev317/api/wrappers/Tile.java rename to src/org/rev317/min/api/wrappers/Tile.java index 2001aa6..a53018a 100644 --- a/src/org/rev317/api/wrappers/Tile.java +++ b/src/org/rev317/min/api/wrappers/Tile.java @@ -1,11 +1,11 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; -import org.rev317.api.interfaces.Locatable; -import org.rev317.api.interfaces.TileFlags; -import org.rev317.api.methods.Calculations; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Players; -import org.rev317.api.methods.Walking; +import org.rev317.min.api.interfaces.Locatable; +import org.rev317.min.api.interfaces.TileFlags; +import org.rev317.min.api.methods.Calculations; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Players; +import org.rev317.min.api.methods.Walking; /** * diff --git a/src/org/rev317/api/wrappers/TilePath.java b/src/org/rev317/min/api/wrappers/TilePath.java similarity index 91% rename from src/org/rev317/api/wrappers/TilePath.java rename to src/org/rev317/min/api/wrappers/TilePath.java index 53821ae..5fd0352 100644 --- a/src/org/rev317/api/wrappers/TilePath.java +++ b/src/org/rev317/min/api/wrappers/TilePath.java @@ -1,4 +1,4 @@ -package org.rev317.api.wrappers; +package org.rev317.min.api.wrappers; /** * diff --git a/src/org/rev317/callback/MenuAction.java b/src/org/rev317/min/callback/MenuAction.java similarity index 76% rename from src/org/rev317/callback/MenuAction.java rename to src/org/rev317/min/callback/MenuAction.java index d1bb63c..f61a46b 100644 --- a/src/org/rev317/callback/MenuAction.java +++ b/src/org/rev317/min/callback/MenuAction.java @@ -1,8 +1,8 @@ -package org.rev317.callback; +package org.rev317.min.callback; -import org.rev317.Loader; -import org.rev317.accessors.Client; -import org.rev317.debug.DActions; +import org.rev317.min.Loader; +import org.rev317.min.accessors.Client; +import org.rev317.min.debug.DActions; /** * diff --git a/src/org/rev317/debug/DActions.java b/src/org/rev317/min/debug/DActions.java similarity index 87% rename from src/org/rev317/debug/DActions.java rename to src/org/rev317/min/debug/DActions.java index 909d5cb..dcedfc4 100644 --- a/src/org/rev317/debug/DActions.java +++ b/src/org/rev317/min/debug/DActions.java @@ -1,4 +1,4 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; diff --git a/src/org/rev317/debug/DAnimation.java b/src/org/rev317/min/debug/DAnimation.java similarity index 82% rename from src/org/rev317/debug/DAnimation.java rename to src/org/rev317/min/debug/DAnimation.java index d9ffb7a..e470dc1 100644 --- a/src/org/rev317/debug/DAnimation.java +++ b/src/org/rev317/min/debug/DAnimation.java @@ -1,10 +1,10 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; -import org.rev317.api.methods.Players; +import org.rev317.min.api.methods.Players; public class DAnimation extends AbstractDebugger { private boolean enabled; diff --git a/src/org/rev317/debug/DCollisionFlags.java b/src/org/rev317/min/debug/DCollisionFlags.java similarity index 87% rename from src/org/rev317/debug/DCollisionFlags.java rename to src/org/rev317/min/debug/DCollisionFlags.java index b02e40c..203febd 100644 --- a/src/org/rev317/debug/DCollisionFlags.java +++ b/src/org/rev317/min/debug/DCollisionFlags.java @@ -1,13 +1,13 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; import org.parabot.core.paint.PaintDebugger; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Players; -import org.rev317.api.wrappers.Tile; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Players; +import org.rev317.min.api.wrappers.Tile; public class DCollisionFlags extends AbstractDebugger { private boolean enabled; diff --git a/src/org/rev317/debug/DGroundItems.java b/src/org/rev317/min/debug/DGroundItems.java similarity index 76% rename from src/org/rev317/debug/DGroundItems.java rename to src/org/rev317/min/debug/DGroundItems.java index 84a64f2..c38d0f3 100644 --- a/src/org/rev317/debug/DGroundItems.java +++ b/src/org/rev317/min/debug/DGroundItems.java @@ -1,10 +1,10 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.paint.AbstractDebugger; -import org.rev317.api.methods.GroundItems; -import org.rev317.api.wrappers.GroundItem; +import org.rev317.min.api.methods.GroundItems; +import org.rev317.min.api.wrappers.GroundItem; public class DGroundItems extends AbstractDebugger { diff --git a/src/org/rev317/debug/DInterfaces.java b/src/org/rev317/min/debug/DInterfaces.java similarity index 85% rename from src/org/rev317/debug/DInterfaces.java rename to src/org/rev317/min/debug/DInterfaces.java index d60044a..fe14f53 100644 --- a/src/org/rev317/debug/DInterfaces.java +++ b/src/org/rev317/min/debug/DInterfaces.java @@ -1,11 +1,11 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; import org.parabot.core.paint.PaintDebugger; -import org.rev317.api.methods.Game; +import org.rev317.min.api.methods.Game; public class DInterfaces extends AbstractDebugger { private boolean enabled; diff --git a/src/org/rev317/debug/DMap.java b/src/org/rev317/min/debug/DMap.java similarity index 79% rename from src/org/rev317/debug/DMap.java rename to src/org/rev317/min/debug/DMap.java index 2cf5921..fe0e7d4 100644 --- a/src/org/rev317/debug/DMap.java +++ b/src/org/rev317/min/debug/DMap.java @@ -1,12 +1,12 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; import org.parabot.core.paint.PaintDebugger; -import org.rev317.api.methods.Game; -import org.rev317.api.methods.Players; +import org.rev317.min.api.methods.Game; +import org.rev317.min.api.methods.Players; public class DMap extends AbstractDebugger { private boolean enabled; diff --git a/src/org/rev317/debug/DNpcs.java b/src/org/rev317/min/debug/DNpcs.java similarity index 76% rename from src/org/rev317/debug/DNpcs.java rename to src/org/rev317/min/debug/DNpcs.java index 210dabb..cd76047 100644 --- a/src/org/rev317/debug/DNpcs.java +++ b/src/org/rev317/min/debug/DNpcs.java @@ -1,10 +1,10 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.paint.AbstractDebugger; -import org.rev317.api.methods.Npcs; -import org.rev317.api.wrappers.Npc; +import org.rev317.min.api.methods.Npcs; +import org.rev317.min.api.wrappers.Npc; public class DNpcs extends AbstractDebugger { diff --git a/src/org/rev317/debug/DSceneObjects.java b/src/org/rev317/min/debug/DSceneObjects.java similarity index 77% rename from src/org/rev317/debug/DSceneObjects.java rename to src/org/rev317/min/debug/DSceneObjects.java index dca5d0d..5dc39cb 100644 --- a/src/org/rev317/debug/DSceneObjects.java +++ b/src/org/rev317/min/debug/DSceneObjects.java @@ -1,10 +1,10 @@ -package org.rev317.debug; +package org.rev317.min.debug; import java.awt.Graphics; import org.parabot.core.paint.AbstractDebugger; -import org.rev317.api.methods.SceneObjects; -import org.rev317.api.wrappers.SceneObject; +import org.rev317.min.api.methods.SceneObjects; +import org.rev317.min.api.wrappers.SceneObject; public class DSceneObjects extends AbstractDebugger { diff --git a/src/org/rev317/script/ScriptEngine.java b/src/org/rev317/min/script/ScriptEngine.java similarity index 95% rename from src/org/rev317/script/ScriptEngine.java rename to src/org/rev317/min/script/ScriptEngine.java index f144fe6..cfa5343 100644 --- a/src/org/rev317/script/ScriptEngine.java +++ b/src/org/rev317/min/script/ScriptEngine.java @@ -1,4 +1,4 @@ -package org.rev317.script; +package org.rev317.min.script; import java.awt.AWTEvent; import java.awt.event.MouseEvent; diff --git a/src/org/rev317/ui/BotMenu.java b/src/org/rev317/min/ui/BotMenu.java similarity index 93% rename from src/org/rev317/ui/BotMenu.java rename to src/org/rev317/min/ui/BotMenu.java index 784bdc1..be7d929 100644 --- a/src/org/rev317/ui/BotMenu.java +++ b/src/org/rev317/min/ui/BotMenu.java @@ -1,14 +1,14 @@ -package org.rev317.ui; +package org.rev317.min.ui; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; -import org.rev317.debug.*; - +import org.rev317.min.debug.*; import org.parabot.core.Context; import org.parabot.core.paint.PaintDebugger;