diff --git a/.gitignore b/.gitignore index 7119fdc2..7b71be68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -2006Redone\ Server/data/characters/ +2006Scape\ Server/data/characters/ .idea/ .idea/workspace.xml **/.idea/workspace.xml **/.idea/* -**/*.jar +*/*.jar *.iml diff --git a/2006Redone Server/src/main/resources/META-INF/MANIFEST.MF b/2006Redone Server/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 893dcfe5..00000000 --- a/2006Redone Server/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: com.rebotted.GameEngine - diff --git a/2006Redone Client/.gitignore b/2006Scape Client/.gitignore similarity index 100% rename from 2006Redone Client/.gitignore rename to 2006Scape Client/.gitignore diff --git a/2006Redone Client/.settings/org.eclipse.jdt.core.prefs b/2006Scape Client/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from 2006Redone Client/.settings/org.eclipse.jdt.core.prefs rename to 2006Scape Client/.settings/org.eclipse.jdt.core.prefs diff --git a/2006Redone Client/compile.bat b/2006Scape Client/compile.bat similarity index 100% rename from 2006Redone Client/compile.bat rename to 2006Scape Client/compile.bat diff --git a/2006Redone Client/pom.xml b/2006Scape Client/pom.xml similarity index 94% rename from 2006Redone Client/pom.xml rename to 2006Scape Client/pom.xml index d25f8016..820c3892 100644 --- a/2006Redone Client/pom.xml +++ b/2006Scape Client/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 2006redone - com.rebotted + 2006Scape + com.rs2 1.0 @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/2006Redone Client/src/main/java/Animable.java b/2006Scape Client/src/main/java/Animable.java similarity index 100% rename from 2006Redone Client/src/main/java/Animable.java rename to 2006Scape Client/src/main/java/Animable.java diff --git a/2006Redone Client/src/main/java/Animable_Sub3.java b/2006Scape Client/src/main/java/Animable_Sub3.java similarity index 100% rename from 2006Redone Client/src/main/java/Animable_Sub3.java rename to 2006Scape Client/src/main/java/Animable_Sub3.java diff --git a/2006Redone Client/src/main/java/Animable_Sub4.java b/2006Scape Client/src/main/java/Animable_Sub4.java similarity index 100% rename from 2006Redone Client/src/main/java/Animable_Sub4.java rename to 2006Scape Client/src/main/java/Animable_Sub4.java diff --git a/2006Redone Client/src/main/java/Animable_Sub5.java b/2006Scape Client/src/main/java/Animable_Sub5.java similarity index 100% rename from 2006Redone Client/src/main/java/Animable_Sub5.java rename to 2006Scape Client/src/main/java/Animable_Sub5.java diff --git a/2006Redone Client/src/main/java/Animation.java b/2006Scape Client/src/main/java/Animation.java similarity index 100% rename from 2006Redone Client/src/main/java/Animation.java rename to 2006Scape Client/src/main/java/Animation.java diff --git a/2006Redone Client/src/main/java/Background.java b/2006Scape Client/src/main/java/Background.java similarity index 100% rename from 2006Redone Client/src/main/java/Background.java rename to 2006Scape Client/src/main/java/Background.java diff --git a/2006Redone Client/src/main/java/Censor.java b/2006Scape Client/src/main/java/Censor.java similarity index 100% rename from 2006Redone Client/src/main/java/Censor.java rename to 2006Scape Client/src/main/java/Censor.java diff --git a/2006Redone Client/src/main/java/Class11.java b/2006Scape Client/src/main/java/Class11.java similarity index 100% rename from 2006Redone Client/src/main/java/Class11.java rename to 2006Scape Client/src/main/java/Class11.java diff --git a/2006Redone Client/src/main/java/Class13.java b/2006Scape Client/src/main/java/Class13.java similarity index 100% rename from 2006Redone Client/src/main/java/Class13.java rename to 2006Scape Client/src/main/java/Class13.java diff --git a/2006Redone Client/src/main/java/Class18.java b/2006Scape Client/src/main/java/Class18.java similarity index 100% rename from 2006Redone Client/src/main/java/Class18.java rename to 2006Scape Client/src/main/java/Class18.java diff --git a/2006Redone Client/src/main/java/Class21.java b/2006Scape Client/src/main/java/Class21.java similarity index 100% rename from 2006Redone Client/src/main/java/Class21.java rename to 2006Scape Client/src/main/java/Class21.java diff --git a/2006Redone Client/src/main/java/Class29.java b/2006Scape Client/src/main/java/Class29.java similarity index 100% rename from 2006Redone Client/src/main/java/Class29.java rename to 2006Scape Client/src/main/java/Class29.java diff --git a/2006Redone Client/src/main/java/Class30_Sub1.java b/2006Scape Client/src/main/java/Class30_Sub1.java similarity index 100% rename from 2006Redone Client/src/main/java/Class30_Sub1.java rename to 2006Scape Client/src/main/java/Class30_Sub1.java diff --git a/2006Redone Client/src/main/java/Class32.java b/2006Scape Client/src/main/java/Class32.java similarity index 100% rename from 2006Redone Client/src/main/java/Class32.java rename to 2006Scape Client/src/main/java/Class32.java diff --git a/2006Redone Client/src/main/java/Class33.java b/2006Scape Client/src/main/java/Class33.java similarity index 100% rename from 2006Redone Client/src/main/java/Class33.java rename to 2006Scape Client/src/main/java/Class33.java diff --git a/2006Redone Client/src/main/java/Class36.java b/2006Scape Client/src/main/java/Class36.java similarity index 100% rename from 2006Redone Client/src/main/java/Class36.java rename to 2006Scape Client/src/main/java/Class36.java diff --git a/2006Redone Client/src/main/java/Class39.java b/2006Scape Client/src/main/java/Class39.java similarity index 100% rename from 2006Redone Client/src/main/java/Class39.java rename to 2006Scape Client/src/main/java/Class39.java diff --git a/2006Redone Client/src/main/java/Class4.java b/2006Scape Client/src/main/java/Class4.java similarity index 100% rename from 2006Redone Client/src/main/java/Class4.java rename to 2006Scape Client/src/main/java/Class4.java diff --git a/2006Redone Client/src/main/java/Class40.java b/2006Scape Client/src/main/java/Class40.java similarity index 100% rename from 2006Redone Client/src/main/java/Class40.java rename to 2006Scape Client/src/main/java/Class40.java diff --git a/2006Redone Client/src/main/java/Class43.java b/2006Scape Client/src/main/java/Class43.java similarity index 100% rename from 2006Redone Client/src/main/java/Class43.java rename to 2006Scape Client/src/main/java/Class43.java diff --git a/2006Redone Client/src/main/java/Class47.java b/2006Scape Client/src/main/java/Class47.java similarity index 100% rename from 2006Redone Client/src/main/java/Class47.java rename to 2006Scape Client/src/main/java/Class47.java diff --git a/2006Redone Client/src/main/java/Class56.java b/2006Scape Client/src/main/java/Class56.java similarity index 100% rename from 2006Redone Client/src/main/java/Class56.java rename to 2006Scape Client/src/main/java/Class56.java diff --git a/2006Redone Client/src/main/java/Class56_Sub1.java b/2006Scape Client/src/main/java/Class56_Sub1.java similarity index 100% rename from 2006Redone Client/src/main/java/Class56_Sub1.java rename to 2006Scape Client/src/main/java/Class56_Sub1.java diff --git a/2006Redone Client/src/main/java/Class56_Sub1_Sub1.java b/2006Scape Client/src/main/java/Class56_Sub1_Sub1.java similarity index 100% rename from 2006Redone Client/src/main/java/Class56_Sub1_Sub1.java rename to 2006Scape Client/src/main/java/Class56_Sub1_Sub1.java diff --git a/2006Redone Client/src/main/java/Class56_Sub1_Sub2.java b/2006Scape Client/src/main/java/Class56_Sub1_Sub2.java similarity index 100% rename from 2006Redone Client/src/main/java/Class56_Sub1_Sub2.java rename to 2006Scape Client/src/main/java/Class56_Sub1_Sub2.java diff --git a/2006Redone Client/src/main/java/Class6.java b/2006Scape Client/src/main/java/Class6.java similarity index 100% rename from 2006Redone Client/src/main/java/Class6.java rename to 2006Scape Client/src/main/java/Class6.java diff --git a/2006Redone Client/src/main/java/Client.java b/2006Scape Client/src/main/java/Client.java similarity index 100% rename from 2006Redone Client/src/main/java/Client.java rename to 2006Scape Client/src/main/java/Client.java diff --git a/2006Redone Client/src/main/java/ClientSettings.java b/2006Scape Client/src/main/java/ClientSettings.java similarity index 90% rename from 2006Redone Client/src/main/java/ClientSettings.java rename to 2006Scape Client/src/main/java/ClientSettings.java index b76e399e..d594b3c7 100644 --- a/2006Redone Client/src/main/java/ClientSettings.java +++ b/2006Scape Client/src/main/java/ClientSettings.java @@ -11,11 +11,11 @@ public class ClientSettings { /** * The Servers Name */ - public final static String SERVER_NAME = "2006rebotted"; + public final static String SERVER_NAME = "2006Scape"; /** * The Servers Website */ - public final static String SERVER_WEBSITE = "www.rsrebotted.com"; + public final static String SERVER_WEBSITE = "www.2006Scape.org"; /** * The Servers Ip * diff --git a/2006Redone Client/src/main/java/CollisionMap.java b/2006Scape Client/src/main/java/CollisionMap.java similarity index 100% rename from 2006Redone Client/src/main/java/CollisionMap.java rename to 2006Scape Client/src/main/java/CollisionMap.java diff --git a/2006Redone Client/src/main/java/Decompressor.java b/2006Scape Client/src/main/java/Decompressor.java similarity index 100% rename from 2006Redone Client/src/main/java/Decompressor.java rename to 2006Scape Client/src/main/java/Decompressor.java diff --git a/2006Redone Client/src/main/java/DrawingArea.java b/2006Scape Client/src/main/java/DrawingArea.java similarity index 100% rename from 2006Redone Client/src/main/java/DrawingArea.java rename to 2006Scape Client/src/main/java/DrawingArea.java diff --git a/2006Redone Client/src/main/java/DummyClass.java b/2006Scape Client/src/main/java/DummyClass.java similarity index 100% rename from 2006Redone Client/src/main/java/DummyClass.java rename to 2006Scape Client/src/main/java/DummyClass.java diff --git a/2006Redone Client/src/main/java/Entity.java b/2006Scape Client/src/main/java/Entity.java similarity index 100% rename from 2006Redone Client/src/main/java/Entity.java rename to 2006Scape Client/src/main/java/Entity.java diff --git a/2006Redone Client/src/main/java/EntityDef.java b/2006Scape Client/src/main/java/EntityDef.java similarity index 99% rename from 2006Redone Client/src/main/java/EntityDef.java rename to 2006Scape Client/src/main/java/EntityDef.java index 4935c41a..a3ca927a 100644 --- a/2006Redone Client/src/main/java/EntityDef.java +++ b/2006Scape Client/src/main/java/EntityDef.java @@ -25,7 +25,7 @@ public final class EntityDef { break; case 945: - entityDef.name = "2006Redone Guide"; + entityDef.name = "2006Scape Guide"; break; } return entityDef; diff --git a/2006Redone Client/src/main/java/Flo.java b/2006Scape Client/src/main/java/Flo.java similarity index 100% rename from 2006Redone Client/src/main/java/Flo.java rename to 2006Scape Client/src/main/java/Flo.java diff --git a/2006Redone Client/src/main/java/Game.java b/2006Scape Client/src/main/java/Game.java similarity index 100% rename from 2006Redone Client/src/main/java/Game.java rename to 2006Scape Client/src/main/java/Game.java diff --git a/2006Redone Client/src/main/java/Ground.java b/2006Scape Client/src/main/java/Ground.java similarity index 100% rename from 2006Redone Client/src/main/java/Ground.java rename to 2006Scape Client/src/main/java/Ground.java diff --git a/2006Redone Client/src/main/java/IDK.java b/2006Scape Client/src/main/java/IDK.java similarity index 100% rename from 2006Redone Client/src/main/java/IDK.java rename to 2006Scape Client/src/main/java/IDK.java diff --git a/2006Redone Client/src/main/java/ISAACRandomGen.java b/2006Scape Client/src/main/java/ISAACRandomGen.java similarity index 98% rename from 2006Redone Client/src/main/java/ISAACRandomGen.java rename to 2006Scape Client/src/main/java/ISAACRandomGen.java index dd62bef6..050690d8 100644 --- a/2006Redone Client/src/main/java/ISAACRandomGen.java +++ b/2006Scape Client/src/main/java/ISAACRandomGen.java @@ -1,6 +1,6 @@ // Decompiled by Jad v1.5.8f. Copyright 2001 Pavel Kouznetsov. // Jad home page: http://www.kpdus.com/jad.html -// Decompiler options: packimports(3) package com.rebotted; +// Decompiler options: packimports(3) package com.rs2; public final class ISAACRandomGen { diff --git a/2006Redone Client/src/main/java/InputStream_Sub1.java b/2006Scape Client/src/main/java/InputStream_Sub1.java similarity index 100% rename from 2006Redone Client/src/main/java/InputStream_Sub1.java rename to 2006Scape Client/src/main/java/InputStream_Sub1.java diff --git a/2006Redone Client/src/main/java/Item.java b/2006Scape Client/src/main/java/Item.java similarity index 100% rename from 2006Redone Client/src/main/java/Item.java rename to 2006Scape Client/src/main/java/Item.java diff --git a/2006Redone Client/src/main/java/ItemDef.java b/2006Scape Client/src/main/java/ItemDef.java similarity index 100% rename from 2006Redone Client/src/main/java/ItemDef.java rename to 2006Scape Client/src/main/java/ItemDef.java diff --git a/2006Redone Client/src/main/java/LocalGame.java b/2006Scape Client/src/main/java/LocalGame.java similarity index 100% rename from 2006Redone Client/src/main/java/LocalGame.java rename to 2006Scape Client/src/main/java/LocalGame.java diff --git a/2006Redone Client/src/main/java/MRUNodes.java b/2006Scape Client/src/main/java/MRUNodes.java similarity index 100% rename from 2006Redone Client/src/main/java/MRUNodes.java rename to 2006Scape Client/src/main/java/MRUNodes.java diff --git a/2006Redone Client/src/main/java/Main.java b/2006Scape Client/src/main/java/Main.java similarity index 94% rename from 2006Redone Client/src/main/java/Main.java rename to 2006Scape Client/src/main/java/Main.java index 0584f37f..619a278e 100644 --- a/2006Redone Client/src/main/java/Main.java +++ b/2006Scape Client/src/main/java/Main.java @@ -16,7 +16,6 @@ public final class Main { */ public static void main(String[] args) { - ClientSettings.SERVER_IP = "2006.2009scape.org"; if (args.length > 1) { System.out.println("Running local"); @@ -36,4 +35,4 @@ public final class Main { } } -} \ No newline at end of file +} diff --git a/2006Redone Client/src/main/java/Midi.java b/2006Scape Client/src/main/java/Midi.java similarity index 100% rename from 2006Redone Client/src/main/java/Midi.java rename to 2006Scape Client/src/main/java/Midi.java diff --git a/2006Redone Client/src/main/java/Model.java b/2006Scape Client/src/main/java/Model.java similarity index 100% rename from 2006Redone Client/src/main/java/Model.java rename to 2006Scape Client/src/main/java/Model.java diff --git a/2006Redone Client/src/main/java/MouseDetection.java b/2006Scape Client/src/main/java/MouseDetection.java similarity index 100% rename from 2006Redone Client/src/main/java/MouseDetection.java rename to 2006Scape Client/src/main/java/MouseDetection.java diff --git a/2006Redone Client/src/main/java/NPC.java b/2006Scape Client/src/main/java/NPC.java similarity index 100% rename from 2006Redone Client/src/main/java/NPC.java rename to 2006Scape Client/src/main/java/NPC.java diff --git a/2006Redone Client/src/main/java/Node.java b/2006Scape Client/src/main/java/Node.java similarity index 100% rename from 2006Redone Client/src/main/java/Node.java rename to 2006Scape Client/src/main/java/Node.java diff --git a/2006Redone Client/src/main/java/NodeCache.java b/2006Scape Client/src/main/java/NodeCache.java similarity index 100% rename from 2006Redone Client/src/main/java/NodeCache.java rename to 2006Scape Client/src/main/java/NodeCache.java diff --git a/2006Redone Client/src/main/java/NodeList.java b/2006Scape Client/src/main/java/NodeList.java similarity index 100% rename from 2006Redone Client/src/main/java/NodeList.java rename to 2006Scape Client/src/main/java/NodeList.java diff --git a/2006Redone Client/src/main/java/NodeSub.java b/2006Scape Client/src/main/java/NodeSub.java similarity index 100% rename from 2006Redone Client/src/main/java/NodeSub.java rename to 2006Scape Client/src/main/java/NodeSub.java diff --git a/2006Redone Client/src/main/java/NodeSubList.java b/2006Scape Client/src/main/java/NodeSubList.java similarity index 100% rename from 2006Redone Client/src/main/java/NodeSubList.java rename to 2006Scape Client/src/main/java/NodeSubList.java diff --git a/2006Redone Client/src/main/java/Object1.java b/2006Scape Client/src/main/java/Object1.java similarity index 100% rename from 2006Redone Client/src/main/java/Object1.java rename to 2006Scape Client/src/main/java/Object1.java diff --git a/2006Redone Client/src/main/java/Object2.java b/2006Scape Client/src/main/java/Object2.java similarity index 100% rename from 2006Redone Client/src/main/java/Object2.java rename to 2006Scape Client/src/main/java/Object2.java diff --git a/2006Redone Client/src/main/java/Object3.java b/2006Scape Client/src/main/java/Object3.java similarity index 100% rename from 2006Redone Client/src/main/java/Object3.java rename to 2006Scape Client/src/main/java/Object3.java diff --git a/2006Redone Client/src/main/java/Object4.java b/2006Scape Client/src/main/java/Object4.java similarity index 100% rename from 2006Redone Client/src/main/java/Object4.java rename to 2006Scape Client/src/main/java/Object4.java diff --git a/2006Redone Client/src/main/java/Object5.java b/2006Scape Client/src/main/java/Object5.java similarity index 100% rename from 2006Redone Client/src/main/java/Object5.java rename to 2006Scape Client/src/main/java/Object5.java diff --git a/2006Redone Client/src/main/java/ObjectDef.java b/2006Scape Client/src/main/java/ObjectDef.java similarity index 100% rename from 2006Redone Client/src/main/java/ObjectDef.java rename to 2006Scape Client/src/main/java/ObjectDef.java diff --git a/2006Redone Client/src/main/java/ObjectManager.java b/2006Scape Client/src/main/java/ObjectManager.java similarity index 100% rename from 2006Redone Client/src/main/java/ObjectManager.java rename to 2006Scape Client/src/main/java/ObjectManager.java diff --git a/2006Redone Client/src/main/java/OnDemandData.java b/2006Scape Client/src/main/java/OnDemandData.java similarity index 100% rename from 2006Redone Client/src/main/java/OnDemandData.java rename to 2006Scape Client/src/main/java/OnDemandData.java diff --git a/2006Redone Client/src/main/java/OnDemandFetcher.java b/2006Scape Client/src/main/java/OnDemandFetcher.java similarity index 100% rename from 2006Redone Client/src/main/java/OnDemandFetcher.java rename to 2006Scape Client/src/main/java/OnDemandFetcher.java diff --git a/2006Redone Client/src/main/java/OnDemandFetcherParent.java b/2006Scape Client/src/main/java/OnDemandFetcherParent.java similarity index 100% rename from 2006Redone Client/src/main/java/OnDemandFetcherParent.java rename to 2006Scape Client/src/main/java/OnDemandFetcherParent.java diff --git a/2006Redone Client/src/main/java/Player.java b/2006Scape Client/src/main/java/Player.java similarity index 100% rename from 2006Redone Client/src/main/java/Player.java rename to 2006Scape Client/src/main/java/Player.java diff --git a/2006Redone Client/src/main/java/RSApplet.java b/2006Scape Client/src/main/java/RSApplet.java similarity index 100% rename from 2006Redone Client/src/main/java/RSApplet.java rename to 2006Scape Client/src/main/java/RSApplet.java diff --git a/2006Redone Client/src/main/java/RSFrame.java b/2006Scape Client/src/main/java/RSFrame.java similarity index 100% rename from 2006Redone Client/src/main/java/RSFrame.java rename to 2006Scape Client/src/main/java/RSFrame.java diff --git a/2006Redone Client/src/main/java/RSImageProducer.java b/2006Scape Client/src/main/java/RSImageProducer.java similarity index 100% rename from 2006Redone Client/src/main/java/RSImageProducer.java rename to 2006Scape Client/src/main/java/RSImageProducer.java diff --git a/2006Redone Client/src/main/java/RSInterface.java b/2006Scape Client/src/main/java/RSInterface.java similarity index 100% rename from 2006Redone Client/src/main/java/RSInterface.java rename to 2006Scape Client/src/main/java/RSInterface.java diff --git a/2006Redone Client/src/main/java/RSSocket.java b/2006Scape Client/src/main/java/RSSocket.java similarity index 100% rename from 2006Redone Client/src/main/java/RSSocket.java rename to 2006Scape Client/src/main/java/RSSocket.java diff --git a/2006Redone Client/src/main/java/Runnable_Impl1.java b/2006Scape Client/src/main/java/Runnable_Impl1.java similarity index 100% rename from 2006Redone Client/src/main/java/Runnable_Impl1.java rename to 2006Scape Client/src/main/java/Runnable_Impl1.java diff --git a/2006Redone Client/src/main/java/Signlink.java b/2006Scape Client/src/main/java/Signlink.java similarity index 98% rename from 2006Redone Client/src/main/java/Signlink.java rename to 2006Scape Client/src/main/java/Signlink.java index 0d14ca31..c206182f 100644 --- a/2006Redone Client/src/main/java/Signlink.java +++ b/2006Scape Client/src/main/java/Signlink.java @@ -278,7 +278,7 @@ public final class Signlink implements Runnable { public static Synthesizer synthesizer = null; public static String findcachedir() { - String path = System.getProperty("user.home") + "/.2006rebotted_file_system/"; + String path = System.getProperty("user.home") + "/.2006Scape_file_system/"; File file = new File(path); if (!file.exists()) { if (!file.mkdirs()) { @@ -289,7 +289,7 @@ public final class Signlink implements Runnable { } public static String secondDir() { - File file = new File("C:/.2006rebotted_file_system/"); + File file = new File("C:/.2006Scape_file_system/"); if (!file.exists()) { file.mkdirs(); } @@ -417,4 +417,4 @@ public final class Signlink implements Runnable { public static String wave = null; public static int wavevol; -} \ No newline at end of file +} diff --git a/2006Redone Client/src/main/java/SizeConstants.java b/2006Scape Client/src/main/java/SizeConstants.java similarity index 100% rename from 2006Redone Client/src/main/java/SizeConstants.java rename to 2006Scape Client/src/main/java/SizeConstants.java diff --git a/2006Redone Client/src/main/java/Skills.java b/2006Scape Client/src/main/java/Skills.java similarity index 100% rename from 2006Redone Client/src/main/java/Skills.java rename to 2006Scape Client/src/main/java/Skills.java diff --git a/2006Redone Client/src/main/java/SoundPlayer.java b/2006Scape Client/src/main/java/SoundPlayer.java similarity index 100% rename from 2006Redone Client/src/main/java/SoundPlayer.java rename to 2006Scape Client/src/main/java/SoundPlayer.java diff --git a/2006Redone Client/src/main/java/Sounds.java b/2006Scape Client/src/main/java/Sounds.java similarity index 100% rename from 2006Redone Client/src/main/java/Sounds.java rename to 2006Scape Client/src/main/java/Sounds.java diff --git a/2006Redone Client/src/main/java/SpotAnim.java b/2006Scape Client/src/main/java/SpotAnim.java similarity index 100% rename from 2006Redone Client/src/main/java/SpotAnim.java rename to 2006Scape Client/src/main/java/SpotAnim.java diff --git a/2006Redone Client/src/main/java/Sprite.java b/2006Scape Client/src/main/java/Sprite.java similarity index 100% rename from 2006Redone Client/src/main/java/Sprite.java rename to 2006Scape Client/src/main/java/Sprite.java diff --git a/2006Redone Client/src/main/java/Stream.java b/2006Scape Client/src/main/java/Stream.java similarity index 100% rename from 2006Redone Client/src/main/java/Stream.java rename to 2006Scape Client/src/main/java/Stream.java diff --git a/2006Redone Client/src/main/java/StreamLoader.java b/2006Scape Client/src/main/java/StreamLoader.java similarity index 100% rename from 2006Redone Client/src/main/java/StreamLoader.java rename to 2006Scape Client/src/main/java/StreamLoader.java diff --git a/2006Redone Client/src/main/java/TextClass.java b/2006Scape Client/src/main/java/TextClass.java similarity index 100% rename from 2006Redone Client/src/main/java/TextClass.java rename to 2006Scape Client/src/main/java/TextClass.java diff --git a/2006Redone Client/src/main/java/TextDrawingArea.java b/2006Scape Client/src/main/java/TextDrawingArea.java similarity index 100% rename from 2006Redone Client/src/main/java/TextDrawingArea.java rename to 2006Scape Client/src/main/java/TextDrawingArea.java diff --git a/2006Redone Client/src/main/java/TextInput.java b/2006Scape Client/src/main/java/TextInput.java similarity index 100% rename from 2006Redone Client/src/main/java/TextInput.java rename to 2006Scape Client/src/main/java/TextInput.java diff --git a/2006Redone Client/src/main/java/Texture.java b/2006Scape Client/src/main/java/Texture.java similarity index 100% rename from 2006Redone Client/src/main/java/Texture.java rename to 2006Scape Client/src/main/java/Texture.java diff --git a/2006Redone Client/src/main/java/VarBit.java b/2006Scape Client/src/main/java/VarBit.java similarity index 100% rename from 2006Redone Client/src/main/java/VarBit.java rename to 2006Scape Client/src/main/java/VarBit.java diff --git a/2006Redone Client/src/main/java/Varp.java b/2006Scape Client/src/main/java/Varp.java similarity index 100% rename from 2006Redone Client/src/main/java/Varp.java rename to 2006Scape Client/src/main/java/Varp.java diff --git a/2006Redone Client/src/main/java/WorldController.java b/2006Scape Client/src/main/java/WorldController.java similarity index 100% rename from 2006Redone Client/src/main/java/WorldController.java rename to 2006Scape Client/src/main/java/WorldController.java diff --git a/2006Redone Server/.gitignore b/2006Scape Server/.gitignore similarity index 100% rename from 2006Redone Server/.gitignore rename to 2006Scape Server/.gitignore diff --git a/2006Redone Server/README.md b/2006Scape Server/README.md similarity index 57% rename from 2006Redone Server/README.md rename to 2006Scape Server/README.md index 5d56c4ec..8ae2ab29 100644 --- a/2006Redone Server/README.md +++ b/2006Scape Server/README.md @@ -1,4 +1,4 @@ -# 2006rebotted - Game Server +# 2006Scape - Game Server This is the Game Server component of our emulated Runescape environment. It's responsibility is to provide the instructions for the in-game world, its entities, and respond to player interactions. @@ -6,10 +6,8 @@ Contained within is an implementation of the Runescape network protocol roughly When run, this java application will listen on TCP port 43594. ### Building the project - - `git clone https://github.com/dginovker/2006rebotted` - - `cd 2006rebotted/2006Redone\ Server/` - - `./gradlew build` - - `java -jar ./build/libs/2006rebotted.jar` - - You will also have to place a copy of the `data` folder in the same location as the jar. - + - `git clone https://github.com/2006-Scape/2006Scape` + - `cd 2006Scape/2006Scape\ Server/` + - `mvn package` + - `./runServer.sh` diff --git a/2006Redone Server/data/.gitignore b/2006Scape Server/data/.gitignore similarity index 100% rename from 2006Redone Server/data/.gitignore rename to 2006Scape Server/data/.gitignore diff --git a/2006Redone Server/data/Manager.jar b/2006Scape Server/data/Manager.jar similarity index 100% rename from 2006Redone Server/data/Manager.jar rename to 2006Scape Server/data/Manager.jar diff --git a/2006Redone Server/data/bans/IpsBanned.txt b/2006Scape Server/data/bans/IpsBanned.txt similarity index 100% rename from 2006Redone Server/data/bans/IpsBanned.txt rename to 2006Scape Server/data/bans/IpsBanned.txt diff --git a/2006Redone Server/data/bans/IpsMuted.txt b/2006Scape Server/data/bans/IpsMuted.txt similarity index 100% rename from 2006Redone Server/data/bans/IpsMuted.txt rename to 2006Scape Server/data/bans/IpsMuted.txt diff --git a/2006Redone Server/data/bans/UsersBanned.txt b/2006Scape Server/data/bans/UsersBanned.txt similarity index 100% rename from 2006Redone Server/data/bans/UsersBanned.txt rename to 2006Scape Server/data/bans/UsersBanned.txt diff --git a/2006Redone Server/data/bans/UsersMuted.txt b/2006Scape Server/data/bans/UsersMuted.txt similarity index 100% rename from 2006Redone Server/data/bans/UsersMuted.txt rename to 2006Scape Server/data/bans/UsersMuted.txt diff --git a/2006Redone Server/data/blacklist.txt b/2006Scape Server/data/blacklist.txt similarity index 100% rename from 2006Redone Server/data/blacklist.txt rename to 2006Scape Server/data/blacklist.txt diff --git a/2006Redone Server/data/cfg/globaldrops.json b/2006Scape Server/data/cfg/globaldrops.json similarity index 100% rename from 2006Redone Server/data/cfg/globaldrops.json rename to 2006Scape Server/data/cfg/globaldrops.json diff --git a/2006Redone Server/data/cfg/items.json b/2006Scape Server/data/cfg/items.json similarity index 100% rename from 2006Redone Server/data/cfg/items.json rename to 2006Scape Server/data/cfg/items.json diff --git a/2006Redone Server/data/cfg/npc.json b/2006Scape Server/data/cfg/npc.json similarity index 100% rename from 2006Redone Server/data/cfg/npc.json rename to 2006Scape Server/data/cfg/npc.json diff --git a/2006Redone Server/data/cfg/npcDefinitions.xml b/2006Scape Server/data/cfg/npcDefinitions.xml similarity index 100% rename from 2006Redone Server/data/cfg/npcDefinitions.xml rename to 2006Scape Server/data/cfg/npcDefinitions.xml diff --git a/2006Redone Server/data/cfg/npcdrops.json b/2006Scape Server/data/cfg/npcdrops.json similarity index 100% rename from 2006Redone Server/data/cfg/npcdrops.json rename to 2006Scape Server/data/cfg/npcdrops.json diff --git a/2006Redone Server/data/cfg/shops.json b/2006Scape Server/data/cfg/shops.json similarity index 100% rename from 2006Redone Server/data/cfg/shops.json rename to 2006Scape Server/data/cfg/shops.json diff --git a/2006Redone Server/data/cfg/spawns.json b/2006Scape Server/data/cfg/spawns.json similarity index 100% rename from 2006Redone Server/data/cfg/spawns.json rename to 2006Scape Server/data/cfg/spawns.json diff --git a/2006Redone Server/data/data/equipment.dat b/2006Scape Server/data/data/equipment.dat similarity index 100% rename from 2006Redone Server/data/data/equipment.dat rename to 2006Scape Server/data/data/equipment.dat diff --git a/2006Redone Server/data/data/itemdef.json b/2006Scape Server/data/data/itemdef.json similarity index 100% rename from 2006Redone Server/data/data/itemdef.json rename to 2006Scape Server/data/data/itemdef.json diff --git a/2006Redone Server/data/data/minutes.log b/2006Scape Server/data/data/minutes.log similarity index 100% rename from 2006Redone Server/data/data/minutes.log rename to 2006Scape Server/data/data/minutes.log diff --git a/2006Redone Server/data/data/notes.dat b/2006Scape Server/data/data/notes.dat similarity index 100% rename from 2006Redone Server/data/data/notes.dat rename to 2006Scape Server/data/data/notes.dat diff --git a/2006Redone Server/data/data/stackable.dat b/2006Scape Server/data/data/stackable.dat similarity index 100% rename from 2006Redone Server/data/data/stackable.dat rename to 2006Scape Server/data/data/stackable.dat diff --git a/2006Redone Server/data/discord.json b/2006Scape Server/data/discord.json similarity index 100% rename from 2006Redone Server/data/discord.json rename to 2006Scape Server/data/discord.json diff --git a/2006Redone Server/data/doors.json b/2006Scape Server/data/doors.json similarity index 100% rename from 2006Redone Server/data/doors.json rename to 2006Scape Server/data/doors.json diff --git a/2006Redone Server/data/doubledoors.json b/2006Scape Server/data/doubledoors.json similarity index 100% rename from 2006Redone Server/data/doubledoors.json rename to 2006Scape Server/data/doubledoors.json diff --git a/2006Redone Server/data/logs/alchlogs/andrewadsfa1.txt b/2006Scape Server/data/logs/alchlogs/andrewadsfa1.txt similarity index 100% rename from 2006Redone Server/data/logs/alchlogs/andrewadsfa1.txt rename to 2006Scape Server/data/logs/alchlogs/andrewadsfa1.txt diff --git a/2006Redone Server/data/logs/clickitem/.keep b/2006Scape Server/data/logs/clickitem/.keep similarity index 100% rename from 2006Redone Server/data/logs/clickitem/.keep rename to 2006Scape Server/data/logs/clickitem/.keep diff --git a/2006Redone Server/data/logs/clickitem/michael2.txt b/2006Scape Server/data/logs/clickitem/michael2.txt similarity index 100% rename from 2006Redone Server/data/logs/clickitem/michael2.txt rename to 2006Scape Server/data/logs/clickitem/michael2.txt diff --git a/2006Redone Server/data/logs/clickitem/michael8.txt b/2006Scape Server/data/logs/clickitem/michael8.txt similarity index 100% rename from 2006Redone Server/data/logs/clickitem/michael8.txt rename to 2006Scape Server/data/logs/clickitem/michael8.txt diff --git a/2006Redone Server/data/logs/commands/andrew.txt b/2006Scape Server/data/logs/commands/andrew.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/andrew.txt rename to 2006Scape Server/data/logs/commands/andrew.txt diff --git a/2006Redone Server/data/logs/commands/andrew1.txt b/2006Scape Server/data/logs/commands/andrew1.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/andrew1.txt rename to 2006Scape Server/data/logs/commands/andrew1.txt diff --git a/2006Redone Server/data/logs/commands/andrew5.txt b/2006Scape Server/data/logs/commands/andrew5.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/andrew5.txt rename to 2006Scape Server/data/logs/commands/andrew5.txt diff --git a/2006Redone Server/data/logs/commands/andrew55.txt b/2006Scape Server/data/logs/commands/andrew55.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/andrew55.txt rename to 2006Scape Server/data/logs/commands/andrew55.txt diff --git a/2006Redone Server/data/logs/commands/michael.txt b/2006Scape Server/data/logs/commands/michael.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/michael.txt rename to 2006Scape Server/data/logs/commands/michael.txt diff --git a/2006Redone Server/data/logs/commands/michael2.txt b/2006Scape Server/data/logs/commands/michael2.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/michael2.txt rename to 2006Scape Server/data/logs/commands/michael2.txt diff --git a/2006Redone Server/data/logs/commands/mod den.txt b/2006Scape Server/data/logs/commands/mod den.txt similarity index 100% rename from 2006Redone Server/data/logs/commands/mod den.txt rename to 2006Scape Server/data/logs/commands/mod den.txt diff --git a/2006Redone Server/data/logs/dropitem/andrewadsfa1.txt b/2006Scape Server/data/logs/dropitem/andrewadsfa1.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/andrewadsfa1.txt rename to 2006Scape Server/data/logs/dropitem/andrewadsfa1.txt diff --git a/2006Redone Server/data/logs/dropitem/andrewf.txt b/2006Scape Server/data/logs/dropitem/andrewf.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/andrewf.txt rename to 2006Scape Server/data/logs/dropitem/andrewf.txt diff --git a/2006Redone Server/data/logs/dropitem/andrewsdf.txt b/2006Scape Server/data/logs/dropitem/andrewsdf.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/andrewsdf.txt rename to 2006Scape Server/data/logs/dropitem/andrewsdf.txt diff --git a/2006Redone Server/data/logs/dropitem/irdb.txt b/2006Scape Server/data/logs/dropitem/irdb.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/irdb.txt rename to 2006Scape Server/data/logs/dropitem/irdb.txt diff --git a/2006Redone Server/data/logs/dropitem/michael.txt b/2006Scape Server/data/logs/dropitem/michael.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael.txt rename to 2006Scape Server/data/logs/dropitem/michael.txt diff --git a/2006Redone Server/data/logs/dropitem/michael2.txt b/2006Scape Server/data/logs/dropitem/michael2.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael2.txt rename to 2006Scape Server/data/logs/dropitem/michael2.txt diff --git a/2006Redone Server/data/logs/dropitem/michael5.txt b/2006Scape Server/data/logs/dropitem/michael5.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael5.txt rename to 2006Scape Server/data/logs/dropitem/michael5.txt diff --git a/2006Redone Server/data/logs/dropitem/michael6.txt b/2006Scape Server/data/logs/dropitem/michael6.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael6.txt rename to 2006Scape Server/data/logs/dropitem/michael6.txt diff --git a/2006Redone Server/data/logs/dropitem/michael7.txt b/2006Scape Server/data/logs/dropitem/michael7.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael7.txt rename to 2006Scape Server/data/logs/dropitem/michael7.txt diff --git a/2006Redone Server/data/logs/dropitem/michael8.txt b/2006Scape Server/data/logs/dropitem/michael8.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/michael8.txt rename to 2006Scape Server/data/logs/dropitem/michael8.txt diff --git a/2006Redone Server/data/logs/dropitem/sandro.txt b/2006Scape Server/data/logs/dropitem/sandro.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/sandro.txt rename to 2006Scape Server/data/logs/dropitem/sandro.txt diff --git a/2006Redone Server/data/logs/dropitem/spamtest1.txt b/2006Scape Server/data/logs/dropitem/spamtest1.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/spamtest1.txt rename to 2006Scape Server/data/logs/dropitem/spamtest1.txt diff --git a/2006Redone Server/data/logs/dropitem/test.txt b/2006Scape Server/data/logs/dropitem/test.txt similarity index 100% rename from 2006Redone Server/data/logs/dropitem/test.txt rename to 2006Scape Server/data/logs/dropitem/test.txt diff --git a/2006Redone Server/data/logs/dueling/killer/andrew1.txt b/2006Scape Server/data/logs/dueling/killer/andrew1.txt similarity index 100% rename from 2006Redone Server/data/logs/dueling/killer/andrew1.txt rename to 2006Scape Server/data/logs/dueling/killer/andrew1.txt diff --git a/2006Redone Server/data/logs/gave/.keep b/2006Scape Server/data/logs/gave/.keep similarity index 100% rename from 2006Redone Server/data/logs/gave/.keep rename to 2006Scape Server/data/logs/gave/.keep diff --git a/2006Redone Server/data/logs/pickupitem/andrew22.txt b/2006Scape Server/data/logs/pickupitem/andrew22.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/andrew22.txt rename to 2006Scape Server/data/logs/pickupitem/andrew22.txt diff --git a/2006Redone Server/data/logs/pickupitem/irdb.txt b/2006Scape Server/data/logs/pickupitem/irdb.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/irdb.txt rename to 2006Scape Server/data/logs/pickupitem/irdb.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael.txt b/2006Scape Server/data/logs/pickupitem/michael.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael.txt rename to 2006Scape Server/data/logs/pickupitem/michael.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael2.txt b/2006Scape Server/data/logs/pickupitem/michael2.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael2.txt rename to 2006Scape Server/data/logs/pickupitem/michael2.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael5.txt b/2006Scape Server/data/logs/pickupitem/michael5.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael5.txt rename to 2006Scape Server/data/logs/pickupitem/michael5.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael6.txt b/2006Scape Server/data/logs/pickupitem/michael6.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael6.txt rename to 2006Scape Server/data/logs/pickupitem/michael6.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael7.txt b/2006Scape Server/data/logs/pickupitem/michael7.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael7.txt rename to 2006Scape Server/data/logs/pickupitem/michael7.txt diff --git a/2006Redone Server/data/logs/pickupitem/michael8.txt b/2006Scape Server/data/logs/pickupitem/michael8.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/michael8.txt rename to 2006Scape Server/data/logs/pickupitem/michael8.txt diff --git a/2006Redone Server/data/logs/pickupitem/spamtest1.txt b/2006Scape Server/data/logs/pickupitem/spamtest1.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/spamtest1.txt rename to 2006Scape Server/data/logs/pickupitem/spamtest1.txt diff --git a/2006Redone Server/data/logs/pickupitem/test.txt b/2006Scape Server/data/logs/pickupitem/test.txt similarity index 100% rename from 2006Redone Server/data/logs/pickupitem/test.txt rename to 2006Scape Server/data/logs/pickupitem/test.txt diff --git a/2006Redone Server/data/logs/pking/killed/andrew.txt b/2006Scape Server/data/logs/pking/killed/andrew.txt similarity index 100% rename from 2006Redone Server/data/logs/pking/killed/andrew.txt rename to 2006Scape Server/data/logs/pking/killed/andrew.txt diff --git a/2006Redone Server/data/logs/pking/killed/andrew5.txt b/2006Scape Server/data/logs/pking/killed/andrew5.txt similarity index 100% rename from 2006Redone Server/data/logs/pking/killed/andrew5.txt rename to 2006Scape Server/data/logs/pking/killed/andrew5.txt diff --git a/2006Redone Server/data/logs/pking/killer/andrew1.txt b/2006Scape Server/data/logs/pking/killer/andrew1.txt similarity index 100% rename from 2006Redone Server/data/logs/pking/killer/andrew1.txt rename to 2006Scape Server/data/logs/pking/killer/andrew1.txt diff --git a/2006Redone Server/data/logs/privatemessages/pmrecieved/.keep b/2006Scape Server/data/logs/privatemessages/pmrecieved/.keep similarity index 100% rename from 2006Redone Server/data/logs/privatemessages/pmrecieved/.keep rename to 2006Scape Server/data/logs/privatemessages/pmrecieved/.keep diff --git a/2006Redone Server/data/logs/privatemessages/pmsent/andrew45.txt b/2006Scape Server/data/logs/privatemessages/pmsent/andrew45.txt similarity index 100% rename from 2006Redone Server/data/logs/privatemessages/pmsent/andrew45.txt rename to 2006Scape Server/data/logs/privatemessages/pmsent/andrew45.txt diff --git a/2006Redone Server/data/logs/reports/Offensive language.txt b/2006Scape Server/data/logs/reports/Offensive language.txt similarity index 100% rename from 2006Redone Server/data/logs/reports/Offensive language.txt rename to 2006Scape Server/data/logs/reports/Offensive language.txt diff --git a/2006Redone Server/data/logs/shopbuying/.keep b/2006Scape Server/data/logs/shopbuying/.keep similarity index 100% rename from 2006Redone Server/data/logs/shopbuying/.keep rename to 2006Scape Server/data/logs/shopbuying/.keep diff --git a/2006Redone Server/data/logs/shopbuying/bot.txt b/2006Scape Server/data/logs/shopbuying/bot.txt similarity index 100% rename from 2006Redone Server/data/logs/shopbuying/bot.txt rename to 2006Scape Server/data/logs/shopbuying/bot.txt diff --git a/2006Redone Server/data/logs/shopselling/.keep b/2006Scape Server/data/logs/shopselling/.keep similarity index 100% rename from 2006Redone Server/data/logs/shopselling/.keep rename to 2006Scape Server/data/logs/shopselling/.keep diff --git a/2006Redone Server/data/logs/shopselling/bot.txt b/2006Scape Server/data/logs/shopselling/bot.txt similarity index 100% rename from 2006Redone Server/data/logs/shopselling/bot.txt rename to 2006Scape Server/data/logs/shopselling/bot.txt diff --git a/2006Redone Server/data/logs/shopselling/irdb.txt b/2006Scape Server/data/logs/shopselling/irdb.txt similarity index 100% rename from 2006Redone Server/data/logs/shopselling/irdb.txt rename to 2006Scape Server/data/logs/shopselling/irdb.txt diff --git a/2006Redone Server/data/logs/trades/recieved/.keep b/2006Scape Server/data/logs/trades/recieved/.keep similarity index 100% rename from 2006Redone Server/data/logs/trades/recieved/.keep rename to 2006Scape Server/data/logs/trades/recieved/.keep diff --git a/2006Redone Server/data/logs/trades/recieved/andrew.txt b/2006Scape Server/data/logs/trades/recieved/andrew.txt similarity index 100% rename from 2006Redone Server/data/logs/trades/recieved/andrew.txt rename to 2006Scape Server/data/logs/trades/recieved/andrew.txt diff --git a/2006Redone Server/data/logs/trades/recieved/irdb2.txt b/2006Scape Server/data/logs/trades/recieved/irdb2.txt similarity index 100% rename from 2006Redone Server/data/logs/trades/recieved/irdb2.txt rename to 2006Scape Server/data/logs/trades/recieved/irdb2.txt diff --git a/2006Redone Server/data/minutes.log b/2006Scape Server/data/minutes.log similarity index 100% rename from 2006Redone Server/data/minutes.log rename to 2006Scape Server/data/minutes.log diff --git a/2006Redone Server/data/world/map/0.gz b/2006Scape Server/data/world/map/0.gz similarity index 100% rename from 2006Redone Server/data/world/map/0.gz rename to 2006Scape Server/data/world/map/0.gz diff --git a/2006Redone Server/data/world/map/1.gz b/2006Scape Server/data/world/map/1.gz similarity index 100% rename from 2006Redone Server/data/world/map/1.gz rename to 2006Scape Server/data/world/map/1.gz diff --git a/2006Redone Server/data/world/map/10.gz b/2006Scape Server/data/world/map/10.gz similarity index 100% rename from 2006Redone Server/data/world/map/10.gz rename to 2006Scape Server/data/world/map/10.gz diff --git a/2006Redone Server/data/world/map/100.gz b/2006Scape Server/data/world/map/100.gz similarity index 100% rename from 2006Redone Server/data/world/map/100.gz rename to 2006Scape Server/data/world/map/100.gz diff --git a/2006Redone Server/data/world/map/1000.gz b/2006Scape Server/data/world/map/1000.gz similarity index 100% rename from 2006Redone Server/data/world/map/1000.gz rename to 2006Scape Server/data/world/map/1000.gz diff --git a/2006Redone Server/data/world/map/1001.gz b/2006Scape Server/data/world/map/1001.gz similarity index 100% rename from 2006Redone Server/data/world/map/1001.gz rename to 2006Scape Server/data/world/map/1001.gz diff --git a/2006Redone Server/data/world/map/1002.gz b/2006Scape Server/data/world/map/1002.gz similarity index 100% rename from 2006Redone Server/data/world/map/1002.gz rename to 2006Scape Server/data/world/map/1002.gz diff --git a/2006Redone Server/data/world/map/1003.gz b/2006Scape Server/data/world/map/1003.gz similarity index 100% rename from 2006Redone Server/data/world/map/1003.gz rename to 2006Scape Server/data/world/map/1003.gz diff --git a/2006Redone Server/data/world/map/1004.gz b/2006Scape Server/data/world/map/1004.gz similarity index 100% rename from 2006Redone Server/data/world/map/1004.gz rename to 2006Scape Server/data/world/map/1004.gz diff --git a/2006Redone Server/data/world/map/1005.gz b/2006Scape Server/data/world/map/1005.gz similarity index 100% rename from 2006Redone Server/data/world/map/1005.gz rename to 2006Scape Server/data/world/map/1005.gz diff --git a/2006Redone Server/data/world/map/1006.gz b/2006Scape Server/data/world/map/1006.gz similarity index 100% rename from 2006Redone Server/data/world/map/1006.gz rename to 2006Scape Server/data/world/map/1006.gz diff --git a/2006Redone Server/data/world/map/1007.gz b/2006Scape Server/data/world/map/1007.gz similarity index 100% rename from 2006Redone Server/data/world/map/1007.gz rename to 2006Scape Server/data/world/map/1007.gz diff --git a/2006Redone Server/data/world/map/1008.gz b/2006Scape Server/data/world/map/1008.gz similarity index 100% rename from 2006Redone Server/data/world/map/1008.gz rename to 2006Scape Server/data/world/map/1008.gz diff --git a/2006Redone Server/data/world/map/1009.gz b/2006Scape Server/data/world/map/1009.gz similarity index 100% rename from 2006Redone Server/data/world/map/1009.gz rename to 2006Scape Server/data/world/map/1009.gz diff --git a/2006Redone Server/data/world/map/101.gz b/2006Scape Server/data/world/map/101.gz similarity index 100% rename from 2006Redone Server/data/world/map/101.gz rename to 2006Scape Server/data/world/map/101.gz diff --git a/2006Redone Server/data/world/map/1010.gz b/2006Scape Server/data/world/map/1010.gz similarity index 100% rename from 2006Redone Server/data/world/map/1010.gz rename to 2006Scape Server/data/world/map/1010.gz diff --git a/2006Redone Server/data/world/map/1011.gz b/2006Scape Server/data/world/map/1011.gz similarity index 100% rename from 2006Redone Server/data/world/map/1011.gz rename to 2006Scape Server/data/world/map/1011.gz diff --git a/2006Redone Server/data/world/map/1012.gz b/2006Scape Server/data/world/map/1012.gz similarity index 100% rename from 2006Redone Server/data/world/map/1012.gz rename to 2006Scape Server/data/world/map/1012.gz diff --git a/2006Redone Server/data/world/map/1013.gz b/2006Scape Server/data/world/map/1013.gz similarity index 100% rename from 2006Redone Server/data/world/map/1013.gz rename to 2006Scape Server/data/world/map/1013.gz diff --git a/2006Redone Server/data/world/map/1014.gz b/2006Scape Server/data/world/map/1014.gz similarity index 100% rename from 2006Redone Server/data/world/map/1014.gz rename to 2006Scape Server/data/world/map/1014.gz diff --git a/2006Redone Server/data/world/map/1015.gz b/2006Scape Server/data/world/map/1015.gz similarity index 100% rename from 2006Redone Server/data/world/map/1015.gz rename to 2006Scape Server/data/world/map/1015.gz diff --git a/2006Redone Server/data/world/map/1016.gz b/2006Scape Server/data/world/map/1016.gz similarity index 100% rename from 2006Redone Server/data/world/map/1016.gz rename to 2006Scape Server/data/world/map/1016.gz diff --git a/2006Redone Server/data/world/map/1017.gz b/2006Scape Server/data/world/map/1017.gz similarity index 100% rename from 2006Redone Server/data/world/map/1017.gz rename to 2006Scape Server/data/world/map/1017.gz diff --git a/2006Redone Server/data/world/map/1018.gz b/2006Scape Server/data/world/map/1018.gz similarity index 100% rename from 2006Redone Server/data/world/map/1018.gz rename to 2006Scape Server/data/world/map/1018.gz diff --git a/2006Redone Server/data/world/map/1019.gz b/2006Scape Server/data/world/map/1019.gz similarity index 100% rename from 2006Redone Server/data/world/map/1019.gz rename to 2006Scape Server/data/world/map/1019.gz diff --git a/2006Redone Server/data/world/map/102.gz b/2006Scape Server/data/world/map/102.gz similarity index 100% rename from 2006Redone Server/data/world/map/102.gz rename to 2006Scape Server/data/world/map/102.gz diff --git a/2006Redone Server/data/world/map/1020.gz b/2006Scape Server/data/world/map/1020.gz similarity index 100% rename from 2006Redone Server/data/world/map/1020.gz rename to 2006Scape Server/data/world/map/1020.gz diff --git a/2006Redone Server/data/world/map/1021.gz b/2006Scape Server/data/world/map/1021.gz similarity index 100% rename from 2006Redone Server/data/world/map/1021.gz rename to 2006Scape Server/data/world/map/1021.gz diff --git a/2006Redone Server/data/world/map/1022.gz b/2006Scape Server/data/world/map/1022.gz similarity index 100% rename from 2006Redone Server/data/world/map/1022.gz rename to 2006Scape Server/data/world/map/1022.gz diff --git a/2006Redone Server/data/world/map/1023.gz b/2006Scape Server/data/world/map/1023.gz similarity index 100% rename from 2006Redone Server/data/world/map/1023.gz rename to 2006Scape Server/data/world/map/1023.gz diff --git a/2006Redone Server/data/world/map/1024.gz b/2006Scape Server/data/world/map/1024.gz similarity index 100% rename from 2006Redone Server/data/world/map/1024.gz rename to 2006Scape Server/data/world/map/1024.gz diff --git a/2006Redone Server/data/world/map/1025.gz b/2006Scape Server/data/world/map/1025.gz similarity index 100% rename from 2006Redone Server/data/world/map/1025.gz rename to 2006Scape Server/data/world/map/1025.gz diff --git a/2006Redone Server/data/world/map/1026.gz b/2006Scape Server/data/world/map/1026.gz similarity index 100% rename from 2006Redone Server/data/world/map/1026.gz rename to 2006Scape Server/data/world/map/1026.gz diff --git a/2006Redone Server/data/world/map/1027.gz b/2006Scape Server/data/world/map/1027.gz similarity index 100% rename from 2006Redone Server/data/world/map/1027.gz rename to 2006Scape Server/data/world/map/1027.gz diff --git a/2006Redone Server/data/world/map/1028.gz b/2006Scape Server/data/world/map/1028.gz similarity index 100% rename from 2006Redone Server/data/world/map/1028.gz rename to 2006Scape Server/data/world/map/1028.gz diff --git a/2006Redone Server/data/world/map/1029.gz b/2006Scape Server/data/world/map/1029.gz similarity index 100% rename from 2006Redone Server/data/world/map/1029.gz rename to 2006Scape Server/data/world/map/1029.gz diff --git a/2006Redone Server/data/world/map/103.gz b/2006Scape Server/data/world/map/103.gz similarity index 100% rename from 2006Redone Server/data/world/map/103.gz rename to 2006Scape Server/data/world/map/103.gz diff --git a/2006Redone Server/data/world/map/1030.gz b/2006Scape Server/data/world/map/1030.gz similarity index 100% rename from 2006Redone Server/data/world/map/1030.gz rename to 2006Scape Server/data/world/map/1030.gz diff --git a/2006Redone Server/data/world/map/1031.gz b/2006Scape Server/data/world/map/1031.gz similarity index 100% rename from 2006Redone Server/data/world/map/1031.gz rename to 2006Scape Server/data/world/map/1031.gz diff --git a/2006Redone Server/data/world/map/1032.gz b/2006Scape Server/data/world/map/1032.gz similarity index 100% rename from 2006Redone Server/data/world/map/1032.gz rename to 2006Scape Server/data/world/map/1032.gz diff --git a/2006Redone Server/data/world/map/1033.gz b/2006Scape Server/data/world/map/1033.gz similarity index 100% rename from 2006Redone Server/data/world/map/1033.gz rename to 2006Scape Server/data/world/map/1033.gz diff --git a/2006Redone Server/data/world/map/1034.gz b/2006Scape Server/data/world/map/1034.gz similarity index 100% rename from 2006Redone Server/data/world/map/1034.gz rename to 2006Scape Server/data/world/map/1034.gz diff --git a/2006Redone Server/data/world/map/1035.gz b/2006Scape Server/data/world/map/1035.gz similarity index 100% rename from 2006Redone Server/data/world/map/1035.gz rename to 2006Scape Server/data/world/map/1035.gz diff --git a/2006Redone Server/data/world/map/1036.gz b/2006Scape Server/data/world/map/1036.gz similarity index 100% rename from 2006Redone Server/data/world/map/1036.gz rename to 2006Scape Server/data/world/map/1036.gz diff --git a/2006Redone Server/data/world/map/1037.gz b/2006Scape Server/data/world/map/1037.gz similarity index 100% rename from 2006Redone Server/data/world/map/1037.gz rename to 2006Scape Server/data/world/map/1037.gz diff --git a/2006Redone Server/data/world/map/1038.gz b/2006Scape Server/data/world/map/1038.gz similarity index 100% rename from 2006Redone Server/data/world/map/1038.gz rename to 2006Scape Server/data/world/map/1038.gz diff --git a/2006Redone Server/data/world/map/1039.gz b/2006Scape Server/data/world/map/1039.gz similarity index 100% rename from 2006Redone Server/data/world/map/1039.gz rename to 2006Scape Server/data/world/map/1039.gz diff --git a/2006Redone Server/data/world/map/104.gz b/2006Scape Server/data/world/map/104.gz similarity index 100% rename from 2006Redone Server/data/world/map/104.gz rename to 2006Scape Server/data/world/map/104.gz diff --git a/2006Redone Server/data/world/map/1040.gz b/2006Scape Server/data/world/map/1040.gz similarity index 100% rename from 2006Redone Server/data/world/map/1040.gz rename to 2006Scape Server/data/world/map/1040.gz diff --git a/2006Redone Server/data/world/map/1041.gz b/2006Scape Server/data/world/map/1041.gz similarity index 100% rename from 2006Redone Server/data/world/map/1041.gz rename to 2006Scape Server/data/world/map/1041.gz diff --git a/2006Redone Server/data/world/map/1042.gz b/2006Scape Server/data/world/map/1042.gz similarity index 100% rename from 2006Redone Server/data/world/map/1042.gz rename to 2006Scape Server/data/world/map/1042.gz diff --git a/2006Redone Server/data/world/map/1043.gz b/2006Scape Server/data/world/map/1043.gz similarity index 100% rename from 2006Redone Server/data/world/map/1043.gz rename to 2006Scape Server/data/world/map/1043.gz diff --git a/2006Redone Server/data/world/map/1044.gz b/2006Scape Server/data/world/map/1044.gz similarity index 100% rename from 2006Redone Server/data/world/map/1044.gz rename to 2006Scape Server/data/world/map/1044.gz diff --git a/2006Redone Server/data/world/map/1045.gz b/2006Scape Server/data/world/map/1045.gz similarity index 100% rename from 2006Redone Server/data/world/map/1045.gz rename to 2006Scape Server/data/world/map/1045.gz diff --git a/2006Redone Server/data/world/map/1046.gz b/2006Scape Server/data/world/map/1046.gz similarity index 100% rename from 2006Redone Server/data/world/map/1046.gz rename to 2006Scape Server/data/world/map/1046.gz diff --git a/2006Redone Server/data/world/map/1047.gz b/2006Scape Server/data/world/map/1047.gz similarity index 100% rename from 2006Redone Server/data/world/map/1047.gz rename to 2006Scape Server/data/world/map/1047.gz diff --git a/2006Redone Server/data/world/map/1048.gz b/2006Scape Server/data/world/map/1048.gz similarity index 100% rename from 2006Redone Server/data/world/map/1048.gz rename to 2006Scape Server/data/world/map/1048.gz diff --git a/2006Redone Server/data/world/map/1049.gz b/2006Scape Server/data/world/map/1049.gz similarity index 100% rename from 2006Redone Server/data/world/map/1049.gz rename to 2006Scape Server/data/world/map/1049.gz diff --git a/2006Redone Server/data/world/map/105.gz b/2006Scape Server/data/world/map/105.gz similarity index 100% rename from 2006Redone Server/data/world/map/105.gz rename to 2006Scape Server/data/world/map/105.gz diff --git a/2006Redone Server/data/world/map/1050.gz b/2006Scape Server/data/world/map/1050.gz similarity index 100% rename from 2006Redone Server/data/world/map/1050.gz rename to 2006Scape Server/data/world/map/1050.gz diff --git a/2006Redone Server/data/world/map/1051.gz b/2006Scape Server/data/world/map/1051.gz similarity index 100% rename from 2006Redone Server/data/world/map/1051.gz rename to 2006Scape Server/data/world/map/1051.gz diff --git a/2006Redone Server/data/world/map/1052.gz b/2006Scape Server/data/world/map/1052.gz similarity index 100% rename from 2006Redone Server/data/world/map/1052.gz rename to 2006Scape Server/data/world/map/1052.gz diff --git a/2006Redone Server/data/world/map/1053.gz b/2006Scape Server/data/world/map/1053.gz similarity index 100% rename from 2006Redone Server/data/world/map/1053.gz rename to 2006Scape Server/data/world/map/1053.gz diff --git a/2006Redone Server/data/world/map/1054.gz b/2006Scape Server/data/world/map/1054.gz similarity index 100% rename from 2006Redone Server/data/world/map/1054.gz rename to 2006Scape Server/data/world/map/1054.gz diff --git a/2006Redone Server/data/world/map/1055.gz b/2006Scape Server/data/world/map/1055.gz similarity index 100% rename from 2006Redone Server/data/world/map/1055.gz rename to 2006Scape Server/data/world/map/1055.gz diff --git a/2006Redone Server/data/world/map/1056.gz b/2006Scape Server/data/world/map/1056.gz similarity index 100% rename from 2006Redone Server/data/world/map/1056.gz rename to 2006Scape Server/data/world/map/1056.gz diff --git a/2006Redone Server/data/world/map/1057.gz b/2006Scape Server/data/world/map/1057.gz similarity index 100% rename from 2006Redone Server/data/world/map/1057.gz rename to 2006Scape Server/data/world/map/1057.gz diff --git a/2006Redone Server/data/world/map/1058.gz b/2006Scape Server/data/world/map/1058.gz similarity index 100% rename from 2006Redone Server/data/world/map/1058.gz rename to 2006Scape Server/data/world/map/1058.gz diff --git a/2006Redone Server/data/world/map/1059.gz b/2006Scape Server/data/world/map/1059.gz similarity index 100% rename from 2006Redone Server/data/world/map/1059.gz rename to 2006Scape Server/data/world/map/1059.gz diff --git a/2006Redone Server/data/world/map/106.gz b/2006Scape Server/data/world/map/106.gz similarity index 100% rename from 2006Redone Server/data/world/map/106.gz rename to 2006Scape Server/data/world/map/106.gz diff --git a/2006Redone Server/data/world/map/1060.gz b/2006Scape Server/data/world/map/1060.gz similarity index 100% rename from 2006Redone Server/data/world/map/1060.gz rename to 2006Scape Server/data/world/map/1060.gz diff --git a/2006Redone Server/data/world/map/1061.gz b/2006Scape Server/data/world/map/1061.gz similarity index 100% rename from 2006Redone Server/data/world/map/1061.gz rename to 2006Scape Server/data/world/map/1061.gz diff --git a/2006Redone Server/data/world/map/1062.gz b/2006Scape Server/data/world/map/1062.gz similarity index 100% rename from 2006Redone Server/data/world/map/1062.gz rename to 2006Scape Server/data/world/map/1062.gz diff --git a/2006Redone Server/data/world/map/1063.gz b/2006Scape Server/data/world/map/1063.gz similarity index 100% rename from 2006Redone Server/data/world/map/1063.gz rename to 2006Scape Server/data/world/map/1063.gz diff --git a/2006Redone Server/data/world/map/1064.gz b/2006Scape Server/data/world/map/1064.gz similarity index 100% rename from 2006Redone Server/data/world/map/1064.gz rename to 2006Scape Server/data/world/map/1064.gz diff --git a/2006Redone Server/data/world/map/1065.gz b/2006Scape Server/data/world/map/1065.gz similarity index 100% rename from 2006Redone Server/data/world/map/1065.gz rename to 2006Scape Server/data/world/map/1065.gz diff --git a/2006Redone Server/data/world/map/1066.gz b/2006Scape Server/data/world/map/1066.gz similarity index 100% rename from 2006Redone Server/data/world/map/1066.gz rename to 2006Scape Server/data/world/map/1066.gz diff --git a/2006Redone Server/data/world/map/1067.gz b/2006Scape Server/data/world/map/1067.gz similarity index 100% rename from 2006Redone Server/data/world/map/1067.gz rename to 2006Scape Server/data/world/map/1067.gz diff --git a/2006Redone Server/data/world/map/1068.gz b/2006Scape Server/data/world/map/1068.gz similarity index 100% rename from 2006Redone Server/data/world/map/1068.gz rename to 2006Scape Server/data/world/map/1068.gz diff --git a/2006Redone Server/data/world/map/1069.gz b/2006Scape Server/data/world/map/1069.gz similarity index 100% rename from 2006Redone Server/data/world/map/1069.gz rename to 2006Scape Server/data/world/map/1069.gz diff --git a/2006Redone Server/data/world/map/107.gz b/2006Scape Server/data/world/map/107.gz similarity index 100% rename from 2006Redone Server/data/world/map/107.gz rename to 2006Scape Server/data/world/map/107.gz diff --git a/2006Redone Server/data/world/map/1070.gz b/2006Scape Server/data/world/map/1070.gz similarity index 100% rename from 2006Redone Server/data/world/map/1070.gz rename to 2006Scape Server/data/world/map/1070.gz diff --git a/2006Redone Server/data/world/map/1071.gz b/2006Scape Server/data/world/map/1071.gz similarity index 100% rename from 2006Redone Server/data/world/map/1071.gz rename to 2006Scape Server/data/world/map/1071.gz diff --git a/2006Redone Server/data/world/map/1072.gz b/2006Scape Server/data/world/map/1072.gz similarity index 100% rename from 2006Redone Server/data/world/map/1072.gz rename to 2006Scape Server/data/world/map/1072.gz diff --git a/2006Redone Server/data/world/map/1073.gz b/2006Scape Server/data/world/map/1073.gz similarity index 100% rename from 2006Redone Server/data/world/map/1073.gz rename to 2006Scape Server/data/world/map/1073.gz diff --git a/2006Redone Server/data/world/map/1074.gz b/2006Scape Server/data/world/map/1074.gz similarity index 100% rename from 2006Redone Server/data/world/map/1074.gz rename to 2006Scape Server/data/world/map/1074.gz diff --git a/2006Redone Server/data/world/map/1075.gz b/2006Scape Server/data/world/map/1075.gz similarity index 100% rename from 2006Redone Server/data/world/map/1075.gz rename to 2006Scape Server/data/world/map/1075.gz diff --git a/2006Redone Server/data/world/map/1076.gz b/2006Scape Server/data/world/map/1076.gz similarity index 100% rename from 2006Redone Server/data/world/map/1076.gz rename to 2006Scape Server/data/world/map/1076.gz diff --git a/2006Redone Server/data/world/map/1077.gz b/2006Scape Server/data/world/map/1077.gz similarity index 100% rename from 2006Redone Server/data/world/map/1077.gz rename to 2006Scape Server/data/world/map/1077.gz diff --git a/2006Redone Server/data/world/map/1078.gz b/2006Scape Server/data/world/map/1078.gz similarity index 100% rename from 2006Redone Server/data/world/map/1078.gz rename to 2006Scape Server/data/world/map/1078.gz diff --git a/2006Redone Server/data/world/map/1079.gz b/2006Scape Server/data/world/map/1079.gz similarity index 100% rename from 2006Redone Server/data/world/map/1079.gz rename to 2006Scape Server/data/world/map/1079.gz diff --git a/2006Redone Server/data/world/map/108.gz b/2006Scape Server/data/world/map/108.gz similarity index 100% rename from 2006Redone Server/data/world/map/108.gz rename to 2006Scape Server/data/world/map/108.gz diff --git a/2006Redone Server/data/world/map/1080.gz b/2006Scape Server/data/world/map/1080.gz similarity index 100% rename from 2006Redone Server/data/world/map/1080.gz rename to 2006Scape Server/data/world/map/1080.gz diff --git a/2006Redone Server/data/world/map/1081.gz b/2006Scape Server/data/world/map/1081.gz similarity index 100% rename from 2006Redone Server/data/world/map/1081.gz rename to 2006Scape Server/data/world/map/1081.gz diff --git a/2006Redone Server/data/world/map/1082.gz b/2006Scape Server/data/world/map/1082.gz similarity index 100% rename from 2006Redone Server/data/world/map/1082.gz rename to 2006Scape Server/data/world/map/1082.gz diff --git a/2006Redone Server/data/world/map/1083.gz b/2006Scape Server/data/world/map/1083.gz similarity index 100% rename from 2006Redone Server/data/world/map/1083.gz rename to 2006Scape Server/data/world/map/1083.gz diff --git a/2006Redone Server/data/world/map/1084.gz b/2006Scape Server/data/world/map/1084.gz similarity index 100% rename from 2006Redone Server/data/world/map/1084.gz rename to 2006Scape Server/data/world/map/1084.gz diff --git a/2006Redone Server/data/world/map/1085.gz b/2006Scape Server/data/world/map/1085.gz similarity index 100% rename from 2006Redone Server/data/world/map/1085.gz rename to 2006Scape Server/data/world/map/1085.gz diff --git a/2006Redone Server/data/world/map/1086.gz b/2006Scape Server/data/world/map/1086.gz similarity index 100% rename from 2006Redone Server/data/world/map/1086.gz rename to 2006Scape Server/data/world/map/1086.gz diff --git a/2006Redone Server/data/world/map/1087.gz b/2006Scape Server/data/world/map/1087.gz similarity index 100% rename from 2006Redone Server/data/world/map/1087.gz rename to 2006Scape Server/data/world/map/1087.gz diff --git a/2006Redone Server/data/world/map/1088.gz b/2006Scape Server/data/world/map/1088.gz similarity index 100% rename from 2006Redone Server/data/world/map/1088.gz rename to 2006Scape Server/data/world/map/1088.gz diff --git a/2006Redone Server/data/world/map/1089.gz b/2006Scape Server/data/world/map/1089.gz similarity index 100% rename from 2006Redone Server/data/world/map/1089.gz rename to 2006Scape Server/data/world/map/1089.gz diff --git a/2006Redone Server/data/world/map/109.gz b/2006Scape Server/data/world/map/109.gz similarity index 100% rename from 2006Redone Server/data/world/map/109.gz rename to 2006Scape Server/data/world/map/109.gz diff --git a/2006Redone Server/data/world/map/1090.gz b/2006Scape Server/data/world/map/1090.gz similarity index 100% rename from 2006Redone Server/data/world/map/1090.gz rename to 2006Scape Server/data/world/map/1090.gz diff --git a/2006Redone Server/data/world/map/1091.gz b/2006Scape Server/data/world/map/1091.gz similarity index 100% rename from 2006Redone Server/data/world/map/1091.gz rename to 2006Scape Server/data/world/map/1091.gz diff --git a/2006Redone Server/data/world/map/1092.gz b/2006Scape Server/data/world/map/1092.gz similarity index 100% rename from 2006Redone Server/data/world/map/1092.gz rename to 2006Scape Server/data/world/map/1092.gz diff --git a/2006Redone Server/data/world/map/1093.gz b/2006Scape Server/data/world/map/1093.gz similarity index 100% rename from 2006Redone Server/data/world/map/1093.gz rename to 2006Scape Server/data/world/map/1093.gz diff --git a/2006Redone Server/data/world/map/1094.gz b/2006Scape Server/data/world/map/1094.gz similarity index 100% rename from 2006Redone Server/data/world/map/1094.gz rename to 2006Scape Server/data/world/map/1094.gz diff --git a/2006Redone Server/data/world/map/1095.gz b/2006Scape Server/data/world/map/1095.gz similarity index 100% rename from 2006Redone Server/data/world/map/1095.gz rename to 2006Scape Server/data/world/map/1095.gz diff --git a/2006Redone Server/data/world/map/1096.gz b/2006Scape Server/data/world/map/1096.gz similarity index 100% rename from 2006Redone Server/data/world/map/1096.gz rename to 2006Scape Server/data/world/map/1096.gz diff --git a/2006Redone Server/data/world/map/1097.gz b/2006Scape Server/data/world/map/1097.gz similarity index 100% rename from 2006Redone Server/data/world/map/1097.gz rename to 2006Scape Server/data/world/map/1097.gz diff --git a/2006Redone Server/data/world/map/1098.gz b/2006Scape Server/data/world/map/1098.gz similarity index 100% rename from 2006Redone Server/data/world/map/1098.gz rename to 2006Scape Server/data/world/map/1098.gz diff --git a/2006Redone Server/data/world/map/1099.gz b/2006Scape Server/data/world/map/1099.gz similarity index 100% rename from 2006Redone Server/data/world/map/1099.gz rename to 2006Scape Server/data/world/map/1099.gz diff --git a/2006Redone Server/data/world/map/11.gz b/2006Scape Server/data/world/map/11.gz similarity index 100% rename from 2006Redone Server/data/world/map/11.gz rename to 2006Scape Server/data/world/map/11.gz diff --git a/2006Redone Server/data/world/map/110.gz b/2006Scape Server/data/world/map/110.gz similarity index 100% rename from 2006Redone Server/data/world/map/110.gz rename to 2006Scape Server/data/world/map/110.gz diff --git a/2006Redone Server/data/world/map/1100.gz b/2006Scape Server/data/world/map/1100.gz similarity index 100% rename from 2006Redone Server/data/world/map/1100.gz rename to 2006Scape Server/data/world/map/1100.gz diff --git a/2006Redone Server/data/world/map/1101.gz b/2006Scape Server/data/world/map/1101.gz similarity index 100% rename from 2006Redone Server/data/world/map/1101.gz rename to 2006Scape Server/data/world/map/1101.gz diff --git a/2006Redone Server/data/world/map/1102.gz b/2006Scape Server/data/world/map/1102.gz similarity index 100% rename from 2006Redone Server/data/world/map/1102.gz rename to 2006Scape Server/data/world/map/1102.gz diff --git a/2006Redone Server/data/world/map/1103.gz b/2006Scape Server/data/world/map/1103.gz similarity index 100% rename from 2006Redone Server/data/world/map/1103.gz rename to 2006Scape Server/data/world/map/1103.gz diff --git a/2006Redone Server/data/world/map/1104.gz b/2006Scape Server/data/world/map/1104.gz similarity index 100% rename from 2006Redone Server/data/world/map/1104.gz rename to 2006Scape Server/data/world/map/1104.gz diff --git a/2006Redone Server/data/world/map/1105.gz b/2006Scape Server/data/world/map/1105.gz similarity index 100% rename from 2006Redone Server/data/world/map/1105.gz rename to 2006Scape Server/data/world/map/1105.gz diff --git a/2006Redone Server/data/world/map/1106.gz b/2006Scape Server/data/world/map/1106.gz similarity index 100% rename from 2006Redone Server/data/world/map/1106.gz rename to 2006Scape Server/data/world/map/1106.gz diff --git a/2006Redone Server/data/world/map/1107.gz b/2006Scape Server/data/world/map/1107.gz similarity index 100% rename from 2006Redone Server/data/world/map/1107.gz rename to 2006Scape Server/data/world/map/1107.gz diff --git a/2006Redone Server/data/world/map/1108.gz b/2006Scape Server/data/world/map/1108.gz similarity index 100% rename from 2006Redone Server/data/world/map/1108.gz rename to 2006Scape Server/data/world/map/1108.gz diff --git a/2006Redone Server/data/world/map/1109.gz b/2006Scape Server/data/world/map/1109.gz similarity index 100% rename from 2006Redone Server/data/world/map/1109.gz rename to 2006Scape Server/data/world/map/1109.gz diff --git a/2006Redone Server/data/world/map/111.gz b/2006Scape Server/data/world/map/111.gz similarity index 100% rename from 2006Redone Server/data/world/map/111.gz rename to 2006Scape Server/data/world/map/111.gz diff --git a/2006Redone Server/data/world/map/1110.gz b/2006Scape Server/data/world/map/1110.gz similarity index 100% rename from 2006Redone Server/data/world/map/1110.gz rename to 2006Scape Server/data/world/map/1110.gz diff --git a/2006Redone Server/data/world/map/1111.gz b/2006Scape Server/data/world/map/1111.gz similarity index 100% rename from 2006Redone Server/data/world/map/1111.gz rename to 2006Scape Server/data/world/map/1111.gz diff --git a/2006Redone Server/data/world/map/1112.gz b/2006Scape Server/data/world/map/1112.gz similarity index 100% rename from 2006Redone Server/data/world/map/1112.gz rename to 2006Scape Server/data/world/map/1112.gz diff --git a/2006Redone Server/data/world/map/1113.gz b/2006Scape Server/data/world/map/1113.gz similarity index 100% rename from 2006Redone Server/data/world/map/1113.gz rename to 2006Scape Server/data/world/map/1113.gz diff --git a/2006Redone Server/data/world/map/1114.gz b/2006Scape Server/data/world/map/1114.gz similarity index 100% rename from 2006Redone Server/data/world/map/1114.gz rename to 2006Scape Server/data/world/map/1114.gz diff --git a/2006Redone Server/data/world/map/1115.gz b/2006Scape Server/data/world/map/1115.gz similarity index 100% rename from 2006Redone Server/data/world/map/1115.gz rename to 2006Scape Server/data/world/map/1115.gz diff --git a/2006Redone Server/data/world/map/1116.gz b/2006Scape Server/data/world/map/1116.gz similarity index 100% rename from 2006Redone Server/data/world/map/1116.gz rename to 2006Scape Server/data/world/map/1116.gz diff --git a/2006Redone Server/data/world/map/1117.gz b/2006Scape Server/data/world/map/1117.gz similarity index 100% rename from 2006Redone Server/data/world/map/1117.gz rename to 2006Scape Server/data/world/map/1117.gz diff --git a/2006Redone Server/data/world/map/1118.gz b/2006Scape Server/data/world/map/1118.gz similarity index 100% rename from 2006Redone Server/data/world/map/1118.gz rename to 2006Scape Server/data/world/map/1118.gz diff --git a/2006Redone Server/data/world/map/1119.gz b/2006Scape Server/data/world/map/1119.gz similarity index 100% rename from 2006Redone Server/data/world/map/1119.gz rename to 2006Scape Server/data/world/map/1119.gz diff --git a/2006Redone Server/data/world/map/112.gz b/2006Scape Server/data/world/map/112.gz similarity index 100% rename from 2006Redone Server/data/world/map/112.gz rename to 2006Scape Server/data/world/map/112.gz diff --git a/2006Redone Server/data/world/map/1120.gz b/2006Scape Server/data/world/map/1120.gz similarity index 100% rename from 2006Redone Server/data/world/map/1120.gz rename to 2006Scape Server/data/world/map/1120.gz diff --git a/2006Redone Server/data/world/map/1121.gz b/2006Scape Server/data/world/map/1121.gz similarity index 100% rename from 2006Redone Server/data/world/map/1121.gz rename to 2006Scape Server/data/world/map/1121.gz diff --git a/2006Redone Server/data/world/map/1122.gz b/2006Scape Server/data/world/map/1122.gz similarity index 100% rename from 2006Redone Server/data/world/map/1122.gz rename to 2006Scape Server/data/world/map/1122.gz diff --git a/2006Redone Server/data/world/map/1123.gz b/2006Scape Server/data/world/map/1123.gz similarity index 100% rename from 2006Redone Server/data/world/map/1123.gz rename to 2006Scape Server/data/world/map/1123.gz diff --git a/2006Redone Server/data/world/map/1124.gz b/2006Scape Server/data/world/map/1124.gz similarity index 100% rename from 2006Redone Server/data/world/map/1124.gz rename to 2006Scape Server/data/world/map/1124.gz diff --git a/2006Redone Server/data/world/map/1125.gz b/2006Scape Server/data/world/map/1125.gz similarity index 100% rename from 2006Redone Server/data/world/map/1125.gz rename to 2006Scape Server/data/world/map/1125.gz diff --git a/2006Redone Server/data/world/map/1126.gz b/2006Scape Server/data/world/map/1126.gz similarity index 100% rename from 2006Redone Server/data/world/map/1126.gz rename to 2006Scape Server/data/world/map/1126.gz diff --git a/2006Redone Server/data/world/map/1127.gz b/2006Scape Server/data/world/map/1127.gz similarity index 100% rename from 2006Redone Server/data/world/map/1127.gz rename to 2006Scape Server/data/world/map/1127.gz diff --git a/2006Redone Server/data/world/map/1128.gz b/2006Scape Server/data/world/map/1128.gz similarity index 100% rename from 2006Redone Server/data/world/map/1128.gz rename to 2006Scape Server/data/world/map/1128.gz diff --git a/2006Redone Server/data/world/map/1129.gz b/2006Scape Server/data/world/map/1129.gz similarity index 100% rename from 2006Redone Server/data/world/map/1129.gz rename to 2006Scape Server/data/world/map/1129.gz diff --git a/2006Redone Server/data/world/map/113.gz b/2006Scape Server/data/world/map/113.gz similarity index 100% rename from 2006Redone Server/data/world/map/113.gz rename to 2006Scape Server/data/world/map/113.gz diff --git a/2006Redone Server/data/world/map/1130.gz b/2006Scape Server/data/world/map/1130.gz similarity index 100% rename from 2006Redone Server/data/world/map/1130.gz rename to 2006Scape Server/data/world/map/1130.gz diff --git a/2006Redone Server/data/world/map/1131.gz b/2006Scape Server/data/world/map/1131.gz similarity index 100% rename from 2006Redone Server/data/world/map/1131.gz rename to 2006Scape Server/data/world/map/1131.gz diff --git a/2006Redone Server/data/world/map/1132.gz b/2006Scape Server/data/world/map/1132.gz similarity index 100% rename from 2006Redone Server/data/world/map/1132.gz rename to 2006Scape Server/data/world/map/1132.gz diff --git a/2006Redone Server/data/world/map/1133.gz b/2006Scape Server/data/world/map/1133.gz similarity index 100% rename from 2006Redone Server/data/world/map/1133.gz rename to 2006Scape Server/data/world/map/1133.gz diff --git a/2006Redone Server/data/world/map/1134.gz b/2006Scape Server/data/world/map/1134.gz similarity index 100% rename from 2006Redone Server/data/world/map/1134.gz rename to 2006Scape Server/data/world/map/1134.gz diff --git a/2006Redone Server/data/world/map/1135.gz b/2006Scape Server/data/world/map/1135.gz similarity index 100% rename from 2006Redone Server/data/world/map/1135.gz rename to 2006Scape Server/data/world/map/1135.gz diff --git a/2006Redone Server/data/world/map/1136.gz b/2006Scape Server/data/world/map/1136.gz similarity index 100% rename from 2006Redone Server/data/world/map/1136.gz rename to 2006Scape Server/data/world/map/1136.gz diff --git a/2006Redone Server/data/world/map/1137.gz b/2006Scape Server/data/world/map/1137.gz similarity index 100% rename from 2006Redone Server/data/world/map/1137.gz rename to 2006Scape Server/data/world/map/1137.gz diff --git a/2006Redone Server/data/world/map/1138.gz b/2006Scape Server/data/world/map/1138.gz similarity index 100% rename from 2006Redone Server/data/world/map/1138.gz rename to 2006Scape Server/data/world/map/1138.gz diff --git a/2006Redone Server/data/world/map/1139.gz b/2006Scape Server/data/world/map/1139.gz similarity index 100% rename from 2006Redone Server/data/world/map/1139.gz rename to 2006Scape Server/data/world/map/1139.gz diff --git a/2006Redone Server/data/world/map/114.gz b/2006Scape Server/data/world/map/114.gz similarity index 100% rename from 2006Redone Server/data/world/map/114.gz rename to 2006Scape Server/data/world/map/114.gz diff --git a/2006Redone Server/data/world/map/1140.gz b/2006Scape Server/data/world/map/1140.gz similarity index 100% rename from 2006Redone Server/data/world/map/1140.gz rename to 2006Scape Server/data/world/map/1140.gz diff --git a/2006Redone Server/data/world/map/1141.gz b/2006Scape Server/data/world/map/1141.gz similarity index 100% rename from 2006Redone Server/data/world/map/1141.gz rename to 2006Scape Server/data/world/map/1141.gz diff --git a/2006Redone Server/data/world/map/1142.gz b/2006Scape Server/data/world/map/1142.gz similarity index 100% rename from 2006Redone Server/data/world/map/1142.gz rename to 2006Scape Server/data/world/map/1142.gz diff --git a/2006Redone Server/data/world/map/1143.gz b/2006Scape Server/data/world/map/1143.gz similarity index 100% rename from 2006Redone Server/data/world/map/1143.gz rename to 2006Scape Server/data/world/map/1143.gz diff --git a/2006Redone Server/data/world/map/1144.gz b/2006Scape Server/data/world/map/1144.gz similarity index 100% rename from 2006Redone Server/data/world/map/1144.gz rename to 2006Scape Server/data/world/map/1144.gz diff --git a/2006Redone Server/data/world/map/1145.gz b/2006Scape Server/data/world/map/1145.gz similarity index 100% rename from 2006Redone Server/data/world/map/1145.gz rename to 2006Scape Server/data/world/map/1145.gz diff --git a/2006Redone Server/data/world/map/1146.gz b/2006Scape Server/data/world/map/1146.gz similarity index 100% rename from 2006Redone Server/data/world/map/1146.gz rename to 2006Scape Server/data/world/map/1146.gz diff --git a/2006Redone Server/data/world/map/1147.gz b/2006Scape Server/data/world/map/1147.gz similarity index 100% rename from 2006Redone Server/data/world/map/1147.gz rename to 2006Scape Server/data/world/map/1147.gz diff --git a/2006Redone Server/data/world/map/1148.gz b/2006Scape Server/data/world/map/1148.gz similarity index 100% rename from 2006Redone Server/data/world/map/1148.gz rename to 2006Scape Server/data/world/map/1148.gz diff --git a/2006Redone Server/data/world/map/1149.gz b/2006Scape Server/data/world/map/1149.gz similarity index 100% rename from 2006Redone Server/data/world/map/1149.gz rename to 2006Scape Server/data/world/map/1149.gz diff --git a/2006Redone Server/data/world/map/115.gz b/2006Scape Server/data/world/map/115.gz similarity index 100% rename from 2006Redone Server/data/world/map/115.gz rename to 2006Scape Server/data/world/map/115.gz diff --git a/2006Redone Server/data/world/map/1150.gz b/2006Scape Server/data/world/map/1150.gz similarity index 100% rename from 2006Redone Server/data/world/map/1150.gz rename to 2006Scape Server/data/world/map/1150.gz diff --git a/2006Redone Server/data/world/map/1151.gz b/2006Scape Server/data/world/map/1151.gz similarity index 100% rename from 2006Redone Server/data/world/map/1151.gz rename to 2006Scape Server/data/world/map/1151.gz diff --git a/2006Redone Server/data/world/map/1152.gz b/2006Scape Server/data/world/map/1152.gz similarity index 100% rename from 2006Redone Server/data/world/map/1152.gz rename to 2006Scape Server/data/world/map/1152.gz diff --git a/2006Redone Server/data/world/map/1153.gz b/2006Scape Server/data/world/map/1153.gz similarity index 100% rename from 2006Redone Server/data/world/map/1153.gz rename to 2006Scape Server/data/world/map/1153.gz diff --git a/2006Redone Server/data/world/map/1154.gz b/2006Scape Server/data/world/map/1154.gz similarity index 100% rename from 2006Redone Server/data/world/map/1154.gz rename to 2006Scape Server/data/world/map/1154.gz diff --git a/2006Redone Server/data/world/map/1155.gz b/2006Scape Server/data/world/map/1155.gz similarity index 100% rename from 2006Redone Server/data/world/map/1155.gz rename to 2006Scape Server/data/world/map/1155.gz diff --git a/2006Redone Server/data/world/map/1156.gz b/2006Scape Server/data/world/map/1156.gz similarity index 100% rename from 2006Redone Server/data/world/map/1156.gz rename to 2006Scape Server/data/world/map/1156.gz diff --git a/2006Redone Server/data/world/map/1157.gz b/2006Scape Server/data/world/map/1157.gz similarity index 100% rename from 2006Redone Server/data/world/map/1157.gz rename to 2006Scape Server/data/world/map/1157.gz diff --git a/2006Redone Server/data/world/map/1158.gz b/2006Scape Server/data/world/map/1158.gz similarity index 100% rename from 2006Redone Server/data/world/map/1158.gz rename to 2006Scape Server/data/world/map/1158.gz diff --git a/2006Redone Server/data/world/map/1159.gz b/2006Scape Server/data/world/map/1159.gz similarity index 100% rename from 2006Redone Server/data/world/map/1159.gz rename to 2006Scape Server/data/world/map/1159.gz diff --git a/2006Redone Server/data/world/map/116.gz b/2006Scape Server/data/world/map/116.gz similarity index 100% rename from 2006Redone Server/data/world/map/116.gz rename to 2006Scape Server/data/world/map/116.gz diff --git a/2006Redone Server/data/world/map/1160.gz b/2006Scape Server/data/world/map/1160.gz similarity index 100% rename from 2006Redone Server/data/world/map/1160.gz rename to 2006Scape Server/data/world/map/1160.gz diff --git a/2006Redone Server/data/world/map/1161.gz b/2006Scape Server/data/world/map/1161.gz similarity index 100% rename from 2006Redone Server/data/world/map/1161.gz rename to 2006Scape Server/data/world/map/1161.gz diff --git a/2006Redone Server/data/world/map/1162.gz b/2006Scape Server/data/world/map/1162.gz similarity index 100% rename from 2006Redone Server/data/world/map/1162.gz rename to 2006Scape Server/data/world/map/1162.gz diff --git a/2006Redone Server/data/world/map/1163.gz b/2006Scape Server/data/world/map/1163.gz similarity index 100% rename from 2006Redone Server/data/world/map/1163.gz rename to 2006Scape Server/data/world/map/1163.gz diff --git a/2006Redone Server/data/world/map/1164.gz b/2006Scape Server/data/world/map/1164.gz similarity index 100% rename from 2006Redone Server/data/world/map/1164.gz rename to 2006Scape Server/data/world/map/1164.gz diff --git a/2006Redone Server/data/world/map/1165.gz b/2006Scape Server/data/world/map/1165.gz similarity index 100% rename from 2006Redone Server/data/world/map/1165.gz rename to 2006Scape Server/data/world/map/1165.gz diff --git a/2006Redone Server/data/world/map/1166.gz b/2006Scape Server/data/world/map/1166.gz similarity index 100% rename from 2006Redone Server/data/world/map/1166.gz rename to 2006Scape Server/data/world/map/1166.gz diff --git a/2006Redone Server/data/world/map/1167.gz b/2006Scape Server/data/world/map/1167.gz similarity index 100% rename from 2006Redone Server/data/world/map/1167.gz rename to 2006Scape Server/data/world/map/1167.gz diff --git a/2006Redone Server/data/world/map/1168.gz b/2006Scape Server/data/world/map/1168.gz similarity index 100% rename from 2006Redone Server/data/world/map/1168.gz rename to 2006Scape Server/data/world/map/1168.gz diff --git a/2006Redone Server/data/world/map/1169.gz b/2006Scape Server/data/world/map/1169.gz similarity index 100% rename from 2006Redone Server/data/world/map/1169.gz rename to 2006Scape Server/data/world/map/1169.gz diff --git a/2006Redone Server/data/world/map/117.gz b/2006Scape Server/data/world/map/117.gz similarity index 100% rename from 2006Redone Server/data/world/map/117.gz rename to 2006Scape Server/data/world/map/117.gz diff --git a/2006Redone Server/data/world/map/1170.gz b/2006Scape Server/data/world/map/1170.gz similarity index 100% rename from 2006Redone Server/data/world/map/1170.gz rename to 2006Scape Server/data/world/map/1170.gz diff --git a/2006Redone Server/data/world/map/1171.gz b/2006Scape Server/data/world/map/1171.gz similarity index 100% rename from 2006Redone Server/data/world/map/1171.gz rename to 2006Scape Server/data/world/map/1171.gz diff --git a/2006Redone Server/data/world/map/1172.gz b/2006Scape Server/data/world/map/1172.gz similarity index 100% rename from 2006Redone Server/data/world/map/1172.gz rename to 2006Scape Server/data/world/map/1172.gz diff --git a/2006Redone Server/data/world/map/1173.gz b/2006Scape Server/data/world/map/1173.gz similarity index 100% rename from 2006Redone Server/data/world/map/1173.gz rename to 2006Scape Server/data/world/map/1173.gz diff --git a/2006Redone Server/data/world/map/1174.gz b/2006Scape Server/data/world/map/1174.gz similarity index 100% rename from 2006Redone Server/data/world/map/1174.gz rename to 2006Scape Server/data/world/map/1174.gz diff --git a/2006Redone Server/data/world/map/1175.gz b/2006Scape Server/data/world/map/1175.gz similarity index 100% rename from 2006Redone Server/data/world/map/1175.gz rename to 2006Scape Server/data/world/map/1175.gz diff --git a/2006Redone Server/data/world/map/1176.gz b/2006Scape Server/data/world/map/1176.gz similarity index 100% rename from 2006Redone Server/data/world/map/1176.gz rename to 2006Scape Server/data/world/map/1176.gz diff --git a/2006Redone Server/data/world/map/1177.gz b/2006Scape Server/data/world/map/1177.gz similarity index 100% rename from 2006Redone Server/data/world/map/1177.gz rename to 2006Scape Server/data/world/map/1177.gz diff --git a/2006Redone Server/data/world/map/1178.gz b/2006Scape Server/data/world/map/1178.gz similarity index 100% rename from 2006Redone Server/data/world/map/1178.gz rename to 2006Scape Server/data/world/map/1178.gz diff --git a/2006Redone Server/data/world/map/1179.gz b/2006Scape Server/data/world/map/1179.gz similarity index 100% rename from 2006Redone Server/data/world/map/1179.gz rename to 2006Scape Server/data/world/map/1179.gz diff --git a/2006Redone Server/data/world/map/118.gz b/2006Scape Server/data/world/map/118.gz similarity index 100% rename from 2006Redone Server/data/world/map/118.gz rename to 2006Scape Server/data/world/map/118.gz diff --git a/2006Redone Server/data/world/map/1180.gz b/2006Scape Server/data/world/map/1180.gz similarity index 100% rename from 2006Redone Server/data/world/map/1180.gz rename to 2006Scape Server/data/world/map/1180.gz diff --git a/2006Redone Server/data/world/map/1181.gz b/2006Scape Server/data/world/map/1181.gz similarity index 100% rename from 2006Redone Server/data/world/map/1181.gz rename to 2006Scape Server/data/world/map/1181.gz diff --git a/2006Redone Server/data/world/map/1182.gz b/2006Scape Server/data/world/map/1182.gz similarity index 100% rename from 2006Redone Server/data/world/map/1182.gz rename to 2006Scape Server/data/world/map/1182.gz diff --git a/2006Redone Server/data/world/map/1183.gz b/2006Scape Server/data/world/map/1183.gz similarity index 100% rename from 2006Redone Server/data/world/map/1183.gz rename to 2006Scape Server/data/world/map/1183.gz diff --git a/2006Redone Server/data/world/map/1184.gz b/2006Scape Server/data/world/map/1184.gz similarity index 100% rename from 2006Redone Server/data/world/map/1184.gz rename to 2006Scape Server/data/world/map/1184.gz diff --git a/2006Redone Server/data/world/map/1185.gz b/2006Scape Server/data/world/map/1185.gz similarity index 100% rename from 2006Redone Server/data/world/map/1185.gz rename to 2006Scape Server/data/world/map/1185.gz diff --git a/2006Redone Server/data/world/map/1186.gz b/2006Scape Server/data/world/map/1186.gz similarity index 100% rename from 2006Redone Server/data/world/map/1186.gz rename to 2006Scape Server/data/world/map/1186.gz diff --git a/2006Redone Server/data/world/map/1187.gz b/2006Scape Server/data/world/map/1187.gz similarity index 100% rename from 2006Redone Server/data/world/map/1187.gz rename to 2006Scape Server/data/world/map/1187.gz diff --git a/2006Redone Server/data/world/map/1188.gz b/2006Scape Server/data/world/map/1188.gz similarity index 100% rename from 2006Redone Server/data/world/map/1188.gz rename to 2006Scape Server/data/world/map/1188.gz diff --git a/2006Redone Server/data/world/map/1189.gz b/2006Scape Server/data/world/map/1189.gz similarity index 100% rename from 2006Redone Server/data/world/map/1189.gz rename to 2006Scape Server/data/world/map/1189.gz diff --git a/2006Redone Server/data/world/map/119.gz b/2006Scape Server/data/world/map/119.gz similarity index 100% rename from 2006Redone Server/data/world/map/119.gz rename to 2006Scape Server/data/world/map/119.gz diff --git a/2006Redone Server/data/world/map/1190.gz b/2006Scape Server/data/world/map/1190.gz similarity index 100% rename from 2006Redone Server/data/world/map/1190.gz rename to 2006Scape Server/data/world/map/1190.gz diff --git a/2006Redone Server/data/world/map/1191.gz b/2006Scape Server/data/world/map/1191.gz similarity index 100% rename from 2006Redone Server/data/world/map/1191.gz rename to 2006Scape Server/data/world/map/1191.gz diff --git a/2006Redone Server/data/world/map/1192.gz b/2006Scape Server/data/world/map/1192.gz similarity index 100% rename from 2006Redone Server/data/world/map/1192.gz rename to 2006Scape Server/data/world/map/1192.gz diff --git a/2006Redone Server/data/world/map/1193.gz b/2006Scape Server/data/world/map/1193.gz similarity index 100% rename from 2006Redone Server/data/world/map/1193.gz rename to 2006Scape Server/data/world/map/1193.gz diff --git a/2006Redone Server/data/world/map/1194.gz b/2006Scape Server/data/world/map/1194.gz similarity index 100% rename from 2006Redone Server/data/world/map/1194.gz rename to 2006Scape Server/data/world/map/1194.gz diff --git a/2006Redone Server/data/world/map/1195.gz b/2006Scape Server/data/world/map/1195.gz similarity index 100% rename from 2006Redone Server/data/world/map/1195.gz rename to 2006Scape Server/data/world/map/1195.gz diff --git a/2006Redone Server/data/world/map/1196.gz b/2006Scape Server/data/world/map/1196.gz similarity index 100% rename from 2006Redone Server/data/world/map/1196.gz rename to 2006Scape Server/data/world/map/1196.gz diff --git a/2006Redone Server/data/world/map/1197.gz b/2006Scape Server/data/world/map/1197.gz similarity index 100% rename from 2006Redone Server/data/world/map/1197.gz rename to 2006Scape Server/data/world/map/1197.gz diff --git a/2006Redone Server/data/world/map/1198.gz b/2006Scape Server/data/world/map/1198.gz similarity index 100% rename from 2006Redone Server/data/world/map/1198.gz rename to 2006Scape Server/data/world/map/1198.gz diff --git a/2006Redone Server/data/world/map/1199.gz b/2006Scape Server/data/world/map/1199.gz similarity index 100% rename from 2006Redone Server/data/world/map/1199.gz rename to 2006Scape Server/data/world/map/1199.gz diff --git a/2006Redone Server/data/world/map/120.gz b/2006Scape Server/data/world/map/120.gz similarity index 100% rename from 2006Redone Server/data/world/map/120.gz rename to 2006Scape Server/data/world/map/120.gz diff --git a/2006Redone Server/data/world/map/1200.gz b/2006Scape Server/data/world/map/1200.gz similarity index 100% rename from 2006Redone Server/data/world/map/1200.gz rename to 2006Scape Server/data/world/map/1200.gz diff --git a/2006Redone Server/data/world/map/1201.gz b/2006Scape Server/data/world/map/1201.gz similarity index 100% rename from 2006Redone Server/data/world/map/1201.gz rename to 2006Scape Server/data/world/map/1201.gz diff --git a/2006Redone Server/data/world/map/1202.gz b/2006Scape Server/data/world/map/1202.gz similarity index 100% rename from 2006Redone Server/data/world/map/1202.gz rename to 2006Scape Server/data/world/map/1202.gz diff --git a/2006Redone Server/data/world/map/1203.gz b/2006Scape Server/data/world/map/1203.gz similarity index 100% rename from 2006Redone Server/data/world/map/1203.gz rename to 2006Scape Server/data/world/map/1203.gz diff --git a/2006Redone Server/data/world/map/1204.gz b/2006Scape Server/data/world/map/1204.gz similarity index 100% rename from 2006Redone Server/data/world/map/1204.gz rename to 2006Scape Server/data/world/map/1204.gz diff --git a/2006Redone Server/data/world/map/1205.gz b/2006Scape Server/data/world/map/1205.gz similarity index 100% rename from 2006Redone Server/data/world/map/1205.gz rename to 2006Scape Server/data/world/map/1205.gz diff --git a/2006Redone Server/data/world/map/1206.gz b/2006Scape Server/data/world/map/1206.gz similarity index 100% rename from 2006Redone Server/data/world/map/1206.gz rename to 2006Scape Server/data/world/map/1206.gz diff --git a/2006Redone Server/data/world/map/1207.gz b/2006Scape Server/data/world/map/1207.gz similarity index 100% rename from 2006Redone Server/data/world/map/1207.gz rename to 2006Scape Server/data/world/map/1207.gz diff --git a/2006Redone Server/data/world/map/1208.gz b/2006Scape Server/data/world/map/1208.gz similarity index 100% rename from 2006Redone Server/data/world/map/1208.gz rename to 2006Scape Server/data/world/map/1208.gz diff --git a/2006Redone Server/data/world/map/1209.gz b/2006Scape Server/data/world/map/1209.gz similarity index 100% rename from 2006Redone Server/data/world/map/1209.gz rename to 2006Scape Server/data/world/map/1209.gz diff --git a/2006Redone Server/data/world/map/121.gz b/2006Scape Server/data/world/map/121.gz similarity index 100% rename from 2006Redone Server/data/world/map/121.gz rename to 2006Scape Server/data/world/map/121.gz diff --git a/2006Redone Server/data/world/map/1210.gz b/2006Scape Server/data/world/map/1210.gz similarity index 100% rename from 2006Redone Server/data/world/map/1210.gz rename to 2006Scape Server/data/world/map/1210.gz diff --git a/2006Redone Server/data/world/map/1211.gz b/2006Scape Server/data/world/map/1211.gz similarity index 100% rename from 2006Redone Server/data/world/map/1211.gz rename to 2006Scape Server/data/world/map/1211.gz diff --git a/2006Redone Server/data/world/map/1212.gz b/2006Scape Server/data/world/map/1212.gz similarity index 100% rename from 2006Redone Server/data/world/map/1212.gz rename to 2006Scape Server/data/world/map/1212.gz diff --git a/2006Redone Server/data/world/map/1213.gz b/2006Scape Server/data/world/map/1213.gz similarity index 100% rename from 2006Redone Server/data/world/map/1213.gz rename to 2006Scape Server/data/world/map/1213.gz diff --git a/2006Redone Server/data/world/map/1214.gz b/2006Scape Server/data/world/map/1214.gz similarity index 100% rename from 2006Redone Server/data/world/map/1214.gz rename to 2006Scape Server/data/world/map/1214.gz diff --git a/2006Redone Server/data/world/map/1215.gz b/2006Scape Server/data/world/map/1215.gz similarity index 100% rename from 2006Redone Server/data/world/map/1215.gz rename to 2006Scape Server/data/world/map/1215.gz diff --git a/2006Redone Server/data/world/map/1216.gz b/2006Scape Server/data/world/map/1216.gz similarity index 100% rename from 2006Redone Server/data/world/map/1216.gz rename to 2006Scape Server/data/world/map/1216.gz diff --git a/2006Redone Server/data/world/map/1217.gz b/2006Scape Server/data/world/map/1217.gz similarity index 100% rename from 2006Redone Server/data/world/map/1217.gz rename to 2006Scape Server/data/world/map/1217.gz diff --git a/2006Redone Server/data/world/map/1218.gz b/2006Scape Server/data/world/map/1218.gz similarity index 100% rename from 2006Redone Server/data/world/map/1218.gz rename to 2006Scape Server/data/world/map/1218.gz diff --git a/2006Redone Server/data/world/map/1219.gz b/2006Scape Server/data/world/map/1219.gz similarity index 100% rename from 2006Redone Server/data/world/map/1219.gz rename to 2006Scape Server/data/world/map/1219.gz diff --git a/2006Redone Server/data/world/map/122.gz b/2006Scape Server/data/world/map/122.gz similarity index 100% rename from 2006Redone Server/data/world/map/122.gz rename to 2006Scape Server/data/world/map/122.gz diff --git a/2006Redone Server/data/world/map/1220.gz b/2006Scape Server/data/world/map/1220.gz similarity index 100% rename from 2006Redone Server/data/world/map/1220.gz rename to 2006Scape Server/data/world/map/1220.gz diff --git a/2006Redone Server/data/world/map/1221.gz b/2006Scape Server/data/world/map/1221.gz similarity index 100% rename from 2006Redone Server/data/world/map/1221.gz rename to 2006Scape Server/data/world/map/1221.gz diff --git a/2006Redone Server/data/world/map/1222.gz b/2006Scape Server/data/world/map/1222.gz similarity index 100% rename from 2006Redone Server/data/world/map/1222.gz rename to 2006Scape Server/data/world/map/1222.gz diff --git a/2006Redone Server/data/world/map/1223.gz b/2006Scape Server/data/world/map/1223.gz similarity index 100% rename from 2006Redone Server/data/world/map/1223.gz rename to 2006Scape Server/data/world/map/1223.gz diff --git a/2006Redone Server/data/world/map/1224.gz b/2006Scape Server/data/world/map/1224.gz similarity index 100% rename from 2006Redone Server/data/world/map/1224.gz rename to 2006Scape Server/data/world/map/1224.gz diff --git a/2006Redone Server/data/world/map/1225.gz b/2006Scape Server/data/world/map/1225.gz similarity index 100% rename from 2006Redone Server/data/world/map/1225.gz rename to 2006Scape Server/data/world/map/1225.gz diff --git a/2006Redone Server/data/world/map/1226.gz b/2006Scape Server/data/world/map/1226.gz similarity index 100% rename from 2006Redone Server/data/world/map/1226.gz rename to 2006Scape Server/data/world/map/1226.gz diff --git a/2006Redone Server/data/world/map/1227.gz b/2006Scape Server/data/world/map/1227.gz similarity index 100% rename from 2006Redone Server/data/world/map/1227.gz rename to 2006Scape Server/data/world/map/1227.gz diff --git a/2006Redone Server/data/world/map/1228.gz b/2006Scape Server/data/world/map/1228.gz similarity index 100% rename from 2006Redone Server/data/world/map/1228.gz rename to 2006Scape Server/data/world/map/1228.gz diff --git a/2006Redone Server/data/world/map/1229.gz b/2006Scape Server/data/world/map/1229.gz similarity index 100% rename from 2006Redone Server/data/world/map/1229.gz rename to 2006Scape Server/data/world/map/1229.gz diff --git a/2006Redone Server/data/world/map/123.gz b/2006Scape Server/data/world/map/123.gz similarity index 100% rename from 2006Redone Server/data/world/map/123.gz rename to 2006Scape Server/data/world/map/123.gz diff --git a/2006Redone Server/data/world/map/1230.gz b/2006Scape Server/data/world/map/1230.gz similarity index 100% rename from 2006Redone Server/data/world/map/1230.gz rename to 2006Scape Server/data/world/map/1230.gz diff --git a/2006Redone Server/data/world/map/1231.gz b/2006Scape Server/data/world/map/1231.gz similarity index 100% rename from 2006Redone Server/data/world/map/1231.gz rename to 2006Scape Server/data/world/map/1231.gz diff --git a/2006Redone Server/data/world/map/1232.gz b/2006Scape Server/data/world/map/1232.gz similarity index 100% rename from 2006Redone Server/data/world/map/1232.gz rename to 2006Scape Server/data/world/map/1232.gz diff --git a/2006Redone Server/data/world/map/1233.gz b/2006Scape Server/data/world/map/1233.gz similarity index 100% rename from 2006Redone Server/data/world/map/1233.gz rename to 2006Scape Server/data/world/map/1233.gz diff --git a/2006Redone Server/data/world/map/1234.gz b/2006Scape Server/data/world/map/1234.gz similarity index 100% rename from 2006Redone Server/data/world/map/1234.gz rename to 2006Scape Server/data/world/map/1234.gz diff --git a/2006Redone Server/data/world/map/1235.gz b/2006Scape Server/data/world/map/1235.gz similarity index 100% rename from 2006Redone Server/data/world/map/1235.gz rename to 2006Scape Server/data/world/map/1235.gz diff --git a/2006Redone Server/data/world/map/1236.gz b/2006Scape Server/data/world/map/1236.gz similarity index 100% rename from 2006Redone Server/data/world/map/1236.gz rename to 2006Scape Server/data/world/map/1236.gz diff --git a/2006Redone Server/data/world/map/1237.gz b/2006Scape Server/data/world/map/1237.gz similarity index 100% rename from 2006Redone Server/data/world/map/1237.gz rename to 2006Scape Server/data/world/map/1237.gz diff --git a/2006Redone Server/data/world/map/1238.gz b/2006Scape Server/data/world/map/1238.gz similarity index 100% rename from 2006Redone Server/data/world/map/1238.gz rename to 2006Scape Server/data/world/map/1238.gz diff --git a/2006Redone Server/data/world/map/1239.gz b/2006Scape Server/data/world/map/1239.gz similarity index 100% rename from 2006Redone Server/data/world/map/1239.gz rename to 2006Scape Server/data/world/map/1239.gz diff --git a/2006Redone Server/data/world/map/124.gz b/2006Scape Server/data/world/map/124.gz similarity index 100% rename from 2006Redone Server/data/world/map/124.gz rename to 2006Scape Server/data/world/map/124.gz diff --git a/2006Redone Server/data/world/map/1240.gz b/2006Scape Server/data/world/map/1240.gz similarity index 100% rename from 2006Redone Server/data/world/map/1240.gz rename to 2006Scape Server/data/world/map/1240.gz diff --git a/2006Redone Server/data/world/map/1241.gz b/2006Scape Server/data/world/map/1241.gz similarity index 100% rename from 2006Redone Server/data/world/map/1241.gz rename to 2006Scape Server/data/world/map/1241.gz diff --git a/2006Redone Server/data/world/map/1242.gz b/2006Scape Server/data/world/map/1242.gz similarity index 100% rename from 2006Redone Server/data/world/map/1242.gz rename to 2006Scape Server/data/world/map/1242.gz diff --git a/2006Redone Server/data/world/map/1243.gz b/2006Scape Server/data/world/map/1243.gz similarity index 100% rename from 2006Redone Server/data/world/map/1243.gz rename to 2006Scape Server/data/world/map/1243.gz diff --git a/2006Redone Server/data/world/map/1244.gz b/2006Scape Server/data/world/map/1244.gz similarity index 100% rename from 2006Redone Server/data/world/map/1244.gz rename to 2006Scape Server/data/world/map/1244.gz diff --git a/2006Redone Server/data/world/map/1245.gz b/2006Scape Server/data/world/map/1245.gz similarity index 100% rename from 2006Redone Server/data/world/map/1245.gz rename to 2006Scape Server/data/world/map/1245.gz diff --git a/2006Redone Server/data/world/map/1246.gz b/2006Scape Server/data/world/map/1246.gz similarity index 100% rename from 2006Redone Server/data/world/map/1246.gz rename to 2006Scape Server/data/world/map/1246.gz diff --git a/2006Redone Server/data/world/map/1247.gz b/2006Scape Server/data/world/map/1247.gz similarity index 100% rename from 2006Redone Server/data/world/map/1247.gz rename to 2006Scape Server/data/world/map/1247.gz diff --git a/2006Redone Server/data/world/map/1248.gz b/2006Scape Server/data/world/map/1248.gz similarity index 100% rename from 2006Redone Server/data/world/map/1248.gz rename to 2006Scape Server/data/world/map/1248.gz diff --git a/2006Redone Server/data/world/map/1249.gz b/2006Scape Server/data/world/map/1249.gz similarity index 100% rename from 2006Redone Server/data/world/map/1249.gz rename to 2006Scape Server/data/world/map/1249.gz diff --git a/2006Redone Server/data/world/map/125.gz b/2006Scape Server/data/world/map/125.gz similarity index 100% rename from 2006Redone Server/data/world/map/125.gz rename to 2006Scape Server/data/world/map/125.gz diff --git a/2006Redone Server/data/world/map/1250.gz b/2006Scape Server/data/world/map/1250.gz similarity index 100% rename from 2006Redone Server/data/world/map/1250.gz rename to 2006Scape Server/data/world/map/1250.gz diff --git a/2006Redone Server/data/world/map/1251.gz b/2006Scape Server/data/world/map/1251.gz similarity index 100% rename from 2006Redone Server/data/world/map/1251.gz rename to 2006Scape Server/data/world/map/1251.gz diff --git a/2006Redone Server/data/world/map/1252.gz b/2006Scape Server/data/world/map/1252.gz similarity index 100% rename from 2006Redone Server/data/world/map/1252.gz rename to 2006Scape Server/data/world/map/1252.gz diff --git a/2006Redone Server/data/world/map/1253.gz b/2006Scape Server/data/world/map/1253.gz similarity index 100% rename from 2006Redone Server/data/world/map/1253.gz rename to 2006Scape Server/data/world/map/1253.gz diff --git a/2006Redone Server/data/world/map/1254.gz b/2006Scape Server/data/world/map/1254.gz similarity index 100% rename from 2006Redone Server/data/world/map/1254.gz rename to 2006Scape Server/data/world/map/1254.gz diff --git a/2006Redone Server/data/world/map/1255.gz b/2006Scape Server/data/world/map/1255.gz similarity index 100% rename from 2006Redone Server/data/world/map/1255.gz rename to 2006Scape Server/data/world/map/1255.gz diff --git a/2006Redone Server/data/world/map/1256.gz b/2006Scape Server/data/world/map/1256.gz similarity index 100% rename from 2006Redone Server/data/world/map/1256.gz rename to 2006Scape Server/data/world/map/1256.gz diff --git a/2006Redone Server/data/world/map/1257.gz b/2006Scape Server/data/world/map/1257.gz similarity index 100% rename from 2006Redone Server/data/world/map/1257.gz rename to 2006Scape Server/data/world/map/1257.gz diff --git a/2006Redone Server/data/world/map/1258.gz b/2006Scape Server/data/world/map/1258.gz similarity index 100% rename from 2006Redone Server/data/world/map/1258.gz rename to 2006Scape Server/data/world/map/1258.gz diff --git a/2006Redone Server/data/world/map/1259.gz b/2006Scape Server/data/world/map/1259.gz similarity index 100% rename from 2006Redone Server/data/world/map/1259.gz rename to 2006Scape Server/data/world/map/1259.gz diff --git a/2006Redone Server/data/world/map/126.gz b/2006Scape Server/data/world/map/126.gz similarity index 100% rename from 2006Redone Server/data/world/map/126.gz rename to 2006Scape Server/data/world/map/126.gz diff --git a/2006Redone Server/data/world/map/1260.gz b/2006Scape Server/data/world/map/1260.gz similarity index 100% rename from 2006Redone Server/data/world/map/1260.gz rename to 2006Scape Server/data/world/map/1260.gz diff --git a/2006Redone Server/data/world/map/1261.gz b/2006Scape Server/data/world/map/1261.gz similarity index 100% rename from 2006Redone Server/data/world/map/1261.gz rename to 2006Scape Server/data/world/map/1261.gz diff --git a/2006Redone Server/data/world/map/1262.gz b/2006Scape Server/data/world/map/1262.gz similarity index 100% rename from 2006Redone Server/data/world/map/1262.gz rename to 2006Scape Server/data/world/map/1262.gz diff --git a/2006Redone Server/data/world/map/1263.gz b/2006Scape Server/data/world/map/1263.gz similarity index 100% rename from 2006Redone Server/data/world/map/1263.gz rename to 2006Scape Server/data/world/map/1263.gz diff --git a/2006Redone Server/data/world/map/1264.gz b/2006Scape Server/data/world/map/1264.gz similarity index 100% rename from 2006Redone Server/data/world/map/1264.gz rename to 2006Scape Server/data/world/map/1264.gz diff --git a/2006Redone Server/data/world/map/1265.gz b/2006Scape Server/data/world/map/1265.gz similarity index 100% rename from 2006Redone Server/data/world/map/1265.gz rename to 2006Scape Server/data/world/map/1265.gz diff --git a/2006Redone Server/data/world/map/1266.gz b/2006Scape Server/data/world/map/1266.gz similarity index 100% rename from 2006Redone Server/data/world/map/1266.gz rename to 2006Scape Server/data/world/map/1266.gz diff --git a/2006Redone Server/data/world/map/1267.gz b/2006Scape Server/data/world/map/1267.gz similarity index 100% rename from 2006Redone Server/data/world/map/1267.gz rename to 2006Scape Server/data/world/map/1267.gz diff --git a/2006Redone Server/data/world/map/1268.gz b/2006Scape Server/data/world/map/1268.gz similarity index 100% rename from 2006Redone Server/data/world/map/1268.gz rename to 2006Scape Server/data/world/map/1268.gz diff --git a/2006Redone Server/data/world/map/1269.gz b/2006Scape Server/data/world/map/1269.gz similarity index 100% rename from 2006Redone Server/data/world/map/1269.gz rename to 2006Scape Server/data/world/map/1269.gz diff --git a/2006Redone Server/data/world/map/127.gz b/2006Scape Server/data/world/map/127.gz similarity index 100% rename from 2006Redone Server/data/world/map/127.gz rename to 2006Scape Server/data/world/map/127.gz diff --git a/2006Redone Server/data/world/map/1270.gz b/2006Scape Server/data/world/map/1270.gz similarity index 100% rename from 2006Redone Server/data/world/map/1270.gz rename to 2006Scape Server/data/world/map/1270.gz diff --git a/2006Redone Server/data/world/map/1271.gz b/2006Scape Server/data/world/map/1271.gz similarity index 100% rename from 2006Redone Server/data/world/map/1271.gz rename to 2006Scape Server/data/world/map/1271.gz diff --git a/2006Redone Server/data/world/map/1272.gz b/2006Scape Server/data/world/map/1272.gz similarity index 100% rename from 2006Redone Server/data/world/map/1272.gz rename to 2006Scape Server/data/world/map/1272.gz diff --git a/2006Redone Server/data/world/map/1273.gz b/2006Scape Server/data/world/map/1273.gz similarity index 100% rename from 2006Redone Server/data/world/map/1273.gz rename to 2006Scape Server/data/world/map/1273.gz diff --git a/2006Redone Server/data/world/map/1274.gz b/2006Scape Server/data/world/map/1274.gz similarity index 100% rename from 2006Redone Server/data/world/map/1274.gz rename to 2006Scape Server/data/world/map/1274.gz diff --git a/2006Redone Server/data/world/map/1275.gz b/2006Scape Server/data/world/map/1275.gz similarity index 100% rename from 2006Redone Server/data/world/map/1275.gz rename to 2006Scape Server/data/world/map/1275.gz diff --git a/2006Redone Server/data/world/map/1276.gz b/2006Scape Server/data/world/map/1276.gz similarity index 100% rename from 2006Redone Server/data/world/map/1276.gz rename to 2006Scape Server/data/world/map/1276.gz diff --git a/2006Redone Server/data/world/map/1277.gz b/2006Scape Server/data/world/map/1277.gz similarity index 100% rename from 2006Redone Server/data/world/map/1277.gz rename to 2006Scape Server/data/world/map/1277.gz diff --git a/2006Redone Server/data/world/map/1278.gz b/2006Scape Server/data/world/map/1278.gz similarity index 100% rename from 2006Redone Server/data/world/map/1278.gz rename to 2006Scape Server/data/world/map/1278.gz diff --git a/2006Redone Server/data/world/map/1279.gz b/2006Scape Server/data/world/map/1279.gz similarity index 100% rename from 2006Redone Server/data/world/map/1279.gz rename to 2006Scape Server/data/world/map/1279.gz diff --git a/2006Redone Server/data/world/map/128.gz b/2006Scape Server/data/world/map/128.gz similarity index 100% rename from 2006Redone Server/data/world/map/128.gz rename to 2006Scape Server/data/world/map/128.gz diff --git a/2006Redone Server/data/world/map/1280.gz b/2006Scape Server/data/world/map/1280.gz similarity index 100% rename from 2006Redone Server/data/world/map/1280.gz rename to 2006Scape Server/data/world/map/1280.gz diff --git a/2006Redone Server/data/world/map/1281.gz b/2006Scape Server/data/world/map/1281.gz similarity index 100% rename from 2006Redone Server/data/world/map/1281.gz rename to 2006Scape Server/data/world/map/1281.gz diff --git a/2006Redone Server/data/world/map/1282.gz b/2006Scape Server/data/world/map/1282.gz similarity index 100% rename from 2006Redone Server/data/world/map/1282.gz rename to 2006Scape Server/data/world/map/1282.gz diff --git a/2006Redone Server/data/world/map/1283.gz b/2006Scape Server/data/world/map/1283.gz similarity index 100% rename from 2006Redone Server/data/world/map/1283.gz rename to 2006Scape Server/data/world/map/1283.gz diff --git a/2006Redone Server/data/world/map/1284.gz b/2006Scape Server/data/world/map/1284.gz similarity index 100% rename from 2006Redone Server/data/world/map/1284.gz rename to 2006Scape Server/data/world/map/1284.gz diff --git a/2006Redone Server/data/world/map/1285.gz b/2006Scape Server/data/world/map/1285.gz similarity index 100% rename from 2006Redone Server/data/world/map/1285.gz rename to 2006Scape Server/data/world/map/1285.gz diff --git a/2006Redone Server/data/world/map/1286.gz b/2006Scape Server/data/world/map/1286.gz similarity index 100% rename from 2006Redone Server/data/world/map/1286.gz rename to 2006Scape Server/data/world/map/1286.gz diff --git a/2006Redone Server/data/world/map/1287.gz b/2006Scape Server/data/world/map/1287.gz similarity index 100% rename from 2006Redone Server/data/world/map/1287.gz rename to 2006Scape Server/data/world/map/1287.gz diff --git a/2006Redone Server/data/world/map/1288.gz b/2006Scape Server/data/world/map/1288.gz similarity index 100% rename from 2006Redone Server/data/world/map/1288.gz rename to 2006Scape Server/data/world/map/1288.gz diff --git a/2006Redone Server/data/world/map/1289.gz b/2006Scape Server/data/world/map/1289.gz similarity index 100% rename from 2006Redone Server/data/world/map/1289.gz rename to 2006Scape Server/data/world/map/1289.gz diff --git a/2006Redone Server/data/world/map/129.gz b/2006Scape Server/data/world/map/129.gz similarity index 100% rename from 2006Redone Server/data/world/map/129.gz rename to 2006Scape Server/data/world/map/129.gz diff --git a/2006Redone Server/data/world/map/1290.gz b/2006Scape Server/data/world/map/1290.gz similarity index 100% rename from 2006Redone Server/data/world/map/1290.gz rename to 2006Scape Server/data/world/map/1290.gz diff --git a/2006Redone Server/data/world/map/1291.gz b/2006Scape Server/data/world/map/1291.gz similarity index 100% rename from 2006Redone Server/data/world/map/1291.gz rename to 2006Scape Server/data/world/map/1291.gz diff --git a/2006Redone Server/data/world/map/1292.gz b/2006Scape Server/data/world/map/1292.gz similarity index 100% rename from 2006Redone Server/data/world/map/1292.gz rename to 2006Scape Server/data/world/map/1292.gz diff --git a/2006Redone Server/data/world/map/1293.gz b/2006Scape Server/data/world/map/1293.gz similarity index 100% rename from 2006Redone Server/data/world/map/1293.gz rename to 2006Scape Server/data/world/map/1293.gz diff --git a/2006Redone Server/data/world/map/1294.gz b/2006Scape Server/data/world/map/1294.gz similarity index 100% rename from 2006Redone Server/data/world/map/1294.gz rename to 2006Scape Server/data/world/map/1294.gz diff --git a/2006Redone Server/data/world/map/1295.gz b/2006Scape Server/data/world/map/1295.gz similarity index 100% rename from 2006Redone Server/data/world/map/1295.gz rename to 2006Scape Server/data/world/map/1295.gz diff --git a/2006Redone Server/data/world/map/1296.gz b/2006Scape Server/data/world/map/1296.gz similarity index 100% rename from 2006Redone Server/data/world/map/1296.gz rename to 2006Scape Server/data/world/map/1296.gz diff --git a/2006Redone Server/data/world/map/1297.gz b/2006Scape Server/data/world/map/1297.gz similarity index 100% rename from 2006Redone Server/data/world/map/1297.gz rename to 2006Scape Server/data/world/map/1297.gz diff --git a/2006Redone Server/data/world/map/1298.gz b/2006Scape Server/data/world/map/1298.gz similarity index 100% rename from 2006Redone Server/data/world/map/1298.gz rename to 2006Scape Server/data/world/map/1298.gz diff --git a/2006Redone Server/data/world/map/1299.gz b/2006Scape Server/data/world/map/1299.gz similarity index 100% rename from 2006Redone Server/data/world/map/1299.gz rename to 2006Scape Server/data/world/map/1299.gz diff --git a/2006Redone Server/data/world/map/130.gz b/2006Scape Server/data/world/map/130.gz similarity index 100% rename from 2006Redone Server/data/world/map/130.gz rename to 2006Scape Server/data/world/map/130.gz diff --git a/2006Redone Server/data/world/map/1300.gz b/2006Scape Server/data/world/map/1300.gz similarity index 100% rename from 2006Redone Server/data/world/map/1300.gz rename to 2006Scape Server/data/world/map/1300.gz diff --git a/2006Redone Server/data/world/map/1301.gz b/2006Scape Server/data/world/map/1301.gz similarity index 100% rename from 2006Redone Server/data/world/map/1301.gz rename to 2006Scape Server/data/world/map/1301.gz diff --git a/2006Redone Server/data/world/map/1302.gz b/2006Scape Server/data/world/map/1302.gz similarity index 100% rename from 2006Redone Server/data/world/map/1302.gz rename to 2006Scape Server/data/world/map/1302.gz diff --git a/2006Redone Server/data/world/map/1303.gz b/2006Scape Server/data/world/map/1303.gz similarity index 100% rename from 2006Redone Server/data/world/map/1303.gz rename to 2006Scape Server/data/world/map/1303.gz diff --git a/2006Redone Server/data/world/map/1304.gz b/2006Scape Server/data/world/map/1304.gz similarity index 100% rename from 2006Redone Server/data/world/map/1304.gz rename to 2006Scape Server/data/world/map/1304.gz diff --git a/2006Redone Server/data/world/map/1305.gz b/2006Scape Server/data/world/map/1305.gz similarity index 100% rename from 2006Redone Server/data/world/map/1305.gz rename to 2006Scape Server/data/world/map/1305.gz diff --git a/2006Redone Server/data/world/map/1306.gz b/2006Scape Server/data/world/map/1306.gz similarity index 100% rename from 2006Redone Server/data/world/map/1306.gz rename to 2006Scape Server/data/world/map/1306.gz diff --git a/2006Redone Server/data/world/map/1307.gz b/2006Scape Server/data/world/map/1307.gz similarity index 100% rename from 2006Redone Server/data/world/map/1307.gz rename to 2006Scape Server/data/world/map/1307.gz diff --git a/2006Redone Server/data/world/map/1308.gz b/2006Scape Server/data/world/map/1308.gz similarity index 100% rename from 2006Redone Server/data/world/map/1308.gz rename to 2006Scape Server/data/world/map/1308.gz diff --git a/2006Redone Server/data/world/map/1309.gz b/2006Scape Server/data/world/map/1309.gz similarity index 100% rename from 2006Redone Server/data/world/map/1309.gz rename to 2006Scape Server/data/world/map/1309.gz diff --git a/2006Redone Server/data/world/map/131.gz b/2006Scape Server/data/world/map/131.gz similarity index 100% rename from 2006Redone Server/data/world/map/131.gz rename to 2006Scape Server/data/world/map/131.gz diff --git a/2006Redone Server/data/world/map/1310.gz b/2006Scape Server/data/world/map/1310.gz similarity index 100% rename from 2006Redone Server/data/world/map/1310.gz rename to 2006Scape Server/data/world/map/1310.gz diff --git a/2006Redone Server/data/world/map/1311.gz b/2006Scape Server/data/world/map/1311.gz similarity index 100% rename from 2006Redone Server/data/world/map/1311.gz rename to 2006Scape Server/data/world/map/1311.gz diff --git a/2006Redone Server/data/world/map/1312.gz b/2006Scape Server/data/world/map/1312.gz similarity index 100% rename from 2006Redone Server/data/world/map/1312.gz rename to 2006Scape Server/data/world/map/1312.gz diff --git a/2006Redone Server/data/world/map/1313.gz b/2006Scape Server/data/world/map/1313.gz similarity index 100% rename from 2006Redone Server/data/world/map/1313.gz rename to 2006Scape Server/data/world/map/1313.gz diff --git a/2006Redone Server/data/world/map/1314.gz b/2006Scape Server/data/world/map/1314.gz similarity index 100% rename from 2006Redone Server/data/world/map/1314.gz rename to 2006Scape Server/data/world/map/1314.gz diff --git a/2006Redone Server/data/world/map/1315.gz b/2006Scape Server/data/world/map/1315.gz similarity index 100% rename from 2006Redone Server/data/world/map/1315.gz rename to 2006Scape Server/data/world/map/1315.gz diff --git a/2006Redone Server/data/world/map/1316.gz b/2006Scape Server/data/world/map/1316.gz similarity index 100% rename from 2006Redone Server/data/world/map/1316.gz rename to 2006Scape Server/data/world/map/1316.gz diff --git a/2006Redone Server/data/world/map/1317.gz b/2006Scape Server/data/world/map/1317.gz similarity index 100% rename from 2006Redone Server/data/world/map/1317.gz rename to 2006Scape Server/data/world/map/1317.gz diff --git a/2006Redone Server/data/world/map/132.gz b/2006Scape Server/data/world/map/132.gz similarity index 100% rename from 2006Redone Server/data/world/map/132.gz rename to 2006Scape Server/data/world/map/132.gz diff --git a/2006Redone Server/data/world/map/1320.gz b/2006Scape Server/data/world/map/1320.gz similarity index 100% rename from 2006Redone Server/data/world/map/1320.gz rename to 2006Scape Server/data/world/map/1320.gz diff --git a/2006Redone Server/data/world/map/1321.gz b/2006Scape Server/data/world/map/1321.gz similarity index 100% rename from 2006Redone Server/data/world/map/1321.gz rename to 2006Scape Server/data/world/map/1321.gz diff --git a/2006Redone Server/data/world/map/1322.gz b/2006Scape Server/data/world/map/1322.gz similarity index 100% rename from 2006Redone Server/data/world/map/1322.gz rename to 2006Scape Server/data/world/map/1322.gz diff --git a/2006Redone Server/data/world/map/1323.gz b/2006Scape Server/data/world/map/1323.gz similarity index 100% rename from 2006Redone Server/data/world/map/1323.gz rename to 2006Scape Server/data/world/map/1323.gz diff --git a/2006Redone Server/data/world/map/1324.gz b/2006Scape Server/data/world/map/1324.gz similarity index 100% rename from 2006Redone Server/data/world/map/1324.gz rename to 2006Scape Server/data/world/map/1324.gz diff --git a/2006Redone Server/data/world/map/1325.gz b/2006Scape Server/data/world/map/1325.gz similarity index 100% rename from 2006Redone Server/data/world/map/1325.gz rename to 2006Scape Server/data/world/map/1325.gz diff --git a/2006Redone Server/data/world/map/1326.gz b/2006Scape Server/data/world/map/1326.gz similarity index 100% rename from 2006Redone Server/data/world/map/1326.gz rename to 2006Scape Server/data/world/map/1326.gz diff --git a/2006Redone Server/data/world/map/1327.gz b/2006Scape Server/data/world/map/1327.gz similarity index 100% rename from 2006Redone Server/data/world/map/1327.gz rename to 2006Scape Server/data/world/map/1327.gz diff --git a/2006Redone Server/data/world/map/1328.gz b/2006Scape Server/data/world/map/1328.gz similarity index 100% rename from 2006Redone Server/data/world/map/1328.gz rename to 2006Scape Server/data/world/map/1328.gz diff --git a/2006Redone Server/data/world/map/1329.gz b/2006Scape Server/data/world/map/1329.gz similarity index 100% rename from 2006Redone Server/data/world/map/1329.gz rename to 2006Scape Server/data/world/map/1329.gz diff --git a/2006Redone Server/data/world/map/133.gz b/2006Scape Server/data/world/map/133.gz similarity index 100% rename from 2006Redone Server/data/world/map/133.gz rename to 2006Scape Server/data/world/map/133.gz diff --git a/2006Redone Server/data/world/map/1330.gz b/2006Scape Server/data/world/map/1330.gz similarity index 100% rename from 2006Redone Server/data/world/map/1330.gz rename to 2006Scape Server/data/world/map/1330.gz diff --git a/2006Redone Server/data/world/map/1331.gz b/2006Scape Server/data/world/map/1331.gz similarity index 100% rename from 2006Redone Server/data/world/map/1331.gz rename to 2006Scape Server/data/world/map/1331.gz diff --git a/2006Redone Server/data/world/map/1332.gz b/2006Scape Server/data/world/map/1332.gz similarity index 100% rename from 2006Redone Server/data/world/map/1332.gz rename to 2006Scape Server/data/world/map/1332.gz diff --git a/2006Redone Server/data/world/map/1333.gz b/2006Scape Server/data/world/map/1333.gz similarity index 100% rename from 2006Redone Server/data/world/map/1333.gz rename to 2006Scape Server/data/world/map/1333.gz diff --git a/2006Redone Server/data/world/map/1334.gz b/2006Scape Server/data/world/map/1334.gz similarity index 100% rename from 2006Redone Server/data/world/map/1334.gz rename to 2006Scape Server/data/world/map/1334.gz diff --git a/2006Redone Server/data/world/map/1335.gz b/2006Scape Server/data/world/map/1335.gz similarity index 100% rename from 2006Redone Server/data/world/map/1335.gz rename to 2006Scape Server/data/world/map/1335.gz diff --git a/2006Redone Server/data/world/map/1336.gz b/2006Scape Server/data/world/map/1336.gz similarity index 100% rename from 2006Redone Server/data/world/map/1336.gz rename to 2006Scape Server/data/world/map/1336.gz diff --git a/2006Redone Server/data/world/map/1337.gz b/2006Scape Server/data/world/map/1337.gz similarity index 100% rename from 2006Redone Server/data/world/map/1337.gz rename to 2006Scape Server/data/world/map/1337.gz diff --git a/2006Redone Server/data/world/map/1338.gz b/2006Scape Server/data/world/map/1338.gz similarity index 100% rename from 2006Redone Server/data/world/map/1338.gz rename to 2006Scape Server/data/world/map/1338.gz diff --git a/2006Redone Server/data/world/map/1339.gz b/2006Scape Server/data/world/map/1339.gz similarity index 100% rename from 2006Redone Server/data/world/map/1339.gz rename to 2006Scape Server/data/world/map/1339.gz diff --git a/2006Redone Server/data/world/map/134.gz b/2006Scape Server/data/world/map/134.gz similarity index 100% rename from 2006Redone Server/data/world/map/134.gz rename to 2006Scape Server/data/world/map/134.gz diff --git a/2006Redone Server/data/world/map/1340.gz b/2006Scape Server/data/world/map/1340.gz similarity index 100% rename from 2006Redone Server/data/world/map/1340.gz rename to 2006Scape Server/data/world/map/1340.gz diff --git a/2006Redone Server/data/world/map/1341.gz b/2006Scape Server/data/world/map/1341.gz similarity index 100% rename from 2006Redone Server/data/world/map/1341.gz rename to 2006Scape Server/data/world/map/1341.gz diff --git a/2006Redone Server/data/world/map/1342.gz b/2006Scape Server/data/world/map/1342.gz similarity index 100% rename from 2006Redone Server/data/world/map/1342.gz rename to 2006Scape Server/data/world/map/1342.gz diff --git a/2006Redone Server/data/world/map/1343.gz b/2006Scape Server/data/world/map/1343.gz similarity index 100% rename from 2006Redone Server/data/world/map/1343.gz rename to 2006Scape Server/data/world/map/1343.gz diff --git a/2006Redone Server/data/world/map/1344.gz b/2006Scape Server/data/world/map/1344.gz similarity index 100% rename from 2006Redone Server/data/world/map/1344.gz rename to 2006Scape Server/data/world/map/1344.gz diff --git a/2006Redone Server/data/world/map/1345.gz b/2006Scape Server/data/world/map/1345.gz similarity index 100% rename from 2006Redone Server/data/world/map/1345.gz rename to 2006Scape Server/data/world/map/1345.gz diff --git a/2006Redone Server/data/world/map/1346.gz b/2006Scape Server/data/world/map/1346.gz similarity index 100% rename from 2006Redone Server/data/world/map/1346.gz rename to 2006Scape Server/data/world/map/1346.gz diff --git a/2006Redone Server/data/world/map/1347.gz b/2006Scape Server/data/world/map/1347.gz similarity index 100% rename from 2006Redone Server/data/world/map/1347.gz rename to 2006Scape Server/data/world/map/1347.gz diff --git a/2006Redone Server/data/world/map/1348.gz b/2006Scape Server/data/world/map/1348.gz similarity index 100% rename from 2006Redone Server/data/world/map/1348.gz rename to 2006Scape Server/data/world/map/1348.gz diff --git a/2006Redone Server/data/world/map/1349.gz b/2006Scape Server/data/world/map/1349.gz similarity index 100% rename from 2006Redone Server/data/world/map/1349.gz rename to 2006Scape Server/data/world/map/1349.gz diff --git a/2006Redone Server/data/world/map/135.gz b/2006Scape Server/data/world/map/135.gz similarity index 100% rename from 2006Redone Server/data/world/map/135.gz rename to 2006Scape Server/data/world/map/135.gz diff --git a/2006Redone Server/data/world/map/1350.gz b/2006Scape Server/data/world/map/1350.gz similarity index 100% rename from 2006Redone Server/data/world/map/1350.gz rename to 2006Scape Server/data/world/map/1350.gz diff --git a/2006Redone Server/data/world/map/1351.gz b/2006Scape Server/data/world/map/1351.gz similarity index 100% rename from 2006Redone Server/data/world/map/1351.gz rename to 2006Scape Server/data/world/map/1351.gz diff --git a/2006Redone Server/data/world/map/1352.gz b/2006Scape Server/data/world/map/1352.gz similarity index 100% rename from 2006Redone Server/data/world/map/1352.gz rename to 2006Scape Server/data/world/map/1352.gz diff --git a/2006Redone Server/data/world/map/1353.gz b/2006Scape Server/data/world/map/1353.gz similarity index 100% rename from 2006Redone Server/data/world/map/1353.gz rename to 2006Scape Server/data/world/map/1353.gz diff --git a/2006Redone Server/data/world/map/1354.gz b/2006Scape Server/data/world/map/1354.gz similarity index 100% rename from 2006Redone Server/data/world/map/1354.gz rename to 2006Scape Server/data/world/map/1354.gz diff --git a/2006Redone Server/data/world/map/1355.gz b/2006Scape Server/data/world/map/1355.gz similarity index 100% rename from 2006Redone Server/data/world/map/1355.gz rename to 2006Scape Server/data/world/map/1355.gz diff --git a/2006Redone Server/data/world/map/1356.gz b/2006Scape Server/data/world/map/1356.gz similarity index 100% rename from 2006Redone Server/data/world/map/1356.gz rename to 2006Scape Server/data/world/map/1356.gz diff --git a/2006Redone Server/data/world/map/1357.gz b/2006Scape Server/data/world/map/1357.gz similarity index 100% rename from 2006Redone Server/data/world/map/1357.gz rename to 2006Scape Server/data/world/map/1357.gz diff --git a/2006Redone Server/data/world/map/1358.gz b/2006Scape Server/data/world/map/1358.gz similarity index 100% rename from 2006Redone Server/data/world/map/1358.gz rename to 2006Scape Server/data/world/map/1358.gz diff --git a/2006Redone Server/data/world/map/1359.gz b/2006Scape Server/data/world/map/1359.gz similarity index 100% rename from 2006Redone Server/data/world/map/1359.gz rename to 2006Scape Server/data/world/map/1359.gz diff --git a/2006Redone Server/data/world/map/136.gz b/2006Scape Server/data/world/map/136.gz similarity index 100% rename from 2006Redone Server/data/world/map/136.gz rename to 2006Scape Server/data/world/map/136.gz diff --git a/2006Redone Server/data/world/map/1360.gz b/2006Scape Server/data/world/map/1360.gz similarity index 100% rename from 2006Redone Server/data/world/map/1360.gz rename to 2006Scape Server/data/world/map/1360.gz diff --git a/2006Redone Server/data/world/map/1361.gz b/2006Scape Server/data/world/map/1361.gz similarity index 100% rename from 2006Redone Server/data/world/map/1361.gz rename to 2006Scape Server/data/world/map/1361.gz diff --git a/2006Redone Server/data/world/map/1362.gz b/2006Scape Server/data/world/map/1362.gz similarity index 100% rename from 2006Redone Server/data/world/map/1362.gz rename to 2006Scape Server/data/world/map/1362.gz diff --git a/2006Redone Server/data/world/map/1363.gz b/2006Scape Server/data/world/map/1363.gz similarity index 100% rename from 2006Redone Server/data/world/map/1363.gz rename to 2006Scape Server/data/world/map/1363.gz diff --git a/2006Redone Server/data/world/map/1364.gz b/2006Scape Server/data/world/map/1364.gz similarity index 100% rename from 2006Redone Server/data/world/map/1364.gz rename to 2006Scape Server/data/world/map/1364.gz diff --git a/2006Redone Server/data/world/map/1365.gz b/2006Scape Server/data/world/map/1365.gz similarity index 100% rename from 2006Redone Server/data/world/map/1365.gz rename to 2006Scape Server/data/world/map/1365.gz diff --git a/2006Redone Server/data/world/map/1366.gz b/2006Scape Server/data/world/map/1366.gz similarity index 100% rename from 2006Redone Server/data/world/map/1366.gz rename to 2006Scape Server/data/world/map/1366.gz diff --git a/2006Redone Server/data/world/map/1367.gz b/2006Scape Server/data/world/map/1367.gz similarity index 100% rename from 2006Redone Server/data/world/map/1367.gz rename to 2006Scape Server/data/world/map/1367.gz diff --git a/2006Redone Server/data/world/map/1368.gz b/2006Scape Server/data/world/map/1368.gz similarity index 100% rename from 2006Redone Server/data/world/map/1368.gz rename to 2006Scape Server/data/world/map/1368.gz diff --git a/2006Redone Server/data/world/map/1369.gz b/2006Scape Server/data/world/map/1369.gz similarity index 100% rename from 2006Redone Server/data/world/map/1369.gz rename to 2006Scape Server/data/world/map/1369.gz diff --git a/2006Redone Server/data/world/map/137.gz b/2006Scape Server/data/world/map/137.gz similarity index 100% rename from 2006Redone Server/data/world/map/137.gz rename to 2006Scape Server/data/world/map/137.gz diff --git a/2006Redone Server/data/world/map/1370.gz b/2006Scape Server/data/world/map/1370.gz similarity index 100% rename from 2006Redone Server/data/world/map/1370.gz rename to 2006Scape Server/data/world/map/1370.gz diff --git a/2006Redone Server/data/world/map/1371.gz b/2006Scape Server/data/world/map/1371.gz similarity index 100% rename from 2006Redone Server/data/world/map/1371.gz rename to 2006Scape Server/data/world/map/1371.gz diff --git a/2006Redone Server/data/world/map/1372.gz b/2006Scape Server/data/world/map/1372.gz similarity index 100% rename from 2006Redone Server/data/world/map/1372.gz rename to 2006Scape Server/data/world/map/1372.gz diff --git a/2006Redone Server/data/world/map/1373.gz b/2006Scape Server/data/world/map/1373.gz similarity index 100% rename from 2006Redone Server/data/world/map/1373.gz rename to 2006Scape Server/data/world/map/1373.gz diff --git a/2006Redone Server/data/world/map/1374.gz b/2006Scape Server/data/world/map/1374.gz similarity index 100% rename from 2006Redone Server/data/world/map/1374.gz rename to 2006Scape Server/data/world/map/1374.gz diff --git a/2006Redone Server/data/world/map/1375.gz b/2006Scape Server/data/world/map/1375.gz similarity index 100% rename from 2006Redone Server/data/world/map/1375.gz rename to 2006Scape Server/data/world/map/1375.gz diff --git a/2006Redone Server/data/world/map/1376.gz b/2006Scape Server/data/world/map/1376.gz similarity index 100% rename from 2006Redone Server/data/world/map/1376.gz rename to 2006Scape Server/data/world/map/1376.gz diff --git a/2006Redone Server/data/world/map/1377.gz b/2006Scape Server/data/world/map/1377.gz similarity index 100% rename from 2006Redone Server/data/world/map/1377.gz rename to 2006Scape Server/data/world/map/1377.gz diff --git a/2006Redone Server/data/world/map/1378.gz b/2006Scape Server/data/world/map/1378.gz similarity index 100% rename from 2006Redone Server/data/world/map/1378.gz rename to 2006Scape Server/data/world/map/1378.gz diff --git a/2006Redone Server/data/world/map/1379.gz b/2006Scape Server/data/world/map/1379.gz similarity index 100% rename from 2006Redone Server/data/world/map/1379.gz rename to 2006Scape Server/data/world/map/1379.gz diff --git a/2006Redone Server/data/world/map/138.gz b/2006Scape Server/data/world/map/138.gz similarity index 100% rename from 2006Redone Server/data/world/map/138.gz rename to 2006Scape Server/data/world/map/138.gz diff --git a/2006Redone Server/data/world/map/1380.gz b/2006Scape Server/data/world/map/1380.gz similarity index 100% rename from 2006Redone Server/data/world/map/1380.gz rename to 2006Scape Server/data/world/map/1380.gz diff --git a/2006Redone Server/data/world/map/1381.gz b/2006Scape Server/data/world/map/1381.gz similarity index 100% rename from 2006Redone Server/data/world/map/1381.gz rename to 2006Scape Server/data/world/map/1381.gz diff --git a/2006Redone Server/data/world/map/1382.gz b/2006Scape Server/data/world/map/1382.gz similarity index 100% rename from 2006Redone Server/data/world/map/1382.gz rename to 2006Scape Server/data/world/map/1382.gz diff --git a/2006Redone Server/data/world/map/1383.gz b/2006Scape Server/data/world/map/1383.gz similarity index 100% rename from 2006Redone Server/data/world/map/1383.gz rename to 2006Scape Server/data/world/map/1383.gz diff --git a/2006Redone Server/data/world/map/1384.gz b/2006Scape Server/data/world/map/1384.gz similarity index 100% rename from 2006Redone Server/data/world/map/1384.gz rename to 2006Scape Server/data/world/map/1384.gz diff --git a/2006Redone Server/data/world/map/1385.gz b/2006Scape Server/data/world/map/1385.gz similarity index 100% rename from 2006Redone Server/data/world/map/1385.gz rename to 2006Scape Server/data/world/map/1385.gz diff --git a/2006Redone Server/data/world/map/1386.gz b/2006Scape Server/data/world/map/1386.gz similarity index 100% rename from 2006Redone Server/data/world/map/1386.gz rename to 2006Scape Server/data/world/map/1386.gz diff --git a/2006Redone Server/data/world/map/1387.gz b/2006Scape Server/data/world/map/1387.gz similarity index 100% rename from 2006Redone Server/data/world/map/1387.gz rename to 2006Scape Server/data/world/map/1387.gz diff --git a/2006Redone Server/data/world/map/1388.gz b/2006Scape Server/data/world/map/1388.gz similarity index 100% rename from 2006Redone Server/data/world/map/1388.gz rename to 2006Scape Server/data/world/map/1388.gz diff --git a/2006Redone Server/data/world/map/1389.gz b/2006Scape Server/data/world/map/1389.gz similarity index 100% rename from 2006Redone Server/data/world/map/1389.gz rename to 2006Scape Server/data/world/map/1389.gz diff --git a/2006Redone Server/data/world/map/139.gz b/2006Scape Server/data/world/map/139.gz similarity index 100% rename from 2006Redone Server/data/world/map/139.gz rename to 2006Scape Server/data/world/map/139.gz diff --git a/2006Redone Server/data/world/map/14.gz b/2006Scape Server/data/world/map/14.gz similarity index 100% rename from 2006Redone Server/data/world/map/14.gz rename to 2006Scape Server/data/world/map/14.gz diff --git a/2006Redone Server/data/world/map/140.gz b/2006Scape Server/data/world/map/140.gz similarity index 100% rename from 2006Redone Server/data/world/map/140.gz rename to 2006Scape Server/data/world/map/140.gz diff --git a/2006Redone Server/data/world/map/141.gz b/2006Scape Server/data/world/map/141.gz similarity index 100% rename from 2006Redone Server/data/world/map/141.gz rename to 2006Scape Server/data/world/map/141.gz diff --git a/2006Redone Server/data/world/map/142.gz b/2006Scape Server/data/world/map/142.gz similarity index 100% rename from 2006Redone Server/data/world/map/142.gz rename to 2006Scape Server/data/world/map/142.gz diff --git a/2006Redone Server/data/world/map/143.gz b/2006Scape Server/data/world/map/143.gz similarity index 100% rename from 2006Redone Server/data/world/map/143.gz rename to 2006Scape Server/data/world/map/143.gz diff --git a/2006Redone Server/data/world/map/146.gz b/2006Scape Server/data/world/map/146.gz similarity index 100% rename from 2006Redone Server/data/world/map/146.gz rename to 2006Scape Server/data/world/map/146.gz diff --git a/2006Redone Server/data/world/map/147.gz b/2006Scape Server/data/world/map/147.gz similarity index 100% rename from 2006Redone Server/data/world/map/147.gz rename to 2006Scape Server/data/world/map/147.gz diff --git a/2006Redone Server/data/world/map/148.gz b/2006Scape Server/data/world/map/148.gz similarity index 100% rename from 2006Redone Server/data/world/map/148.gz rename to 2006Scape Server/data/world/map/148.gz diff --git a/2006Redone Server/data/world/map/149.gz b/2006Scape Server/data/world/map/149.gz similarity index 100% rename from 2006Redone Server/data/world/map/149.gz rename to 2006Scape Server/data/world/map/149.gz diff --git a/2006Redone Server/data/world/map/15.gz b/2006Scape Server/data/world/map/15.gz similarity index 100% rename from 2006Redone Server/data/world/map/15.gz rename to 2006Scape Server/data/world/map/15.gz diff --git a/2006Redone Server/data/world/map/150.gz b/2006Scape Server/data/world/map/150.gz similarity index 100% rename from 2006Redone Server/data/world/map/150.gz rename to 2006Scape Server/data/world/map/150.gz diff --git a/2006Redone Server/data/world/map/151.gz b/2006Scape Server/data/world/map/151.gz similarity index 100% rename from 2006Redone Server/data/world/map/151.gz rename to 2006Scape Server/data/world/map/151.gz diff --git a/2006Redone Server/data/world/map/152.gz b/2006Scape Server/data/world/map/152.gz similarity index 100% rename from 2006Redone Server/data/world/map/152.gz rename to 2006Scape Server/data/world/map/152.gz diff --git a/2006Redone Server/data/world/map/153.gz b/2006Scape Server/data/world/map/153.gz similarity index 100% rename from 2006Redone Server/data/world/map/153.gz rename to 2006Scape Server/data/world/map/153.gz diff --git a/2006Redone Server/data/world/map/154.gz b/2006Scape Server/data/world/map/154.gz similarity index 100% rename from 2006Redone Server/data/world/map/154.gz rename to 2006Scape Server/data/world/map/154.gz diff --git a/2006Redone Server/data/world/map/155.gz b/2006Scape Server/data/world/map/155.gz similarity index 100% rename from 2006Redone Server/data/world/map/155.gz rename to 2006Scape Server/data/world/map/155.gz diff --git a/2006Redone Server/data/world/map/156.gz b/2006Scape Server/data/world/map/156.gz similarity index 100% rename from 2006Redone Server/data/world/map/156.gz rename to 2006Scape Server/data/world/map/156.gz diff --git a/2006Redone Server/data/world/map/157.gz b/2006Scape Server/data/world/map/157.gz similarity index 100% rename from 2006Redone Server/data/world/map/157.gz rename to 2006Scape Server/data/world/map/157.gz diff --git a/2006Redone Server/data/world/map/158.gz b/2006Scape Server/data/world/map/158.gz similarity index 100% rename from 2006Redone Server/data/world/map/158.gz rename to 2006Scape Server/data/world/map/158.gz diff --git a/2006Redone Server/data/world/map/159.gz b/2006Scape Server/data/world/map/159.gz similarity index 100% rename from 2006Redone Server/data/world/map/159.gz rename to 2006Scape Server/data/world/map/159.gz diff --git a/2006Redone Server/data/world/map/16.gz b/2006Scape Server/data/world/map/16.gz similarity index 100% rename from 2006Redone Server/data/world/map/16.gz rename to 2006Scape Server/data/world/map/16.gz diff --git a/2006Redone Server/data/world/map/160.gz b/2006Scape Server/data/world/map/160.gz similarity index 100% rename from 2006Redone Server/data/world/map/160.gz rename to 2006Scape Server/data/world/map/160.gz diff --git a/2006Redone Server/data/world/map/161.gz b/2006Scape Server/data/world/map/161.gz similarity index 100% rename from 2006Redone Server/data/world/map/161.gz rename to 2006Scape Server/data/world/map/161.gz diff --git a/2006Redone Server/data/world/map/162.gz b/2006Scape Server/data/world/map/162.gz similarity index 100% rename from 2006Redone Server/data/world/map/162.gz rename to 2006Scape Server/data/world/map/162.gz diff --git a/2006Redone Server/data/world/map/163.gz b/2006Scape Server/data/world/map/163.gz similarity index 100% rename from 2006Redone Server/data/world/map/163.gz rename to 2006Scape Server/data/world/map/163.gz diff --git a/2006Redone Server/data/world/map/164.gz b/2006Scape Server/data/world/map/164.gz similarity index 100% rename from 2006Redone Server/data/world/map/164.gz rename to 2006Scape Server/data/world/map/164.gz diff --git a/2006Redone Server/data/world/map/165.gz b/2006Scape Server/data/world/map/165.gz similarity index 100% rename from 2006Redone Server/data/world/map/165.gz rename to 2006Scape Server/data/world/map/165.gz diff --git a/2006Redone Server/data/world/map/166.gz b/2006Scape Server/data/world/map/166.gz similarity index 100% rename from 2006Redone Server/data/world/map/166.gz rename to 2006Scape Server/data/world/map/166.gz diff --git a/2006Redone Server/data/world/map/167.gz b/2006Scape Server/data/world/map/167.gz similarity index 100% rename from 2006Redone Server/data/world/map/167.gz rename to 2006Scape Server/data/world/map/167.gz diff --git a/2006Redone Server/data/world/map/168.gz b/2006Scape Server/data/world/map/168.gz similarity index 100% rename from 2006Redone Server/data/world/map/168.gz rename to 2006Scape Server/data/world/map/168.gz diff --git a/2006Redone Server/data/world/map/169.gz b/2006Scape Server/data/world/map/169.gz similarity index 100% rename from 2006Redone Server/data/world/map/169.gz rename to 2006Scape Server/data/world/map/169.gz diff --git a/2006Redone Server/data/world/map/17.gz b/2006Scape Server/data/world/map/17.gz similarity index 100% rename from 2006Redone Server/data/world/map/17.gz rename to 2006Scape Server/data/world/map/17.gz diff --git a/2006Redone Server/data/world/map/170.gz b/2006Scape Server/data/world/map/170.gz similarity index 100% rename from 2006Redone Server/data/world/map/170.gz rename to 2006Scape Server/data/world/map/170.gz diff --git a/2006Redone Server/data/world/map/171.gz b/2006Scape Server/data/world/map/171.gz similarity index 100% rename from 2006Redone Server/data/world/map/171.gz rename to 2006Scape Server/data/world/map/171.gz diff --git a/2006Redone Server/data/world/map/172.gz b/2006Scape Server/data/world/map/172.gz similarity index 100% rename from 2006Redone Server/data/world/map/172.gz rename to 2006Scape Server/data/world/map/172.gz diff --git a/2006Redone Server/data/world/map/173.gz b/2006Scape Server/data/world/map/173.gz similarity index 100% rename from 2006Redone Server/data/world/map/173.gz rename to 2006Scape Server/data/world/map/173.gz diff --git a/2006Redone Server/data/world/map/174.gz b/2006Scape Server/data/world/map/174.gz similarity index 100% rename from 2006Redone Server/data/world/map/174.gz rename to 2006Scape Server/data/world/map/174.gz diff --git a/2006Redone Server/data/world/map/175.gz b/2006Scape Server/data/world/map/175.gz similarity index 100% rename from 2006Redone Server/data/world/map/175.gz rename to 2006Scape Server/data/world/map/175.gz diff --git a/2006Redone Server/data/world/map/176.gz b/2006Scape Server/data/world/map/176.gz similarity index 100% rename from 2006Redone Server/data/world/map/176.gz rename to 2006Scape Server/data/world/map/176.gz diff --git a/2006Redone Server/data/world/map/177.gz b/2006Scape Server/data/world/map/177.gz similarity index 100% rename from 2006Redone Server/data/world/map/177.gz rename to 2006Scape Server/data/world/map/177.gz diff --git a/2006Redone Server/data/world/map/18.gz b/2006Scape Server/data/world/map/18.gz similarity index 100% rename from 2006Redone Server/data/world/map/18.gz rename to 2006Scape Server/data/world/map/18.gz diff --git a/2006Redone Server/data/world/map/180.gz b/2006Scape Server/data/world/map/180.gz similarity index 100% rename from 2006Redone Server/data/world/map/180.gz rename to 2006Scape Server/data/world/map/180.gz diff --git a/2006Redone Server/data/world/map/181.gz b/2006Scape Server/data/world/map/181.gz similarity index 100% rename from 2006Redone Server/data/world/map/181.gz rename to 2006Scape Server/data/world/map/181.gz diff --git a/2006Redone Server/data/world/map/182.gz b/2006Scape Server/data/world/map/182.gz similarity index 100% rename from 2006Redone Server/data/world/map/182.gz rename to 2006Scape Server/data/world/map/182.gz diff --git a/2006Redone Server/data/world/map/183.gz b/2006Scape Server/data/world/map/183.gz similarity index 100% rename from 2006Redone Server/data/world/map/183.gz rename to 2006Scape Server/data/world/map/183.gz diff --git a/2006Redone Server/data/world/map/184.gz b/2006Scape Server/data/world/map/184.gz similarity index 100% rename from 2006Redone Server/data/world/map/184.gz rename to 2006Scape Server/data/world/map/184.gz diff --git a/2006Redone Server/data/world/map/185.gz b/2006Scape Server/data/world/map/185.gz similarity index 100% rename from 2006Redone Server/data/world/map/185.gz rename to 2006Scape Server/data/world/map/185.gz diff --git a/2006Redone Server/data/world/map/186.gz b/2006Scape Server/data/world/map/186.gz similarity index 100% rename from 2006Redone Server/data/world/map/186.gz rename to 2006Scape Server/data/world/map/186.gz diff --git a/2006Redone Server/data/world/map/187.gz b/2006Scape Server/data/world/map/187.gz similarity index 100% rename from 2006Redone Server/data/world/map/187.gz rename to 2006Scape Server/data/world/map/187.gz diff --git a/2006Redone Server/data/world/map/188.gz b/2006Scape Server/data/world/map/188.gz similarity index 100% rename from 2006Redone Server/data/world/map/188.gz rename to 2006Scape Server/data/world/map/188.gz diff --git a/2006Redone Server/data/world/map/189.gz b/2006Scape Server/data/world/map/189.gz similarity index 100% rename from 2006Redone Server/data/world/map/189.gz rename to 2006Scape Server/data/world/map/189.gz diff --git a/2006Redone Server/data/world/map/19.gz b/2006Scape Server/data/world/map/19.gz similarity index 100% rename from 2006Redone Server/data/world/map/19.gz rename to 2006Scape Server/data/world/map/19.gz diff --git a/2006Redone Server/data/world/map/190.gz b/2006Scape Server/data/world/map/190.gz similarity index 100% rename from 2006Redone Server/data/world/map/190.gz rename to 2006Scape Server/data/world/map/190.gz diff --git a/2006Redone Server/data/world/map/191.gz b/2006Scape Server/data/world/map/191.gz similarity index 100% rename from 2006Redone Server/data/world/map/191.gz rename to 2006Scape Server/data/world/map/191.gz diff --git a/2006Redone Server/data/world/map/192.gz b/2006Scape Server/data/world/map/192.gz similarity index 100% rename from 2006Redone Server/data/world/map/192.gz rename to 2006Scape Server/data/world/map/192.gz diff --git a/2006Redone Server/data/world/map/193.gz b/2006Scape Server/data/world/map/193.gz similarity index 100% rename from 2006Redone Server/data/world/map/193.gz rename to 2006Scape Server/data/world/map/193.gz diff --git a/2006Redone Server/data/world/map/194.gz b/2006Scape Server/data/world/map/194.gz similarity index 100% rename from 2006Redone Server/data/world/map/194.gz rename to 2006Scape Server/data/world/map/194.gz diff --git a/2006Redone Server/data/world/map/195.gz b/2006Scape Server/data/world/map/195.gz similarity index 100% rename from 2006Redone Server/data/world/map/195.gz rename to 2006Scape Server/data/world/map/195.gz diff --git a/2006Redone Server/data/world/map/196.gz b/2006Scape Server/data/world/map/196.gz similarity index 100% rename from 2006Redone Server/data/world/map/196.gz rename to 2006Scape Server/data/world/map/196.gz diff --git a/2006Redone Server/data/world/map/197.gz b/2006Scape Server/data/world/map/197.gz similarity index 100% rename from 2006Redone Server/data/world/map/197.gz rename to 2006Scape Server/data/world/map/197.gz diff --git a/2006Redone Server/data/world/map/198.gz b/2006Scape Server/data/world/map/198.gz similarity index 100% rename from 2006Redone Server/data/world/map/198.gz rename to 2006Scape Server/data/world/map/198.gz diff --git a/2006Redone Server/data/world/map/199.gz b/2006Scape Server/data/world/map/199.gz similarity index 100% rename from 2006Redone Server/data/world/map/199.gz rename to 2006Scape Server/data/world/map/199.gz diff --git a/2006Redone Server/data/world/map/2.gz b/2006Scape Server/data/world/map/2.gz similarity index 100% rename from 2006Redone Server/data/world/map/2.gz rename to 2006Scape Server/data/world/map/2.gz diff --git a/2006Redone Server/data/world/map/20.gz b/2006Scape Server/data/world/map/20.gz similarity index 100% rename from 2006Redone Server/data/world/map/20.gz rename to 2006Scape Server/data/world/map/20.gz diff --git a/2006Redone Server/data/world/map/200.gz b/2006Scape Server/data/world/map/200.gz similarity index 100% rename from 2006Redone Server/data/world/map/200.gz rename to 2006Scape Server/data/world/map/200.gz diff --git a/2006Redone Server/data/world/map/201.gz b/2006Scape Server/data/world/map/201.gz similarity index 100% rename from 2006Redone Server/data/world/map/201.gz rename to 2006Scape Server/data/world/map/201.gz diff --git a/2006Redone Server/data/world/map/202.gz b/2006Scape Server/data/world/map/202.gz similarity index 100% rename from 2006Redone Server/data/world/map/202.gz rename to 2006Scape Server/data/world/map/202.gz diff --git a/2006Redone Server/data/world/map/203.gz b/2006Scape Server/data/world/map/203.gz similarity index 100% rename from 2006Redone Server/data/world/map/203.gz rename to 2006Scape Server/data/world/map/203.gz diff --git a/2006Redone Server/data/world/map/204.gz b/2006Scape Server/data/world/map/204.gz similarity index 100% rename from 2006Redone Server/data/world/map/204.gz rename to 2006Scape Server/data/world/map/204.gz diff --git a/2006Redone Server/data/world/map/205.gz b/2006Scape Server/data/world/map/205.gz similarity index 100% rename from 2006Redone Server/data/world/map/205.gz rename to 2006Scape Server/data/world/map/205.gz diff --git a/2006Redone Server/data/world/map/206.gz b/2006Scape Server/data/world/map/206.gz similarity index 100% rename from 2006Redone Server/data/world/map/206.gz rename to 2006Scape Server/data/world/map/206.gz diff --git a/2006Redone Server/data/world/map/207.gz b/2006Scape Server/data/world/map/207.gz similarity index 100% rename from 2006Redone Server/data/world/map/207.gz rename to 2006Scape Server/data/world/map/207.gz diff --git a/2006Redone Server/data/world/map/208.gz b/2006Scape Server/data/world/map/208.gz similarity index 100% rename from 2006Redone Server/data/world/map/208.gz rename to 2006Scape Server/data/world/map/208.gz diff --git a/2006Redone Server/data/world/map/209.gz b/2006Scape Server/data/world/map/209.gz similarity index 100% rename from 2006Redone Server/data/world/map/209.gz rename to 2006Scape Server/data/world/map/209.gz diff --git a/2006Redone Server/data/world/map/21.gz b/2006Scape Server/data/world/map/21.gz similarity index 100% rename from 2006Redone Server/data/world/map/21.gz rename to 2006Scape Server/data/world/map/21.gz diff --git a/2006Redone Server/data/world/map/210.gz b/2006Scape Server/data/world/map/210.gz similarity index 100% rename from 2006Redone Server/data/world/map/210.gz rename to 2006Scape Server/data/world/map/210.gz diff --git a/2006Redone Server/data/world/map/211.gz b/2006Scape Server/data/world/map/211.gz similarity index 100% rename from 2006Redone Server/data/world/map/211.gz rename to 2006Scape Server/data/world/map/211.gz diff --git a/2006Redone Server/data/world/map/212.gz b/2006Scape Server/data/world/map/212.gz similarity index 100% rename from 2006Redone Server/data/world/map/212.gz rename to 2006Scape Server/data/world/map/212.gz diff --git a/2006Redone Server/data/world/map/213.gz b/2006Scape Server/data/world/map/213.gz similarity index 100% rename from 2006Redone Server/data/world/map/213.gz rename to 2006Scape Server/data/world/map/213.gz diff --git a/2006Redone Server/data/world/map/214.gz b/2006Scape Server/data/world/map/214.gz similarity index 100% rename from 2006Redone Server/data/world/map/214.gz rename to 2006Scape Server/data/world/map/214.gz diff --git a/2006Redone Server/data/world/map/215.gz b/2006Scape Server/data/world/map/215.gz similarity index 100% rename from 2006Redone Server/data/world/map/215.gz rename to 2006Scape Server/data/world/map/215.gz diff --git a/2006Redone Server/data/world/map/216.gz b/2006Scape Server/data/world/map/216.gz similarity index 100% rename from 2006Redone Server/data/world/map/216.gz rename to 2006Scape Server/data/world/map/216.gz diff --git a/2006Redone Server/data/world/map/217.gz b/2006Scape Server/data/world/map/217.gz similarity index 100% rename from 2006Redone Server/data/world/map/217.gz rename to 2006Scape Server/data/world/map/217.gz diff --git a/2006Redone Server/data/world/map/218.gz b/2006Scape Server/data/world/map/218.gz similarity index 100% rename from 2006Redone Server/data/world/map/218.gz rename to 2006Scape Server/data/world/map/218.gz diff --git a/2006Redone Server/data/world/map/219.gz b/2006Scape Server/data/world/map/219.gz similarity index 100% rename from 2006Redone Server/data/world/map/219.gz rename to 2006Scape Server/data/world/map/219.gz diff --git a/2006Redone Server/data/world/map/22.gz b/2006Scape Server/data/world/map/22.gz similarity index 100% rename from 2006Redone Server/data/world/map/22.gz rename to 2006Scape Server/data/world/map/22.gz diff --git a/2006Redone Server/data/world/map/220.gz b/2006Scape Server/data/world/map/220.gz similarity index 100% rename from 2006Redone Server/data/world/map/220.gz rename to 2006Scape Server/data/world/map/220.gz diff --git a/2006Redone Server/data/world/map/221.gz b/2006Scape Server/data/world/map/221.gz similarity index 100% rename from 2006Redone Server/data/world/map/221.gz rename to 2006Scape Server/data/world/map/221.gz diff --git a/2006Redone Server/data/world/map/222.gz b/2006Scape Server/data/world/map/222.gz similarity index 100% rename from 2006Redone Server/data/world/map/222.gz rename to 2006Scape Server/data/world/map/222.gz diff --git a/2006Redone Server/data/world/map/223.gz b/2006Scape Server/data/world/map/223.gz similarity index 100% rename from 2006Redone Server/data/world/map/223.gz rename to 2006Scape Server/data/world/map/223.gz diff --git a/2006Redone Server/data/world/map/224.gz b/2006Scape Server/data/world/map/224.gz similarity index 100% rename from 2006Redone Server/data/world/map/224.gz rename to 2006Scape Server/data/world/map/224.gz diff --git a/2006Redone Server/data/world/map/225.gz b/2006Scape Server/data/world/map/225.gz similarity index 100% rename from 2006Redone Server/data/world/map/225.gz rename to 2006Scape Server/data/world/map/225.gz diff --git a/2006Redone Server/data/world/map/226.gz b/2006Scape Server/data/world/map/226.gz similarity index 100% rename from 2006Redone Server/data/world/map/226.gz rename to 2006Scape Server/data/world/map/226.gz diff --git a/2006Redone Server/data/world/map/227.gz b/2006Scape Server/data/world/map/227.gz similarity index 100% rename from 2006Redone Server/data/world/map/227.gz rename to 2006Scape Server/data/world/map/227.gz diff --git a/2006Redone Server/data/world/map/228.gz b/2006Scape Server/data/world/map/228.gz similarity index 100% rename from 2006Redone Server/data/world/map/228.gz rename to 2006Scape Server/data/world/map/228.gz diff --git a/2006Redone Server/data/world/map/229.gz b/2006Scape Server/data/world/map/229.gz similarity index 100% rename from 2006Redone Server/data/world/map/229.gz rename to 2006Scape Server/data/world/map/229.gz diff --git a/2006Redone Server/data/world/map/23.gz b/2006Scape Server/data/world/map/23.gz similarity index 100% rename from 2006Redone Server/data/world/map/23.gz rename to 2006Scape Server/data/world/map/23.gz diff --git a/2006Redone Server/data/world/map/230.gz b/2006Scape Server/data/world/map/230.gz similarity index 100% rename from 2006Redone Server/data/world/map/230.gz rename to 2006Scape Server/data/world/map/230.gz diff --git a/2006Redone Server/data/world/map/231.gz b/2006Scape Server/data/world/map/231.gz similarity index 100% rename from 2006Redone Server/data/world/map/231.gz rename to 2006Scape Server/data/world/map/231.gz diff --git a/2006Redone Server/data/world/map/232.gz b/2006Scape Server/data/world/map/232.gz similarity index 100% rename from 2006Redone Server/data/world/map/232.gz rename to 2006Scape Server/data/world/map/232.gz diff --git a/2006Redone Server/data/world/map/233.gz b/2006Scape Server/data/world/map/233.gz similarity index 100% rename from 2006Redone Server/data/world/map/233.gz rename to 2006Scape Server/data/world/map/233.gz diff --git a/2006Redone Server/data/world/map/234.gz b/2006Scape Server/data/world/map/234.gz similarity index 100% rename from 2006Redone Server/data/world/map/234.gz rename to 2006Scape Server/data/world/map/234.gz diff --git a/2006Redone Server/data/world/map/235.gz b/2006Scape Server/data/world/map/235.gz similarity index 100% rename from 2006Redone Server/data/world/map/235.gz rename to 2006Scape Server/data/world/map/235.gz diff --git a/2006Redone Server/data/world/map/236.gz b/2006Scape Server/data/world/map/236.gz similarity index 100% rename from 2006Redone Server/data/world/map/236.gz rename to 2006Scape Server/data/world/map/236.gz diff --git a/2006Redone Server/data/world/map/237.gz b/2006Scape Server/data/world/map/237.gz similarity index 100% rename from 2006Redone Server/data/world/map/237.gz rename to 2006Scape Server/data/world/map/237.gz diff --git a/2006Redone Server/data/world/map/238.gz b/2006Scape Server/data/world/map/238.gz similarity index 100% rename from 2006Redone Server/data/world/map/238.gz rename to 2006Scape Server/data/world/map/238.gz diff --git a/2006Redone Server/data/world/map/239.gz b/2006Scape Server/data/world/map/239.gz similarity index 100% rename from 2006Redone Server/data/world/map/239.gz rename to 2006Scape Server/data/world/map/239.gz diff --git a/2006Redone Server/data/world/map/240.gz b/2006Scape Server/data/world/map/240.gz similarity index 100% rename from 2006Redone Server/data/world/map/240.gz rename to 2006Scape Server/data/world/map/240.gz diff --git a/2006Redone Server/data/world/map/241.gz b/2006Scape Server/data/world/map/241.gz similarity index 100% rename from 2006Redone Server/data/world/map/241.gz rename to 2006Scape Server/data/world/map/241.gz diff --git a/2006Redone Server/data/world/map/242.gz b/2006Scape Server/data/world/map/242.gz similarity index 100% rename from 2006Redone Server/data/world/map/242.gz rename to 2006Scape Server/data/world/map/242.gz diff --git a/2006Redone Server/data/world/map/243.gz b/2006Scape Server/data/world/map/243.gz similarity index 100% rename from 2006Redone Server/data/world/map/243.gz rename to 2006Scape Server/data/world/map/243.gz diff --git a/2006Redone Server/data/world/map/244.gz b/2006Scape Server/data/world/map/244.gz similarity index 100% rename from 2006Redone Server/data/world/map/244.gz rename to 2006Scape Server/data/world/map/244.gz diff --git a/2006Redone Server/data/world/map/245.gz b/2006Scape Server/data/world/map/245.gz similarity index 100% rename from 2006Redone Server/data/world/map/245.gz rename to 2006Scape Server/data/world/map/245.gz diff --git a/2006Redone Server/data/world/map/246.gz b/2006Scape Server/data/world/map/246.gz similarity index 100% rename from 2006Redone Server/data/world/map/246.gz rename to 2006Scape Server/data/world/map/246.gz diff --git a/2006Redone Server/data/world/map/247.gz b/2006Scape Server/data/world/map/247.gz similarity index 100% rename from 2006Redone Server/data/world/map/247.gz rename to 2006Scape Server/data/world/map/247.gz diff --git a/2006Redone Server/data/world/map/248.gz b/2006Scape Server/data/world/map/248.gz similarity index 100% rename from 2006Redone Server/data/world/map/248.gz rename to 2006Scape Server/data/world/map/248.gz diff --git a/2006Redone Server/data/world/map/249.gz b/2006Scape Server/data/world/map/249.gz similarity index 100% rename from 2006Redone Server/data/world/map/249.gz rename to 2006Scape Server/data/world/map/249.gz diff --git a/2006Redone Server/data/world/map/250.gz b/2006Scape Server/data/world/map/250.gz similarity index 100% rename from 2006Redone Server/data/world/map/250.gz rename to 2006Scape Server/data/world/map/250.gz diff --git a/2006Redone Server/data/world/map/251.gz b/2006Scape Server/data/world/map/251.gz similarity index 100% rename from 2006Redone Server/data/world/map/251.gz rename to 2006Scape Server/data/world/map/251.gz diff --git a/2006Redone Server/data/world/map/252.gz b/2006Scape Server/data/world/map/252.gz similarity index 100% rename from 2006Redone Server/data/world/map/252.gz rename to 2006Scape Server/data/world/map/252.gz diff --git a/2006Redone Server/data/world/map/253.gz b/2006Scape Server/data/world/map/253.gz similarity index 100% rename from 2006Redone Server/data/world/map/253.gz rename to 2006Scape Server/data/world/map/253.gz diff --git a/2006Redone Server/data/world/map/254.gz b/2006Scape Server/data/world/map/254.gz similarity index 100% rename from 2006Redone Server/data/world/map/254.gz rename to 2006Scape Server/data/world/map/254.gz diff --git a/2006Redone Server/data/world/map/255.gz b/2006Scape Server/data/world/map/255.gz similarity index 100% rename from 2006Redone Server/data/world/map/255.gz rename to 2006Scape Server/data/world/map/255.gz diff --git a/2006Redone Server/data/world/map/256.gz b/2006Scape Server/data/world/map/256.gz similarity index 100% rename from 2006Redone Server/data/world/map/256.gz rename to 2006Scape Server/data/world/map/256.gz diff --git a/2006Redone Server/data/world/map/257.gz b/2006Scape Server/data/world/map/257.gz similarity index 100% rename from 2006Redone Server/data/world/map/257.gz rename to 2006Scape Server/data/world/map/257.gz diff --git a/2006Redone Server/data/world/map/258.gz b/2006Scape Server/data/world/map/258.gz similarity index 100% rename from 2006Redone Server/data/world/map/258.gz rename to 2006Scape Server/data/world/map/258.gz diff --git a/2006Redone Server/data/world/map/259.gz b/2006Scape Server/data/world/map/259.gz similarity index 100% rename from 2006Redone Server/data/world/map/259.gz rename to 2006Scape Server/data/world/map/259.gz diff --git a/2006Redone Server/data/world/map/26.gz b/2006Scape Server/data/world/map/26.gz similarity index 100% rename from 2006Redone Server/data/world/map/26.gz rename to 2006Scape Server/data/world/map/26.gz diff --git a/2006Redone Server/data/world/map/260.gz b/2006Scape Server/data/world/map/260.gz similarity index 100% rename from 2006Redone Server/data/world/map/260.gz rename to 2006Scape Server/data/world/map/260.gz diff --git a/2006Redone Server/data/world/map/261.gz b/2006Scape Server/data/world/map/261.gz similarity index 100% rename from 2006Redone Server/data/world/map/261.gz rename to 2006Scape Server/data/world/map/261.gz diff --git a/2006Redone Server/data/world/map/262.gz b/2006Scape Server/data/world/map/262.gz similarity index 100% rename from 2006Redone Server/data/world/map/262.gz rename to 2006Scape Server/data/world/map/262.gz diff --git a/2006Redone Server/data/world/map/263.gz b/2006Scape Server/data/world/map/263.gz similarity index 100% rename from 2006Redone Server/data/world/map/263.gz rename to 2006Scape Server/data/world/map/263.gz diff --git a/2006Redone Server/data/world/map/266.gz b/2006Scape Server/data/world/map/266.gz similarity index 100% rename from 2006Redone Server/data/world/map/266.gz rename to 2006Scape Server/data/world/map/266.gz diff --git a/2006Redone Server/data/world/map/267.gz b/2006Scape Server/data/world/map/267.gz similarity index 100% rename from 2006Redone Server/data/world/map/267.gz rename to 2006Scape Server/data/world/map/267.gz diff --git a/2006Redone Server/data/world/map/268.gz b/2006Scape Server/data/world/map/268.gz similarity index 100% rename from 2006Redone Server/data/world/map/268.gz rename to 2006Scape Server/data/world/map/268.gz diff --git a/2006Redone Server/data/world/map/269.gz b/2006Scape Server/data/world/map/269.gz similarity index 100% rename from 2006Redone Server/data/world/map/269.gz rename to 2006Scape Server/data/world/map/269.gz diff --git a/2006Redone Server/data/world/map/27.gz b/2006Scape Server/data/world/map/27.gz similarity index 100% rename from 2006Redone Server/data/world/map/27.gz rename to 2006Scape Server/data/world/map/27.gz diff --git a/2006Redone Server/data/world/map/270.gz b/2006Scape Server/data/world/map/270.gz similarity index 100% rename from 2006Redone Server/data/world/map/270.gz rename to 2006Scape Server/data/world/map/270.gz diff --git a/2006Redone Server/data/world/map/271.gz b/2006Scape Server/data/world/map/271.gz similarity index 100% rename from 2006Redone Server/data/world/map/271.gz rename to 2006Scape Server/data/world/map/271.gz diff --git a/2006Redone Server/data/world/map/272.gz b/2006Scape Server/data/world/map/272.gz similarity index 100% rename from 2006Redone Server/data/world/map/272.gz rename to 2006Scape Server/data/world/map/272.gz diff --git a/2006Redone Server/data/world/map/273.gz b/2006Scape Server/data/world/map/273.gz similarity index 100% rename from 2006Redone Server/data/world/map/273.gz rename to 2006Scape Server/data/world/map/273.gz diff --git a/2006Redone Server/data/world/map/274.gz b/2006Scape Server/data/world/map/274.gz similarity index 100% rename from 2006Redone Server/data/world/map/274.gz rename to 2006Scape Server/data/world/map/274.gz diff --git a/2006Redone Server/data/world/map/275.gz b/2006Scape Server/data/world/map/275.gz similarity index 100% rename from 2006Redone Server/data/world/map/275.gz rename to 2006Scape Server/data/world/map/275.gz diff --git a/2006Redone Server/data/world/map/276.gz b/2006Scape Server/data/world/map/276.gz similarity index 100% rename from 2006Redone Server/data/world/map/276.gz rename to 2006Scape Server/data/world/map/276.gz diff --git a/2006Redone Server/data/world/map/277.gz b/2006Scape Server/data/world/map/277.gz similarity index 100% rename from 2006Redone Server/data/world/map/277.gz rename to 2006Scape Server/data/world/map/277.gz diff --git a/2006Redone Server/data/world/map/278.gz b/2006Scape Server/data/world/map/278.gz similarity index 100% rename from 2006Redone Server/data/world/map/278.gz rename to 2006Scape Server/data/world/map/278.gz diff --git a/2006Redone Server/data/world/map/279.gz b/2006Scape Server/data/world/map/279.gz similarity index 100% rename from 2006Redone Server/data/world/map/279.gz rename to 2006Scape Server/data/world/map/279.gz diff --git a/2006Redone Server/data/world/map/28.gz b/2006Scape Server/data/world/map/28.gz similarity index 100% rename from 2006Redone Server/data/world/map/28.gz rename to 2006Scape Server/data/world/map/28.gz diff --git a/2006Redone Server/data/world/map/280.gz b/2006Scape Server/data/world/map/280.gz similarity index 100% rename from 2006Redone Server/data/world/map/280.gz rename to 2006Scape Server/data/world/map/280.gz diff --git a/2006Redone Server/data/world/map/281.gz b/2006Scape Server/data/world/map/281.gz similarity index 100% rename from 2006Redone Server/data/world/map/281.gz rename to 2006Scape Server/data/world/map/281.gz diff --git a/2006Redone Server/data/world/map/282.gz b/2006Scape Server/data/world/map/282.gz similarity index 100% rename from 2006Redone Server/data/world/map/282.gz rename to 2006Scape Server/data/world/map/282.gz diff --git a/2006Redone Server/data/world/map/283.gz b/2006Scape Server/data/world/map/283.gz similarity index 100% rename from 2006Redone Server/data/world/map/283.gz rename to 2006Scape Server/data/world/map/283.gz diff --git a/2006Redone Server/data/world/map/284.gz b/2006Scape Server/data/world/map/284.gz similarity index 100% rename from 2006Redone Server/data/world/map/284.gz rename to 2006Scape Server/data/world/map/284.gz diff --git a/2006Redone Server/data/world/map/285.gz b/2006Scape Server/data/world/map/285.gz similarity index 100% rename from 2006Redone Server/data/world/map/285.gz rename to 2006Scape Server/data/world/map/285.gz diff --git a/2006Redone Server/data/world/map/286.gz b/2006Scape Server/data/world/map/286.gz similarity index 100% rename from 2006Redone Server/data/world/map/286.gz rename to 2006Scape Server/data/world/map/286.gz diff --git a/2006Redone Server/data/world/map/287.gz b/2006Scape Server/data/world/map/287.gz similarity index 100% rename from 2006Redone Server/data/world/map/287.gz rename to 2006Scape Server/data/world/map/287.gz diff --git a/2006Redone Server/data/world/map/288.gz b/2006Scape Server/data/world/map/288.gz similarity index 100% rename from 2006Redone Server/data/world/map/288.gz rename to 2006Scape Server/data/world/map/288.gz diff --git a/2006Redone Server/data/world/map/289.gz b/2006Scape Server/data/world/map/289.gz similarity index 100% rename from 2006Redone Server/data/world/map/289.gz rename to 2006Scape Server/data/world/map/289.gz diff --git a/2006Redone Server/data/world/map/29.gz b/2006Scape Server/data/world/map/29.gz similarity index 100% rename from 2006Redone Server/data/world/map/29.gz rename to 2006Scape Server/data/world/map/29.gz diff --git a/2006Redone Server/data/world/map/290.gz b/2006Scape Server/data/world/map/290.gz similarity index 100% rename from 2006Redone Server/data/world/map/290.gz rename to 2006Scape Server/data/world/map/290.gz diff --git a/2006Redone Server/data/world/map/291.gz b/2006Scape Server/data/world/map/291.gz similarity index 100% rename from 2006Redone Server/data/world/map/291.gz rename to 2006Scape Server/data/world/map/291.gz diff --git a/2006Redone Server/data/world/map/292.gz b/2006Scape Server/data/world/map/292.gz similarity index 100% rename from 2006Redone Server/data/world/map/292.gz rename to 2006Scape Server/data/world/map/292.gz diff --git a/2006Redone Server/data/world/map/293.gz b/2006Scape Server/data/world/map/293.gz similarity index 100% rename from 2006Redone Server/data/world/map/293.gz rename to 2006Scape Server/data/world/map/293.gz diff --git a/2006Redone Server/data/world/map/294.gz b/2006Scape Server/data/world/map/294.gz similarity index 100% rename from 2006Redone Server/data/world/map/294.gz rename to 2006Scape Server/data/world/map/294.gz diff --git a/2006Redone Server/data/world/map/295.gz b/2006Scape Server/data/world/map/295.gz similarity index 100% rename from 2006Redone Server/data/world/map/295.gz rename to 2006Scape Server/data/world/map/295.gz diff --git a/2006Redone Server/data/world/map/296.gz b/2006Scape Server/data/world/map/296.gz similarity index 100% rename from 2006Redone Server/data/world/map/296.gz rename to 2006Scape Server/data/world/map/296.gz diff --git a/2006Redone Server/data/world/map/297.gz b/2006Scape Server/data/world/map/297.gz similarity index 100% rename from 2006Redone Server/data/world/map/297.gz rename to 2006Scape Server/data/world/map/297.gz diff --git a/2006Redone Server/data/world/map/298.gz b/2006Scape Server/data/world/map/298.gz similarity index 100% rename from 2006Redone Server/data/world/map/298.gz rename to 2006Scape Server/data/world/map/298.gz diff --git a/2006Redone Server/data/world/map/299.gz b/2006Scape Server/data/world/map/299.gz similarity index 100% rename from 2006Redone Server/data/world/map/299.gz rename to 2006Scape Server/data/world/map/299.gz diff --git a/2006Redone Server/data/world/map/3.gz b/2006Scape Server/data/world/map/3.gz similarity index 100% rename from 2006Redone Server/data/world/map/3.gz rename to 2006Scape Server/data/world/map/3.gz diff --git a/2006Redone Server/data/world/map/30.gz b/2006Scape Server/data/world/map/30.gz similarity index 100% rename from 2006Redone Server/data/world/map/30.gz rename to 2006Scape Server/data/world/map/30.gz diff --git a/2006Redone Server/data/world/map/300.gz b/2006Scape Server/data/world/map/300.gz similarity index 100% rename from 2006Redone Server/data/world/map/300.gz rename to 2006Scape Server/data/world/map/300.gz diff --git a/2006Redone Server/data/world/map/301.gz b/2006Scape Server/data/world/map/301.gz similarity index 100% rename from 2006Redone Server/data/world/map/301.gz rename to 2006Scape Server/data/world/map/301.gz diff --git a/2006Redone Server/data/world/map/302.gz b/2006Scape Server/data/world/map/302.gz similarity index 100% rename from 2006Redone Server/data/world/map/302.gz rename to 2006Scape Server/data/world/map/302.gz diff --git a/2006Redone Server/data/world/map/303.gz b/2006Scape Server/data/world/map/303.gz similarity index 100% rename from 2006Redone Server/data/world/map/303.gz rename to 2006Scape Server/data/world/map/303.gz diff --git a/2006Redone Server/data/world/map/304.gz b/2006Scape Server/data/world/map/304.gz similarity index 100% rename from 2006Redone Server/data/world/map/304.gz rename to 2006Scape Server/data/world/map/304.gz diff --git a/2006Redone Server/data/world/map/305.gz b/2006Scape Server/data/world/map/305.gz similarity index 100% rename from 2006Redone Server/data/world/map/305.gz rename to 2006Scape Server/data/world/map/305.gz diff --git a/2006Redone Server/data/world/map/306.gz b/2006Scape Server/data/world/map/306.gz similarity index 100% rename from 2006Redone Server/data/world/map/306.gz rename to 2006Scape Server/data/world/map/306.gz diff --git a/2006Redone Server/data/world/map/307.gz b/2006Scape Server/data/world/map/307.gz similarity index 100% rename from 2006Redone Server/data/world/map/307.gz rename to 2006Scape Server/data/world/map/307.gz diff --git a/2006Redone Server/data/world/map/308.gz b/2006Scape Server/data/world/map/308.gz similarity index 100% rename from 2006Redone Server/data/world/map/308.gz rename to 2006Scape Server/data/world/map/308.gz diff --git a/2006Redone Server/data/world/map/309.gz b/2006Scape Server/data/world/map/309.gz similarity index 100% rename from 2006Redone Server/data/world/map/309.gz rename to 2006Scape Server/data/world/map/309.gz diff --git a/2006Redone Server/data/world/map/31.gz b/2006Scape Server/data/world/map/31.gz similarity index 100% rename from 2006Redone Server/data/world/map/31.gz rename to 2006Scape Server/data/world/map/31.gz diff --git a/2006Redone Server/data/world/map/310.gz b/2006Scape Server/data/world/map/310.gz similarity index 100% rename from 2006Redone Server/data/world/map/310.gz rename to 2006Scape Server/data/world/map/310.gz diff --git a/2006Redone Server/data/world/map/311.gz b/2006Scape Server/data/world/map/311.gz similarity index 100% rename from 2006Redone Server/data/world/map/311.gz rename to 2006Scape Server/data/world/map/311.gz diff --git a/2006Redone Server/data/world/map/312.gz b/2006Scape Server/data/world/map/312.gz similarity index 100% rename from 2006Redone Server/data/world/map/312.gz rename to 2006Scape Server/data/world/map/312.gz diff --git a/2006Redone Server/data/world/map/313.gz b/2006Scape Server/data/world/map/313.gz similarity index 100% rename from 2006Redone Server/data/world/map/313.gz rename to 2006Scape Server/data/world/map/313.gz diff --git a/2006Redone Server/data/world/map/314.gz b/2006Scape Server/data/world/map/314.gz similarity index 100% rename from 2006Redone Server/data/world/map/314.gz rename to 2006Scape Server/data/world/map/314.gz diff --git a/2006Redone Server/data/world/map/315.gz b/2006Scape Server/data/world/map/315.gz similarity index 100% rename from 2006Redone Server/data/world/map/315.gz rename to 2006Scape Server/data/world/map/315.gz diff --git a/2006Redone Server/data/world/map/316.gz b/2006Scape Server/data/world/map/316.gz similarity index 100% rename from 2006Redone Server/data/world/map/316.gz rename to 2006Scape Server/data/world/map/316.gz diff --git a/2006Redone Server/data/world/map/317.gz b/2006Scape Server/data/world/map/317.gz similarity index 100% rename from 2006Redone Server/data/world/map/317.gz rename to 2006Scape Server/data/world/map/317.gz diff --git a/2006Redone Server/data/world/map/318.gz b/2006Scape Server/data/world/map/318.gz similarity index 100% rename from 2006Redone Server/data/world/map/318.gz rename to 2006Scape Server/data/world/map/318.gz diff --git a/2006Redone Server/data/world/map/319.gz b/2006Scape Server/data/world/map/319.gz similarity index 100% rename from 2006Redone Server/data/world/map/319.gz rename to 2006Scape Server/data/world/map/319.gz diff --git a/2006Redone Server/data/world/map/324.gz b/2006Scape Server/data/world/map/324.gz similarity index 100% rename from 2006Redone Server/data/world/map/324.gz rename to 2006Scape Server/data/world/map/324.gz diff --git a/2006Redone Server/data/world/map/325.gz b/2006Scape Server/data/world/map/325.gz similarity index 100% rename from 2006Redone Server/data/world/map/325.gz rename to 2006Scape Server/data/world/map/325.gz diff --git a/2006Redone Server/data/world/map/328.gz b/2006Scape Server/data/world/map/328.gz similarity index 100% rename from 2006Redone Server/data/world/map/328.gz rename to 2006Scape Server/data/world/map/328.gz diff --git a/2006Redone Server/data/world/map/329.gz b/2006Scape Server/data/world/map/329.gz similarity index 100% rename from 2006Redone Server/data/world/map/329.gz rename to 2006Scape Server/data/world/map/329.gz diff --git a/2006Redone Server/data/world/map/330.gz b/2006Scape Server/data/world/map/330.gz similarity index 100% rename from 2006Redone Server/data/world/map/330.gz rename to 2006Scape Server/data/world/map/330.gz diff --git a/2006Redone Server/data/world/map/331.gz b/2006Scape Server/data/world/map/331.gz similarity index 100% rename from 2006Redone Server/data/world/map/331.gz rename to 2006Scape Server/data/world/map/331.gz diff --git a/2006Redone Server/data/world/map/332.gz b/2006Scape Server/data/world/map/332.gz similarity index 100% rename from 2006Redone Server/data/world/map/332.gz rename to 2006Scape Server/data/world/map/332.gz diff --git a/2006Redone Server/data/world/map/333.gz b/2006Scape Server/data/world/map/333.gz similarity index 100% rename from 2006Redone Server/data/world/map/333.gz rename to 2006Scape Server/data/world/map/333.gz diff --git a/2006Redone Server/data/world/map/334.gz b/2006Scape Server/data/world/map/334.gz similarity index 100% rename from 2006Redone Server/data/world/map/334.gz rename to 2006Scape Server/data/world/map/334.gz diff --git a/2006Redone Server/data/world/map/335.gz b/2006Scape Server/data/world/map/335.gz similarity index 100% rename from 2006Redone Server/data/world/map/335.gz rename to 2006Scape Server/data/world/map/335.gz diff --git a/2006Redone Server/data/world/map/336.gz b/2006Scape Server/data/world/map/336.gz similarity index 100% rename from 2006Redone Server/data/world/map/336.gz rename to 2006Scape Server/data/world/map/336.gz diff --git a/2006Redone Server/data/world/map/337.gz b/2006Scape Server/data/world/map/337.gz similarity index 100% rename from 2006Redone Server/data/world/map/337.gz rename to 2006Scape Server/data/world/map/337.gz diff --git a/2006Redone Server/data/world/map/338.gz b/2006Scape Server/data/world/map/338.gz similarity index 100% rename from 2006Redone Server/data/world/map/338.gz rename to 2006Scape Server/data/world/map/338.gz diff --git a/2006Redone Server/data/world/map/339.gz b/2006Scape Server/data/world/map/339.gz similarity index 100% rename from 2006Redone Server/data/world/map/339.gz rename to 2006Scape Server/data/world/map/339.gz diff --git a/2006Redone Server/data/world/map/340.gz b/2006Scape Server/data/world/map/340.gz similarity index 100% rename from 2006Redone Server/data/world/map/340.gz rename to 2006Scape Server/data/world/map/340.gz diff --git a/2006Redone Server/data/world/map/341.gz b/2006Scape Server/data/world/map/341.gz similarity index 100% rename from 2006Redone Server/data/world/map/341.gz rename to 2006Scape Server/data/world/map/341.gz diff --git a/2006Redone Server/data/world/map/342.gz b/2006Scape Server/data/world/map/342.gz similarity index 100% rename from 2006Redone Server/data/world/map/342.gz rename to 2006Scape Server/data/world/map/342.gz diff --git a/2006Redone Server/data/world/map/343.gz b/2006Scape Server/data/world/map/343.gz similarity index 100% rename from 2006Redone Server/data/world/map/343.gz rename to 2006Scape Server/data/world/map/343.gz diff --git a/2006Redone Server/data/world/map/344.gz b/2006Scape Server/data/world/map/344.gz similarity index 100% rename from 2006Redone Server/data/world/map/344.gz rename to 2006Scape Server/data/world/map/344.gz diff --git a/2006Redone Server/data/world/map/345.gz b/2006Scape Server/data/world/map/345.gz similarity index 100% rename from 2006Redone Server/data/world/map/345.gz rename to 2006Scape Server/data/world/map/345.gz diff --git a/2006Redone Server/data/world/map/348.gz b/2006Scape Server/data/world/map/348.gz similarity index 100% rename from 2006Redone Server/data/world/map/348.gz rename to 2006Scape Server/data/world/map/348.gz diff --git a/2006Redone Server/data/world/map/349.gz b/2006Scape Server/data/world/map/349.gz similarity index 100% rename from 2006Redone Server/data/world/map/349.gz rename to 2006Scape Server/data/world/map/349.gz diff --git a/2006Redone Server/data/world/map/352.gz b/2006Scape Server/data/world/map/352.gz similarity index 100% rename from 2006Redone Server/data/world/map/352.gz rename to 2006Scape Server/data/world/map/352.gz diff --git a/2006Redone Server/data/world/map/353.gz b/2006Scape Server/data/world/map/353.gz similarity index 100% rename from 2006Redone Server/data/world/map/353.gz rename to 2006Scape Server/data/world/map/353.gz diff --git a/2006Redone Server/data/world/map/354.gz b/2006Scape Server/data/world/map/354.gz similarity index 100% rename from 2006Redone Server/data/world/map/354.gz rename to 2006Scape Server/data/world/map/354.gz diff --git a/2006Redone Server/data/world/map/355.gz b/2006Scape Server/data/world/map/355.gz similarity index 100% rename from 2006Redone Server/data/world/map/355.gz rename to 2006Scape Server/data/world/map/355.gz diff --git a/2006Redone Server/data/world/map/356.gz b/2006Scape Server/data/world/map/356.gz similarity index 100% rename from 2006Redone Server/data/world/map/356.gz rename to 2006Scape Server/data/world/map/356.gz diff --git a/2006Redone Server/data/world/map/357.gz b/2006Scape Server/data/world/map/357.gz similarity index 100% rename from 2006Redone Server/data/world/map/357.gz rename to 2006Scape Server/data/world/map/357.gz diff --git a/2006Redone Server/data/world/map/358.gz b/2006Scape Server/data/world/map/358.gz similarity index 100% rename from 2006Redone Server/data/world/map/358.gz rename to 2006Scape Server/data/world/map/358.gz diff --git a/2006Redone Server/data/world/map/359.gz b/2006Scape Server/data/world/map/359.gz similarity index 100% rename from 2006Redone Server/data/world/map/359.gz rename to 2006Scape Server/data/world/map/359.gz diff --git a/2006Redone Server/data/world/map/36.gz b/2006Scape Server/data/world/map/36.gz similarity index 100% rename from 2006Redone Server/data/world/map/36.gz rename to 2006Scape Server/data/world/map/36.gz diff --git a/2006Redone Server/data/world/map/360.gz b/2006Scape Server/data/world/map/360.gz similarity index 100% rename from 2006Redone Server/data/world/map/360.gz rename to 2006Scape Server/data/world/map/360.gz diff --git a/2006Redone Server/data/world/map/361.gz b/2006Scape Server/data/world/map/361.gz similarity index 100% rename from 2006Redone Server/data/world/map/361.gz rename to 2006Scape Server/data/world/map/361.gz diff --git a/2006Redone Server/data/world/map/362.gz b/2006Scape Server/data/world/map/362.gz similarity index 100% rename from 2006Redone Server/data/world/map/362.gz rename to 2006Scape Server/data/world/map/362.gz diff --git a/2006Redone Server/data/world/map/363.gz b/2006Scape Server/data/world/map/363.gz similarity index 100% rename from 2006Redone Server/data/world/map/363.gz rename to 2006Scape Server/data/world/map/363.gz diff --git a/2006Redone Server/data/world/map/364.gz b/2006Scape Server/data/world/map/364.gz similarity index 100% rename from 2006Redone Server/data/world/map/364.gz rename to 2006Scape Server/data/world/map/364.gz diff --git a/2006Redone Server/data/world/map/365.gz b/2006Scape Server/data/world/map/365.gz similarity index 100% rename from 2006Redone Server/data/world/map/365.gz rename to 2006Scape Server/data/world/map/365.gz diff --git a/2006Redone Server/data/world/map/366.gz b/2006Scape Server/data/world/map/366.gz similarity index 100% rename from 2006Redone Server/data/world/map/366.gz rename to 2006Scape Server/data/world/map/366.gz diff --git a/2006Redone Server/data/world/map/367.gz b/2006Scape Server/data/world/map/367.gz similarity index 100% rename from 2006Redone Server/data/world/map/367.gz rename to 2006Scape Server/data/world/map/367.gz diff --git a/2006Redone Server/data/world/map/368.gz b/2006Scape Server/data/world/map/368.gz similarity index 100% rename from 2006Redone Server/data/world/map/368.gz rename to 2006Scape Server/data/world/map/368.gz diff --git a/2006Redone Server/data/world/map/369.gz b/2006Scape Server/data/world/map/369.gz similarity index 100% rename from 2006Redone Server/data/world/map/369.gz rename to 2006Scape Server/data/world/map/369.gz diff --git a/2006Redone Server/data/world/map/37.gz b/2006Scape Server/data/world/map/37.gz similarity index 100% rename from 2006Redone Server/data/world/map/37.gz rename to 2006Scape Server/data/world/map/37.gz diff --git a/2006Redone Server/data/world/map/370.gz b/2006Scape Server/data/world/map/370.gz similarity index 100% rename from 2006Redone Server/data/world/map/370.gz rename to 2006Scape Server/data/world/map/370.gz diff --git a/2006Redone Server/data/world/map/371.gz b/2006Scape Server/data/world/map/371.gz similarity index 100% rename from 2006Redone Server/data/world/map/371.gz rename to 2006Scape Server/data/world/map/371.gz diff --git a/2006Redone Server/data/world/map/372.gz b/2006Scape Server/data/world/map/372.gz similarity index 100% rename from 2006Redone Server/data/world/map/372.gz rename to 2006Scape Server/data/world/map/372.gz diff --git a/2006Redone Server/data/world/map/373.gz b/2006Scape Server/data/world/map/373.gz similarity index 100% rename from 2006Redone Server/data/world/map/373.gz rename to 2006Scape Server/data/world/map/373.gz diff --git a/2006Redone Server/data/world/map/374.gz b/2006Scape Server/data/world/map/374.gz similarity index 100% rename from 2006Redone Server/data/world/map/374.gz rename to 2006Scape Server/data/world/map/374.gz diff --git a/2006Redone Server/data/world/map/375.gz b/2006Scape Server/data/world/map/375.gz similarity index 100% rename from 2006Redone Server/data/world/map/375.gz rename to 2006Scape Server/data/world/map/375.gz diff --git a/2006Redone Server/data/world/map/376.gz b/2006Scape Server/data/world/map/376.gz similarity index 100% rename from 2006Redone Server/data/world/map/376.gz rename to 2006Scape Server/data/world/map/376.gz diff --git a/2006Redone Server/data/world/map/377.gz b/2006Scape Server/data/world/map/377.gz similarity index 100% rename from 2006Redone Server/data/world/map/377.gz rename to 2006Scape Server/data/world/map/377.gz diff --git a/2006Redone Server/data/world/map/378.gz b/2006Scape Server/data/world/map/378.gz similarity index 100% rename from 2006Redone Server/data/world/map/378.gz rename to 2006Scape Server/data/world/map/378.gz diff --git a/2006Redone Server/data/world/map/379.gz b/2006Scape Server/data/world/map/379.gz similarity index 100% rename from 2006Redone Server/data/world/map/379.gz rename to 2006Scape Server/data/world/map/379.gz diff --git a/2006Redone Server/data/world/map/38.gz b/2006Scape Server/data/world/map/38.gz similarity index 100% rename from 2006Redone Server/data/world/map/38.gz rename to 2006Scape Server/data/world/map/38.gz diff --git a/2006Redone Server/data/world/map/380.gz b/2006Scape Server/data/world/map/380.gz similarity index 100% rename from 2006Redone Server/data/world/map/380.gz rename to 2006Scape Server/data/world/map/380.gz diff --git a/2006Redone Server/data/world/map/381.gz b/2006Scape Server/data/world/map/381.gz similarity index 100% rename from 2006Redone Server/data/world/map/381.gz rename to 2006Scape Server/data/world/map/381.gz diff --git a/2006Redone Server/data/world/map/382.gz b/2006Scape Server/data/world/map/382.gz similarity index 100% rename from 2006Redone Server/data/world/map/382.gz rename to 2006Scape Server/data/world/map/382.gz diff --git a/2006Redone Server/data/world/map/383.gz b/2006Scape Server/data/world/map/383.gz similarity index 100% rename from 2006Redone Server/data/world/map/383.gz rename to 2006Scape Server/data/world/map/383.gz diff --git a/2006Redone Server/data/world/map/384.gz b/2006Scape Server/data/world/map/384.gz similarity index 100% rename from 2006Redone Server/data/world/map/384.gz rename to 2006Scape Server/data/world/map/384.gz diff --git a/2006Redone Server/data/world/map/385.gz b/2006Scape Server/data/world/map/385.gz similarity index 100% rename from 2006Redone Server/data/world/map/385.gz rename to 2006Scape Server/data/world/map/385.gz diff --git a/2006Redone Server/data/world/map/386.gz b/2006Scape Server/data/world/map/386.gz similarity index 100% rename from 2006Redone Server/data/world/map/386.gz rename to 2006Scape Server/data/world/map/386.gz diff --git a/2006Redone Server/data/world/map/387.gz b/2006Scape Server/data/world/map/387.gz similarity index 100% rename from 2006Redone Server/data/world/map/387.gz rename to 2006Scape Server/data/world/map/387.gz diff --git a/2006Redone Server/data/world/map/388.gz b/2006Scape Server/data/world/map/388.gz similarity index 100% rename from 2006Redone Server/data/world/map/388.gz rename to 2006Scape Server/data/world/map/388.gz diff --git a/2006Redone Server/data/world/map/389.gz b/2006Scape Server/data/world/map/389.gz similarity index 100% rename from 2006Redone Server/data/world/map/389.gz rename to 2006Scape Server/data/world/map/389.gz diff --git a/2006Redone Server/data/world/map/39.gz b/2006Scape Server/data/world/map/39.gz similarity index 100% rename from 2006Redone Server/data/world/map/39.gz rename to 2006Scape Server/data/world/map/39.gz diff --git a/2006Redone Server/data/world/map/390.gz b/2006Scape Server/data/world/map/390.gz similarity index 100% rename from 2006Redone Server/data/world/map/390.gz rename to 2006Scape Server/data/world/map/390.gz diff --git a/2006Redone Server/data/world/map/391.gz b/2006Scape Server/data/world/map/391.gz similarity index 100% rename from 2006Redone Server/data/world/map/391.gz rename to 2006Scape Server/data/world/map/391.gz diff --git a/2006Redone Server/data/world/map/392.gz b/2006Scape Server/data/world/map/392.gz similarity index 100% rename from 2006Redone Server/data/world/map/392.gz rename to 2006Scape Server/data/world/map/392.gz diff --git a/2006Redone Server/data/world/map/393.gz b/2006Scape Server/data/world/map/393.gz similarity index 100% rename from 2006Redone Server/data/world/map/393.gz rename to 2006Scape Server/data/world/map/393.gz diff --git a/2006Redone Server/data/world/map/394.gz b/2006Scape Server/data/world/map/394.gz similarity index 100% rename from 2006Redone Server/data/world/map/394.gz rename to 2006Scape Server/data/world/map/394.gz diff --git a/2006Redone Server/data/world/map/395.gz b/2006Scape Server/data/world/map/395.gz similarity index 100% rename from 2006Redone Server/data/world/map/395.gz rename to 2006Scape Server/data/world/map/395.gz diff --git a/2006Redone Server/data/world/map/396.gz b/2006Scape Server/data/world/map/396.gz similarity index 100% rename from 2006Redone Server/data/world/map/396.gz rename to 2006Scape Server/data/world/map/396.gz diff --git a/2006Redone Server/data/world/map/397.gz b/2006Scape Server/data/world/map/397.gz similarity index 100% rename from 2006Redone Server/data/world/map/397.gz rename to 2006Scape Server/data/world/map/397.gz diff --git a/2006Redone Server/data/world/map/398.gz b/2006Scape Server/data/world/map/398.gz similarity index 100% rename from 2006Redone Server/data/world/map/398.gz rename to 2006Scape Server/data/world/map/398.gz diff --git a/2006Redone Server/data/world/map/399.gz b/2006Scape Server/data/world/map/399.gz similarity index 100% rename from 2006Redone Server/data/world/map/399.gz rename to 2006Scape Server/data/world/map/399.gz diff --git a/2006Redone Server/data/world/map/40.gz b/2006Scape Server/data/world/map/40.gz similarity index 100% rename from 2006Redone Server/data/world/map/40.gz rename to 2006Scape Server/data/world/map/40.gz diff --git a/2006Redone Server/data/world/map/400.gz b/2006Scape Server/data/world/map/400.gz similarity index 100% rename from 2006Redone Server/data/world/map/400.gz rename to 2006Scape Server/data/world/map/400.gz diff --git a/2006Redone Server/data/world/map/401.gz b/2006Scape Server/data/world/map/401.gz similarity index 100% rename from 2006Redone Server/data/world/map/401.gz rename to 2006Scape Server/data/world/map/401.gz diff --git a/2006Redone Server/data/world/map/402.gz b/2006Scape Server/data/world/map/402.gz similarity index 100% rename from 2006Redone Server/data/world/map/402.gz rename to 2006Scape Server/data/world/map/402.gz diff --git a/2006Redone Server/data/world/map/403.gz b/2006Scape Server/data/world/map/403.gz similarity index 100% rename from 2006Redone Server/data/world/map/403.gz rename to 2006Scape Server/data/world/map/403.gz diff --git a/2006Redone Server/data/world/map/404.gz b/2006Scape Server/data/world/map/404.gz similarity index 100% rename from 2006Redone Server/data/world/map/404.gz rename to 2006Scape Server/data/world/map/404.gz diff --git a/2006Redone Server/data/world/map/405.gz b/2006Scape Server/data/world/map/405.gz similarity index 100% rename from 2006Redone Server/data/world/map/405.gz rename to 2006Scape Server/data/world/map/405.gz diff --git a/2006Redone Server/data/world/map/406.gz b/2006Scape Server/data/world/map/406.gz similarity index 100% rename from 2006Redone Server/data/world/map/406.gz rename to 2006Scape Server/data/world/map/406.gz diff --git a/2006Redone Server/data/world/map/407.gz b/2006Scape Server/data/world/map/407.gz similarity index 100% rename from 2006Redone Server/data/world/map/407.gz rename to 2006Scape Server/data/world/map/407.gz diff --git a/2006Redone Server/data/world/map/408.gz b/2006Scape Server/data/world/map/408.gz similarity index 100% rename from 2006Redone Server/data/world/map/408.gz rename to 2006Scape Server/data/world/map/408.gz diff --git a/2006Redone Server/data/world/map/409.gz b/2006Scape Server/data/world/map/409.gz similarity index 100% rename from 2006Redone Server/data/world/map/409.gz rename to 2006Scape Server/data/world/map/409.gz diff --git a/2006Redone Server/data/world/map/41.gz b/2006Scape Server/data/world/map/41.gz similarity index 100% rename from 2006Redone Server/data/world/map/41.gz rename to 2006Scape Server/data/world/map/41.gz diff --git a/2006Redone Server/data/world/map/410.gz b/2006Scape Server/data/world/map/410.gz similarity index 100% rename from 2006Redone Server/data/world/map/410.gz rename to 2006Scape Server/data/world/map/410.gz diff --git a/2006Redone Server/data/world/map/411.gz b/2006Scape Server/data/world/map/411.gz similarity index 100% rename from 2006Redone Server/data/world/map/411.gz rename to 2006Scape Server/data/world/map/411.gz diff --git a/2006Redone Server/data/world/map/412.gz b/2006Scape Server/data/world/map/412.gz similarity index 100% rename from 2006Redone Server/data/world/map/412.gz rename to 2006Scape Server/data/world/map/412.gz diff --git a/2006Redone Server/data/world/map/413.gz b/2006Scape Server/data/world/map/413.gz similarity index 100% rename from 2006Redone Server/data/world/map/413.gz rename to 2006Scape Server/data/world/map/413.gz diff --git a/2006Redone Server/data/world/map/414.gz b/2006Scape Server/data/world/map/414.gz similarity index 100% rename from 2006Redone Server/data/world/map/414.gz rename to 2006Scape Server/data/world/map/414.gz diff --git a/2006Redone Server/data/world/map/415.gz b/2006Scape Server/data/world/map/415.gz similarity index 100% rename from 2006Redone Server/data/world/map/415.gz rename to 2006Scape Server/data/world/map/415.gz diff --git a/2006Redone Server/data/world/map/416.gz b/2006Scape Server/data/world/map/416.gz similarity index 100% rename from 2006Redone Server/data/world/map/416.gz rename to 2006Scape Server/data/world/map/416.gz diff --git a/2006Redone Server/data/world/map/417.gz b/2006Scape Server/data/world/map/417.gz similarity index 100% rename from 2006Redone Server/data/world/map/417.gz rename to 2006Scape Server/data/world/map/417.gz diff --git a/2006Redone Server/data/world/map/418.gz b/2006Scape Server/data/world/map/418.gz similarity index 100% rename from 2006Redone Server/data/world/map/418.gz rename to 2006Scape Server/data/world/map/418.gz diff --git a/2006Redone Server/data/world/map/419.gz b/2006Scape Server/data/world/map/419.gz similarity index 100% rename from 2006Redone Server/data/world/map/419.gz rename to 2006Scape Server/data/world/map/419.gz diff --git a/2006Redone Server/data/world/map/42.gz b/2006Scape Server/data/world/map/42.gz similarity index 100% rename from 2006Redone Server/data/world/map/42.gz rename to 2006Scape Server/data/world/map/42.gz diff --git a/2006Redone Server/data/world/map/420.gz b/2006Scape Server/data/world/map/420.gz similarity index 100% rename from 2006Redone Server/data/world/map/420.gz rename to 2006Scape Server/data/world/map/420.gz diff --git a/2006Redone Server/data/world/map/421.gz b/2006Scape Server/data/world/map/421.gz similarity index 100% rename from 2006Redone Server/data/world/map/421.gz rename to 2006Scape Server/data/world/map/421.gz diff --git a/2006Redone Server/data/world/map/422.gz b/2006Scape Server/data/world/map/422.gz similarity index 100% rename from 2006Redone Server/data/world/map/422.gz rename to 2006Scape Server/data/world/map/422.gz diff --git a/2006Redone Server/data/world/map/423.gz b/2006Scape Server/data/world/map/423.gz similarity index 100% rename from 2006Redone Server/data/world/map/423.gz rename to 2006Scape Server/data/world/map/423.gz diff --git a/2006Redone Server/data/world/map/424.gz b/2006Scape Server/data/world/map/424.gz similarity index 100% rename from 2006Redone Server/data/world/map/424.gz rename to 2006Scape Server/data/world/map/424.gz diff --git a/2006Redone Server/data/world/map/425.gz b/2006Scape Server/data/world/map/425.gz similarity index 100% rename from 2006Redone Server/data/world/map/425.gz rename to 2006Scape Server/data/world/map/425.gz diff --git a/2006Redone Server/data/world/map/426.gz b/2006Scape Server/data/world/map/426.gz similarity index 100% rename from 2006Redone Server/data/world/map/426.gz rename to 2006Scape Server/data/world/map/426.gz diff --git a/2006Redone Server/data/world/map/427.gz b/2006Scape Server/data/world/map/427.gz similarity index 100% rename from 2006Redone Server/data/world/map/427.gz rename to 2006Scape Server/data/world/map/427.gz diff --git a/2006Redone Server/data/world/map/428.gz b/2006Scape Server/data/world/map/428.gz similarity index 100% rename from 2006Redone Server/data/world/map/428.gz rename to 2006Scape Server/data/world/map/428.gz diff --git a/2006Redone Server/data/world/map/429.gz b/2006Scape Server/data/world/map/429.gz similarity index 100% rename from 2006Redone Server/data/world/map/429.gz rename to 2006Scape Server/data/world/map/429.gz diff --git a/2006Redone Server/data/world/map/43.gz b/2006Scape Server/data/world/map/43.gz similarity index 100% rename from 2006Redone Server/data/world/map/43.gz rename to 2006Scape Server/data/world/map/43.gz diff --git a/2006Redone Server/data/world/map/430.gz b/2006Scape Server/data/world/map/430.gz similarity index 100% rename from 2006Redone Server/data/world/map/430.gz rename to 2006Scape Server/data/world/map/430.gz diff --git a/2006Redone Server/data/world/map/431.gz b/2006Scape Server/data/world/map/431.gz similarity index 100% rename from 2006Redone Server/data/world/map/431.gz rename to 2006Scape Server/data/world/map/431.gz diff --git a/2006Redone Server/data/world/map/432.gz b/2006Scape Server/data/world/map/432.gz similarity index 100% rename from 2006Redone Server/data/world/map/432.gz rename to 2006Scape Server/data/world/map/432.gz diff --git a/2006Redone Server/data/world/map/433.gz b/2006Scape Server/data/world/map/433.gz similarity index 100% rename from 2006Redone Server/data/world/map/433.gz rename to 2006Scape Server/data/world/map/433.gz diff --git a/2006Redone Server/data/world/map/434.gz b/2006Scape Server/data/world/map/434.gz similarity index 100% rename from 2006Redone Server/data/world/map/434.gz rename to 2006Scape Server/data/world/map/434.gz diff --git a/2006Redone Server/data/world/map/435.gz b/2006Scape Server/data/world/map/435.gz similarity index 100% rename from 2006Redone Server/data/world/map/435.gz rename to 2006Scape Server/data/world/map/435.gz diff --git a/2006Redone Server/data/world/map/436.gz b/2006Scape Server/data/world/map/436.gz similarity index 100% rename from 2006Redone Server/data/world/map/436.gz rename to 2006Scape Server/data/world/map/436.gz diff --git a/2006Redone Server/data/world/map/437.gz b/2006Scape Server/data/world/map/437.gz similarity index 100% rename from 2006Redone Server/data/world/map/437.gz rename to 2006Scape Server/data/world/map/437.gz diff --git a/2006Redone Server/data/world/map/438.gz b/2006Scape Server/data/world/map/438.gz similarity index 100% rename from 2006Redone Server/data/world/map/438.gz rename to 2006Scape Server/data/world/map/438.gz diff --git a/2006Redone Server/data/world/map/439.gz b/2006Scape Server/data/world/map/439.gz similarity index 100% rename from 2006Redone Server/data/world/map/439.gz rename to 2006Scape Server/data/world/map/439.gz diff --git a/2006Redone Server/data/world/map/44.gz b/2006Scape Server/data/world/map/44.gz similarity index 100% rename from 2006Redone Server/data/world/map/44.gz rename to 2006Scape Server/data/world/map/44.gz diff --git a/2006Redone Server/data/world/map/440.gz b/2006Scape Server/data/world/map/440.gz similarity index 100% rename from 2006Redone Server/data/world/map/440.gz rename to 2006Scape Server/data/world/map/440.gz diff --git a/2006Redone Server/data/world/map/441.gz b/2006Scape Server/data/world/map/441.gz similarity index 100% rename from 2006Redone Server/data/world/map/441.gz rename to 2006Scape Server/data/world/map/441.gz diff --git a/2006Redone Server/data/world/map/442.gz b/2006Scape Server/data/world/map/442.gz similarity index 100% rename from 2006Redone Server/data/world/map/442.gz rename to 2006Scape Server/data/world/map/442.gz diff --git a/2006Redone Server/data/world/map/443.gz b/2006Scape Server/data/world/map/443.gz similarity index 100% rename from 2006Redone Server/data/world/map/443.gz rename to 2006Scape Server/data/world/map/443.gz diff --git a/2006Redone Server/data/world/map/444.gz b/2006Scape Server/data/world/map/444.gz similarity index 100% rename from 2006Redone Server/data/world/map/444.gz rename to 2006Scape Server/data/world/map/444.gz diff --git a/2006Redone Server/data/world/map/445.gz b/2006Scape Server/data/world/map/445.gz similarity index 100% rename from 2006Redone Server/data/world/map/445.gz rename to 2006Scape Server/data/world/map/445.gz diff --git a/2006Redone Server/data/world/map/448.gz b/2006Scape Server/data/world/map/448.gz similarity index 100% rename from 2006Redone Server/data/world/map/448.gz rename to 2006Scape Server/data/world/map/448.gz diff --git a/2006Redone Server/data/world/map/449.gz b/2006Scape Server/data/world/map/449.gz similarity index 100% rename from 2006Redone Server/data/world/map/449.gz rename to 2006Scape Server/data/world/map/449.gz diff --git a/2006Redone Server/data/world/map/45.gz b/2006Scape Server/data/world/map/45.gz similarity index 100% rename from 2006Redone Server/data/world/map/45.gz rename to 2006Scape Server/data/world/map/45.gz diff --git a/2006Redone Server/data/world/map/450.gz b/2006Scape Server/data/world/map/450.gz similarity index 100% rename from 2006Redone Server/data/world/map/450.gz rename to 2006Scape Server/data/world/map/450.gz diff --git a/2006Redone Server/data/world/map/451.gz b/2006Scape Server/data/world/map/451.gz similarity index 100% rename from 2006Redone Server/data/world/map/451.gz rename to 2006Scape Server/data/world/map/451.gz diff --git a/2006Redone Server/data/world/map/452.gz b/2006Scape Server/data/world/map/452.gz similarity index 100% rename from 2006Redone Server/data/world/map/452.gz rename to 2006Scape Server/data/world/map/452.gz diff --git a/2006Redone Server/data/world/map/453.gz b/2006Scape Server/data/world/map/453.gz similarity index 100% rename from 2006Redone Server/data/world/map/453.gz rename to 2006Scape Server/data/world/map/453.gz diff --git a/2006Redone Server/data/world/map/454.gz b/2006Scape Server/data/world/map/454.gz similarity index 100% rename from 2006Redone Server/data/world/map/454.gz rename to 2006Scape Server/data/world/map/454.gz diff --git a/2006Redone Server/data/world/map/455.gz b/2006Scape Server/data/world/map/455.gz similarity index 100% rename from 2006Redone Server/data/world/map/455.gz rename to 2006Scape Server/data/world/map/455.gz diff --git a/2006Redone Server/data/world/map/456.gz b/2006Scape Server/data/world/map/456.gz similarity index 100% rename from 2006Redone Server/data/world/map/456.gz rename to 2006Scape Server/data/world/map/456.gz diff --git a/2006Redone Server/data/world/map/457.gz b/2006Scape Server/data/world/map/457.gz similarity index 100% rename from 2006Redone Server/data/world/map/457.gz rename to 2006Scape Server/data/world/map/457.gz diff --git a/2006Redone Server/data/world/map/458.gz b/2006Scape Server/data/world/map/458.gz similarity index 100% rename from 2006Redone Server/data/world/map/458.gz rename to 2006Scape Server/data/world/map/458.gz diff --git a/2006Redone Server/data/world/map/459.gz b/2006Scape Server/data/world/map/459.gz similarity index 100% rename from 2006Redone Server/data/world/map/459.gz rename to 2006Scape Server/data/world/map/459.gz diff --git a/2006Redone Server/data/world/map/46.gz b/2006Scape Server/data/world/map/46.gz similarity index 100% rename from 2006Redone Server/data/world/map/46.gz rename to 2006Scape Server/data/world/map/46.gz diff --git a/2006Redone Server/data/world/map/460.gz b/2006Scape Server/data/world/map/460.gz similarity index 100% rename from 2006Redone Server/data/world/map/460.gz rename to 2006Scape Server/data/world/map/460.gz diff --git a/2006Redone Server/data/world/map/461.gz b/2006Scape Server/data/world/map/461.gz similarity index 100% rename from 2006Redone Server/data/world/map/461.gz rename to 2006Scape Server/data/world/map/461.gz diff --git a/2006Redone Server/data/world/map/462.gz b/2006Scape Server/data/world/map/462.gz similarity index 100% rename from 2006Redone Server/data/world/map/462.gz rename to 2006Scape Server/data/world/map/462.gz diff --git a/2006Redone Server/data/world/map/463.gz b/2006Scape Server/data/world/map/463.gz similarity index 100% rename from 2006Redone Server/data/world/map/463.gz rename to 2006Scape Server/data/world/map/463.gz diff --git a/2006Redone Server/data/world/map/464.gz b/2006Scape Server/data/world/map/464.gz similarity index 100% rename from 2006Redone Server/data/world/map/464.gz rename to 2006Scape Server/data/world/map/464.gz diff --git a/2006Redone Server/data/world/map/465.gz b/2006Scape Server/data/world/map/465.gz similarity index 100% rename from 2006Redone Server/data/world/map/465.gz rename to 2006Scape Server/data/world/map/465.gz diff --git a/2006Redone Server/data/world/map/466.gz b/2006Scape Server/data/world/map/466.gz similarity index 100% rename from 2006Redone Server/data/world/map/466.gz rename to 2006Scape Server/data/world/map/466.gz diff --git a/2006Redone Server/data/world/map/467.gz b/2006Scape Server/data/world/map/467.gz similarity index 100% rename from 2006Redone Server/data/world/map/467.gz rename to 2006Scape Server/data/world/map/467.gz diff --git a/2006Redone Server/data/world/map/468.gz b/2006Scape Server/data/world/map/468.gz similarity index 100% rename from 2006Redone Server/data/world/map/468.gz rename to 2006Scape Server/data/world/map/468.gz diff --git a/2006Redone Server/data/world/map/469.gz b/2006Scape Server/data/world/map/469.gz similarity index 100% rename from 2006Redone Server/data/world/map/469.gz rename to 2006Scape Server/data/world/map/469.gz diff --git a/2006Redone Server/data/world/map/47.gz b/2006Scape Server/data/world/map/47.gz similarity index 100% rename from 2006Redone Server/data/world/map/47.gz rename to 2006Scape Server/data/world/map/47.gz diff --git a/2006Redone Server/data/world/map/470.gz b/2006Scape Server/data/world/map/470.gz similarity index 100% rename from 2006Redone Server/data/world/map/470.gz rename to 2006Scape Server/data/world/map/470.gz diff --git a/2006Redone Server/data/world/map/471.gz b/2006Scape Server/data/world/map/471.gz similarity index 100% rename from 2006Redone Server/data/world/map/471.gz rename to 2006Scape Server/data/world/map/471.gz diff --git a/2006Redone Server/data/world/map/472.gz b/2006Scape Server/data/world/map/472.gz similarity index 100% rename from 2006Redone Server/data/world/map/472.gz rename to 2006Scape Server/data/world/map/472.gz diff --git a/2006Redone Server/data/world/map/473.gz b/2006Scape Server/data/world/map/473.gz similarity index 100% rename from 2006Redone Server/data/world/map/473.gz rename to 2006Scape Server/data/world/map/473.gz diff --git a/2006Redone Server/data/world/map/474.gz b/2006Scape Server/data/world/map/474.gz similarity index 100% rename from 2006Redone Server/data/world/map/474.gz rename to 2006Scape Server/data/world/map/474.gz diff --git a/2006Redone Server/data/world/map/475.gz b/2006Scape Server/data/world/map/475.gz similarity index 100% rename from 2006Redone Server/data/world/map/475.gz rename to 2006Scape Server/data/world/map/475.gz diff --git a/2006Redone Server/data/world/map/476.gz b/2006Scape Server/data/world/map/476.gz similarity index 100% rename from 2006Redone Server/data/world/map/476.gz rename to 2006Scape Server/data/world/map/476.gz diff --git a/2006Redone Server/data/world/map/477.gz b/2006Scape Server/data/world/map/477.gz similarity index 100% rename from 2006Redone Server/data/world/map/477.gz rename to 2006Scape Server/data/world/map/477.gz diff --git a/2006Redone Server/data/world/map/478.gz b/2006Scape Server/data/world/map/478.gz similarity index 100% rename from 2006Redone Server/data/world/map/478.gz rename to 2006Scape Server/data/world/map/478.gz diff --git a/2006Redone Server/data/world/map/479.gz b/2006Scape Server/data/world/map/479.gz similarity index 100% rename from 2006Redone Server/data/world/map/479.gz rename to 2006Scape Server/data/world/map/479.gz diff --git a/2006Redone Server/data/world/map/48.gz b/2006Scape Server/data/world/map/48.gz similarity index 100% rename from 2006Redone Server/data/world/map/48.gz rename to 2006Scape Server/data/world/map/48.gz diff --git a/2006Redone Server/data/world/map/480.gz b/2006Scape Server/data/world/map/480.gz similarity index 100% rename from 2006Redone Server/data/world/map/480.gz rename to 2006Scape Server/data/world/map/480.gz diff --git a/2006Redone Server/data/world/map/481.gz b/2006Scape Server/data/world/map/481.gz similarity index 100% rename from 2006Redone Server/data/world/map/481.gz rename to 2006Scape Server/data/world/map/481.gz diff --git a/2006Redone Server/data/world/map/482.gz b/2006Scape Server/data/world/map/482.gz similarity index 100% rename from 2006Redone Server/data/world/map/482.gz rename to 2006Scape Server/data/world/map/482.gz diff --git a/2006Redone Server/data/world/map/483.gz b/2006Scape Server/data/world/map/483.gz similarity index 100% rename from 2006Redone Server/data/world/map/483.gz rename to 2006Scape Server/data/world/map/483.gz diff --git a/2006Redone Server/data/world/map/484.gz b/2006Scape Server/data/world/map/484.gz similarity index 100% rename from 2006Redone Server/data/world/map/484.gz rename to 2006Scape Server/data/world/map/484.gz diff --git a/2006Redone Server/data/world/map/485.gz b/2006Scape Server/data/world/map/485.gz similarity index 100% rename from 2006Redone Server/data/world/map/485.gz rename to 2006Scape Server/data/world/map/485.gz diff --git a/2006Redone Server/data/world/map/486.gz b/2006Scape Server/data/world/map/486.gz similarity index 100% rename from 2006Redone Server/data/world/map/486.gz rename to 2006Scape Server/data/world/map/486.gz diff --git a/2006Redone Server/data/world/map/487.gz b/2006Scape Server/data/world/map/487.gz similarity index 100% rename from 2006Redone Server/data/world/map/487.gz rename to 2006Scape Server/data/world/map/487.gz diff --git a/2006Redone Server/data/world/map/488.gz b/2006Scape Server/data/world/map/488.gz similarity index 100% rename from 2006Redone Server/data/world/map/488.gz rename to 2006Scape Server/data/world/map/488.gz diff --git a/2006Redone Server/data/world/map/489.gz b/2006Scape Server/data/world/map/489.gz similarity index 100% rename from 2006Redone Server/data/world/map/489.gz rename to 2006Scape Server/data/world/map/489.gz diff --git a/2006Redone Server/data/world/map/49.gz b/2006Scape Server/data/world/map/49.gz similarity index 100% rename from 2006Redone Server/data/world/map/49.gz rename to 2006Scape Server/data/world/map/49.gz diff --git a/2006Redone Server/data/world/map/490.gz b/2006Scape Server/data/world/map/490.gz similarity index 100% rename from 2006Redone Server/data/world/map/490.gz rename to 2006Scape Server/data/world/map/490.gz diff --git a/2006Redone Server/data/world/map/491.gz b/2006Scape Server/data/world/map/491.gz similarity index 100% rename from 2006Redone Server/data/world/map/491.gz rename to 2006Scape Server/data/world/map/491.gz diff --git a/2006Redone Server/data/world/map/492.gz b/2006Scape Server/data/world/map/492.gz similarity index 100% rename from 2006Redone Server/data/world/map/492.gz rename to 2006Scape Server/data/world/map/492.gz diff --git a/2006Redone Server/data/world/map/493.gz b/2006Scape Server/data/world/map/493.gz similarity index 100% rename from 2006Redone Server/data/world/map/493.gz rename to 2006Scape Server/data/world/map/493.gz diff --git a/2006Redone Server/data/world/map/494.gz b/2006Scape Server/data/world/map/494.gz similarity index 100% rename from 2006Redone Server/data/world/map/494.gz rename to 2006Scape Server/data/world/map/494.gz diff --git a/2006Redone Server/data/world/map/495.gz b/2006Scape Server/data/world/map/495.gz similarity index 100% rename from 2006Redone Server/data/world/map/495.gz rename to 2006Scape Server/data/world/map/495.gz diff --git a/2006Redone Server/data/world/map/496.gz b/2006Scape Server/data/world/map/496.gz similarity index 100% rename from 2006Redone Server/data/world/map/496.gz rename to 2006Scape Server/data/world/map/496.gz diff --git a/2006Redone Server/data/world/map/497.gz b/2006Scape Server/data/world/map/497.gz similarity index 100% rename from 2006Redone Server/data/world/map/497.gz rename to 2006Scape Server/data/world/map/497.gz diff --git a/2006Redone Server/data/world/map/498.gz b/2006Scape Server/data/world/map/498.gz similarity index 100% rename from 2006Redone Server/data/world/map/498.gz rename to 2006Scape Server/data/world/map/498.gz diff --git a/2006Redone Server/data/world/map/499.gz b/2006Scape Server/data/world/map/499.gz similarity index 100% rename from 2006Redone Server/data/world/map/499.gz rename to 2006Scape Server/data/world/map/499.gz diff --git a/2006Redone Server/data/world/map/50.gz b/2006Scape Server/data/world/map/50.gz similarity index 100% rename from 2006Redone Server/data/world/map/50.gz rename to 2006Scape Server/data/world/map/50.gz diff --git a/2006Redone Server/data/world/map/500.gz b/2006Scape Server/data/world/map/500.gz similarity index 100% rename from 2006Redone Server/data/world/map/500.gz rename to 2006Scape Server/data/world/map/500.gz diff --git a/2006Redone Server/data/world/map/501.gz b/2006Scape Server/data/world/map/501.gz similarity index 100% rename from 2006Redone Server/data/world/map/501.gz rename to 2006Scape Server/data/world/map/501.gz diff --git a/2006Redone Server/data/world/map/502.gz b/2006Scape Server/data/world/map/502.gz similarity index 100% rename from 2006Redone Server/data/world/map/502.gz rename to 2006Scape Server/data/world/map/502.gz diff --git a/2006Redone Server/data/world/map/503.gz b/2006Scape Server/data/world/map/503.gz similarity index 100% rename from 2006Redone Server/data/world/map/503.gz rename to 2006Scape Server/data/world/map/503.gz diff --git a/2006Redone Server/data/world/map/504.gz b/2006Scape Server/data/world/map/504.gz similarity index 100% rename from 2006Redone Server/data/world/map/504.gz rename to 2006Scape Server/data/world/map/504.gz diff --git a/2006Redone Server/data/world/map/505.gz b/2006Scape Server/data/world/map/505.gz similarity index 100% rename from 2006Redone Server/data/world/map/505.gz rename to 2006Scape Server/data/world/map/505.gz diff --git a/2006Redone Server/data/world/map/508.gz b/2006Scape Server/data/world/map/508.gz similarity index 100% rename from 2006Redone Server/data/world/map/508.gz rename to 2006Scape Server/data/world/map/508.gz diff --git a/2006Redone Server/data/world/map/509.gz b/2006Scape Server/data/world/map/509.gz similarity index 100% rename from 2006Redone Server/data/world/map/509.gz rename to 2006Scape Server/data/world/map/509.gz diff --git a/2006Redone Server/data/world/map/51.gz b/2006Scape Server/data/world/map/51.gz similarity index 100% rename from 2006Redone Server/data/world/map/51.gz rename to 2006Scape Server/data/world/map/51.gz diff --git a/2006Redone Server/data/world/map/510.gz b/2006Scape Server/data/world/map/510.gz similarity index 100% rename from 2006Redone Server/data/world/map/510.gz rename to 2006Scape Server/data/world/map/510.gz diff --git a/2006Redone Server/data/world/map/511.gz b/2006Scape Server/data/world/map/511.gz similarity index 100% rename from 2006Redone Server/data/world/map/511.gz rename to 2006Scape Server/data/world/map/511.gz diff --git a/2006Redone Server/data/world/map/512.gz b/2006Scape Server/data/world/map/512.gz similarity index 100% rename from 2006Redone Server/data/world/map/512.gz rename to 2006Scape Server/data/world/map/512.gz diff --git a/2006Redone Server/data/world/map/513.gz b/2006Scape Server/data/world/map/513.gz similarity index 100% rename from 2006Redone Server/data/world/map/513.gz rename to 2006Scape Server/data/world/map/513.gz diff --git a/2006Redone Server/data/world/map/514.gz b/2006Scape Server/data/world/map/514.gz similarity index 100% rename from 2006Redone Server/data/world/map/514.gz rename to 2006Scape Server/data/world/map/514.gz diff --git a/2006Redone Server/data/world/map/515.gz b/2006Scape Server/data/world/map/515.gz similarity index 100% rename from 2006Redone Server/data/world/map/515.gz rename to 2006Scape Server/data/world/map/515.gz diff --git a/2006Redone Server/data/world/map/516.gz b/2006Scape Server/data/world/map/516.gz similarity index 100% rename from 2006Redone Server/data/world/map/516.gz rename to 2006Scape Server/data/world/map/516.gz diff --git a/2006Redone Server/data/world/map/517.gz b/2006Scape Server/data/world/map/517.gz similarity index 100% rename from 2006Redone Server/data/world/map/517.gz rename to 2006Scape Server/data/world/map/517.gz diff --git a/2006Redone Server/data/world/map/518.gz b/2006Scape Server/data/world/map/518.gz similarity index 100% rename from 2006Redone Server/data/world/map/518.gz rename to 2006Scape Server/data/world/map/518.gz diff --git a/2006Redone Server/data/world/map/519.gz b/2006Scape Server/data/world/map/519.gz similarity index 100% rename from 2006Redone Server/data/world/map/519.gz rename to 2006Scape Server/data/world/map/519.gz diff --git a/2006Redone Server/data/world/map/52.gz b/2006Scape Server/data/world/map/52.gz similarity index 100% rename from 2006Redone Server/data/world/map/52.gz rename to 2006Scape Server/data/world/map/52.gz diff --git a/2006Redone Server/data/world/map/520.gz b/2006Scape Server/data/world/map/520.gz similarity index 100% rename from 2006Redone Server/data/world/map/520.gz rename to 2006Scape Server/data/world/map/520.gz diff --git a/2006Redone Server/data/world/map/521.gz b/2006Scape Server/data/world/map/521.gz similarity index 100% rename from 2006Redone Server/data/world/map/521.gz rename to 2006Scape Server/data/world/map/521.gz diff --git a/2006Redone Server/data/world/map/522.gz b/2006Scape Server/data/world/map/522.gz similarity index 100% rename from 2006Redone Server/data/world/map/522.gz rename to 2006Scape Server/data/world/map/522.gz diff --git a/2006Redone Server/data/world/map/523.gz b/2006Scape Server/data/world/map/523.gz similarity index 100% rename from 2006Redone Server/data/world/map/523.gz rename to 2006Scape Server/data/world/map/523.gz diff --git a/2006Redone Server/data/world/map/526.gz b/2006Scape Server/data/world/map/526.gz similarity index 100% rename from 2006Redone Server/data/world/map/526.gz rename to 2006Scape Server/data/world/map/526.gz diff --git a/2006Redone Server/data/world/map/527.gz b/2006Scape Server/data/world/map/527.gz similarity index 100% rename from 2006Redone Server/data/world/map/527.gz rename to 2006Scape Server/data/world/map/527.gz diff --git a/2006Redone Server/data/world/map/528.gz b/2006Scape Server/data/world/map/528.gz similarity index 100% rename from 2006Redone Server/data/world/map/528.gz rename to 2006Scape Server/data/world/map/528.gz diff --git a/2006Redone Server/data/world/map/529.gz b/2006Scape Server/data/world/map/529.gz similarity index 100% rename from 2006Redone Server/data/world/map/529.gz rename to 2006Scape Server/data/world/map/529.gz diff --git a/2006Redone Server/data/world/map/53.gz b/2006Scape Server/data/world/map/53.gz similarity index 100% rename from 2006Redone Server/data/world/map/53.gz rename to 2006Scape Server/data/world/map/53.gz diff --git a/2006Redone Server/data/world/map/530.gz b/2006Scape Server/data/world/map/530.gz similarity index 100% rename from 2006Redone Server/data/world/map/530.gz rename to 2006Scape Server/data/world/map/530.gz diff --git a/2006Redone Server/data/world/map/531.gz b/2006Scape Server/data/world/map/531.gz similarity index 100% rename from 2006Redone Server/data/world/map/531.gz rename to 2006Scape Server/data/world/map/531.gz diff --git a/2006Redone Server/data/world/map/532.gz b/2006Scape Server/data/world/map/532.gz similarity index 100% rename from 2006Redone Server/data/world/map/532.gz rename to 2006Scape Server/data/world/map/532.gz diff --git a/2006Redone Server/data/world/map/533.gz b/2006Scape Server/data/world/map/533.gz similarity index 100% rename from 2006Redone Server/data/world/map/533.gz rename to 2006Scape Server/data/world/map/533.gz diff --git a/2006Redone Server/data/world/map/534.gz b/2006Scape Server/data/world/map/534.gz similarity index 100% rename from 2006Redone Server/data/world/map/534.gz rename to 2006Scape Server/data/world/map/534.gz diff --git a/2006Redone Server/data/world/map/535.gz b/2006Scape Server/data/world/map/535.gz similarity index 100% rename from 2006Redone Server/data/world/map/535.gz rename to 2006Scape Server/data/world/map/535.gz diff --git a/2006Redone Server/data/world/map/536.gz b/2006Scape Server/data/world/map/536.gz similarity index 100% rename from 2006Redone Server/data/world/map/536.gz rename to 2006Scape Server/data/world/map/536.gz diff --git a/2006Redone Server/data/world/map/537.gz b/2006Scape Server/data/world/map/537.gz similarity index 100% rename from 2006Redone Server/data/world/map/537.gz rename to 2006Scape Server/data/world/map/537.gz diff --git a/2006Redone Server/data/world/map/538.gz b/2006Scape Server/data/world/map/538.gz similarity index 100% rename from 2006Redone Server/data/world/map/538.gz rename to 2006Scape Server/data/world/map/538.gz diff --git a/2006Redone Server/data/world/map/539.gz b/2006Scape Server/data/world/map/539.gz similarity index 100% rename from 2006Redone Server/data/world/map/539.gz rename to 2006Scape Server/data/world/map/539.gz diff --git a/2006Redone Server/data/world/map/54.gz b/2006Scape Server/data/world/map/54.gz similarity index 100% rename from 2006Redone Server/data/world/map/54.gz rename to 2006Scape Server/data/world/map/54.gz diff --git a/2006Redone Server/data/world/map/540.gz b/2006Scape Server/data/world/map/540.gz similarity index 100% rename from 2006Redone Server/data/world/map/540.gz rename to 2006Scape Server/data/world/map/540.gz diff --git a/2006Redone Server/data/world/map/541.gz b/2006Scape Server/data/world/map/541.gz similarity index 100% rename from 2006Redone Server/data/world/map/541.gz rename to 2006Scape Server/data/world/map/541.gz diff --git a/2006Redone Server/data/world/map/542.gz b/2006Scape Server/data/world/map/542.gz similarity index 100% rename from 2006Redone Server/data/world/map/542.gz rename to 2006Scape Server/data/world/map/542.gz diff --git a/2006Redone Server/data/world/map/543.gz b/2006Scape Server/data/world/map/543.gz similarity index 100% rename from 2006Redone Server/data/world/map/543.gz rename to 2006Scape Server/data/world/map/543.gz diff --git a/2006Redone Server/data/world/map/544.gz b/2006Scape Server/data/world/map/544.gz similarity index 100% rename from 2006Redone Server/data/world/map/544.gz rename to 2006Scape Server/data/world/map/544.gz diff --git a/2006Redone Server/data/world/map/545.gz b/2006Scape Server/data/world/map/545.gz similarity index 100% rename from 2006Redone Server/data/world/map/545.gz rename to 2006Scape Server/data/world/map/545.gz diff --git a/2006Redone Server/data/world/map/546.gz b/2006Scape Server/data/world/map/546.gz similarity index 100% rename from 2006Redone Server/data/world/map/546.gz rename to 2006Scape Server/data/world/map/546.gz diff --git a/2006Redone Server/data/world/map/547.gz b/2006Scape Server/data/world/map/547.gz similarity index 100% rename from 2006Redone Server/data/world/map/547.gz rename to 2006Scape Server/data/world/map/547.gz diff --git a/2006Redone Server/data/world/map/548.gz b/2006Scape Server/data/world/map/548.gz similarity index 100% rename from 2006Redone Server/data/world/map/548.gz rename to 2006Scape Server/data/world/map/548.gz diff --git a/2006Redone Server/data/world/map/549.gz b/2006Scape Server/data/world/map/549.gz similarity index 100% rename from 2006Redone Server/data/world/map/549.gz rename to 2006Scape Server/data/world/map/549.gz diff --git a/2006Redone Server/data/world/map/55.gz b/2006Scape Server/data/world/map/55.gz similarity index 100% rename from 2006Redone Server/data/world/map/55.gz rename to 2006Scape Server/data/world/map/55.gz diff --git a/2006Redone Server/data/world/map/550.gz b/2006Scape Server/data/world/map/550.gz similarity index 100% rename from 2006Redone Server/data/world/map/550.gz rename to 2006Scape Server/data/world/map/550.gz diff --git a/2006Redone Server/data/world/map/551.gz b/2006Scape Server/data/world/map/551.gz similarity index 100% rename from 2006Redone Server/data/world/map/551.gz rename to 2006Scape Server/data/world/map/551.gz diff --git a/2006Redone Server/data/world/map/552.gz b/2006Scape Server/data/world/map/552.gz similarity index 100% rename from 2006Redone Server/data/world/map/552.gz rename to 2006Scape Server/data/world/map/552.gz diff --git a/2006Redone Server/data/world/map/553.gz b/2006Scape Server/data/world/map/553.gz similarity index 100% rename from 2006Redone Server/data/world/map/553.gz rename to 2006Scape Server/data/world/map/553.gz diff --git a/2006Redone Server/data/world/map/554.gz b/2006Scape Server/data/world/map/554.gz similarity index 100% rename from 2006Redone Server/data/world/map/554.gz rename to 2006Scape Server/data/world/map/554.gz diff --git a/2006Redone Server/data/world/map/555.gz b/2006Scape Server/data/world/map/555.gz similarity index 100% rename from 2006Redone Server/data/world/map/555.gz rename to 2006Scape Server/data/world/map/555.gz diff --git a/2006Redone Server/data/world/map/556.gz b/2006Scape Server/data/world/map/556.gz similarity index 100% rename from 2006Redone Server/data/world/map/556.gz rename to 2006Scape Server/data/world/map/556.gz diff --git a/2006Redone Server/data/world/map/557.gz b/2006Scape Server/data/world/map/557.gz similarity index 100% rename from 2006Redone Server/data/world/map/557.gz rename to 2006Scape Server/data/world/map/557.gz diff --git a/2006Redone Server/data/world/map/558.gz b/2006Scape Server/data/world/map/558.gz similarity index 100% rename from 2006Redone Server/data/world/map/558.gz rename to 2006Scape Server/data/world/map/558.gz diff --git a/2006Redone Server/data/world/map/559.gz b/2006Scape Server/data/world/map/559.gz similarity index 100% rename from 2006Redone Server/data/world/map/559.gz rename to 2006Scape Server/data/world/map/559.gz diff --git a/2006Redone Server/data/world/map/56.gz b/2006Scape Server/data/world/map/56.gz similarity index 100% rename from 2006Redone Server/data/world/map/56.gz rename to 2006Scape Server/data/world/map/56.gz diff --git a/2006Redone Server/data/world/map/560.gz b/2006Scape Server/data/world/map/560.gz similarity index 100% rename from 2006Redone Server/data/world/map/560.gz rename to 2006Scape Server/data/world/map/560.gz diff --git a/2006Redone Server/data/world/map/561.gz b/2006Scape Server/data/world/map/561.gz similarity index 100% rename from 2006Redone Server/data/world/map/561.gz rename to 2006Scape Server/data/world/map/561.gz diff --git a/2006Redone Server/data/world/map/562.gz b/2006Scape Server/data/world/map/562.gz similarity index 100% rename from 2006Redone Server/data/world/map/562.gz rename to 2006Scape Server/data/world/map/562.gz diff --git a/2006Redone Server/data/world/map/563.gz b/2006Scape Server/data/world/map/563.gz similarity index 100% rename from 2006Redone Server/data/world/map/563.gz rename to 2006Scape Server/data/world/map/563.gz diff --git a/2006Redone Server/data/world/map/564.gz b/2006Scape Server/data/world/map/564.gz similarity index 100% rename from 2006Redone Server/data/world/map/564.gz rename to 2006Scape Server/data/world/map/564.gz diff --git a/2006Redone Server/data/world/map/565.gz b/2006Scape Server/data/world/map/565.gz similarity index 100% rename from 2006Redone Server/data/world/map/565.gz rename to 2006Scape Server/data/world/map/565.gz diff --git a/2006Redone Server/data/world/map/566.gz b/2006Scape Server/data/world/map/566.gz similarity index 100% rename from 2006Redone Server/data/world/map/566.gz rename to 2006Scape Server/data/world/map/566.gz diff --git a/2006Redone Server/data/world/map/567.gz b/2006Scape Server/data/world/map/567.gz similarity index 100% rename from 2006Redone Server/data/world/map/567.gz rename to 2006Scape Server/data/world/map/567.gz diff --git a/2006Redone Server/data/world/map/568.gz b/2006Scape Server/data/world/map/568.gz similarity index 100% rename from 2006Redone Server/data/world/map/568.gz rename to 2006Scape Server/data/world/map/568.gz diff --git a/2006Redone Server/data/world/map/569.gz b/2006Scape Server/data/world/map/569.gz similarity index 100% rename from 2006Redone Server/data/world/map/569.gz rename to 2006Scape Server/data/world/map/569.gz diff --git a/2006Redone Server/data/world/map/57.gz b/2006Scape Server/data/world/map/57.gz similarity index 100% rename from 2006Redone Server/data/world/map/57.gz rename to 2006Scape Server/data/world/map/57.gz diff --git a/2006Redone Server/data/world/map/570.gz b/2006Scape Server/data/world/map/570.gz similarity index 100% rename from 2006Redone Server/data/world/map/570.gz rename to 2006Scape Server/data/world/map/570.gz diff --git a/2006Redone Server/data/world/map/571.gz b/2006Scape Server/data/world/map/571.gz similarity index 100% rename from 2006Redone Server/data/world/map/571.gz rename to 2006Scape Server/data/world/map/571.gz diff --git a/2006Redone Server/data/world/map/572.gz b/2006Scape Server/data/world/map/572.gz similarity index 100% rename from 2006Redone Server/data/world/map/572.gz rename to 2006Scape Server/data/world/map/572.gz diff --git a/2006Redone Server/data/world/map/573.gz b/2006Scape Server/data/world/map/573.gz similarity index 100% rename from 2006Redone Server/data/world/map/573.gz rename to 2006Scape Server/data/world/map/573.gz diff --git a/2006Redone Server/data/world/map/574.gz b/2006Scape Server/data/world/map/574.gz similarity index 100% rename from 2006Redone Server/data/world/map/574.gz rename to 2006Scape Server/data/world/map/574.gz diff --git a/2006Redone Server/data/world/map/575.gz b/2006Scape Server/data/world/map/575.gz similarity index 100% rename from 2006Redone Server/data/world/map/575.gz rename to 2006Scape Server/data/world/map/575.gz diff --git a/2006Redone Server/data/world/map/576.gz b/2006Scape Server/data/world/map/576.gz similarity index 100% rename from 2006Redone Server/data/world/map/576.gz rename to 2006Scape Server/data/world/map/576.gz diff --git a/2006Redone Server/data/world/map/577.gz b/2006Scape Server/data/world/map/577.gz similarity index 100% rename from 2006Redone Server/data/world/map/577.gz rename to 2006Scape Server/data/world/map/577.gz diff --git a/2006Redone Server/data/world/map/578.gz b/2006Scape Server/data/world/map/578.gz similarity index 100% rename from 2006Redone Server/data/world/map/578.gz rename to 2006Scape Server/data/world/map/578.gz diff --git a/2006Redone Server/data/world/map/579.gz b/2006Scape Server/data/world/map/579.gz similarity index 100% rename from 2006Redone Server/data/world/map/579.gz rename to 2006Scape Server/data/world/map/579.gz diff --git a/2006Redone Server/data/world/map/58.gz b/2006Scape Server/data/world/map/58.gz similarity index 100% rename from 2006Redone Server/data/world/map/58.gz rename to 2006Scape Server/data/world/map/58.gz diff --git a/2006Redone Server/data/world/map/580.gz b/2006Scape Server/data/world/map/580.gz similarity index 100% rename from 2006Redone Server/data/world/map/580.gz rename to 2006Scape Server/data/world/map/580.gz diff --git a/2006Redone Server/data/world/map/581.gz b/2006Scape Server/data/world/map/581.gz similarity index 100% rename from 2006Redone Server/data/world/map/581.gz rename to 2006Scape Server/data/world/map/581.gz diff --git a/2006Redone Server/data/world/map/582.gz b/2006Scape Server/data/world/map/582.gz similarity index 100% rename from 2006Redone Server/data/world/map/582.gz rename to 2006Scape Server/data/world/map/582.gz diff --git a/2006Redone Server/data/world/map/583.gz b/2006Scape Server/data/world/map/583.gz similarity index 100% rename from 2006Redone Server/data/world/map/583.gz rename to 2006Scape Server/data/world/map/583.gz diff --git a/2006Redone Server/data/world/map/584.gz b/2006Scape Server/data/world/map/584.gz similarity index 100% rename from 2006Redone Server/data/world/map/584.gz rename to 2006Scape Server/data/world/map/584.gz diff --git a/2006Redone Server/data/world/map/585.gz b/2006Scape Server/data/world/map/585.gz similarity index 100% rename from 2006Redone Server/data/world/map/585.gz rename to 2006Scape Server/data/world/map/585.gz diff --git a/2006Redone Server/data/world/map/586.gz b/2006Scape Server/data/world/map/586.gz similarity index 100% rename from 2006Redone Server/data/world/map/586.gz rename to 2006Scape Server/data/world/map/586.gz diff --git a/2006Redone Server/data/world/map/587.gz b/2006Scape Server/data/world/map/587.gz similarity index 100% rename from 2006Redone Server/data/world/map/587.gz rename to 2006Scape Server/data/world/map/587.gz diff --git a/2006Redone Server/data/world/map/588.gz b/2006Scape Server/data/world/map/588.gz similarity index 100% rename from 2006Redone Server/data/world/map/588.gz rename to 2006Scape Server/data/world/map/588.gz diff --git a/2006Redone Server/data/world/map/589.gz b/2006Scape Server/data/world/map/589.gz similarity index 100% rename from 2006Redone Server/data/world/map/589.gz rename to 2006Scape Server/data/world/map/589.gz diff --git a/2006Redone Server/data/world/map/59.gz b/2006Scape Server/data/world/map/59.gz similarity index 100% rename from 2006Redone Server/data/world/map/59.gz rename to 2006Scape Server/data/world/map/59.gz diff --git a/2006Redone Server/data/world/map/590.gz b/2006Scape Server/data/world/map/590.gz similarity index 100% rename from 2006Redone Server/data/world/map/590.gz rename to 2006Scape Server/data/world/map/590.gz diff --git a/2006Redone Server/data/world/map/591.gz b/2006Scape Server/data/world/map/591.gz similarity index 100% rename from 2006Redone Server/data/world/map/591.gz rename to 2006Scape Server/data/world/map/591.gz diff --git a/2006Redone Server/data/world/map/592.gz b/2006Scape Server/data/world/map/592.gz similarity index 100% rename from 2006Redone Server/data/world/map/592.gz rename to 2006Scape Server/data/world/map/592.gz diff --git a/2006Redone Server/data/world/map/593.gz b/2006Scape Server/data/world/map/593.gz similarity index 100% rename from 2006Redone Server/data/world/map/593.gz rename to 2006Scape Server/data/world/map/593.gz diff --git a/2006Redone Server/data/world/map/594.gz b/2006Scape Server/data/world/map/594.gz similarity index 100% rename from 2006Redone Server/data/world/map/594.gz rename to 2006Scape Server/data/world/map/594.gz diff --git a/2006Redone Server/data/world/map/595.gz b/2006Scape Server/data/world/map/595.gz similarity index 100% rename from 2006Redone Server/data/world/map/595.gz rename to 2006Scape Server/data/world/map/595.gz diff --git a/2006Redone Server/data/world/map/596.gz b/2006Scape Server/data/world/map/596.gz similarity index 100% rename from 2006Redone Server/data/world/map/596.gz rename to 2006Scape Server/data/world/map/596.gz diff --git a/2006Redone Server/data/world/map/597.gz b/2006Scape Server/data/world/map/597.gz similarity index 100% rename from 2006Redone Server/data/world/map/597.gz rename to 2006Scape Server/data/world/map/597.gz diff --git a/2006Redone Server/data/world/map/598.gz b/2006Scape Server/data/world/map/598.gz similarity index 100% rename from 2006Redone Server/data/world/map/598.gz rename to 2006Scape Server/data/world/map/598.gz diff --git a/2006Redone Server/data/world/map/599.gz b/2006Scape Server/data/world/map/599.gz similarity index 100% rename from 2006Redone Server/data/world/map/599.gz rename to 2006Scape Server/data/world/map/599.gz diff --git a/2006Redone Server/data/world/map/6.gz b/2006Scape Server/data/world/map/6.gz similarity index 100% rename from 2006Redone Server/data/world/map/6.gz rename to 2006Scape Server/data/world/map/6.gz diff --git a/2006Redone Server/data/world/map/60.gz b/2006Scape Server/data/world/map/60.gz similarity index 100% rename from 2006Redone Server/data/world/map/60.gz rename to 2006Scape Server/data/world/map/60.gz diff --git a/2006Redone Server/data/world/map/600.gz b/2006Scape Server/data/world/map/600.gz similarity index 100% rename from 2006Redone Server/data/world/map/600.gz rename to 2006Scape Server/data/world/map/600.gz diff --git a/2006Redone Server/data/world/map/601.gz b/2006Scape Server/data/world/map/601.gz similarity index 100% rename from 2006Redone Server/data/world/map/601.gz rename to 2006Scape Server/data/world/map/601.gz diff --git a/2006Redone Server/data/world/map/602.gz b/2006Scape Server/data/world/map/602.gz similarity index 100% rename from 2006Redone Server/data/world/map/602.gz rename to 2006Scape Server/data/world/map/602.gz diff --git a/2006Redone Server/data/world/map/603.gz b/2006Scape Server/data/world/map/603.gz similarity index 100% rename from 2006Redone Server/data/world/map/603.gz rename to 2006Scape Server/data/world/map/603.gz diff --git a/2006Redone Server/data/world/map/604.gz b/2006Scape Server/data/world/map/604.gz similarity index 100% rename from 2006Redone Server/data/world/map/604.gz rename to 2006Scape Server/data/world/map/604.gz diff --git a/2006Redone Server/data/world/map/605.gz b/2006Scape Server/data/world/map/605.gz similarity index 100% rename from 2006Redone Server/data/world/map/605.gz rename to 2006Scape Server/data/world/map/605.gz diff --git a/2006Redone Server/data/world/map/606.gz b/2006Scape Server/data/world/map/606.gz similarity index 100% rename from 2006Redone Server/data/world/map/606.gz rename to 2006Scape Server/data/world/map/606.gz diff --git a/2006Redone Server/data/world/map/607.gz b/2006Scape Server/data/world/map/607.gz similarity index 100% rename from 2006Redone Server/data/world/map/607.gz rename to 2006Scape Server/data/world/map/607.gz diff --git a/2006Redone Server/data/world/map/608.gz b/2006Scape Server/data/world/map/608.gz similarity index 100% rename from 2006Redone Server/data/world/map/608.gz rename to 2006Scape Server/data/world/map/608.gz diff --git a/2006Redone Server/data/world/map/609.gz b/2006Scape Server/data/world/map/609.gz similarity index 100% rename from 2006Redone Server/data/world/map/609.gz rename to 2006Scape Server/data/world/map/609.gz diff --git a/2006Redone Server/data/world/map/61.gz b/2006Scape Server/data/world/map/61.gz similarity index 100% rename from 2006Redone Server/data/world/map/61.gz rename to 2006Scape Server/data/world/map/61.gz diff --git a/2006Redone Server/data/world/map/610.gz b/2006Scape Server/data/world/map/610.gz similarity index 100% rename from 2006Redone Server/data/world/map/610.gz rename to 2006Scape Server/data/world/map/610.gz diff --git a/2006Redone Server/data/world/map/611.gz b/2006Scape Server/data/world/map/611.gz similarity index 100% rename from 2006Redone Server/data/world/map/611.gz rename to 2006Scape Server/data/world/map/611.gz diff --git a/2006Redone Server/data/world/map/612.gz b/2006Scape Server/data/world/map/612.gz similarity index 100% rename from 2006Redone Server/data/world/map/612.gz rename to 2006Scape Server/data/world/map/612.gz diff --git a/2006Redone Server/data/world/map/613.gz b/2006Scape Server/data/world/map/613.gz similarity index 100% rename from 2006Redone Server/data/world/map/613.gz rename to 2006Scape Server/data/world/map/613.gz diff --git a/2006Redone Server/data/world/map/614.gz b/2006Scape Server/data/world/map/614.gz similarity index 100% rename from 2006Redone Server/data/world/map/614.gz rename to 2006Scape Server/data/world/map/614.gz diff --git a/2006Redone Server/data/world/map/615.gz b/2006Scape Server/data/world/map/615.gz similarity index 100% rename from 2006Redone Server/data/world/map/615.gz rename to 2006Scape Server/data/world/map/615.gz diff --git a/2006Redone Server/data/world/map/616.gz b/2006Scape Server/data/world/map/616.gz similarity index 100% rename from 2006Redone Server/data/world/map/616.gz rename to 2006Scape Server/data/world/map/616.gz diff --git a/2006Redone Server/data/world/map/617.gz b/2006Scape Server/data/world/map/617.gz similarity index 100% rename from 2006Redone Server/data/world/map/617.gz rename to 2006Scape Server/data/world/map/617.gz diff --git a/2006Redone Server/data/world/map/618.gz b/2006Scape Server/data/world/map/618.gz similarity index 100% rename from 2006Redone Server/data/world/map/618.gz rename to 2006Scape Server/data/world/map/618.gz diff --git a/2006Redone Server/data/world/map/619.gz b/2006Scape Server/data/world/map/619.gz similarity index 100% rename from 2006Redone Server/data/world/map/619.gz rename to 2006Scape Server/data/world/map/619.gz diff --git a/2006Redone Server/data/world/map/62.gz b/2006Scape Server/data/world/map/62.gz similarity index 100% rename from 2006Redone Server/data/world/map/62.gz rename to 2006Scape Server/data/world/map/62.gz diff --git a/2006Redone Server/data/world/map/620.gz b/2006Scape Server/data/world/map/620.gz similarity index 100% rename from 2006Redone Server/data/world/map/620.gz rename to 2006Scape Server/data/world/map/620.gz diff --git a/2006Redone Server/data/world/map/621.gz b/2006Scape Server/data/world/map/621.gz similarity index 100% rename from 2006Redone Server/data/world/map/621.gz rename to 2006Scape Server/data/world/map/621.gz diff --git a/2006Redone Server/data/world/map/622.gz b/2006Scape Server/data/world/map/622.gz similarity index 100% rename from 2006Redone Server/data/world/map/622.gz rename to 2006Scape Server/data/world/map/622.gz diff --git a/2006Redone Server/data/world/map/623.gz b/2006Scape Server/data/world/map/623.gz similarity index 100% rename from 2006Redone Server/data/world/map/623.gz rename to 2006Scape Server/data/world/map/623.gz diff --git a/2006Redone Server/data/world/map/624.gz b/2006Scape Server/data/world/map/624.gz similarity index 100% rename from 2006Redone Server/data/world/map/624.gz rename to 2006Scape Server/data/world/map/624.gz diff --git a/2006Redone Server/data/world/map/625.gz b/2006Scape Server/data/world/map/625.gz similarity index 100% rename from 2006Redone Server/data/world/map/625.gz rename to 2006Scape Server/data/world/map/625.gz diff --git a/2006Redone Server/data/world/map/626.gz b/2006Scape Server/data/world/map/626.gz similarity index 100% rename from 2006Redone Server/data/world/map/626.gz rename to 2006Scape Server/data/world/map/626.gz diff --git a/2006Redone Server/data/world/map/627.gz b/2006Scape Server/data/world/map/627.gz similarity index 100% rename from 2006Redone Server/data/world/map/627.gz rename to 2006Scape Server/data/world/map/627.gz diff --git a/2006Redone Server/data/world/map/628.gz b/2006Scape Server/data/world/map/628.gz similarity index 100% rename from 2006Redone Server/data/world/map/628.gz rename to 2006Scape Server/data/world/map/628.gz diff --git a/2006Redone Server/data/world/map/629.gz b/2006Scape Server/data/world/map/629.gz similarity index 100% rename from 2006Redone Server/data/world/map/629.gz rename to 2006Scape Server/data/world/map/629.gz diff --git a/2006Redone Server/data/world/map/63.gz b/2006Scape Server/data/world/map/63.gz similarity index 100% rename from 2006Redone Server/data/world/map/63.gz rename to 2006Scape Server/data/world/map/63.gz diff --git a/2006Redone Server/data/world/map/630.gz b/2006Scape Server/data/world/map/630.gz similarity index 100% rename from 2006Redone Server/data/world/map/630.gz rename to 2006Scape Server/data/world/map/630.gz diff --git a/2006Redone Server/data/world/map/631.gz b/2006Scape Server/data/world/map/631.gz similarity index 100% rename from 2006Redone Server/data/world/map/631.gz rename to 2006Scape Server/data/world/map/631.gz diff --git a/2006Redone Server/data/world/map/632.gz b/2006Scape Server/data/world/map/632.gz similarity index 100% rename from 2006Redone Server/data/world/map/632.gz rename to 2006Scape Server/data/world/map/632.gz diff --git a/2006Redone Server/data/world/map/633.gz b/2006Scape Server/data/world/map/633.gz similarity index 100% rename from 2006Redone Server/data/world/map/633.gz rename to 2006Scape Server/data/world/map/633.gz diff --git a/2006Redone Server/data/world/map/634.gz b/2006Scape Server/data/world/map/634.gz similarity index 100% rename from 2006Redone Server/data/world/map/634.gz rename to 2006Scape Server/data/world/map/634.gz diff --git a/2006Redone Server/data/world/map/635.gz b/2006Scape Server/data/world/map/635.gz similarity index 100% rename from 2006Redone Server/data/world/map/635.gz rename to 2006Scape Server/data/world/map/635.gz diff --git a/2006Redone Server/data/world/map/636.gz b/2006Scape Server/data/world/map/636.gz similarity index 100% rename from 2006Redone Server/data/world/map/636.gz rename to 2006Scape Server/data/world/map/636.gz diff --git a/2006Redone Server/data/world/map/637.gz b/2006Scape Server/data/world/map/637.gz similarity index 100% rename from 2006Redone Server/data/world/map/637.gz rename to 2006Scape Server/data/world/map/637.gz diff --git a/2006Redone Server/data/world/map/638.gz b/2006Scape Server/data/world/map/638.gz similarity index 100% rename from 2006Redone Server/data/world/map/638.gz rename to 2006Scape Server/data/world/map/638.gz diff --git a/2006Redone Server/data/world/map/639.gz b/2006Scape Server/data/world/map/639.gz similarity index 100% rename from 2006Redone Server/data/world/map/639.gz rename to 2006Scape Server/data/world/map/639.gz diff --git a/2006Redone Server/data/world/map/64.gz b/2006Scape Server/data/world/map/64.gz similarity index 100% rename from 2006Redone Server/data/world/map/64.gz rename to 2006Scape Server/data/world/map/64.gz diff --git a/2006Redone Server/data/world/map/640.gz b/2006Scape Server/data/world/map/640.gz similarity index 100% rename from 2006Redone Server/data/world/map/640.gz rename to 2006Scape Server/data/world/map/640.gz diff --git a/2006Redone Server/data/world/map/641.gz b/2006Scape Server/data/world/map/641.gz similarity index 100% rename from 2006Redone Server/data/world/map/641.gz rename to 2006Scape Server/data/world/map/641.gz diff --git a/2006Redone Server/data/world/map/642.gz b/2006Scape Server/data/world/map/642.gz similarity index 100% rename from 2006Redone Server/data/world/map/642.gz rename to 2006Scape Server/data/world/map/642.gz diff --git a/2006Redone Server/data/world/map/643.gz b/2006Scape Server/data/world/map/643.gz similarity index 100% rename from 2006Redone Server/data/world/map/643.gz rename to 2006Scape Server/data/world/map/643.gz diff --git a/2006Redone Server/data/world/map/644.gz b/2006Scape Server/data/world/map/644.gz similarity index 100% rename from 2006Redone Server/data/world/map/644.gz rename to 2006Scape Server/data/world/map/644.gz diff --git a/2006Redone Server/data/world/map/645.gz b/2006Scape Server/data/world/map/645.gz similarity index 100% rename from 2006Redone Server/data/world/map/645.gz rename to 2006Scape Server/data/world/map/645.gz diff --git a/2006Redone Server/data/world/map/646.gz b/2006Scape Server/data/world/map/646.gz similarity index 100% rename from 2006Redone Server/data/world/map/646.gz rename to 2006Scape Server/data/world/map/646.gz diff --git a/2006Redone Server/data/world/map/647.gz b/2006Scape Server/data/world/map/647.gz similarity index 100% rename from 2006Redone Server/data/world/map/647.gz rename to 2006Scape Server/data/world/map/647.gz diff --git a/2006Redone Server/data/world/map/648.gz b/2006Scape Server/data/world/map/648.gz similarity index 100% rename from 2006Redone Server/data/world/map/648.gz rename to 2006Scape Server/data/world/map/648.gz diff --git a/2006Redone Server/data/world/map/649.gz b/2006Scape Server/data/world/map/649.gz similarity index 100% rename from 2006Redone Server/data/world/map/649.gz rename to 2006Scape Server/data/world/map/649.gz diff --git a/2006Redone Server/data/world/map/65.gz b/2006Scape Server/data/world/map/65.gz similarity index 100% rename from 2006Redone Server/data/world/map/65.gz rename to 2006Scape Server/data/world/map/65.gz diff --git a/2006Redone Server/data/world/map/650.gz b/2006Scape Server/data/world/map/650.gz similarity index 100% rename from 2006Redone Server/data/world/map/650.gz rename to 2006Scape Server/data/world/map/650.gz diff --git a/2006Redone Server/data/world/map/651.gz b/2006Scape Server/data/world/map/651.gz similarity index 100% rename from 2006Redone Server/data/world/map/651.gz rename to 2006Scape Server/data/world/map/651.gz diff --git a/2006Redone Server/data/world/map/652.gz b/2006Scape Server/data/world/map/652.gz similarity index 100% rename from 2006Redone Server/data/world/map/652.gz rename to 2006Scape Server/data/world/map/652.gz diff --git a/2006Redone Server/data/world/map/653.gz b/2006Scape Server/data/world/map/653.gz similarity index 100% rename from 2006Redone Server/data/world/map/653.gz rename to 2006Scape Server/data/world/map/653.gz diff --git a/2006Redone Server/data/world/map/654.gz b/2006Scape Server/data/world/map/654.gz similarity index 100% rename from 2006Redone Server/data/world/map/654.gz rename to 2006Scape Server/data/world/map/654.gz diff --git a/2006Redone Server/data/world/map/655.gz b/2006Scape Server/data/world/map/655.gz similarity index 100% rename from 2006Redone Server/data/world/map/655.gz rename to 2006Scape Server/data/world/map/655.gz diff --git a/2006Redone Server/data/world/map/656.gz b/2006Scape Server/data/world/map/656.gz similarity index 100% rename from 2006Redone Server/data/world/map/656.gz rename to 2006Scape Server/data/world/map/656.gz diff --git a/2006Redone Server/data/world/map/657.gz b/2006Scape Server/data/world/map/657.gz similarity index 100% rename from 2006Redone Server/data/world/map/657.gz rename to 2006Scape Server/data/world/map/657.gz diff --git a/2006Redone Server/data/world/map/658.gz b/2006Scape Server/data/world/map/658.gz similarity index 100% rename from 2006Redone Server/data/world/map/658.gz rename to 2006Scape Server/data/world/map/658.gz diff --git a/2006Redone Server/data/world/map/659.gz b/2006Scape Server/data/world/map/659.gz similarity index 100% rename from 2006Redone Server/data/world/map/659.gz rename to 2006Scape Server/data/world/map/659.gz diff --git a/2006Redone Server/data/world/map/66.gz b/2006Scape Server/data/world/map/66.gz similarity index 100% rename from 2006Redone Server/data/world/map/66.gz rename to 2006Scape Server/data/world/map/66.gz diff --git a/2006Redone Server/data/world/map/660.gz b/2006Scape Server/data/world/map/660.gz similarity index 100% rename from 2006Redone Server/data/world/map/660.gz rename to 2006Scape Server/data/world/map/660.gz diff --git a/2006Redone Server/data/world/map/661.gz b/2006Scape Server/data/world/map/661.gz similarity index 100% rename from 2006Redone Server/data/world/map/661.gz rename to 2006Scape Server/data/world/map/661.gz diff --git a/2006Redone Server/data/world/map/662.gz b/2006Scape Server/data/world/map/662.gz similarity index 100% rename from 2006Redone Server/data/world/map/662.gz rename to 2006Scape Server/data/world/map/662.gz diff --git a/2006Redone Server/data/world/map/663.gz b/2006Scape Server/data/world/map/663.gz similarity index 100% rename from 2006Redone Server/data/world/map/663.gz rename to 2006Scape Server/data/world/map/663.gz diff --git a/2006Redone Server/data/world/map/666.gz b/2006Scape Server/data/world/map/666.gz similarity index 100% rename from 2006Redone Server/data/world/map/666.gz rename to 2006Scape Server/data/world/map/666.gz diff --git a/2006Redone Server/data/world/map/667.gz b/2006Scape Server/data/world/map/667.gz similarity index 100% rename from 2006Redone Server/data/world/map/667.gz rename to 2006Scape Server/data/world/map/667.gz diff --git a/2006Redone Server/data/world/map/668.gz b/2006Scape Server/data/world/map/668.gz similarity index 100% rename from 2006Redone Server/data/world/map/668.gz rename to 2006Scape Server/data/world/map/668.gz diff --git a/2006Redone Server/data/world/map/669.gz b/2006Scape Server/data/world/map/669.gz similarity index 100% rename from 2006Redone Server/data/world/map/669.gz rename to 2006Scape Server/data/world/map/669.gz diff --git a/2006Redone Server/data/world/map/67.gz b/2006Scape Server/data/world/map/67.gz similarity index 100% rename from 2006Redone Server/data/world/map/67.gz rename to 2006Scape Server/data/world/map/67.gz diff --git a/2006Redone Server/data/world/map/670.gz b/2006Scape Server/data/world/map/670.gz similarity index 100% rename from 2006Redone Server/data/world/map/670.gz rename to 2006Scape Server/data/world/map/670.gz diff --git a/2006Redone Server/data/world/map/671.gz b/2006Scape Server/data/world/map/671.gz similarity index 100% rename from 2006Redone Server/data/world/map/671.gz rename to 2006Scape Server/data/world/map/671.gz diff --git a/2006Redone Server/data/world/map/672.gz b/2006Scape Server/data/world/map/672.gz similarity index 100% rename from 2006Redone Server/data/world/map/672.gz rename to 2006Scape Server/data/world/map/672.gz diff --git a/2006Redone Server/data/world/map/673.gz b/2006Scape Server/data/world/map/673.gz similarity index 100% rename from 2006Redone Server/data/world/map/673.gz rename to 2006Scape Server/data/world/map/673.gz diff --git a/2006Redone Server/data/world/map/674.gz b/2006Scape Server/data/world/map/674.gz similarity index 100% rename from 2006Redone Server/data/world/map/674.gz rename to 2006Scape Server/data/world/map/674.gz diff --git a/2006Redone Server/data/world/map/675.gz b/2006Scape Server/data/world/map/675.gz similarity index 100% rename from 2006Redone Server/data/world/map/675.gz rename to 2006Scape Server/data/world/map/675.gz diff --git a/2006Redone Server/data/world/map/676.gz b/2006Scape Server/data/world/map/676.gz similarity index 100% rename from 2006Redone Server/data/world/map/676.gz rename to 2006Scape Server/data/world/map/676.gz diff --git a/2006Redone Server/data/world/map/677.gz b/2006Scape Server/data/world/map/677.gz similarity index 100% rename from 2006Redone Server/data/world/map/677.gz rename to 2006Scape Server/data/world/map/677.gz diff --git a/2006Redone Server/data/world/map/678.gz b/2006Scape Server/data/world/map/678.gz similarity index 100% rename from 2006Redone Server/data/world/map/678.gz rename to 2006Scape Server/data/world/map/678.gz diff --git a/2006Redone Server/data/world/map/679.gz b/2006Scape Server/data/world/map/679.gz similarity index 100% rename from 2006Redone Server/data/world/map/679.gz rename to 2006Scape Server/data/world/map/679.gz diff --git a/2006Redone Server/data/world/map/68.gz b/2006Scape Server/data/world/map/68.gz similarity index 100% rename from 2006Redone Server/data/world/map/68.gz rename to 2006Scape Server/data/world/map/68.gz diff --git a/2006Redone Server/data/world/map/680.gz b/2006Scape Server/data/world/map/680.gz similarity index 100% rename from 2006Redone Server/data/world/map/680.gz rename to 2006Scape Server/data/world/map/680.gz diff --git a/2006Redone Server/data/world/map/681.gz b/2006Scape Server/data/world/map/681.gz similarity index 100% rename from 2006Redone Server/data/world/map/681.gz rename to 2006Scape Server/data/world/map/681.gz diff --git a/2006Redone Server/data/world/map/682.gz b/2006Scape Server/data/world/map/682.gz similarity index 100% rename from 2006Redone Server/data/world/map/682.gz rename to 2006Scape Server/data/world/map/682.gz diff --git a/2006Redone Server/data/world/map/683.gz b/2006Scape Server/data/world/map/683.gz similarity index 100% rename from 2006Redone Server/data/world/map/683.gz rename to 2006Scape Server/data/world/map/683.gz diff --git a/2006Redone Server/data/world/map/684.gz b/2006Scape Server/data/world/map/684.gz similarity index 100% rename from 2006Redone Server/data/world/map/684.gz rename to 2006Scape Server/data/world/map/684.gz diff --git a/2006Redone Server/data/world/map/685.gz b/2006Scape Server/data/world/map/685.gz similarity index 100% rename from 2006Redone Server/data/world/map/685.gz rename to 2006Scape Server/data/world/map/685.gz diff --git a/2006Redone Server/data/world/map/686.gz b/2006Scape Server/data/world/map/686.gz similarity index 100% rename from 2006Redone Server/data/world/map/686.gz rename to 2006Scape Server/data/world/map/686.gz diff --git a/2006Redone Server/data/world/map/687.gz b/2006Scape Server/data/world/map/687.gz similarity index 100% rename from 2006Redone Server/data/world/map/687.gz rename to 2006Scape Server/data/world/map/687.gz diff --git a/2006Redone Server/data/world/map/688.gz b/2006Scape Server/data/world/map/688.gz similarity index 100% rename from 2006Redone Server/data/world/map/688.gz rename to 2006Scape Server/data/world/map/688.gz diff --git a/2006Redone Server/data/world/map/689.gz b/2006Scape Server/data/world/map/689.gz similarity index 100% rename from 2006Redone Server/data/world/map/689.gz rename to 2006Scape Server/data/world/map/689.gz diff --git a/2006Redone Server/data/world/map/69.gz b/2006Scape Server/data/world/map/69.gz similarity index 100% rename from 2006Redone Server/data/world/map/69.gz rename to 2006Scape Server/data/world/map/69.gz diff --git a/2006Redone Server/data/world/map/690.gz b/2006Scape Server/data/world/map/690.gz similarity index 100% rename from 2006Redone Server/data/world/map/690.gz rename to 2006Scape Server/data/world/map/690.gz diff --git a/2006Redone Server/data/world/map/691.gz b/2006Scape Server/data/world/map/691.gz similarity index 100% rename from 2006Redone Server/data/world/map/691.gz rename to 2006Scape Server/data/world/map/691.gz diff --git a/2006Redone Server/data/world/map/692.gz b/2006Scape Server/data/world/map/692.gz similarity index 100% rename from 2006Redone Server/data/world/map/692.gz rename to 2006Scape Server/data/world/map/692.gz diff --git a/2006Redone Server/data/world/map/693.gz b/2006Scape Server/data/world/map/693.gz similarity index 100% rename from 2006Redone Server/data/world/map/693.gz rename to 2006Scape Server/data/world/map/693.gz diff --git a/2006Redone Server/data/world/map/694.gz b/2006Scape Server/data/world/map/694.gz similarity index 100% rename from 2006Redone Server/data/world/map/694.gz rename to 2006Scape Server/data/world/map/694.gz diff --git a/2006Redone Server/data/world/map/695.gz b/2006Scape Server/data/world/map/695.gz similarity index 100% rename from 2006Redone Server/data/world/map/695.gz rename to 2006Scape Server/data/world/map/695.gz diff --git a/2006Redone Server/data/world/map/696.gz b/2006Scape Server/data/world/map/696.gz similarity index 100% rename from 2006Redone Server/data/world/map/696.gz rename to 2006Scape Server/data/world/map/696.gz diff --git a/2006Redone Server/data/world/map/697.gz b/2006Scape Server/data/world/map/697.gz similarity index 100% rename from 2006Redone Server/data/world/map/697.gz rename to 2006Scape Server/data/world/map/697.gz diff --git a/2006Redone Server/data/world/map/698.gz b/2006Scape Server/data/world/map/698.gz similarity index 100% rename from 2006Redone Server/data/world/map/698.gz rename to 2006Scape Server/data/world/map/698.gz diff --git a/2006Redone Server/data/world/map/699.gz b/2006Scape Server/data/world/map/699.gz similarity index 100% rename from 2006Redone Server/data/world/map/699.gz rename to 2006Scape Server/data/world/map/699.gz diff --git a/2006Redone Server/data/world/map/7.gz b/2006Scape Server/data/world/map/7.gz similarity index 100% rename from 2006Redone Server/data/world/map/7.gz rename to 2006Scape Server/data/world/map/7.gz diff --git a/2006Redone Server/data/world/map/70.gz b/2006Scape Server/data/world/map/70.gz similarity index 100% rename from 2006Redone Server/data/world/map/70.gz rename to 2006Scape Server/data/world/map/70.gz diff --git a/2006Redone Server/data/world/map/700.gz b/2006Scape Server/data/world/map/700.gz similarity index 100% rename from 2006Redone Server/data/world/map/700.gz rename to 2006Scape Server/data/world/map/700.gz diff --git a/2006Redone Server/data/world/map/701.gz b/2006Scape Server/data/world/map/701.gz similarity index 100% rename from 2006Redone Server/data/world/map/701.gz rename to 2006Scape Server/data/world/map/701.gz diff --git a/2006Redone Server/data/world/map/702.gz b/2006Scape Server/data/world/map/702.gz similarity index 100% rename from 2006Redone Server/data/world/map/702.gz rename to 2006Scape Server/data/world/map/702.gz diff --git a/2006Redone Server/data/world/map/703.gz b/2006Scape Server/data/world/map/703.gz similarity index 100% rename from 2006Redone Server/data/world/map/703.gz rename to 2006Scape Server/data/world/map/703.gz diff --git a/2006Redone Server/data/world/map/704.gz b/2006Scape Server/data/world/map/704.gz similarity index 100% rename from 2006Redone Server/data/world/map/704.gz rename to 2006Scape Server/data/world/map/704.gz diff --git a/2006Redone Server/data/world/map/705.gz b/2006Scape Server/data/world/map/705.gz similarity index 100% rename from 2006Redone Server/data/world/map/705.gz rename to 2006Scape Server/data/world/map/705.gz diff --git a/2006Redone Server/data/world/map/706.gz b/2006Scape Server/data/world/map/706.gz similarity index 100% rename from 2006Redone Server/data/world/map/706.gz rename to 2006Scape Server/data/world/map/706.gz diff --git a/2006Redone Server/data/world/map/707.gz b/2006Scape Server/data/world/map/707.gz similarity index 100% rename from 2006Redone Server/data/world/map/707.gz rename to 2006Scape Server/data/world/map/707.gz diff --git a/2006Redone Server/data/world/map/708.gz b/2006Scape Server/data/world/map/708.gz similarity index 100% rename from 2006Redone Server/data/world/map/708.gz rename to 2006Scape Server/data/world/map/708.gz diff --git a/2006Redone Server/data/world/map/709.gz b/2006Scape Server/data/world/map/709.gz similarity index 100% rename from 2006Redone Server/data/world/map/709.gz rename to 2006Scape Server/data/world/map/709.gz diff --git a/2006Redone Server/data/world/map/71.gz b/2006Scape Server/data/world/map/71.gz similarity index 100% rename from 2006Redone Server/data/world/map/71.gz rename to 2006Scape Server/data/world/map/71.gz diff --git a/2006Redone Server/data/world/map/710.gz b/2006Scape Server/data/world/map/710.gz similarity index 100% rename from 2006Redone Server/data/world/map/710.gz rename to 2006Scape Server/data/world/map/710.gz diff --git a/2006Redone Server/data/world/map/711.gz b/2006Scape Server/data/world/map/711.gz similarity index 100% rename from 2006Redone Server/data/world/map/711.gz rename to 2006Scape Server/data/world/map/711.gz diff --git a/2006Redone Server/data/world/map/712.gz b/2006Scape Server/data/world/map/712.gz similarity index 100% rename from 2006Redone Server/data/world/map/712.gz rename to 2006Scape Server/data/world/map/712.gz diff --git a/2006Redone Server/data/world/map/713.gz b/2006Scape Server/data/world/map/713.gz similarity index 100% rename from 2006Redone Server/data/world/map/713.gz rename to 2006Scape Server/data/world/map/713.gz diff --git a/2006Redone Server/data/world/map/714.gz b/2006Scape Server/data/world/map/714.gz similarity index 100% rename from 2006Redone Server/data/world/map/714.gz rename to 2006Scape Server/data/world/map/714.gz diff --git a/2006Redone Server/data/world/map/715.gz b/2006Scape Server/data/world/map/715.gz similarity index 100% rename from 2006Redone Server/data/world/map/715.gz rename to 2006Scape Server/data/world/map/715.gz diff --git a/2006Redone Server/data/world/map/716.gz b/2006Scape Server/data/world/map/716.gz similarity index 100% rename from 2006Redone Server/data/world/map/716.gz rename to 2006Scape Server/data/world/map/716.gz diff --git a/2006Redone Server/data/world/map/717.gz b/2006Scape Server/data/world/map/717.gz similarity index 100% rename from 2006Redone Server/data/world/map/717.gz rename to 2006Scape Server/data/world/map/717.gz diff --git a/2006Redone Server/data/world/map/72.gz b/2006Scape Server/data/world/map/72.gz similarity index 100% rename from 2006Redone Server/data/world/map/72.gz rename to 2006Scape Server/data/world/map/72.gz diff --git a/2006Redone Server/data/world/map/720.gz b/2006Scape Server/data/world/map/720.gz similarity index 100% rename from 2006Redone Server/data/world/map/720.gz rename to 2006Scape Server/data/world/map/720.gz diff --git a/2006Redone Server/data/world/map/721.gz b/2006Scape Server/data/world/map/721.gz similarity index 100% rename from 2006Redone Server/data/world/map/721.gz rename to 2006Scape Server/data/world/map/721.gz diff --git a/2006Redone Server/data/world/map/722.gz b/2006Scape Server/data/world/map/722.gz similarity index 100% rename from 2006Redone Server/data/world/map/722.gz rename to 2006Scape Server/data/world/map/722.gz diff --git a/2006Redone Server/data/world/map/723.gz b/2006Scape Server/data/world/map/723.gz similarity index 100% rename from 2006Redone Server/data/world/map/723.gz rename to 2006Scape Server/data/world/map/723.gz diff --git a/2006Redone Server/data/world/map/724.gz b/2006Scape Server/data/world/map/724.gz similarity index 100% rename from 2006Redone Server/data/world/map/724.gz rename to 2006Scape Server/data/world/map/724.gz diff --git a/2006Redone Server/data/world/map/725.gz b/2006Scape Server/data/world/map/725.gz similarity index 100% rename from 2006Redone Server/data/world/map/725.gz rename to 2006Scape Server/data/world/map/725.gz diff --git a/2006Redone Server/data/world/map/726.gz b/2006Scape Server/data/world/map/726.gz similarity index 100% rename from 2006Redone Server/data/world/map/726.gz rename to 2006Scape Server/data/world/map/726.gz diff --git a/2006Redone Server/data/world/map/727.gz b/2006Scape Server/data/world/map/727.gz similarity index 100% rename from 2006Redone Server/data/world/map/727.gz rename to 2006Scape Server/data/world/map/727.gz diff --git a/2006Redone Server/data/world/map/728.gz b/2006Scape Server/data/world/map/728.gz similarity index 100% rename from 2006Redone Server/data/world/map/728.gz rename to 2006Scape Server/data/world/map/728.gz diff --git a/2006Redone Server/data/world/map/729.gz b/2006Scape Server/data/world/map/729.gz similarity index 100% rename from 2006Redone Server/data/world/map/729.gz rename to 2006Scape Server/data/world/map/729.gz diff --git a/2006Redone Server/data/world/map/73.gz b/2006Scape Server/data/world/map/73.gz similarity index 100% rename from 2006Redone Server/data/world/map/73.gz rename to 2006Scape Server/data/world/map/73.gz diff --git a/2006Redone Server/data/world/map/730.gz b/2006Scape Server/data/world/map/730.gz similarity index 100% rename from 2006Redone Server/data/world/map/730.gz rename to 2006Scape Server/data/world/map/730.gz diff --git a/2006Redone Server/data/world/map/731.gz b/2006Scape Server/data/world/map/731.gz similarity index 100% rename from 2006Redone Server/data/world/map/731.gz rename to 2006Scape Server/data/world/map/731.gz diff --git a/2006Redone Server/data/world/map/732.gz b/2006Scape Server/data/world/map/732.gz similarity index 100% rename from 2006Redone Server/data/world/map/732.gz rename to 2006Scape Server/data/world/map/732.gz diff --git a/2006Redone Server/data/world/map/733.gz b/2006Scape Server/data/world/map/733.gz similarity index 100% rename from 2006Redone Server/data/world/map/733.gz rename to 2006Scape Server/data/world/map/733.gz diff --git a/2006Redone Server/data/world/map/736.gz b/2006Scape Server/data/world/map/736.gz similarity index 100% rename from 2006Redone Server/data/world/map/736.gz rename to 2006Scape Server/data/world/map/736.gz diff --git a/2006Redone Server/data/world/map/737.gz b/2006Scape Server/data/world/map/737.gz similarity index 100% rename from 2006Redone Server/data/world/map/737.gz rename to 2006Scape Server/data/world/map/737.gz diff --git a/2006Redone Server/data/world/map/738.gz b/2006Scape Server/data/world/map/738.gz similarity index 100% rename from 2006Redone Server/data/world/map/738.gz rename to 2006Scape Server/data/world/map/738.gz diff --git a/2006Redone Server/data/world/map/739.gz b/2006Scape Server/data/world/map/739.gz similarity index 100% rename from 2006Redone Server/data/world/map/739.gz rename to 2006Scape Server/data/world/map/739.gz diff --git a/2006Redone Server/data/world/map/74.gz b/2006Scape Server/data/world/map/74.gz similarity index 100% rename from 2006Redone Server/data/world/map/74.gz rename to 2006Scape Server/data/world/map/74.gz diff --git a/2006Redone Server/data/world/map/740.gz b/2006Scape Server/data/world/map/740.gz similarity index 100% rename from 2006Redone Server/data/world/map/740.gz rename to 2006Scape Server/data/world/map/740.gz diff --git a/2006Redone Server/data/world/map/741.gz b/2006Scape Server/data/world/map/741.gz similarity index 100% rename from 2006Redone Server/data/world/map/741.gz rename to 2006Scape Server/data/world/map/741.gz diff --git a/2006Redone Server/data/world/map/742.gz b/2006Scape Server/data/world/map/742.gz similarity index 100% rename from 2006Redone Server/data/world/map/742.gz rename to 2006Scape Server/data/world/map/742.gz diff --git a/2006Redone Server/data/world/map/743.gz b/2006Scape Server/data/world/map/743.gz similarity index 100% rename from 2006Redone Server/data/world/map/743.gz rename to 2006Scape Server/data/world/map/743.gz diff --git a/2006Redone Server/data/world/map/744.gz b/2006Scape Server/data/world/map/744.gz similarity index 100% rename from 2006Redone Server/data/world/map/744.gz rename to 2006Scape Server/data/world/map/744.gz diff --git a/2006Redone Server/data/world/map/745.gz b/2006Scape Server/data/world/map/745.gz similarity index 100% rename from 2006Redone Server/data/world/map/745.gz rename to 2006Scape Server/data/world/map/745.gz diff --git a/2006Redone Server/data/world/map/746.gz b/2006Scape Server/data/world/map/746.gz similarity index 100% rename from 2006Redone Server/data/world/map/746.gz rename to 2006Scape Server/data/world/map/746.gz diff --git a/2006Redone Server/data/world/map/747.gz b/2006Scape Server/data/world/map/747.gz similarity index 100% rename from 2006Redone Server/data/world/map/747.gz rename to 2006Scape Server/data/world/map/747.gz diff --git a/2006Redone Server/data/world/map/748.gz b/2006Scape Server/data/world/map/748.gz similarity index 100% rename from 2006Redone Server/data/world/map/748.gz rename to 2006Scape Server/data/world/map/748.gz diff --git a/2006Redone Server/data/world/map/749.gz b/2006Scape Server/data/world/map/749.gz similarity index 100% rename from 2006Redone Server/data/world/map/749.gz rename to 2006Scape Server/data/world/map/749.gz diff --git a/2006Redone Server/data/world/map/75.gz b/2006Scape Server/data/world/map/75.gz similarity index 100% rename from 2006Redone Server/data/world/map/75.gz rename to 2006Scape Server/data/world/map/75.gz diff --git a/2006Redone Server/data/world/map/750.gz b/2006Scape Server/data/world/map/750.gz similarity index 100% rename from 2006Redone Server/data/world/map/750.gz rename to 2006Scape Server/data/world/map/750.gz diff --git a/2006Redone Server/data/world/map/751.gz b/2006Scape Server/data/world/map/751.gz similarity index 100% rename from 2006Redone Server/data/world/map/751.gz rename to 2006Scape Server/data/world/map/751.gz diff --git a/2006Redone Server/data/world/map/752.gz b/2006Scape Server/data/world/map/752.gz similarity index 100% rename from 2006Redone Server/data/world/map/752.gz rename to 2006Scape Server/data/world/map/752.gz diff --git a/2006Redone Server/data/world/map/753.gz b/2006Scape Server/data/world/map/753.gz similarity index 100% rename from 2006Redone Server/data/world/map/753.gz rename to 2006Scape Server/data/world/map/753.gz diff --git a/2006Redone Server/data/world/map/754.gz b/2006Scape Server/data/world/map/754.gz similarity index 100% rename from 2006Redone Server/data/world/map/754.gz rename to 2006Scape Server/data/world/map/754.gz diff --git a/2006Redone Server/data/world/map/755.gz b/2006Scape Server/data/world/map/755.gz similarity index 100% rename from 2006Redone Server/data/world/map/755.gz rename to 2006Scape Server/data/world/map/755.gz diff --git a/2006Redone Server/data/world/map/756.gz b/2006Scape Server/data/world/map/756.gz similarity index 100% rename from 2006Redone Server/data/world/map/756.gz rename to 2006Scape Server/data/world/map/756.gz diff --git a/2006Redone Server/data/world/map/757.gz b/2006Scape Server/data/world/map/757.gz similarity index 100% rename from 2006Redone Server/data/world/map/757.gz rename to 2006Scape Server/data/world/map/757.gz diff --git a/2006Redone Server/data/world/map/758.gz b/2006Scape Server/data/world/map/758.gz similarity index 100% rename from 2006Redone Server/data/world/map/758.gz rename to 2006Scape Server/data/world/map/758.gz diff --git a/2006Redone Server/data/world/map/759.gz b/2006Scape Server/data/world/map/759.gz similarity index 100% rename from 2006Redone Server/data/world/map/759.gz rename to 2006Scape Server/data/world/map/759.gz diff --git a/2006Redone Server/data/world/map/76.gz b/2006Scape Server/data/world/map/76.gz similarity index 100% rename from 2006Redone Server/data/world/map/76.gz rename to 2006Scape Server/data/world/map/76.gz diff --git a/2006Redone Server/data/world/map/760.gz b/2006Scape Server/data/world/map/760.gz similarity index 100% rename from 2006Redone Server/data/world/map/760.gz rename to 2006Scape Server/data/world/map/760.gz diff --git a/2006Redone Server/data/world/map/761.gz b/2006Scape Server/data/world/map/761.gz similarity index 100% rename from 2006Redone Server/data/world/map/761.gz rename to 2006Scape Server/data/world/map/761.gz diff --git a/2006Redone Server/data/world/map/762.gz b/2006Scape Server/data/world/map/762.gz similarity index 100% rename from 2006Redone Server/data/world/map/762.gz rename to 2006Scape Server/data/world/map/762.gz diff --git a/2006Redone Server/data/world/map/763.gz b/2006Scape Server/data/world/map/763.gz similarity index 100% rename from 2006Redone Server/data/world/map/763.gz rename to 2006Scape Server/data/world/map/763.gz diff --git a/2006Redone Server/data/world/map/764.gz b/2006Scape Server/data/world/map/764.gz similarity index 100% rename from 2006Redone Server/data/world/map/764.gz rename to 2006Scape Server/data/world/map/764.gz diff --git a/2006Redone Server/data/world/map/765.gz b/2006Scape Server/data/world/map/765.gz similarity index 100% rename from 2006Redone Server/data/world/map/765.gz rename to 2006Scape Server/data/world/map/765.gz diff --git a/2006Redone Server/data/world/map/766.gz b/2006Scape Server/data/world/map/766.gz similarity index 100% rename from 2006Redone Server/data/world/map/766.gz rename to 2006Scape Server/data/world/map/766.gz diff --git a/2006Redone Server/data/world/map/767.gz b/2006Scape Server/data/world/map/767.gz similarity index 100% rename from 2006Redone Server/data/world/map/767.gz rename to 2006Scape Server/data/world/map/767.gz diff --git a/2006Redone Server/data/world/map/768.gz b/2006Scape Server/data/world/map/768.gz similarity index 100% rename from 2006Redone Server/data/world/map/768.gz rename to 2006Scape Server/data/world/map/768.gz diff --git a/2006Redone Server/data/world/map/769.gz b/2006Scape Server/data/world/map/769.gz similarity index 100% rename from 2006Redone Server/data/world/map/769.gz rename to 2006Scape Server/data/world/map/769.gz diff --git a/2006Redone Server/data/world/map/77.gz b/2006Scape Server/data/world/map/77.gz similarity index 100% rename from 2006Redone Server/data/world/map/77.gz rename to 2006Scape Server/data/world/map/77.gz diff --git a/2006Redone Server/data/world/map/770.gz b/2006Scape Server/data/world/map/770.gz similarity index 100% rename from 2006Redone Server/data/world/map/770.gz rename to 2006Scape Server/data/world/map/770.gz diff --git a/2006Redone Server/data/world/map/771.gz b/2006Scape Server/data/world/map/771.gz similarity index 100% rename from 2006Redone Server/data/world/map/771.gz rename to 2006Scape Server/data/world/map/771.gz diff --git a/2006Redone Server/data/world/map/772.gz b/2006Scape Server/data/world/map/772.gz similarity index 100% rename from 2006Redone Server/data/world/map/772.gz rename to 2006Scape Server/data/world/map/772.gz diff --git a/2006Redone Server/data/world/map/773.gz b/2006Scape Server/data/world/map/773.gz similarity index 100% rename from 2006Redone Server/data/world/map/773.gz rename to 2006Scape Server/data/world/map/773.gz diff --git a/2006Redone Server/data/world/map/774.gz b/2006Scape Server/data/world/map/774.gz similarity index 100% rename from 2006Redone Server/data/world/map/774.gz rename to 2006Scape Server/data/world/map/774.gz diff --git a/2006Redone Server/data/world/map/775.gz b/2006Scape Server/data/world/map/775.gz similarity index 100% rename from 2006Redone Server/data/world/map/775.gz rename to 2006Scape Server/data/world/map/775.gz diff --git a/2006Redone Server/data/world/map/776.gz b/2006Scape Server/data/world/map/776.gz similarity index 100% rename from 2006Redone Server/data/world/map/776.gz rename to 2006Scape Server/data/world/map/776.gz diff --git a/2006Redone Server/data/world/map/777.gz b/2006Scape Server/data/world/map/777.gz similarity index 100% rename from 2006Redone Server/data/world/map/777.gz rename to 2006Scape Server/data/world/map/777.gz diff --git a/2006Redone Server/data/world/map/78.gz b/2006Scape Server/data/world/map/78.gz similarity index 100% rename from 2006Redone Server/data/world/map/78.gz rename to 2006Scape Server/data/world/map/78.gz diff --git a/2006Redone Server/data/world/map/780.gz b/2006Scape Server/data/world/map/780.gz similarity index 100% rename from 2006Redone Server/data/world/map/780.gz rename to 2006Scape Server/data/world/map/780.gz diff --git a/2006Redone Server/data/world/map/781.gz b/2006Scape Server/data/world/map/781.gz similarity index 100% rename from 2006Redone Server/data/world/map/781.gz rename to 2006Scape Server/data/world/map/781.gz diff --git a/2006Redone Server/data/world/map/782.gz b/2006Scape Server/data/world/map/782.gz similarity index 100% rename from 2006Redone Server/data/world/map/782.gz rename to 2006Scape Server/data/world/map/782.gz diff --git a/2006Redone Server/data/world/map/783.gz b/2006Scape Server/data/world/map/783.gz similarity index 100% rename from 2006Redone Server/data/world/map/783.gz rename to 2006Scape Server/data/world/map/783.gz diff --git a/2006Redone Server/data/world/map/784.gz b/2006Scape Server/data/world/map/784.gz similarity index 100% rename from 2006Redone Server/data/world/map/784.gz rename to 2006Scape Server/data/world/map/784.gz diff --git a/2006Redone Server/data/world/map/785.gz b/2006Scape Server/data/world/map/785.gz similarity index 100% rename from 2006Redone Server/data/world/map/785.gz rename to 2006Scape Server/data/world/map/785.gz diff --git a/2006Redone Server/data/world/map/786.gz b/2006Scape Server/data/world/map/786.gz similarity index 100% rename from 2006Redone Server/data/world/map/786.gz rename to 2006Scape Server/data/world/map/786.gz diff --git a/2006Redone Server/data/world/map/787.gz b/2006Scape Server/data/world/map/787.gz similarity index 100% rename from 2006Redone Server/data/world/map/787.gz rename to 2006Scape Server/data/world/map/787.gz diff --git a/2006Redone Server/data/world/map/788.gz b/2006Scape Server/data/world/map/788.gz similarity index 100% rename from 2006Redone Server/data/world/map/788.gz rename to 2006Scape Server/data/world/map/788.gz diff --git a/2006Redone Server/data/world/map/789.gz b/2006Scape Server/data/world/map/789.gz similarity index 100% rename from 2006Redone Server/data/world/map/789.gz rename to 2006Scape Server/data/world/map/789.gz diff --git a/2006Redone Server/data/world/map/79.gz b/2006Scape Server/data/world/map/79.gz similarity index 100% rename from 2006Redone Server/data/world/map/79.gz rename to 2006Scape Server/data/world/map/79.gz diff --git a/2006Redone Server/data/world/map/790.gz b/2006Scape Server/data/world/map/790.gz similarity index 100% rename from 2006Redone Server/data/world/map/790.gz rename to 2006Scape Server/data/world/map/790.gz diff --git a/2006Redone Server/data/world/map/791.gz b/2006Scape Server/data/world/map/791.gz similarity index 100% rename from 2006Redone Server/data/world/map/791.gz rename to 2006Scape Server/data/world/map/791.gz diff --git a/2006Redone Server/data/world/map/792.gz b/2006Scape Server/data/world/map/792.gz similarity index 100% rename from 2006Redone Server/data/world/map/792.gz rename to 2006Scape Server/data/world/map/792.gz diff --git a/2006Redone Server/data/world/map/793.gz b/2006Scape Server/data/world/map/793.gz similarity index 100% rename from 2006Redone Server/data/world/map/793.gz rename to 2006Scape Server/data/world/map/793.gz diff --git a/2006Redone Server/data/world/map/794.gz b/2006Scape Server/data/world/map/794.gz similarity index 100% rename from 2006Redone Server/data/world/map/794.gz rename to 2006Scape Server/data/world/map/794.gz diff --git a/2006Redone Server/data/world/map/795.gz b/2006Scape Server/data/world/map/795.gz similarity index 100% rename from 2006Redone Server/data/world/map/795.gz rename to 2006Scape Server/data/world/map/795.gz diff --git a/2006Redone Server/data/world/map/796.gz b/2006Scape Server/data/world/map/796.gz similarity index 100% rename from 2006Redone Server/data/world/map/796.gz rename to 2006Scape Server/data/world/map/796.gz diff --git a/2006Redone Server/data/world/map/797.gz b/2006Scape Server/data/world/map/797.gz similarity index 100% rename from 2006Redone Server/data/world/map/797.gz rename to 2006Scape Server/data/world/map/797.gz diff --git a/2006Redone Server/data/world/map/798.gz b/2006Scape Server/data/world/map/798.gz similarity index 100% rename from 2006Redone Server/data/world/map/798.gz rename to 2006Scape Server/data/world/map/798.gz diff --git a/2006Redone Server/data/world/map/799.gz b/2006Scape Server/data/world/map/799.gz similarity index 100% rename from 2006Redone Server/data/world/map/799.gz rename to 2006Scape Server/data/world/map/799.gz diff --git a/2006Redone Server/data/world/map/8.gz b/2006Scape Server/data/world/map/8.gz similarity index 100% rename from 2006Redone Server/data/world/map/8.gz rename to 2006Scape Server/data/world/map/8.gz diff --git a/2006Redone Server/data/world/map/80.gz b/2006Scape Server/data/world/map/80.gz similarity index 100% rename from 2006Redone Server/data/world/map/80.gz rename to 2006Scape Server/data/world/map/80.gz diff --git a/2006Redone Server/data/world/map/800.gz b/2006Scape Server/data/world/map/800.gz similarity index 100% rename from 2006Redone Server/data/world/map/800.gz rename to 2006Scape Server/data/world/map/800.gz diff --git a/2006Redone Server/data/world/map/801.gz b/2006Scape Server/data/world/map/801.gz similarity index 100% rename from 2006Redone Server/data/world/map/801.gz rename to 2006Scape Server/data/world/map/801.gz diff --git a/2006Redone Server/data/world/map/806.gz b/2006Scape Server/data/world/map/806.gz similarity index 100% rename from 2006Redone Server/data/world/map/806.gz rename to 2006Scape Server/data/world/map/806.gz diff --git a/2006Redone Server/data/world/map/807.gz b/2006Scape Server/data/world/map/807.gz similarity index 100% rename from 2006Redone Server/data/world/map/807.gz rename to 2006Scape Server/data/world/map/807.gz diff --git a/2006Redone Server/data/world/map/808.gz b/2006Scape Server/data/world/map/808.gz similarity index 100% rename from 2006Redone Server/data/world/map/808.gz rename to 2006Scape Server/data/world/map/808.gz diff --git a/2006Redone Server/data/world/map/809.gz b/2006Scape Server/data/world/map/809.gz similarity index 100% rename from 2006Redone Server/data/world/map/809.gz rename to 2006Scape Server/data/world/map/809.gz diff --git a/2006Redone Server/data/world/map/81.gz b/2006Scape Server/data/world/map/81.gz similarity index 100% rename from 2006Redone Server/data/world/map/81.gz rename to 2006Scape Server/data/world/map/81.gz diff --git a/2006Redone Server/data/world/map/810.gz b/2006Scape Server/data/world/map/810.gz similarity index 100% rename from 2006Redone Server/data/world/map/810.gz rename to 2006Scape Server/data/world/map/810.gz diff --git a/2006Redone Server/data/world/map/811.gz b/2006Scape Server/data/world/map/811.gz similarity index 100% rename from 2006Redone Server/data/world/map/811.gz rename to 2006Scape Server/data/world/map/811.gz diff --git a/2006Redone Server/data/world/map/812.gz b/2006Scape Server/data/world/map/812.gz similarity index 100% rename from 2006Redone Server/data/world/map/812.gz rename to 2006Scape Server/data/world/map/812.gz diff --git a/2006Redone Server/data/world/map/813.gz b/2006Scape Server/data/world/map/813.gz similarity index 100% rename from 2006Redone Server/data/world/map/813.gz rename to 2006Scape Server/data/world/map/813.gz diff --git a/2006Redone Server/data/world/map/814.gz b/2006Scape Server/data/world/map/814.gz similarity index 100% rename from 2006Redone Server/data/world/map/814.gz rename to 2006Scape Server/data/world/map/814.gz diff --git a/2006Redone Server/data/world/map/815.gz b/2006Scape Server/data/world/map/815.gz similarity index 100% rename from 2006Redone Server/data/world/map/815.gz rename to 2006Scape Server/data/world/map/815.gz diff --git a/2006Redone Server/data/world/map/816.gz b/2006Scape Server/data/world/map/816.gz similarity index 100% rename from 2006Redone Server/data/world/map/816.gz rename to 2006Scape Server/data/world/map/816.gz diff --git a/2006Redone Server/data/world/map/817.gz b/2006Scape Server/data/world/map/817.gz similarity index 100% rename from 2006Redone Server/data/world/map/817.gz rename to 2006Scape Server/data/world/map/817.gz diff --git a/2006Redone Server/data/world/map/818.gz b/2006Scape Server/data/world/map/818.gz similarity index 100% rename from 2006Redone Server/data/world/map/818.gz rename to 2006Scape Server/data/world/map/818.gz diff --git a/2006Redone Server/data/world/map/819.gz b/2006Scape Server/data/world/map/819.gz similarity index 100% rename from 2006Redone Server/data/world/map/819.gz rename to 2006Scape Server/data/world/map/819.gz diff --git a/2006Redone Server/data/world/map/82.gz b/2006Scape Server/data/world/map/82.gz similarity index 100% rename from 2006Redone Server/data/world/map/82.gz rename to 2006Scape Server/data/world/map/82.gz diff --git a/2006Redone Server/data/world/map/820.gz b/2006Scape Server/data/world/map/820.gz similarity index 100% rename from 2006Redone Server/data/world/map/820.gz rename to 2006Scape Server/data/world/map/820.gz diff --git a/2006Redone Server/data/world/map/821.gz b/2006Scape Server/data/world/map/821.gz similarity index 100% rename from 2006Redone Server/data/world/map/821.gz rename to 2006Scape Server/data/world/map/821.gz diff --git a/2006Redone Server/data/world/map/822.gz b/2006Scape Server/data/world/map/822.gz similarity index 100% rename from 2006Redone Server/data/world/map/822.gz rename to 2006Scape Server/data/world/map/822.gz diff --git a/2006Redone Server/data/world/map/823.gz b/2006Scape Server/data/world/map/823.gz similarity index 100% rename from 2006Redone Server/data/world/map/823.gz rename to 2006Scape Server/data/world/map/823.gz diff --git a/2006Redone Server/data/world/map/824.gz b/2006Scape Server/data/world/map/824.gz similarity index 100% rename from 2006Redone Server/data/world/map/824.gz rename to 2006Scape Server/data/world/map/824.gz diff --git a/2006Redone Server/data/world/map/825.gz b/2006Scape Server/data/world/map/825.gz similarity index 100% rename from 2006Redone Server/data/world/map/825.gz rename to 2006Scape Server/data/world/map/825.gz diff --git a/2006Redone Server/data/world/map/826.gz b/2006Scape Server/data/world/map/826.gz similarity index 100% rename from 2006Redone Server/data/world/map/826.gz rename to 2006Scape Server/data/world/map/826.gz diff --git a/2006Redone Server/data/world/map/827.gz b/2006Scape Server/data/world/map/827.gz similarity index 100% rename from 2006Redone Server/data/world/map/827.gz rename to 2006Scape Server/data/world/map/827.gz diff --git a/2006Redone Server/data/world/map/828.gz b/2006Scape Server/data/world/map/828.gz similarity index 100% rename from 2006Redone Server/data/world/map/828.gz rename to 2006Scape Server/data/world/map/828.gz diff --git a/2006Redone Server/data/world/map/829.gz b/2006Scape Server/data/world/map/829.gz similarity index 100% rename from 2006Redone Server/data/world/map/829.gz rename to 2006Scape Server/data/world/map/829.gz diff --git a/2006Redone Server/data/world/map/83.gz b/2006Scape Server/data/world/map/83.gz similarity index 100% rename from 2006Redone Server/data/world/map/83.gz rename to 2006Scape Server/data/world/map/83.gz diff --git a/2006Redone Server/data/world/map/830.gz b/2006Scape Server/data/world/map/830.gz similarity index 100% rename from 2006Redone Server/data/world/map/830.gz rename to 2006Scape Server/data/world/map/830.gz diff --git a/2006Redone Server/data/world/map/831.gz b/2006Scape Server/data/world/map/831.gz similarity index 100% rename from 2006Redone Server/data/world/map/831.gz rename to 2006Scape Server/data/world/map/831.gz diff --git a/2006Redone Server/data/world/map/832.gz b/2006Scape Server/data/world/map/832.gz similarity index 100% rename from 2006Redone Server/data/world/map/832.gz rename to 2006Scape Server/data/world/map/832.gz diff --git a/2006Redone Server/data/world/map/833.gz b/2006Scape Server/data/world/map/833.gz similarity index 100% rename from 2006Redone Server/data/world/map/833.gz rename to 2006Scape Server/data/world/map/833.gz diff --git a/2006Redone Server/data/world/map/834.gz b/2006Scape Server/data/world/map/834.gz similarity index 100% rename from 2006Redone Server/data/world/map/834.gz rename to 2006Scape Server/data/world/map/834.gz diff --git a/2006Redone Server/data/world/map/835.gz b/2006Scape Server/data/world/map/835.gz similarity index 100% rename from 2006Redone Server/data/world/map/835.gz rename to 2006Scape Server/data/world/map/835.gz diff --git a/2006Redone Server/data/world/map/836.gz b/2006Scape Server/data/world/map/836.gz similarity index 100% rename from 2006Redone Server/data/world/map/836.gz rename to 2006Scape Server/data/world/map/836.gz diff --git a/2006Redone Server/data/world/map/837.gz b/2006Scape Server/data/world/map/837.gz similarity index 100% rename from 2006Redone Server/data/world/map/837.gz rename to 2006Scape Server/data/world/map/837.gz diff --git a/2006Redone Server/data/world/map/838.gz b/2006Scape Server/data/world/map/838.gz similarity index 100% rename from 2006Redone Server/data/world/map/838.gz rename to 2006Scape Server/data/world/map/838.gz diff --git a/2006Redone Server/data/world/map/839.gz b/2006Scape Server/data/world/map/839.gz similarity index 100% rename from 2006Redone Server/data/world/map/839.gz rename to 2006Scape Server/data/world/map/839.gz diff --git a/2006Redone Server/data/world/map/84.gz b/2006Scape Server/data/world/map/84.gz similarity index 100% rename from 2006Redone Server/data/world/map/84.gz rename to 2006Scape Server/data/world/map/84.gz diff --git a/2006Redone Server/data/world/map/840.gz b/2006Scape Server/data/world/map/840.gz similarity index 100% rename from 2006Redone Server/data/world/map/840.gz rename to 2006Scape Server/data/world/map/840.gz diff --git a/2006Redone Server/data/world/map/841.gz b/2006Scape Server/data/world/map/841.gz similarity index 100% rename from 2006Redone Server/data/world/map/841.gz rename to 2006Scape Server/data/world/map/841.gz diff --git a/2006Redone Server/data/world/map/842.gz b/2006Scape Server/data/world/map/842.gz similarity index 100% rename from 2006Redone Server/data/world/map/842.gz rename to 2006Scape Server/data/world/map/842.gz diff --git a/2006Redone Server/data/world/map/843.gz b/2006Scape Server/data/world/map/843.gz similarity index 100% rename from 2006Redone Server/data/world/map/843.gz rename to 2006Scape Server/data/world/map/843.gz diff --git a/2006Redone Server/data/world/map/844.gz b/2006Scape Server/data/world/map/844.gz similarity index 100% rename from 2006Redone Server/data/world/map/844.gz rename to 2006Scape Server/data/world/map/844.gz diff --git a/2006Redone Server/data/world/map/845.gz b/2006Scape Server/data/world/map/845.gz similarity index 100% rename from 2006Redone Server/data/world/map/845.gz rename to 2006Scape Server/data/world/map/845.gz diff --git a/2006Redone Server/data/world/map/846.gz b/2006Scape Server/data/world/map/846.gz similarity index 100% rename from 2006Redone Server/data/world/map/846.gz rename to 2006Scape Server/data/world/map/846.gz diff --git a/2006Redone Server/data/world/map/847.gz b/2006Scape Server/data/world/map/847.gz similarity index 100% rename from 2006Redone Server/data/world/map/847.gz rename to 2006Scape Server/data/world/map/847.gz diff --git a/2006Redone Server/data/world/map/848.gz b/2006Scape Server/data/world/map/848.gz similarity index 100% rename from 2006Redone Server/data/world/map/848.gz rename to 2006Scape Server/data/world/map/848.gz diff --git a/2006Redone Server/data/world/map/849.gz b/2006Scape Server/data/world/map/849.gz similarity index 100% rename from 2006Redone Server/data/world/map/849.gz rename to 2006Scape Server/data/world/map/849.gz diff --git a/2006Redone Server/data/world/map/85.gz b/2006Scape Server/data/world/map/85.gz similarity index 100% rename from 2006Redone Server/data/world/map/85.gz rename to 2006Scape Server/data/world/map/85.gz diff --git a/2006Redone Server/data/world/map/850.gz b/2006Scape Server/data/world/map/850.gz similarity index 100% rename from 2006Redone Server/data/world/map/850.gz rename to 2006Scape Server/data/world/map/850.gz diff --git a/2006Redone Server/data/world/map/851.gz b/2006Scape Server/data/world/map/851.gz similarity index 100% rename from 2006Redone Server/data/world/map/851.gz rename to 2006Scape Server/data/world/map/851.gz diff --git a/2006Redone Server/data/world/map/852.gz b/2006Scape Server/data/world/map/852.gz similarity index 100% rename from 2006Redone Server/data/world/map/852.gz rename to 2006Scape Server/data/world/map/852.gz diff --git a/2006Redone Server/data/world/map/853.gz b/2006Scape Server/data/world/map/853.gz similarity index 100% rename from 2006Redone Server/data/world/map/853.gz rename to 2006Scape Server/data/world/map/853.gz diff --git a/2006Redone Server/data/world/map/854.gz b/2006Scape Server/data/world/map/854.gz similarity index 100% rename from 2006Redone Server/data/world/map/854.gz rename to 2006Scape Server/data/world/map/854.gz diff --git a/2006Redone Server/data/world/map/855.gz b/2006Scape Server/data/world/map/855.gz similarity index 100% rename from 2006Redone Server/data/world/map/855.gz rename to 2006Scape Server/data/world/map/855.gz diff --git a/2006Redone Server/data/world/map/856.gz b/2006Scape Server/data/world/map/856.gz similarity index 100% rename from 2006Redone Server/data/world/map/856.gz rename to 2006Scape Server/data/world/map/856.gz diff --git a/2006Redone Server/data/world/map/857.gz b/2006Scape Server/data/world/map/857.gz similarity index 100% rename from 2006Redone Server/data/world/map/857.gz rename to 2006Scape Server/data/world/map/857.gz diff --git a/2006Redone Server/data/world/map/858.gz b/2006Scape Server/data/world/map/858.gz similarity index 100% rename from 2006Redone Server/data/world/map/858.gz rename to 2006Scape Server/data/world/map/858.gz diff --git a/2006Redone Server/data/world/map/859.gz b/2006Scape Server/data/world/map/859.gz similarity index 100% rename from 2006Redone Server/data/world/map/859.gz rename to 2006Scape Server/data/world/map/859.gz diff --git a/2006Redone Server/data/world/map/86.gz b/2006Scape Server/data/world/map/86.gz similarity index 100% rename from 2006Redone Server/data/world/map/86.gz rename to 2006Scape Server/data/world/map/86.gz diff --git a/2006Redone Server/data/world/map/860.gz b/2006Scape Server/data/world/map/860.gz similarity index 100% rename from 2006Redone Server/data/world/map/860.gz rename to 2006Scape Server/data/world/map/860.gz diff --git a/2006Redone Server/data/world/map/861.gz b/2006Scape Server/data/world/map/861.gz similarity index 100% rename from 2006Redone Server/data/world/map/861.gz rename to 2006Scape Server/data/world/map/861.gz diff --git a/2006Redone Server/data/world/map/862.gz b/2006Scape Server/data/world/map/862.gz similarity index 100% rename from 2006Redone Server/data/world/map/862.gz rename to 2006Scape Server/data/world/map/862.gz diff --git a/2006Redone Server/data/world/map/863.gz b/2006Scape Server/data/world/map/863.gz similarity index 100% rename from 2006Redone Server/data/world/map/863.gz rename to 2006Scape Server/data/world/map/863.gz diff --git a/2006Redone Server/data/world/map/864.gz b/2006Scape Server/data/world/map/864.gz similarity index 100% rename from 2006Redone Server/data/world/map/864.gz rename to 2006Scape Server/data/world/map/864.gz diff --git a/2006Redone Server/data/world/map/865.gz b/2006Scape Server/data/world/map/865.gz similarity index 100% rename from 2006Redone Server/data/world/map/865.gz rename to 2006Scape Server/data/world/map/865.gz diff --git a/2006Redone Server/data/world/map/866.gz b/2006Scape Server/data/world/map/866.gz similarity index 100% rename from 2006Redone Server/data/world/map/866.gz rename to 2006Scape Server/data/world/map/866.gz diff --git a/2006Redone Server/data/world/map/867.gz b/2006Scape Server/data/world/map/867.gz similarity index 100% rename from 2006Redone Server/data/world/map/867.gz rename to 2006Scape Server/data/world/map/867.gz diff --git a/2006Redone Server/data/world/map/868.gz b/2006Scape Server/data/world/map/868.gz similarity index 100% rename from 2006Redone Server/data/world/map/868.gz rename to 2006Scape Server/data/world/map/868.gz diff --git a/2006Redone Server/data/world/map/869.gz b/2006Scape Server/data/world/map/869.gz similarity index 100% rename from 2006Redone Server/data/world/map/869.gz rename to 2006Scape Server/data/world/map/869.gz diff --git a/2006Redone Server/data/world/map/87.gz b/2006Scape Server/data/world/map/87.gz similarity index 100% rename from 2006Redone Server/data/world/map/87.gz rename to 2006Scape Server/data/world/map/87.gz diff --git a/2006Redone Server/data/world/map/870.gz b/2006Scape Server/data/world/map/870.gz similarity index 100% rename from 2006Redone Server/data/world/map/870.gz rename to 2006Scape Server/data/world/map/870.gz diff --git a/2006Redone Server/data/world/map/871.gz b/2006Scape Server/data/world/map/871.gz similarity index 100% rename from 2006Redone Server/data/world/map/871.gz rename to 2006Scape Server/data/world/map/871.gz diff --git a/2006Redone Server/data/world/map/872.gz b/2006Scape Server/data/world/map/872.gz similarity index 100% rename from 2006Redone Server/data/world/map/872.gz rename to 2006Scape Server/data/world/map/872.gz diff --git a/2006Redone Server/data/world/map/873.gz b/2006Scape Server/data/world/map/873.gz similarity index 100% rename from 2006Redone Server/data/world/map/873.gz rename to 2006Scape Server/data/world/map/873.gz diff --git a/2006Redone Server/data/world/map/874.gz b/2006Scape Server/data/world/map/874.gz similarity index 100% rename from 2006Redone Server/data/world/map/874.gz rename to 2006Scape Server/data/world/map/874.gz diff --git a/2006Redone Server/data/world/map/875.gz b/2006Scape Server/data/world/map/875.gz similarity index 100% rename from 2006Redone Server/data/world/map/875.gz rename to 2006Scape Server/data/world/map/875.gz diff --git a/2006Redone Server/data/world/map/876.gz b/2006Scape Server/data/world/map/876.gz similarity index 100% rename from 2006Redone Server/data/world/map/876.gz rename to 2006Scape Server/data/world/map/876.gz diff --git a/2006Redone Server/data/world/map/877.gz b/2006Scape Server/data/world/map/877.gz similarity index 100% rename from 2006Redone Server/data/world/map/877.gz rename to 2006Scape Server/data/world/map/877.gz diff --git a/2006Redone Server/data/world/map/88.gz b/2006Scape Server/data/world/map/88.gz similarity index 100% rename from 2006Redone Server/data/world/map/88.gz rename to 2006Scape Server/data/world/map/88.gz diff --git a/2006Redone Server/data/world/map/880.gz b/2006Scape Server/data/world/map/880.gz similarity index 100% rename from 2006Redone Server/data/world/map/880.gz rename to 2006Scape Server/data/world/map/880.gz diff --git a/2006Redone Server/data/world/map/881.gz b/2006Scape Server/data/world/map/881.gz similarity index 100% rename from 2006Redone Server/data/world/map/881.gz rename to 2006Scape Server/data/world/map/881.gz diff --git a/2006Redone Server/data/world/map/882.gz b/2006Scape Server/data/world/map/882.gz similarity index 100% rename from 2006Redone Server/data/world/map/882.gz rename to 2006Scape Server/data/world/map/882.gz diff --git a/2006Redone Server/data/world/map/883.gz b/2006Scape Server/data/world/map/883.gz similarity index 100% rename from 2006Redone Server/data/world/map/883.gz rename to 2006Scape Server/data/world/map/883.gz diff --git a/2006Redone Server/data/world/map/886.gz b/2006Scape Server/data/world/map/886.gz similarity index 100% rename from 2006Redone Server/data/world/map/886.gz rename to 2006Scape Server/data/world/map/886.gz diff --git a/2006Redone Server/data/world/map/887.gz b/2006Scape Server/data/world/map/887.gz similarity index 100% rename from 2006Redone Server/data/world/map/887.gz rename to 2006Scape Server/data/world/map/887.gz diff --git a/2006Redone Server/data/world/map/888.gz b/2006Scape Server/data/world/map/888.gz similarity index 100% rename from 2006Redone Server/data/world/map/888.gz rename to 2006Scape Server/data/world/map/888.gz diff --git a/2006Redone Server/data/world/map/889.gz b/2006Scape Server/data/world/map/889.gz similarity index 100% rename from 2006Redone Server/data/world/map/889.gz rename to 2006Scape Server/data/world/map/889.gz diff --git a/2006Redone Server/data/world/map/89.gz b/2006Scape Server/data/world/map/89.gz similarity index 100% rename from 2006Redone Server/data/world/map/89.gz rename to 2006Scape Server/data/world/map/89.gz diff --git a/2006Redone Server/data/world/map/890.gz b/2006Scape Server/data/world/map/890.gz similarity index 100% rename from 2006Redone Server/data/world/map/890.gz rename to 2006Scape Server/data/world/map/890.gz diff --git a/2006Redone Server/data/world/map/891.gz b/2006Scape Server/data/world/map/891.gz similarity index 100% rename from 2006Redone Server/data/world/map/891.gz rename to 2006Scape Server/data/world/map/891.gz diff --git a/2006Redone Server/data/world/map/892.gz b/2006Scape Server/data/world/map/892.gz similarity index 100% rename from 2006Redone Server/data/world/map/892.gz rename to 2006Scape Server/data/world/map/892.gz diff --git a/2006Redone Server/data/world/map/893.gz b/2006Scape Server/data/world/map/893.gz similarity index 100% rename from 2006Redone Server/data/world/map/893.gz rename to 2006Scape Server/data/world/map/893.gz diff --git a/2006Redone Server/data/world/map/894.gz b/2006Scape Server/data/world/map/894.gz similarity index 100% rename from 2006Redone Server/data/world/map/894.gz rename to 2006Scape Server/data/world/map/894.gz diff --git a/2006Redone Server/data/world/map/895.gz b/2006Scape Server/data/world/map/895.gz similarity index 100% rename from 2006Redone Server/data/world/map/895.gz rename to 2006Scape Server/data/world/map/895.gz diff --git a/2006Redone Server/data/world/map/896.gz b/2006Scape Server/data/world/map/896.gz similarity index 100% rename from 2006Redone Server/data/world/map/896.gz rename to 2006Scape Server/data/world/map/896.gz diff --git a/2006Redone Server/data/world/map/897.gz b/2006Scape Server/data/world/map/897.gz similarity index 100% rename from 2006Redone Server/data/world/map/897.gz rename to 2006Scape Server/data/world/map/897.gz diff --git a/2006Redone Server/data/world/map/898.gz b/2006Scape Server/data/world/map/898.gz similarity index 100% rename from 2006Redone Server/data/world/map/898.gz rename to 2006Scape Server/data/world/map/898.gz diff --git a/2006Redone Server/data/world/map/899.gz b/2006Scape Server/data/world/map/899.gz similarity index 100% rename from 2006Redone Server/data/world/map/899.gz rename to 2006Scape Server/data/world/map/899.gz diff --git a/2006Redone Server/data/world/map/9.gz b/2006Scape Server/data/world/map/9.gz similarity index 100% rename from 2006Redone Server/data/world/map/9.gz rename to 2006Scape Server/data/world/map/9.gz diff --git a/2006Redone Server/data/world/map/90.gz b/2006Scape Server/data/world/map/90.gz similarity index 100% rename from 2006Redone Server/data/world/map/90.gz rename to 2006Scape Server/data/world/map/90.gz diff --git a/2006Redone Server/data/world/map/900.gz b/2006Scape Server/data/world/map/900.gz similarity index 100% rename from 2006Redone Server/data/world/map/900.gz rename to 2006Scape Server/data/world/map/900.gz diff --git a/2006Redone Server/data/world/map/901.gz b/2006Scape Server/data/world/map/901.gz similarity index 100% rename from 2006Redone Server/data/world/map/901.gz rename to 2006Scape Server/data/world/map/901.gz diff --git a/2006Redone Server/data/world/map/902.gz b/2006Scape Server/data/world/map/902.gz similarity index 100% rename from 2006Redone Server/data/world/map/902.gz rename to 2006Scape Server/data/world/map/902.gz diff --git a/2006Redone Server/data/world/map/903.gz b/2006Scape Server/data/world/map/903.gz similarity index 100% rename from 2006Redone Server/data/world/map/903.gz rename to 2006Scape Server/data/world/map/903.gz diff --git a/2006Redone Server/data/world/map/904.gz b/2006Scape Server/data/world/map/904.gz similarity index 100% rename from 2006Redone Server/data/world/map/904.gz rename to 2006Scape Server/data/world/map/904.gz diff --git a/2006Redone Server/data/world/map/905.gz b/2006Scape Server/data/world/map/905.gz similarity index 100% rename from 2006Redone Server/data/world/map/905.gz rename to 2006Scape Server/data/world/map/905.gz diff --git a/2006Redone Server/data/world/map/906.gz b/2006Scape Server/data/world/map/906.gz similarity index 100% rename from 2006Redone Server/data/world/map/906.gz rename to 2006Scape Server/data/world/map/906.gz diff --git a/2006Redone Server/data/world/map/907.gz b/2006Scape Server/data/world/map/907.gz similarity index 100% rename from 2006Redone Server/data/world/map/907.gz rename to 2006Scape Server/data/world/map/907.gz diff --git a/2006Redone Server/data/world/map/908.gz b/2006Scape Server/data/world/map/908.gz similarity index 100% rename from 2006Redone Server/data/world/map/908.gz rename to 2006Scape Server/data/world/map/908.gz diff --git a/2006Redone Server/data/world/map/909.gz b/2006Scape Server/data/world/map/909.gz similarity index 100% rename from 2006Redone Server/data/world/map/909.gz rename to 2006Scape Server/data/world/map/909.gz diff --git a/2006Redone Server/data/world/map/91.gz b/2006Scape Server/data/world/map/91.gz similarity index 100% rename from 2006Redone Server/data/world/map/91.gz rename to 2006Scape Server/data/world/map/91.gz diff --git a/2006Redone Server/data/world/map/910.gz b/2006Scape Server/data/world/map/910.gz similarity index 100% rename from 2006Redone Server/data/world/map/910.gz rename to 2006Scape Server/data/world/map/910.gz diff --git a/2006Redone Server/data/world/map/911.gz b/2006Scape Server/data/world/map/911.gz similarity index 100% rename from 2006Redone Server/data/world/map/911.gz rename to 2006Scape Server/data/world/map/911.gz diff --git a/2006Redone Server/data/world/map/912.gz b/2006Scape Server/data/world/map/912.gz similarity index 100% rename from 2006Redone Server/data/world/map/912.gz rename to 2006Scape Server/data/world/map/912.gz diff --git a/2006Redone Server/data/world/map/913.gz b/2006Scape Server/data/world/map/913.gz similarity index 100% rename from 2006Redone Server/data/world/map/913.gz rename to 2006Scape Server/data/world/map/913.gz diff --git a/2006Redone Server/data/world/map/914.gz b/2006Scape Server/data/world/map/914.gz similarity index 100% rename from 2006Redone Server/data/world/map/914.gz rename to 2006Scape Server/data/world/map/914.gz diff --git a/2006Redone Server/data/world/map/915.gz b/2006Scape Server/data/world/map/915.gz similarity index 100% rename from 2006Redone Server/data/world/map/915.gz rename to 2006Scape Server/data/world/map/915.gz diff --git a/2006Redone Server/data/world/map/916.gz b/2006Scape Server/data/world/map/916.gz similarity index 100% rename from 2006Redone Server/data/world/map/916.gz rename to 2006Scape Server/data/world/map/916.gz diff --git a/2006Redone Server/data/world/map/917.gz b/2006Scape Server/data/world/map/917.gz similarity index 100% rename from 2006Redone Server/data/world/map/917.gz rename to 2006Scape Server/data/world/map/917.gz diff --git a/2006Redone Server/data/world/map/918.gz b/2006Scape Server/data/world/map/918.gz similarity index 100% rename from 2006Redone Server/data/world/map/918.gz rename to 2006Scape Server/data/world/map/918.gz diff --git a/2006Redone Server/data/world/map/919.gz b/2006Scape Server/data/world/map/919.gz similarity index 100% rename from 2006Redone Server/data/world/map/919.gz rename to 2006Scape Server/data/world/map/919.gz diff --git a/2006Redone Server/data/world/map/92.gz b/2006Scape Server/data/world/map/92.gz similarity index 100% rename from 2006Redone Server/data/world/map/92.gz rename to 2006Scape Server/data/world/map/92.gz diff --git a/2006Redone Server/data/world/map/920.gz b/2006Scape Server/data/world/map/920.gz similarity index 100% rename from 2006Redone Server/data/world/map/920.gz rename to 2006Scape Server/data/world/map/920.gz diff --git a/2006Redone Server/data/world/map/921.gz b/2006Scape Server/data/world/map/921.gz similarity index 100% rename from 2006Redone Server/data/world/map/921.gz rename to 2006Scape Server/data/world/map/921.gz diff --git a/2006Redone Server/data/world/map/922.gz b/2006Scape Server/data/world/map/922.gz similarity index 100% rename from 2006Redone Server/data/world/map/922.gz rename to 2006Scape Server/data/world/map/922.gz diff --git a/2006Redone Server/data/world/map/923.gz b/2006Scape Server/data/world/map/923.gz similarity index 100% rename from 2006Redone Server/data/world/map/923.gz rename to 2006Scape Server/data/world/map/923.gz diff --git a/2006Redone Server/data/world/map/924.gz b/2006Scape Server/data/world/map/924.gz similarity index 100% rename from 2006Redone Server/data/world/map/924.gz rename to 2006Scape Server/data/world/map/924.gz diff --git a/2006Redone Server/data/world/map/925.gz b/2006Scape Server/data/world/map/925.gz similarity index 100% rename from 2006Redone Server/data/world/map/925.gz rename to 2006Scape Server/data/world/map/925.gz diff --git a/2006Redone Server/data/world/map/926.gz b/2006Scape Server/data/world/map/926.gz similarity index 100% rename from 2006Redone Server/data/world/map/926.gz rename to 2006Scape Server/data/world/map/926.gz diff --git a/2006Redone Server/data/world/map/927.gz b/2006Scape Server/data/world/map/927.gz similarity index 100% rename from 2006Redone Server/data/world/map/927.gz rename to 2006Scape Server/data/world/map/927.gz diff --git a/2006Redone Server/data/world/map/928.gz b/2006Scape Server/data/world/map/928.gz similarity index 100% rename from 2006Redone Server/data/world/map/928.gz rename to 2006Scape Server/data/world/map/928.gz diff --git a/2006Redone Server/data/world/map/929.gz b/2006Scape Server/data/world/map/929.gz similarity index 100% rename from 2006Redone Server/data/world/map/929.gz rename to 2006Scape Server/data/world/map/929.gz diff --git a/2006Redone Server/data/world/map/93.gz b/2006Scape Server/data/world/map/93.gz similarity index 100% rename from 2006Redone Server/data/world/map/93.gz rename to 2006Scape Server/data/world/map/93.gz diff --git a/2006Redone Server/data/world/map/930.gz b/2006Scape Server/data/world/map/930.gz similarity index 100% rename from 2006Redone Server/data/world/map/930.gz rename to 2006Scape Server/data/world/map/930.gz diff --git a/2006Redone Server/data/world/map/931.gz b/2006Scape Server/data/world/map/931.gz similarity index 100% rename from 2006Redone Server/data/world/map/931.gz rename to 2006Scape Server/data/world/map/931.gz diff --git a/2006Redone Server/data/world/map/932.gz b/2006Scape Server/data/world/map/932.gz similarity index 100% rename from 2006Redone Server/data/world/map/932.gz rename to 2006Scape Server/data/world/map/932.gz diff --git a/2006Redone Server/data/world/map/933.gz b/2006Scape Server/data/world/map/933.gz similarity index 100% rename from 2006Redone Server/data/world/map/933.gz rename to 2006Scape Server/data/world/map/933.gz diff --git a/2006Redone Server/data/world/map/934.gz b/2006Scape Server/data/world/map/934.gz similarity index 100% rename from 2006Redone Server/data/world/map/934.gz rename to 2006Scape Server/data/world/map/934.gz diff --git a/2006Redone Server/data/world/map/935.gz b/2006Scape Server/data/world/map/935.gz similarity index 100% rename from 2006Redone Server/data/world/map/935.gz rename to 2006Scape Server/data/world/map/935.gz diff --git a/2006Redone Server/data/world/map/936.gz b/2006Scape Server/data/world/map/936.gz similarity index 100% rename from 2006Redone Server/data/world/map/936.gz rename to 2006Scape Server/data/world/map/936.gz diff --git a/2006Redone Server/data/world/map/937.gz b/2006Scape Server/data/world/map/937.gz similarity index 100% rename from 2006Redone Server/data/world/map/937.gz rename to 2006Scape Server/data/world/map/937.gz diff --git a/2006Redone Server/data/world/map/938.gz b/2006Scape Server/data/world/map/938.gz similarity index 100% rename from 2006Redone Server/data/world/map/938.gz rename to 2006Scape Server/data/world/map/938.gz diff --git a/2006Redone Server/data/world/map/939.gz b/2006Scape Server/data/world/map/939.gz similarity index 100% rename from 2006Redone Server/data/world/map/939.gz rename to 2006Scape Server/data/world/map/939.gz diff --git a/2006Redone Server/data/world/map/94.gz b/2006Scape Server/data/world/map/94.gz similarity index 100% rename from 2006Redone Server/data/world/map/94.gz rename to 2006Scape Server/data/world/map/94.gz diff --git a/2006Redone Server/data/world/map/940.gz b/2006Scape Server/data/world/map/940.gz similarity index 100% rename from 2006Redone Server/data/world/map/940.gz rename to 2006Scape Server/data/world/map/940.gz diff --git a/2006Redone Server/data/world/map/941.gz b/2006Scape Server/data/world/map/941.gz similarity index 100% rename from 2006Redone Server/data/world/map/941.gz rename to 2006Scape Server/data/world/map/941.gz diff --git a/2006Redone Server/data/world/map/942.gz b/2006Scape Server/data/world/map/942.gz similarity index 100% rename from 2006Redone Server/data/world/map/942.gz rename to 2006Scape Server/data/world/map/942.gz diff --git a/2006Redone Server/data/world/map/943.gz b/2006Scape Server/data/world/map/943.gz similarity index 100% rename from 2006Redone Server/data/world/map/943.gz rename to 2006Scape Server/data/world/map/943.gz diff --git a/2006Redone Server/data/world/map/944.gz b/2006Scape Server/data/world/map/944.gz similarity index 100% rename from 2006Redone Server/data/world/map/944.gz rename to 2006Scape Server/data/world/map/944.gz diff --git a/2006Redone Server/data/world/map/945.gz b/2006Scape Server/data/world/map/945.gz similarity index 100% rename from 2006Redone Server/data/world/map/945.gz rename to 2006Scape Server/data/world/map/945.gz diff --git a/2006Redone Server/data/world/map/946.gz b/2006Scape Server/data/world/map/946.gz similarity index 100% rename from 2006Redone Server/data/world/map/946.gz rename to 2006Scape Server/data/world/map/946.gz diff --git a/2006Redone Server/data/world/map/947.gz b/2006Scape Server/data/world/map/947.gz similarity index 100% rename from 2006Redone Server/data/world/map/947.gz rename to 2006Scape Server/data/world/map/947.gz diff --git a/2006Redone Server/data/world/map/948.gz b/2006Scape Server/data/world/map/948.gz similarity index 100% rename from 2006Redone Server/data/world/map/948.gz rename to 2006Scape Server/data/world/map/948.gz diff --git a/2006Redone Server/data/world/map/949.gz b/2006Scape Server/data/world/map/949.gz similarity index 100% rename from 2006Redone Server/data/world/map/949.gz rename to 2006Scape Server/data/world/map/949.gz diff --git a/2006Redone Server/data/world/map/95.gz b/2006Scape Server/data/world/map/95.gz similarity index 100% rename from 2006Redone Server/data/world/map/95.gz rename to 2006Scape Server/data/world/map/95.gz diff --git a/2006Redone Server/data/world/map/950.gz b/2006Scape Server/data/world/map/950.gz similarity index 100% rename from 2006Redone Server/data/world/map/950.gz rename to 2006Scape Server/data/world/map/950.gz diff --git a/2006Redone Server/data/world/map/951.gz b/2006Scape Server/data/world/map/951.gz similarity index 100% rename from 2006Redone Server/data/world/map/951.gz rename to 2006Scape Server/data/world/map/951.gz diff --git a/2006Redone Server/data/world/map/952.gz b/2006Scape Server/data/world/map/952.gz similarity index 100% rename from 2006Redone Server/data/world/map/952.gz rename to 2006Scape Server/data/world/map/952.gz diff --git a/2006Redone Server/data/world/map/953.gz b/2006Scape Server/data/world/map/953.gz similarity index 100% rename from 2006Redone Server/data/world/map/953.gz rename to 2006Scape Server/data/world/map/953.gz diff --git a/2006Redone Server/data/world/map/954.gz b/2006Scape Server/data/world/map/954.gz similarity index 100% rename from 2006Redone Server/data/world/map/954.gz rename to 2006Scape Server/data/world/map/954.gz diff --git a/2006Redone Server/data/world/map/955.gz b/2006Scape Server/data/world/map/955.gz similarity index 100% rename from 2006Redone Server/data/world/map/955.gz rename to 2006Scape Server/data/world/map/955.gz diff --git a/2006Redone Server/data/world/map/956.gz b/2006Scape Server/data/world/map/956.gz similarity index 100% rename from 2006Redone Server/data/world/map/956.gz rename to 2006Scape Server/data/world/map/956.gz diff --git a/2006Redone Server/data/world/map/957.gz b/2006Scape Server/data/world/map/957.gz similarity index 100% rename from 2006Redone Server/data/world/map/957.gz rename to 2006Scape Server/data/world/map/957.gz diff --git a/2006Redone Server/data/world/map/958.gz b/2006Scape Server/data/world/map/958.gz similarity index 100% rename from 2006Redone Server/data/world/map/958.gz rename to 2006Scape Server/data/world/map/958.gz diff --git a/2006Redone Server/data/world/map/959.gz b/2006Scape Server/data/world/map/959.gz similarity index 100% rename from 2006Redone Server/data/world/map/959.gz rename to 2006Scape Server/data/world/map/959.gz diff --git a/2006Redone Server/data/world/map/96.gz b/2006Scape Server/data/world/map/96.gz similarity index 100% rename from 2006Redone Server/data/world/map/96.gz rename to 2006Scape Server/data/world/map/96.gz diff --git a/2006Redone Server/data/world/map/960.gz b/2006Scape Server/data/world/map/960.gz similarity index 100% rename from 2006Redone Server/data/world/map/960.gz rename to 2006Scape Server/data/world/map/960.gz diff --git a/2006Redone Server/data/world/map/961.gz b/2006Scape Server/data/world/map/961.gz similarity index 100% rename from 2006Redone Server/data/world/map/961.gz rename to 2006Scape Server/data/world/map/961.gz diff --git a/2006Redone Server/data/world/map/962.gz b/2006Scape Server/data/world/map/962.gz similarity index 100% rename from 2006Redone Server/data/world/map/962.gz rename to 2006Scape Server/data/world/map/962.gz diff --git a/2006Redone Server/data/world/map/963.gz b/2006Scape Server/data/world/map/963.gz similarity index 100% rename from 2006Redone Server/data/world/map/963.gz rename to 2006Scape Server/data/world/map/963.gz diff --git a/2006Redone Server/data/world/map/964.gz b/2006Scape Server/data/world/map/964.gz similarity index 100% rename from 2006Redone Server/data/world/map/964.gz rename to 2006Scape Server/data/world/map/964.gz diff --git a/2006Redone Server/data/world/map/965.gz b/2006Scape Server/data/world/map/965.gz similarity index 100% rename from 2006Redone Server/data/world/map/965.gz rename to 2006Scape Server/data/world/map/965.gz diff --git a/2006Redone Server/data/world/map/966.gz b/2006Scape Server/data/world/map/966.gz similarity index 100% rename from 2006Redone Server/data/world/map/966.gz rename to 2006Scape Server/data/world/map/966.gz diff --git a/2006Redone Server/data/world/map/967.gz b/2006Scape Server/data/world/map/967.gz similarity index 100% rename from 2006Redone Server/data/world/map/967.gz rename to 2006Scape Server/data/world/map/967.gz diff --git a/2006Redone Server/data/world/map/968.gz b/2006Scape Server/data/world/map/968.gz similarity index 100% rename from 2006Redone Server/data/world/map/968.gz rename to 2006Scape Server/data/world/map/968.gz diff --git a/2006Redone Server/data/world/map/969.gz b/2006Scape Server/data/world/map/969.gz similarity index 100% rename from 2006Redone Server/data/world/map/969.gz rename to 2006Scape Server/data/world/map/969.gz diff --git a/2006Redone Server/data/world/map/97.gz b/2006Scape Server/data/world/map/97.gz similarity index 100% rename from 2006Redone Server/data/world/map/97.gz rename to 2006Scape Server/data/world/map/97.gz diff --git a/2006Redone Server/data/world/map/970.gz b/2006Scape Server/data/world/map/970.gz similarity index 100% rename from 2006Redone Server/data/world/map/970.gz rename to 2006Scape Server/data/world/map/970.gz diff --git a/2006Redone Server/data/world/map/971.gz b/2006Scape Server/data/world/map/971.gz similarity index 100% rename from 2006Redone Server/data/world/map/971.gz rename to 2006Scape Server/data/world/map/971.gz diff --git a/2006Redone Server/data/world/map/972.gz b/2006Scape Server/data/world/map/972.gz similarity index 100% rename from 2006Redone Server/data/world/map/972.gz rename to 2006Scape Server/data/world/map/972.gz diff --git a/2006Redone Server/data/world/map/973.gz b/2006Scape Server/data/world/map/973.gz similarity index 100% rename from 2006Redone Server/data/world/map/973.gz rename to 2006Scape Server/data/world/map/973.gz diff --git a/2006Redone Server/data/world/map/974.gz b/2006Scape Server/data/world/map/974.gz similarity index 100% rename from 2006Redone Server/data/world/map/974.gz rename to 2006Scape Server/data/world/map/974.gz diff --git a/2006Redone Server/data/world/map/975.gz b/2006Scape Server/data/world/map/975.gz similarity index 100% rename from 2006Redone Server/data/world/map/975.gz rename to 2006Scape Server/data/world/map/975.gz diff --git a/2006Redone Server/data/world/map/976.gz b/2006Scape Server/data/world/map/976.gz similarity index 100% rename from 2006Redone Server/data/world/map/976.gz rename to 2006Scape Server/data/world/map/976.gz diff --git a/2006Redone Server/data/world/map/977.gz b/2006Scape Server/data/world/map/977.gz similarity index 100% rename from 2006Redone Server/data/world/map/977.gz rename to 2006Scape Server/data/world/map/977.gz diff --git a/2006Redone Server/data/world/map/978.gz b/2006Scape Server/data/world/map/978.gz similarity index 100% rename from 2006Redone Server/data/world/map/978.gz rename to 2006Scape Server/data/world/map/978.gz diff --git a/2006Redone Server/data/world/map/979.gz b/2006Scape Server/data/world/map/979.gz similarity index 100% rename from 2006Redone Server/data/world/map/979.gz rename to 2006Scape Server/data/world/map/979.gz diff --git a/2006Redone Server/data/world/map/98.gz b/2006Scape Server/data/world/map/98.gz similarity index 100% rename from 2006Redone Server/data/world/map/98.gz rename to 2006Scape Server/data/world/map/98.gz diff --git a/2006Redone Server/data/world/map/980.gz b/2006Scape Server/data/world/map/980.gz similarity index 100% rename from 2006Redone Server/data/world/map/980.gz rename to 2006Scape Server/data/world/map/980.gz diff --git a/2006Redone Server/data/world/map/981.gz b/2006Scape Server/data/world/map/981.gz similarity index 100% rename from 2006Redone Server/data/world/map/981.gz rename to 2006Scape Server/data/world/map/981.gz diff --git a/2006Redone Server/data/world/map/982.gz b/2006Scape Server/data/world/map/982.gz similarity index 100% rename from 2006Redone Server/data/world/map/982.gz rename to 2006Scape Server/data/world/map/982.gz diff --git a/2006Redone Server/data/world/map/983.gz b/2006Scape Server/data/world/map/983.gz similarity index 100% rename from 2006Redone Server/data/world/map/983.gz rename to 2006Scape Server/data/world/map/983.gz diff --git a/2006Redone Server/data/world/map/984.gz b/2006Scape Server/data/world/map/984.gz similarity index 100% rename from 2006Redone Server/data/world/map/984.gz rename to 2006Scape Server/data/world/map/984.gz diff --git a/2006Redone Server/data/world/map/985.gz b/2006Scape Server/data/world/map/985.gz similarity index 100% rename from 2006Redone Server/data/world/map/985.gz rename to 2006Scape Server/data/world/map/985.gz diff --git a/2006Redone Server/data/world/map/986.gz b/2006Scape Server/data/world/map/986.gz similarity index 100% rename from 2006Redone Server/data/world/map/986.gz rename to 2006Scape Server/data/world/map/986.gz diff --git a/2006Redone Server/data/world/map/987.gz b/2006Scape Server/data/world/map/987.gz similarity index 100% rename from 2006Redone Server/data/world/map/987.gz rename to 2006Scape Server/data/world/map/987.gz diff --git a/2006Redone Server/data/world/map/988.gz b/2006Scape Server/data/world/map/988.gz similarity index 100% rename from 2006Redone Server/data/world/map/988.gz rename to 2006Scape Server/data/world/map/988.gz diff --git a/2006Redone Server/data/world/map/989.gz b/2006Scape Server/data/world/map/989.gz similarity index 100% rename from 2006Redone Server/data/world/map/989.gz rename to 2006Scape Server/data/world/map/989.gz diff --git a/2006Redone Server/data/world/map/99.gz b/2006Scape Server/data/world/map/99.gz similarity index 100% rename from 2006Redone Server/data/world/map/99.gz rename to 2006Scape Server/data/world/map/99.gz diff --git a/2006Redone Server/data/world/map/990.gz b/2006Scape Server/data/world/map/990.gz similarity index 100% rename from 2006Redone Server/data/world/map/990.gz rename to 2006Scape Server/data/world/map/990.gz diff --git a/2006Redone Server/data/world/map/991.gz b/2006Scape Server/data/world/map/991.gz similarity index 100% rename from 2006Redone Server/data/world/map/991.gz rename to 2006Scape Server/data/world/map/991.gz diff --git a/2006Redone Server/data/world/map/992.gz b/2006Scape Server/data/world/map/992.gz similarity index 100% rename from 2006Redone Server/data/world/map/992.gz rename to 2006Scape Server/data/world/map/992.gz diff --git a/2006Redone Server/data/world/map/993.gz b/2006Scape Server/data/world/map/993.gz similarity index 100% rename from 2006Redone Server/data/world/map/993.gz rename to 2006Scape Server/data/world/map/993.gz diff --git a/2006Redone Server/data/world/map/994.gz b/2006Scape Server/data/world/map/994.gz similarity index 100% rename from 2006Redone Server/data/world/map/994.gz rename to 2006Scape Server/data/world/map/994.gz diff --git a/2006Redone Server/data/world/map/995.gz b/2006Scape Server/data/world/map/995.gz similarity index 100% rename from 2006Redone Server/data/world/map/995.gz rename to 2006Scape Server/data/world/map/995.gz diff --git a/2006Redone Server/data/world/map/996.gz b/2006Scape Server/data/world/map/996.gz similarity index 100% rename from 2006Redone Server/data/world/map/996.gz rename to 2006Scape Server/data/world/map/996.gz diff --git a/2006Redone Server/data/world/map/997.gz b/2006Scape Server/data/world/map/997.gz similarity index 100% rename from 2006Redone Server/data/world/map/997.gz rename to 2006Scape Server/data/world/map/997.gz diff --git a/2006Redone Server/data/world/map_index b/2006Scape Server/data/world/map_index similarity index 100% rename from 2006Redone Server/data/world/map_index rename to 2006Scape Server/data/world/map_index diff --git a/2006Redone Server/data/world/object/loc.dat b/2006Scape Server/data/world/object/loc.dat similarity index 100% rename from 2006Redone Server/data/world/object/loc.dat rename to 2006Scape Server/data/world/object/loc.dat diff --git a/2006Redone Server/data/world/object/loc.idx b/2006Scape Server/data/world/object/loc.idx similarity index 100% rename from 2006Redone Server/data/world/object/loc.idx rename to 2006Scape Server/data/world/object/loc.idx diff --git a/2006Redone Server/libs/everythingrs-api.jar b/2006Scape Server/libs/everythingrs-api.jar similarity index 100% rename from 2006Redone Server/libs/everythingrs-api.jar rename to 2006Scape Server/libs/everythingrs-api.jar diff --git a/2006Redone Server/pom.xml b/2006Scape Server/pom.xml similarity index 98% rename from 2006Redone Server/pom.xml rename to 2006Scape Server/pom.xml index 764ebe52..d3509b54 100644 --- a/2006Redone Server/pom.xml +++ b/2006Scape Server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.rebotted + com.rs2 server 1.0 jar @@ -163,7 +163,7 @@ - com.rebotted.GameEngine + com.rs2.GameEngine diff --git a/2006Redone Server/runServer.sh b/2006Scape Server/runServer.sh similarity index 100% rename from 2006Redone Server/runServer.sh rename to 2006Scape Server/runServer.sh diff --git a/2006Redone Server/src/main/java/com/rebotted/Connection.java b/2006Scape Server/src/main/java/com/rs2/Connection.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/Connection.java rename to 2006Scape Server/src/main/java/com/rs2/Connection.java index a458c8d2..7d042448 100644 --- a/2006Redone Server/src/main/java/com/rebotted/Connection.java +++ b/2006Scape Server/src/main/java/com/rs2/Connection.java @@ -1,4 +1,4 @@ -package com.rebotted; +package com.rs2; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -6,7 +6,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Connection Check Class diff --git a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/GameConstants.java rename to 2006Scape Server/src/main/java/com/rs2/GameConstants.java index 86b0180e..d1d21d9e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -1,10 +1,12 @@ -package com.rebotted; +package com.rs2; public class GameConstants { public final static boolean SERVER_DEBUG = false; - public final static String SERVER_NAME = "2006rebotted", SERVER_VERSION = "Server Stage v " + GameConstants.TEST_VERSION + "."; + public final static String SERVER_NAME = "2006Scape", SERVER_VERSION = "Server Stage v " + GameConstants.TEST_VERSION + "."; + + public final static String WEBSITE_LINK = "https://2006Scape.org"; public final static double TEST_VERSION = 2.3; diff --git a/2006Redone Server/src/main/java/com/rebotted/GameEngine.java b/2006Scape Server/src/main/java/com/rs2/GameEngine.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/GameEngine.java rename to 2006Scape Server/src/main/java/com/rs2/GameEngine.java index 5a31dbd1..bab5e0ab 100644 --- a/2006Redone Server/src/main/java/com/rebotted/GameEngine.java +++ b/2006Scape Server/src/main/java/com/rs2/GameEngine.java @@ -1,4 +1,4 @@ -package com.rebotted; +package com.rs2; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -13,41 +13,41 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.rebotted.game.bots.BotHandler; +import com.rs2.game.bots.BotHandler; import org.apache.mina.common.IoAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.content.minigames.FightPits; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.minigames.trawler.Trawler; -import com.rebotted.game.globalworldobjects.Doors; -import com.rebotted.game.globalworldobjects.DoubleDoors; -import com.rebotted.game.items.ItemDefinition; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.game.players.PlayerSave; -import com.rebotted.game.shops.ShopHandler; -import com.rebotted.integrations.PlayersOnlineWebsite; -import com.rebotted.integrations.RegisteredAccsWebsite; -import com.rebotted.integrations.SettingsLoader; -import com.rebotted.integrations.discord.DiscordActivity; -import com.rebotted.integrations.discord.JavaCord; -import com.rebotted.net.ConnectionHandler; -import com.rebotted.net.ConnectionThrottleFilter; -import com.rebotted.tick.Scheduler; -import com.rebotted.tick.Tick; -import com.rebotted.util.HostBlacklist; -import com.rebotted.world.GlobalDropsHandler; -import com.rebotted.world.ItemHandler; -import com.rebotted.world.ObjectHandler; -import com.rebotted.world.ObjectManager; -import com.rebotted.world.clip.ObjectDefinition; -import com.rebotted.world.clip.RegionFactory; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.content.minigames.FightPits; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.minigames.trawler.Trawler; +import com.rs2.game.globalworldobjects.Doors; +import com.rs2.game.globalworldobjects.DoubleDoors; +import com.rs2.game.items.ItemDefinition; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.game.players.PlayerSave; +import com.rs2.game.shops.ShopHandler; +import com.rs2.integrations.PlayersOnlineWebsite; +import com.rs2.integrations.RegisteredAccsWebsite; +import com.rs2.integrations.SettingsLoader; +import com.rs2.integrations.discord.DiscordActivity; +import com.rs2.integrations.discord.JavaCord; +import com.rs2.net.ConnectionHandler; +import com.rs2.net.ConnectionThrottleFilter; +import com.rs2.tick.Scheduler; +import com.rs2.tick.Tick; +import com.rs2.util.HostBlacklist; +import com.rs2.world.GlobalDropsHandler; +import com.rs2.world.ItemHandler; +import com.rs2.world.ObjectHandler; +import com.rs2.world.ObjectManager; +import com.rs2.world.clip.ObjectDefinition; +import com.rs2.world.clip.RegionFactory; /** * Server.java @@ -152,7 +152,7 @@ public class GameEngine { System.out.println("************************************"); System.out.println("WARNING: I could not find the /data folder. You are LIKELY running this in the wrong directory!"); System.out.println("In IntelliJ, fix it by clicking \"Server\" > Edit Configurations at the top of your screen"); - System.out.println("Then changing the \"Working Directory\" to be in \"2006rebotted/2006Redone Server\", instead of just \"2006rebotted\""); + System.out.println("Then changing the \"Working Directory\" to be in \"2006Scape/2006Scape Server\", instead of just \"2006Scape\""); System.out.println("************************************"); System.out.println("************************************"); System.out.println("************************************"); diff --git a/2006Redone Server/src/main/java/com/rebotted/console/CommandConsole.java b/2006Scape Server/src/main/java/com/rs2/console/CommandConsole.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/console/CommandConsole.java rename to 2006Scape Server/src/main/java/com/rs2/console/CommandConsole.java index 9aeb5a68..11b43758 100644 --- a/2006Redone Server/src/main/java/com/rebotted/console/CommandConsole.java +++ b/2006Scape Server/src/main/java/com/rs2/console/CommandConsole.java @@ -1,12 +1,12 @@ -package com.rebotted.console; +package com.rs2.console; import java.util.ArrayList; import java.util.NoSuchElementException; import java.util.Scanner; -import com.rebotted.GameConstants; -import com.rebotted.console.commands.ListPlayers; -import com.rebotted.console.commands.Stop; +import com.rs2.GameConstants; +import com.rs2.console.commands.ListPlayers; +import com.rs2.console.commands.Stop; /** * diff --git a/2006Redone Server/src/main/java/com/rebotted/console/CommandProcessor.java b/2006Scape Server/src/main/java/com/rs2/console/CommandProcessor.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/console/CommandProcessor.java rename to 2006Scape Server/src/main/java/com/rs2/console/CommandProcessor.java index 0a9ac902..eaf13404 100644 --- a/2006Redone Server/src/main/java/com/rebotted/console/CommandProcessor.java +++ b/2006Scape Server/src/main/java/com/rs2/console/CommandProcessor.java @@ -1,4 +1,4 @@ -package com.rebotted.console; +package com.rs2.console; /** * diff --git a/2006Redone Server/src/main/java/com/rebotted/console/commands/ListPlayers.java b/2006Scape Server/src/main/java/com/rs2/console/commands/ListPlayers.java similarity index 73% rename from 2006Redone Server/src/main/java/com/rebotted/console/commands/ListPlayers.java rename to 2006Scape Server/src/main/java/com/rs2/console/commands/ListPlayers.java index 1843a5d9..8cc5c2d4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/console/commands/ListPlayers.java +++ b/2006Scape Server/src/main/java/com/rs2/console/commands/ListPlayers.java @@ -1,8 +1,8 @@ -package com.rebotted.console.commands; +package com.rs2.console.commands; -import com.rebotted.console.CommandProcessor; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.console.CommandProcessor; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; /** * diff --git a/2006Redone Server/src/main/java/com/rebotted/console/commands/Stop.java b/2006Scape Server/src/main/java/com/rs2/console/commands/Stop.java similarity index 78% rename from 2006Redone Server/src/main/java/com/rebotted/console/commands/Stop.java rename to 2006Scape Server/src/main/java/com/rs2/console/commands/Stop.java index 4ec8ca96..675f3192 100644 --- a/2006Redone Server/src/main/java/com/rebotted/console/commands/Stop.java +++ b/2006Scape Server/src/main/java/com/rs2/console/commands/Stop.java @@ -1,7 +1,7 @@ -package com.rebotted.console.commands; +package com.rs2.console.commands; -import com.rebotted.GameEngine; -import com.rebotted.console.CommandProcessor; +import com.rs2.GameEngine; +import com.rs2.console.CommandProcessor; /** * diff --git a/2006Redone Server/src/main/java/com/rebotted/event/CycleEvent.java b/2006Scape Server/src/main/java/com/rs2/event/CycleEvent.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/event/CycleEvent.java rename to 2006Scape Server/src/main/java/com/rs2/event/CycleEvent.java index a1720a8f..99358b9b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/event/CycleEvent.java +++ b/2006Scape Server/src/main/java/com/rs2/event/CycleEvent.java @@ -1,4 +1,4 @@ -package com.rebotted.event; +package com.rs2.event; /** * What the event must implement diff --git a/2006Redone Server/src/main/java/com/rebotted/event/CycleEventContainer.java b/2006Scape Server/src/main/java/com/rs2/event/CycleEventContainer.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/event/CycleEventContainer.java rename to 2006Scape Server/src/main/java/com/rs2/event/CycleEventContainer.java index 9b46e07c..41a9a274 100644 --- a/2006Redone Server/src/main/java/com/rebotted/event/CycleEventContainer.java +++ b/2006Scape Server/src/main/java/com/rs2/event/CycleEventContainer.java @@ -1,4 +1,4 @@ -package com.rebotted.event; +package com.rs2.event; /** * The wrapper for our event diff --git a/2006Redone Server/src/main/java/com/rebotted/event/CycleEventHandler.java b/2006Scape Server/src/main/java/com/rs2/event/CycleEventHandler.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/event/CycleEventHandler.java rename to 2006Scape Server/src/main/java/com/rs2/event/CycleEventHandler.java index e692cc5c..19169fde 100644 --- a/2006Redone Server/src/main/java/com/rebotted/event/CycleEventHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/event/CycleEventHandler.java @@ -1,4 +1,4 @@ -package com.rebotted.event; +package com.rs2.event; import java.util.ArrayList; import java.util.List; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/bots/Bot.java b/2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/bots/Bot.java rename to 2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java index d7c83d23..08ad915b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/bots/Bot.java +++ b/2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java @@ -1,14 +1,14 @@ -package com.rebotted.game.bots; +package com.rs2.game.bots; -import static com.rebotted.game.players.PlayerSave.loadPlayerInfo; +import static com.rs2.game.players.PlayerSave.loadPlayerInfo; import java.text.DecimalFormat; import java.util.*; -import com.rebotted.GameEngine; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Client; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Client; +import com.rs2.util.Misc; public class Bot { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/bots/BotConstants.java b/2006Scape Server/src/main/java/com/rs2/game/bots/BotConstants.java similarity index 69% rename from 2006Redone Server/src/main/java/com/rebotted/game/bots/BotConstants.java rename to 2006Scape Server/src/main/java/com/rs2/game/bots/BotConstants.java index b27ccd3a..544b6a09 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/bots/BotConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/game/bots/BotConstants.java @@ -1,4 +1,4 @@ -package com.rebotted.game.bots; +package com.rs2.game.bots; public class BotConstants { public static final int MAX_BOTS = 100; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/bots/BotHandler.java b/2006Scape Server/src/main/java/com/rs2/game/bots/BotHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/bots/BotHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/bots/BotHandler.java index 4b5f9e38..075a18fb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/bots/BotHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/bots/BotHandler.java @@ -1,4 +1,4 @@ -package com.rebotted.game.bots; +package com.rs2.game.bots; import java.io.File; import java.security.SecureRandom; @@ -7,14 +7,14 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import com.rebotted.GameConstants; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.game.shops.ShopHandler; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.game.shops.ShopHandler; +import com.rs2.util.Misc; -import static com.rebotted.game.players.PlayerSave.loadPlayerInfo; +import static com.rs2.game.players.PlayerSave.loadPlayerInfo; public class BotHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java b/2006Scape Server/src/main/java/com/rs2/game/content/BankPin.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/BankPin.java index 3bcf44b0..932db27f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/BankPin.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/BankPin.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content; +package com.rs2.game.content; import java.util.Calendar; import java.util.GregorianCalendar; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Handles the BankPin on Bank's diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/EmoteHandler.java b/2006Scape Server/src/main/java/com/rs2/game/content/EmoteHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/EmoteHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/EmoteHandler.java index 3da4c975..5407dfa0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/EmoteHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/EmoteHandler.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content; +package com.rs2.game.content; import java.util.HashMap; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class EmoteHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java index b60c9f37..52804d9c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java @@ -1,34 +1,34 @@ -package com.rebotted.game.content.combat; +package com.rs2.game.content.combat; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.combat.magic.CastOnOther; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.content.combat.magic.MagicMaxHit; -import com.rebotted.game.content.combat.magic.MagicRequirements; -import com.rebotted.game.content.combat.magic.MagicSpells; -import com.rebotted.game.content.combat.melee.MeleeData; -import com.rebotted.game.content.combat.melee.MeleeMaxHit; -import com.rebotted.game.content.combat.npcs.NpcEmotes; -import com.rebotted.game.content.combat.prayer.PrayerDrain; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.content.combat.range.RangeMaxHit; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.content.minigames.FightPits; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.music.sound.CombatSounds; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.slayer.SlayerRequirements; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.PathFinder; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.combat.magic.CastOnOther; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.content.combat.magic.MagicMaxHit; +import com.rs2.game.content.combat.magic.MagicRequirements; +import com.rs2.game.content.combat.magic.MagicSpells; +import com.rs2.game.content.combat.melee.MeleeData; +import com.rs2.game.content.combat.melee.MeleeMaxHit; +import com.rs2.game.content.combat.npcs.NpcEmotes; +import com.rs2.game.content.combat.prayer.PrayerDrain; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.content.combat.range.RangeMaxHit; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.content.minigames.FightPits; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.music.sound.CombatSounds; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.slayer.SlayerRequirements; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.PathFinder; /** * @author whoever contributed diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatConstants.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatConstants.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatConstants.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatConstants.java index 4db13b15..5b8c5f35 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatConstants.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.combat; +package com.rs2.game.content.combat; /** diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/Specials.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/Specials.java index 0787151d..d45d53f9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/Specials.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/Specials.java @@ -1,13 +1,13 @@ -package com.rebotted.game.content.combat; +package com.rs2.game.content.combat; import java.util.HashMap; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.content.music.sound.CombatSounds; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.content.music.sound.CombatSounds; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; public class Specials { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastOnOther.java similarity index 88% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastOnOther.java index 6c77b07c..467eb4d1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastOnOther.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastOnOther.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; public class CastOnOther extends CastRequirements { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastRequirements.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastRequirements.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastRequirements.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastRequirements.java index 6e4a21d4..9e86e318 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/CastRequirements.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastRequirements.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class CastRequirements { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/Enchanting.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/Enchanting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java index 093d9ca8..0e007a3c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/Enchanting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class Enchanting { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicData.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicData.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicData.java index f75d341b..ee76932d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicData.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class MagicData { public static final int[][] MAGIC_SPELLS = { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicMaxHit.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicMaxHit.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicMaxHit.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicMaxHit.java index 2c543ece..d7547ebb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicMaxHit.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicMaxHit.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class MagicMaxHit { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicRequirements.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicRequirements.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java index 46de09bc..39ba3e38 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicRequirements.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; public class MagicRequirements { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicSpells.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicSpells.java index 6cdb9fa5..03fff5d3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicSpells.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicSpells.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; public class MagicSpells extends MagicData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicTeleports.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicTeleports.java index dc06e18b..e98b8714 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/MagicTeleports.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicTeleports.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.players.Player; public class MagicTeleports { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/NonCombatSpells.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/NonCombatSpells.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/NonCombatSpells.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/NonCombatSpells.java index cdb9905a..2fc043d7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/NonCombatSpells.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/NonCombatSpells.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; -import com.rebotted.game.players.Client; +import com.rs2.game.players.Client; public class NonCombatSpells { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/SpellTeleport.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/SpellTeleport.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/SpellTeleport.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/SpellTeleport.java index 92d9a5ed..5c743e2e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/magic/SpellTeleport.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/SpellTeleport.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.combat.magic; +package com.rs2.game.content.combat.magic; public enum SpellTeleport { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java index cd2096e4..00154650 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.combat.melee; +package com.rs2.game.content.combat.melee; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.players.Player; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.players.Player; public class MeleeData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeMaxHit.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeMaxHit.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeMaxHit.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeMaxHit.java index 831eaa8f..494b9bef 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeMaxHit.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeMaxHit.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.melee; +package com.rs2.game.content.combat.melee; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class MeleeMaxHit { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/PlayerKilling.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/PlayerKilling.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/PlayerKilling.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/PlayerKilling.java index 0545eb93..b2acd9b5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/PlayerKilling.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/PlayerKilling.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.melee; +package com.rs2.game.content.combat.melee; -import com.rebotted.game.players.Client; +import com.rs2.game.players.Client; /** * Handles adding and removing hosts to the players array list. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcAggressive.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcAggressive.java index a552de9b..ff0f7c74 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcAggressive.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcAggressive.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.combat.npcs; +package com.rs2.game.content.combat.npcs; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.npcs.NpcHandler; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.npcs.NpcHandler; public class NpcAggressive { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java index b1a6df34..9f55f658 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java @@ -1,20 +1,20 @@ -package com.rebotted.game.content.combat.npcs; +package com.rs2.game.content.combat.npcs; -import com.rebotted.GameConstants; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.melee.MeleeData; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.music.sound.CombatSounds; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.npcs.NpcData; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; +import com.rs2.GameConstants; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.melee.MeleeData; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.music.sound.CombatSounds; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.npcs.NpcData; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; public class NpcCombat { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcEmotes.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcEmotes.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java index 7f5f89be..ce16ad46 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcEmotes.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.combat.npcs; +package com.rs2.game.content.combat.npcs; -import com.rebotted.GameEngine; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; +import com.rs2.GameEngine; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; /** * Npc Emotes diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/StaticNpcList.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/StaticNpcList.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/StaticNpcList.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/StaticNpcList.java index 53e9c81a..04dbb497 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/StaticNpcList.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/StaticNpcList.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.combat.npcs; +package com.rs2.game.content.combat.npcs; public class StaticNpcList { public final static int TOO_EPRECHAUN_0 = 0; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/ActivatePrayers.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/ActivatePrayers.java index 65ecce42..c53d89dd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/ActivatePrayers.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/ActivatePrayers.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.combat.prayer; +package com.rs2.game.content.combat.prayer; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.players.Player; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.players.Player; public class ActivatePrayers { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerData.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerData.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerData.java index 96a858c9..59f91ad0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerData.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.combat.prayer; +package com.rs2.game.content.combat.prayer; public class PrayerData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerDrain.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerDrain.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerDrain.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerDrain.java index 9c3d0c52..07aa5a33 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/prayer/PrayerDrain.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerDrain.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.prayer; +package com.rs2.game.content.combat.prayer; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class PrayerDrain { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java index f534f19b..8c1d9181 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/DwarfCannon.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java @@ -1,17 +1,17 @@ -package com.rebotted.game.content.combat.range; +package com.rs2.game.content.combat.range; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; /** * Cannon diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeData.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeData.java index cfb51dfa..4e05ed4c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeData.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.range; +package com.rs2.game.content.combat.range; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class RangeData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeMaxHit.java b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeMaxHit.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeMaxHit.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeMaxHit.java index 1134eedd..4ab5c667 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/combat/range/RangeMaxHit.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeMaxHit.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.combat.range; +package com.rs2.game.content.combat.range; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class RangeMaxHit { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Beverages.java b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Beverages.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Beverages.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Beverages.java index c42d1962..67563960 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Beverages.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Beverages.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.consumables; +package com.rs2.game.content.consumables; -import com.rebotted.event.*; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.*; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Beverages { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java index b6bdf905..ff515687 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.consumables; +package com.rs2.game.content.consumables; import java.util.HashMap; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Food { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Kebabs.java b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Kebabs.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Kebabs.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Kebabs.java index a1686804..6ecab71b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Kebabs.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Kebabs.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.consumables; +package com.rs2.game.content.consumables; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author darkside1222 diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java index 2ac75127..1cb276d0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Potions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.consumables; +package com.rs2.game.content.consumables; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class Potions { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/Guilds.java b/2006Scape Server/src/main/java/com/rs2/game/content/guilds/Guilds.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/guilds/Guilds.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/guilds/Guilds.java index 6fe6eaf0..1a302ef1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/Guilds.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/guilds/Guilds.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.guilds; +package com.rs2.game.content.guilds; -import com.rebotted.GameConstants; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.globalworldobjects.PassDoor; -import com.rebotted.game.objects.impl.Climbing; -import com.rebotted.game.objects.impl.UseOther; -import com.rebotted.game.players.Player; +import com.rs2.GameConstants; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.globalworldobjects.PassDoor; +import com.rs2.game.objects.impl.Climbing; +import com.rs2.game.objects.impl.UseOther; +import com.rs2.game.players.Player; /** * Guilds Class diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java b/2006Scape Server/src/main/java/com/rs2/game/content/guilds/impl/RangersGuild.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/guilds/impl/RangersGuild.java index 038332f8..d40b078c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/guilds/impl/RangersGuild.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/guilds/impl/RangersGuild.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.guilds.impl; +package com.rs2.game.content.guilds.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Rangers Guild diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Barrows.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Barrows.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java index ad3d8aa5..2cb4a5b3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Barrows.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; -import com.rebotted.game.content.quests.QuestRewards; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; +import com.rs2.game.content.quests.QuestRewards; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; public class Barrows { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java index 19c836f6..b87d8659 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Dueling.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java @@ -1,21 +1,21 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; import java.util.concurrent.CopyOnWriteArrayList; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.combat.prayer.PrayerDrain; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.game.players.PlayerSave; -import com.rebotted.util.GameLogger; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.combat.prayer.PrayerDrain; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.game.players.PlayerSave; +import com.rs2.util.GameLogger; +import com.rs2.util.Misc; public class Dueling { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightCaves.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightCaves.java index 43839002..bbe9fc9f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightCaves.java @@ -1,15 +1,15 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; public class FightCaves { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightPits.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightPits.java index 4bdcb58f..4645d44c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightPits.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightPits.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author ArrowzFtw diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/MageArena.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/MageArena.java index a7c4e029..ba9e3c47 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/MageArena.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/MageArena.java @@ -3,10 +3,10 @@ * the editor. */ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Client; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Client; /** * @author D diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/PestControl.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/PestControl.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/PestControl.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/PestControl.java index 80614190..7682bb5e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/PestControl.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/PestControl.java @@ -1,13 +1,13 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; import java.util.HashMap; -import com.rebotted.GameEngine; -import com.rebotted.game.content.combat.prayer.PrayerDrain; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.content.combat.prayer.PrayerDrain; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author Harlan Credits to Sanity diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/TreasureTrails.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/TreasureTrails.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/TreasureTrails.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/TreasureTrails.java index 38886472..10273c09 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/TreasureTrails.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/TreasureTrails.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.minigames; +package com.rs2.game.content.minigames; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class TreasureTrails { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWarObjects.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWarObjects.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWarObjects.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWarObjects.java index a4a7e5d4..88d6bfb3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWarObjects.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWarObjects.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.minigames.castlewars; +package com.rs2.game.content.minigames.castlewars; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class CastleWarObjects { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java index 835ba365..5bc05288 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/castlewars/CastleWars.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.minigames.castlewars; +package com.rs2.game.content.minigames.castlewars; import java.util.HashMap; import java.util.Iterator; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @Author Sanity for base diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/GroupMinigame.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/GroupMinigame.java similarity index 76% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/GroupMinigame.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/GroupMinigame.java index 8b4f593c..13e9d057 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/GroupMinigame.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/GroupMinigame.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.minigames.trawler; +package com.rs2.game.content.minigames.trawler; public abstract class GroupMinigame { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/Trawler.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/Trawler.java index 259af7e4..e8c67073 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/Trawler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/Trawler.java @@ -1,13 +1,13 @@ -package com.rebotted.game.content.minigames.trawler; +package com.rs2.game.content.minigames.trawler; import java.util.ArrayList; import java.util.Random; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.players.Player; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.GameItem; +import com.rs2.game.players.Player; public class Trawler extends GroupMinigame { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/TrawlerWaitingRoom.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/TrawlerWaitingRoom.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/TrawlerWaitingRoom.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/TrawlerWaitingRoom.java index 727465bd..3aad39b5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/TrawlerWaitingRoom.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/TrawlerWaitingRoom.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.minigames.trawler; +package com.rs2.game.content.minigames.trawler; -import com.rebotted.game.players.Player; -import com.rebotted.world.Boundary; +import com.rs2.game.players.Player; +import com.rs2.world.Boundary; public class TrawlerWaitingRoom extends WaitingRoom { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/WaitingRoom.java b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/WaitingRoom.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/WaitingRoom.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/WaitingRoom.java index 874c81ce..ec7f55f9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/WaitingRoom.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/WaitingRoom.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.minigames.trawler; +package com.rs2.game.content.minigames.trawler; import java.util.ArrayList; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.world.Boundary; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.world.Boundary; public abstract class WaitingRoom { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/Music.java b/2006Scape Server/src/main/java/com/rs2/game/content/music/Music.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/music/Music.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/music/Music.java index 858a008b..e4cf6355 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/Music.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/music/Music.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.music; +package com.rs2.game.content.music; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * http://runescape.wikia.com/wiki/Music Good resource song id = 2 absx/64 = 1 diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java b/2006Scape Server/src/main/java/com/rs2/game/content/music/PlayList.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/music/PlayList.java index 0e76796a..4b9da70b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/PlayList.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/music/PlayList.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.music; +package com.rs2.game.content.music; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class PlayList { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java b/2006Scape Server/src/main/java/com/rs2/game/content/music/sound/CombatSounds.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/music/sound/CombatSounds.java index b47a71bd..b1ead1ad 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/music/sound/CombatSounds.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.music.sound; +package com.rs2.game.content.music.sound; -import com.rebotted.GameEngine; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * CombatSounds diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/SoundList.java b/2006Scape Server/src/main/java/com/rs2/game/content/music/sound/SoundList.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/SoundList.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/music/sound/SoundList.java index fe11d92e..036269b9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/SoundList.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/music/sound/SoundList.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.music.sound; +package com.rs2.game.content.music.sound; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Sounds diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestAssistant.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestAssistant.java index d5908bec..fa7b5836 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestAssistant.java @@ -1,21 +1,21 @@ -package com.rebotted.game.content.quests; +package com.rs2.game.content.quests; -import com.rebotted.game.content.quests.impl.BlackKnightsFortress; -import com.rebotted.game.content.quests.impl.CooksAssistant; -import com.rebotted.game.content.quests.impl.DoricsQuest; -import com.rebotted.game.content.quests.impl.GertrudesCat; -import com.rebotted.game.content.quests.impl.ImpCatcher; -import com.rebotted.game.content.quests.impl.KnightsSword; -import com.rebotted.game.content.quests.impl.PiratesTreasure; -import com.rebotted.game.content.quests.impl.RestlessGhost; -import com.rebotted.game.content.quests.impl.RomeoJuliet; -import com.rebotted.game.content.quests.impl.RuneMysteries; -import com.rebotted.game.content.quests.impl.SheepShearer; -import com.rebotted.game.content.quests.impl.ShieldArrav; -import com.rebotted.game.content.quests.impl.VampyreSlayer; -import com.rebotted.game.content.quests.impl.WitchsPotion; -import com.rebotted.game.content.quests.impl.LostCity; -import com.rebotted.game.players.Player; +import com.rs2.game.content.quests.impl.BlackKnightsFortress; +import com.rs2.game.content.quests.impl.CooksAssistant; +import com.rs2.game.content.quests.impl.DoricsQuest; +import com.rs2.game.content.quests.impl.GertrudesCat; +import com.rs2.game.content.quests.impl.ImpCatcher; +import com.rs2.game.content.quests.impl.KnightsSword; +import com.rs2.game.content.quests.impl.PiratesTreasure; +import com.rs2.game.content.quests.impl.RestlessGhost; +import com.rs2.game.content.quests.impl.RomeoJuliet; +import com.rs2.game.content.quests.impl.RuneMysteries; +import com.rs2.game.content.quests.impl.SheepShearer; +import com.rs2.game.content.quests.impl.ShieldArrav; +import com.rs2.game.content.quests.impl.VampyreSlayer; +import com.rs2.game.content.quests.impl.WitchsPotion; +import com.rs2.game.content.quests.impl.LostCity; +import com.rs2.game.players.Player; /** * Quest Assistant diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestRewards.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestRewards.java index 9f52d6a3..2aad66bf 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/QuestRewards.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestRewards.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests; +package com.rs2.game.content.quests; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Quest Rewards diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java index a20481ab..eb7d6b43 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/BlackKnightsFortress.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class BlackKnightsFortress { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java index ab063ee2..89cad322 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/CooksAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java index b316f53f..53d60541 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/DoricsQuest.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Doric's Quest diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/GertrudesCat.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/GertrudesCat.java index 3768ca8b..d15862da 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/GertrudesCat.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/GertrudesCat.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Gertrudes Cat diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ImpCatcher.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ImpCatcher.java index b464fc1a..698e10f9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ImpCatcher.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ImpCatcher.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Imp Catcher diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/KnightsSword.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/KnightsSword.java index 185598ac..30f7c39e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/KnightsSword.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/KnightsSword.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class KnightsSword { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/LostCity.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/LostCity.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/LostCity.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/LostCity.java index 6596f5b7..0c6ed4e9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/LostCity.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/LostCity.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Lost City diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/PiratesTreasure.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/PiratesTreasure.java index 307754d5..86aacac2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/PiratesTreasure.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/PiratesTreasure.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Pirates Treasure diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RestlessGhost.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RestlessGhost.java index 38ec96b7..2ff6c985 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RestlessGhost.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Restless Ghost diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RomeoJuliet.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RomeoJuliet.java index 12c386f4..826e9596 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RomeoJuliet.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RomeoJuliet.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Romeo and Juliet diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RuneMysteries.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RuneMysteries.java index 130954a2..62d9c037 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RuneMysteries.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/RuneMysteries.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Rune Mysteries diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/SheepShearer.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/SheepShearer.java index 763bf6b2..bbbb60e1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/SheepShearer.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/SheepShearer.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Sheep Shearer diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ShieldArrav.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ShieldArrav.java index 40e74be7..04252d11 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/ShieldArrav.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/ShieldArrav.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; /** * Shield of Arrav diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/VampyreSlayer.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/VampyreSlayer.java index 4bb0cf2c..8d021f5c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/VampyreSlayer.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/VampyreSlayer.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Vampyre Slayer diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/WitchsPotion.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/WitchsPotion.java index 9ed92efe..9bf5a09c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/WitchsPotion.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/WitchsPotion.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.quests.impl; +package com.rs2.game.content.quests.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Witchs Potion diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/random/Balloons.java b/2006Scape Server/src/main/java/com/rs2/game/content/random/Balloons.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/random/Balloons.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/random/Balloons.java index e05b5745..0964bc3d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/random/Balloons.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/random/Balloons.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.random; +package com.rs2.game.content.random; import java.awt.Point; import java.util.Random; -import com.rebotted.GameEngine; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; +import com.rs2.GameEngine; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; public class Balloons extends Objects { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/random/HolidayDrops.java b/2006Scape Server/src/main/java/com/rs2/game/content/random/HolidayDrops.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/random/HolidayDrops.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/random/HolidayDrops.java index cd6aa8cf..d6e39f95 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/random/HolidayDrops.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/random/HolidayDrops.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.random; +package com.rs2.game.content.random; -import com.rebotted.GameConstants; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.GameConstants; +import com.rs2.game.players.PlayerHandler; /** * Holiday Drops diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/random/Holidays.java b/2006Scape Server/src/main/java/com/rs2/game/content/random/Holidays.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/random/Holidays.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/random/Holidays.java index b0b8881a..fbb4093a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/random/Holidays.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/random/Holidays.java @@ -1,13 +1,13 @@ -package com.rebotted.game.content.random; +package com.rs2.game.content.random; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; /** * Holiday Drops diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java b/2006Scape Server/src/main/java/com/rs2/game/content/random/PartyRoom.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/random/PartyRoom.java index d97d2759..38fc8506 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/random/PartyRoom.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/random/PartyRoom.java @@ -1,14 +1,14 @@ -package com.rebotted.game.content.random; +package com.rs2.game.content.random; import java.awt.Point; import java.util.ArrayList; import java.util.Random; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.ItemData; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; public class PartyRoom { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/EvilChicken.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/EvilChicken.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/EvilChicken.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/EvilChicken.java index 1f311a40..2a4e8079 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/EvilChicken.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/EvilChicken.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class EvilChicken { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/FreakyForester.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/FreakyForester.java index 955ff5da..98c87f43 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/FreakyForester.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/FreakyForester.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class FreakyForester { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Frog.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Frog.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Frog.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Frog.java index a86f134e..48666744 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Frog.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Frog.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.util.Misc; /** * Frog Event diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/GenieLamp.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/GenieLamp.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/GenieLamp.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/GenieLamp.java index 723de766..f2b28b38 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/GenieLamp.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/GenieLamp.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.util.Misc; /** * @author Aintaro diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RandomEventHandler.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RandomEventHandler.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RandomEventHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RandomEventHandler.java index ad59ab22..739bea6a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RandomEventHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RandomEventHandler.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Eventhandler class diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RiverTroll.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RiverTroll.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RiverTroll.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RiverTroll.java index 90e04318..ebc72b55 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RiverTroll.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RiverTroll.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class RiverTroll { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RockGolem.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RockGolem.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RockGolem.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RockGolem.java index 9ce11b70..5bf72e28 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/RockGolem.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RockGolem.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.util.Misc; public class RockGolem { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/SandwhichLady.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/SandwhichLady.java index 2b869202..a8ffefcc 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/SandwhichLady.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/SandwhichLady.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class SandwhichLady { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Shade.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Shade.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Shade.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Shade.java index 95588a55..0500cf1f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Shade.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Shade.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Shade { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Swarm.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Swarm.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Swarm.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Swarm.java index 372890a7..4d4f3d7e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Swarm.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Swarm.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Swarm Event diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/TreeSpirit.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/TreeSpirit.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/TreeSpirit.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/TreeSpirit.java index d5c81de8..ad4c7d0c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/TreeSpirit.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/TreeSpirit.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class TreeSpirit { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Zombie.java b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Zombie.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Zombie.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Zombie.java index 3aa39fde..c9abadd3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/randomevents/Zombie.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Zombie.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.randomevents; +package com.rs2.game.content.randomevents; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Zombie { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/Menus.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/Menus.java index cf2f3cb9..e92dc843 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/Menus.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/Menus.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; -import com.rebotted.game.players.Client; +import com.rs2.game.players.Client; /** * Created by IntelliJ IDEA. User: vayken Date: 21/12/11 Time: 13:55 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillConstants.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillConstants.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillConstants.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillConstants.java index db323c88..00cb19a0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillConstants.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; /** * SkillConstants.java * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillData.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillData.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillData.java index 10310184..643f0d6e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillData.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; import java.util.Arrays; import java.util.Optional; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java index 8f2a9f62..a16ae128 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java @@ -1,16 +1,16 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; import java.util.Random; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.core.Fishing; -import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.herblore.Herblore; -import com.rebotted.game.content.skills.smithing.Smelting; -import com.rebotted.game.content.skills.woodcutting.Woodcutting; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.core.Fishing; +import com.rs2.game.content.skills.core.Mining; +import com.rs2.game.content.skills.herblore.Herblore; +import com.rs2.game.content.skills.smithing.Smelting; +import com.rs2.game.content.skills.woodcutting.Woodcutting; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * Skillhandler diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillInterfaces.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillInterfaces.java index f28098e1..5e62df9a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillInterfaces.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class SkillInterfaces { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillMenu.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillMenu.java index db12756f..a70d5a59 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillMenu.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillMenu.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills; +package com.rs2.game.content.skills; -import com.rebotted.game.players.Client; +import com.rs2.game.players.Client; /** * @author Sanity diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/Agility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/Agility.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/Agility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/Agility.java index ad1a199e..9a1d9233 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/Agility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/Agility.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; public class Agility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/AgilityShortcut.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/AgilityShortcut.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/AgilityShortcut.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/AgilityShortcut.java index 3f780405..aa7bf6d0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/AgilityShortcut.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/AgilityShortcut.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Agility Shortcuts diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/ApeAtollAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/ApeAtollAgility.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/ApeAtollAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/ApeAtollAgility.java index 5f78b839..10a8acf8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/ApeAtollAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/ApeAtollAgility.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class ApeAtollAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/BarbarianAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/BarbarianAgility.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/BarbarianAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/BarbarianAgility.java index 7588e41f..7d7dc76b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/BarbarianAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/BarbarianAgility.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class BarbarianAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/GnomeAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/GnomeAgility.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/GnomeAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/GnomeAgility.java index c56549ec..16c6b2c9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/GnomeAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/GnomeAgility.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class GnomeAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/PyramidAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/PyramidAgility.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/PyramidAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/PyramidAgility.java index 7b32e1e7..e96051f1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/PyramidAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/PyramidAgility.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class PyramidAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WerewolfAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WerewolfAgility.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WerewolfAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WerewolfAgility.java index 34cb3f0c..72ca877e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WerewolfAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WerewolfAgility.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class WerewolfAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WildernessAgility.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WildernessAgility.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WildernessAgility.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WildernessAgility.java index b530adbb..513fd890 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/agility/WildernessAgility.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WildernessAgility.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.agility; +package com.rs2.game.content.skills.agility; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class WildernessAgility { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java index eb4c2122..12cc215c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Cooking.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java @@ -1,17 +1,17 @@ -package com.rebotted.game.content.skills.cooking; +package com.rs2.game.content.skills.cooking; import java.security.SecureRandom; -import com.rebotted.GameConstants; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Cooking extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java index 8c9dcdf7..a9549ee1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java @@ -1,14 +1,14 @@ -package com.rebotted.game.content.skills.cooking; +package com.rs2.game.content.skills.cooking; -import com.rebotted.GameConstants; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class CookingTutorialIsland extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/DairyChurn.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/DairyChurn.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java index 92697aa4..38b8c155 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/DairyChurn.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.cooking; +package com.rs2.game.content.skills.cooking; import java.util.HashMap; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * Created by IntelliJ IDEA. User: vayken Date: 23/12/11 Time: 20:42 To change * this template use File | Settings | File Templates. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java index 6f6dca45..4efb86d9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.cooking; +package com.rs2.game.content.skills.cooking; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.players.Player; public class Potatoes extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Fishing.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Fishing.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java index 7b581345..b89499d0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Fishing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java @@ -1,14 +1,14 @@ -package com.rebotted.game.content.skills.core; +package com.rs2.game.content.skills.core; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.randomevents.RiverTroll; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.randomevents.RiverTroll; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Fishing extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java index dd799d47..4c0bcf3a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.core; +package com.rs2.game.content.skills.core; -import com.rebotted.event.*; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.objects.Object; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.Region; +import com.rs2.event.*; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.objects.Object; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.clip.Region; public class Mining { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/BattleStaffs.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/BattleStaffs.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/BattleStaffs.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/BattleStaffs.java index 13cfd82c..904080de 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/BattleStaffs.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/BattleStaffs.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; /** * Battle Staff making diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/CraftingData.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/CraftingData.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/CraftingData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/CraftingData.java index c4c4db36..aaa6249c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/CraftingData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/CraftingData.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.SkillHandler; public class CraftingData extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GemCutting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GemCutting.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GemCutting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GemCutting.java index 57ff4e33..b3acb5ed 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GemCutting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GemCutting.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class GemCutting extends CraftingData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GlassBlowing.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GlassBlowing.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GlassBlowing.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GlassBlowing.java index 2c4abb31..3fc46c93 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/GlassBlowing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GlassBlowing.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.GameConstants; -import com.rebotted.event.*; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.GameConstants; +import com.rs2.event.*; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Arrowz flame diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/JewelryMaking.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/JewelryMaking.java index 1927fd72..477a73f4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/JewelryMaking.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class JewelryMaking { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/LeatherMaking.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/LeatherMaking.java index 1ccf6923..7dcbefc2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/LeatherMaking.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/LeatherMaking.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class LeatherMaking extends CraftingData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/OrbCharging.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/OrbCharging.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/OrbCharging.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/OrbCharging.java index afd9f9c2..2eaf74de 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/OrbCharging.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/OrbCharging.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class OrbCharging { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Pottery.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Pottery.java index bd24af5b..6fe4c6eb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Pottery.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/SoftClay.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/SoftClay.java similarity index 81% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/SoftClay.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/SoftClay.java index 9ffaebde..36ecde2a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/SoftClay.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/SoftClay.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.players.Player; /** * Soft Clay diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Spinning.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Spinning.java index b6f661b3..4b25b34e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Spinning.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class Spinning extends CraftingData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Tanning.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Tanning.java index 801ba608..37c78fa5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Tanning.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Tanning.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.crafting; +package com.rs2.game.content.skills.crafting; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class Tanning extends CraftingData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Allotments.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Allotments.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Allotments.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Allotments.java index 364fc0b1..2a2980ad 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Allotments.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Allotments.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -14,13 +14,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change * this template use File | Settings | File Templates. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Bushes.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Bushes.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Bushes.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Bushes.java index 502cea8c..95c5af6b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Bushes.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Bushes.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -13,13 +13,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ChopTree.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ChopTree.java index 5dcc6355..8d1c180f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ChopTree.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ChopTree.java @@ -2,12 +2,12 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class ChopTree { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Compost.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Compost.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Compost.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Compost.java index daafb931..59738818 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Compost.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Compost.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -12,12 +12,12 @@ package com.rebotted.game.content.skills.farming; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; /** * Created by IntelliJ IDEA. User: vayken Date: 22/02/12 Time: 15:43 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farmers.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farmers.java index 2a421df4..921a7b1c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farmers.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farmers.java @@ -1,13 +1,13 @@ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.game.dialogues.ChatEmotes; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.dialogues.ChatEmotes; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 19/04/12 Time: 02:42 To change * this template use File | Settings | File Templates. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farming.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farming.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farming.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farming.java index b74b365e..4e5ecc8b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Farming.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Farming.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class Farming { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingConstants.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingConstants.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingConstants.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingConstants.java index e49902fd..33c006ec 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingConstants.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; import java.awt.Point; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingTask.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingTask.java similarity index 64% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingTask.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingTask.java index 254432eb..7fa44f47 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FarmingTask.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FarmingTask.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; -import com.rebotted.game.players.Player; -import com.rebotted.tick.Tick; +import com.rs2.game.players.Player; +import com.rs2.tick.Tick; public class FarmingTask extends Tick { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Flowers.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Flowers.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Flowers.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Flowers.java index 89b0644d..1b7bea79 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Flowers.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Flowers.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -12,13 +12,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FruitTree.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FruitTree.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FruitTree.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FruitTree.java index 49ad26fa..780e11a4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/FruitTree.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/FruitTree.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -8,13 +8,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Herbs.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Herbs.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Herbs.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Herbs.java index 223f96b3..65049755 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Herbs.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Herbs.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -12,13 +12,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Hops.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Hops.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Hops.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Hops.java index 5d283ded..3df9ce0f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Hops.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Hops.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -13,13 +13,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change * this template use File | Settings | File Templates. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/PatchState.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/PatchState.java similarity index 50% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/PatchState.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/PatchState.java index 69e32a97..0b8d89e3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/PatchState.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/PatchState.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; public enum PatchState { EMPTY, DESEASED, DEAD diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Seedling.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Seedling.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Seedling.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Seedling.java index af9b95cd..33dda638 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/Seedling.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/Seedling.java @@ -2,14 +2,14 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.items.Item; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.items.Item; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * Created by IntelliJ IDEA. User: vayken Date: 18/03/12 Time: 11:00 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantOne.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantOne.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantOne.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantOne.java index 46604284..10207e51 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantOne.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantOne.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -13,14 +13,14 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change * this template use File | Settings | File Templates. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantTwo.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantTwo.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantTwo.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantTwo.java index 48ce2667..6655e61e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/SpecialPlantTwo.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/SpecialPlantTwo.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -13,13 +13,13 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ToolLeprechaun.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ToolLeprechaun.java index 971a6b40..070ce99e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/ToolLeprechaun.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/ToolLeprechaun.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -12,10 +12,10 @@ package com.rebotted.game.content.skills.farming; import java.util.HashMap; import java.util.Map; -import com.rebotted.game.dialogues.ChatEmotes; -import com.rebotted.game.items.Item; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.players.Player; +import com.rs2.game.dialogues.ChatEmotes; +import com.rs2.game.items.Item; +import com.rs2.game.items.ItemData; +import com.rs2.game.players.Player; /** * Created by IntelliJ IDEA. User: vayken Date: 23/02/12 Time: 12:12 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/WoodTrees.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/WoodTrees.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/WoodTrees.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/WoodTrees.java index 911016c7..8fff8f78 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/farming/WoodTrees.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/farming/WoodTrees.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package com.rebotted.game.content.skills.farming; +package com.rs2.game.content.skills.farming; /** * @@ -13,16 +13,16 @@ import java.awt.Point; import java.util.HashMap; import java.util.Map; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillConstants; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.farming.ChopTree.Tree; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillConstants; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.farming.ChopTree.Tree; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Created by IntelliJ IDEA. User: vayken Date: 24/02/12 Time: 20:34 To change diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/Firemaking.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/Firemaking.java index 75036137..a3a7b1ed 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/Firemaking.java @@ -1,18 +1,18 @@ -package com.rebotted.game.content.skills.firemaking; +package com.rs2.game.content.skills.firemaking; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.objects.Object; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.objects.Object; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; public class Firemaking { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/LogData.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/LogData.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/LogData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/LogData.java index cd7eaf2e..851ce31a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/LogData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/LogData.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills.firemaking; +package com.rs2.game.content.skills.firemaking; public enum LogData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/ArrowMaking.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/ArrowMaking.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/ArrowMaking.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/ArrowMaking.java index 8c9ed713..f6af6858 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/ArrowMaking.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/ArrowMaking.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.fletching; +package com.rs2.game.content.skills.fletching; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCutting.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCutting.java index 266608f0..45fa57cf 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCutting.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.skills.fletching; +package com.rs2.game.content.skills.fletching; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCuttingInterface.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCuttingInterface.java index 4eccbb47..06403bea 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCuttingInterface.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCuttingInterface.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.skills.fletching; +package com.rs2.game.content.skills.fletching; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/Stringing.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/Stringing.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/Stringing.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/Stringing.java index d7a015ba..880c779a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/Stringing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/Stringing.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.fletching; +package com.rs2.game.content.skills.fletching; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/GrindingAction.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/GrindingAction.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/GrindingAction.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/GrindingAction.java index c382bf0f..9e6df044 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/GrindingAction.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/GrindingAction.java @@ -1,8 +1,8 @@ -package com.rebotted.game.content.skills.herblore; +package com.rs2.game.content.skills.herblore; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class GrindingAction { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/Herblore.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/Herblore.java index 927919fe..faeddfc9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/Herblore.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.skills.herblore; +package com.rs2.game.content.skills.herblore; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class Herblore extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Ectofuntus.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Ectofuntus.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Ectofuntus.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Ectofuntus.java index 6de96126..d0f0ee0f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Ectofuntus.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Ectofuntus.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.prayer; +package com.rs2.game.content.skills.prayer; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; /** * Aug 31, 2017 : 5:29:02 PM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Prayer.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Prayer.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Prayer.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Prayer.java index a91163e1..efbe9306 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/prayer/Prayer.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Prayer.java @@ -1,15 +1,15 @@ -package com.rebotted.game.content.skills.prayer; +package com.rs2.game.content.skills.prayer; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.Shade; -import com.rebotted.game.content.randomevents.Zombie; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.Shade; +import com.rs2.game.content.randomevents.Zombie; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Class Prayer Handles Prayer diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/AbyssalHandler.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/AbyssalHandler.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/AbyssalHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/AbyssalHandler.java index caa2da45..31736bbe 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/AbyssalHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/AbyssalHandler.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.runecrafting; +package com.rs2.game.content.skills.runecrafting; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class AbyssalHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/RuneCraftingActions.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/RuneCraftingActions.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/RuneCraftingActions.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/RuneCraftingActions.java index 9f98fd60..dd7a2cb0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/RuneCraftingActions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/RuneCraftingActions.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.runecrafting; +package com.rs2.game.content.skills.runecrafting; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Handles runecrafting actions diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Runecrafting.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Runecrafting.java index 623fd1c7..5fc545d1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Runecrafting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Runecrafting.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.runecrafting; +package com.rs2.game.content.skills.runecrafting; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.players.Player; /** * @author phl0w diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Tiaras.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Tiaras.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Tiaras.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Tiaras.java index 04f5d38e..327173f9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Tiaras.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Tiaras.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.skills.runecrafting; +package com.rs2.game.content.skills.runecrafting; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.players.Player; public class Tiaras { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/Slayer.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/Slayer.java index a37608d3..0f5edb85 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/Slayer.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/Slayer.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.slayer; +package com.rs2.game.content.skills.slayer; import java.util.ArrayList; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Slayer { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/SlayerRequirements.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/SlayerRequirements.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/SlayerRequirements.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/SlayerRequirements.java index 5232129a..71821d9a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/slayer/SlayerRequirements.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/SlayerRequirements.java @@ -1,7 +1,7 @@ -package com.rebotted.game.content.skills.slayer; +package com.rs2.game.content.skills.slayer; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; /** * Slayer Item Requirements diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SilverCrafting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SilverCrafting.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SilverCrafting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SilverCrafting.java index 711d570f..a3ffd35b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SilverCrafting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SilverCrafting.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; import java.util.HashMap; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class SilverCrafting { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smelting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smelting.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smelting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smelting.java index e13e2dd8..5255c5b0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smelting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smelting.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author abysspartyy diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smithing.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smithing.java index 67ea8ae9..50eed7c7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smithing.java @@ -1,10 +1,10 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; public class Smithing { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingData.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingData.java index 3d977e72..4c5294bd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingData.java @@ -1,4 +1,4 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; /** * SmithingData diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingInterface.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingInterface.java index d467cc49..e3638894 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingInterface.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingInterface.java @@ -1,6 +1,6 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class SmithingInterface { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Superheat.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Superheat.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java index 1c447837..03543cd9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Superheat.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.smithing; +package com.rs2.game.content.skills.smithing; -import com.rebotted.game.content.combat.magic.CastRequirements; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.content.combat.magic.CastRequirements; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java index 6b895a68..3326a7c3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java @@ -1,16 +1,16 @@ -package com.rebotted.game.content.skills.thieving; +package com.rs2.game.content.skills.thieving; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemList; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemList; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Pickpocket extends SkillHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Stalls.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Stalls.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java index a9af0c24..fc6fd122 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Stalls.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java @@ -1,17 +1,17 @@ -package com.rebotted.game.content.skills.thieving; +package com.rs2.game.content.skills.thieving; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemList; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemList; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class Stalls { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/ThieveOther.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/ThieveOther.java similarity index 88% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/ThieveOther.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/ThieveOther.java index 2edf03a4..80a8af2b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/ThieveOther.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/ThieveOther.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.skills.thieving; +package com.rs2.game.content.skills.thieving; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Thieveother diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/BirdNest.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/BirdNest.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/BirdNest.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/BirdNest.java index 5e960c8d..c0de58a2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/BirdNest.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/BirdNest.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.skills.woodcutting; +package com.rs2.game.content.skills.woodcutting; -import com.rebotted.GameEngine; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Aug 31, 2017 : 3:02:33 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/Woodcutting.java b/2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/Woodcutting.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/Woodcutting.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/Woodcutting.java index f82f17a1..3fe08f83 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/woodcutting/Woodcutting.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/Woodcutting.java @@ -1,17 +1,17 @@ -package com.rebotted.game.content.skills.woodcutting; +package com.rs2.game.content.skills.woodcutting; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.randomevents.TreeSpirit; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.objects.Object; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.randomevents.TreeSpirit; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.objects.Object; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; public class Woodcutting { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/CarpetTravel.java b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/CarpetTravel.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/traveling/CarpetTravel.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/traveling/CarpetTravel.java index faae6f3a..5b932067 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/CarpetTravel.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/CarpetTravel.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.traveling; +package com.rs2.game.content.traveling; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; /** * Aug 31, 2017 : 6:54:30 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertCactus.java b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertCactus.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertCactus.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertCactus.java index 00bf6a9d..a89d5980 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertCactus.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertCactus.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.traveling; +package com.rs2.game.content.traveling; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class DesertCactus { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertHeat.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertHeat.java index 629241fd..e273a601 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/DesertHeat.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertHeat.java @@ -1,12 +1,12 @@ -package com.rebotted.game.content.traveling; +package com.rs2.game.content.traveling; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; /** * Aug 12, 2017 : 1:51:21 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/GnomeGlider.java b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/GnomeGlider.java similarity index 90% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/traveling/GnomeGlider.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/traveling/GnomeGlider.java index 9cd3b8a4..b8735237 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/GnomeGlider.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/GnomeGlider.java @@ -1,9 +1,9 @@ -package com.rebotted.game.content.traveling; +package com.rs2.game.content.traveling; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; public class GnomeGlider { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/Sailing.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java rename to 2006Scape Server/src/main/java/com/rs2/game/content/traveling/Sailing.java index 560b7085..76cedc2f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/traveling/Sailing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/content/traveling/Sailing.java @@ -1,11 +1,11 @@ -package com.rebotted.game.content.traveling; +package com.rs2.game.content.traveling; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; /** * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/ChatEmotes.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/ChatEmotes.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/dialogues/ChatEmotes.java rename to 2006Scape Server/src/main/java/com/rs2/game/dialogues/ChatEmotes.java index 2211158d..1199c294 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/ChatEmotes.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/ChatEmotes.java @@ -1,4 +1,4 @@ -package com.rebotted.game.dialogues; +package com.rs2.game.dialogues; /** * ChatEmotes.java diff --git a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/Dialogue.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/Dialogue.java similarity index 71% rename from 2006Redone Server/src/main/java/com/rebotted/game/dialogues/Dialogue.java rename to 2006Scape Server/src/main/java/com/rs2/game/dialogues/Dialogue.java index 5cc5ef50..0ac640cb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/Dialogue.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/Dialogue.java @@ -1,7 +1,7 @@ -package com.rebotted.game.dialogues; +package com.rs2.game.dialogues; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Dialogue diff --git a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java index ce9281ed..b7ce5c62 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java @@ -1,23 +1,23 @@ -package com.rebotted.game.dialogues; +package com.rs2.game.dialogues; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.content.quests.QuestRewards; -import com.rebotted.game.content.randomevents.FreakyForester; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.farming.Farmers; -import com.rebotted.game.content.skills.slayer.Slayer; -import com.rebotted.game.content.traveling.CarpetTravel; -import com.rebotted.game.content.traveling.Sailing; -import com.rebotted.game.globalworldobjects.PassDoor; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.objects.impl.OtherObjects; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerAssistant; -import com.rebotted.game.shops.Shops.Shop; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.content.quests.QuestRewards; +import com.rs2.game.content.randomevents.FreakyForester; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.farming.Farmers; +import com.rs2.game.content.skills.slayer.Slayer; +import com.rs2.game.content.traveling.CarpetTravel; +import com.rs2.game.content.traveling.Sailing; +import com.rs2.game.globalworldobjects.PassDoor; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.objects.impl.OtherObjects; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerAssistant; +import com.rs2.game.shops.Shops.Shop; +import com.rs2.util.Misc; public class DialogueHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueOptions.java b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueOptions.java rename to 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java index 3e21c9b8..a9ee2117 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueOptions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java @@ -1,9 +1,9 @@ -package com.rebotted.game.dialogues; +package com.rs2.game.dialogues; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.items.impl.Flowers; -import com.rebotted.game.items.impl.Teles; -import com.rebotted.game.players.Player; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.items.impl.Flowers; +import com.rs2.game.items.impl.Teles; +import com.rs2.game.players.Player; /** * Dialogue Options diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/ClimbOther.java similarity index 84% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/ClimbOther.java index fa7a327b..97cb0542 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/ClimbOther.java @@ -1,10 +1,10 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; -import com.rebotted.game.objects.Object; -import com.rebotted.game.objects.ObjectDefaults; -import com.rebotted.game.players.Player; -import com.rebotted.world.clip.ObjectDefinition; -import com.rebotted.world.clip.Region; +import com.rs2.game.objects.Object; +import com.rs2.game.objects.ObjectDefaults; +import com.rs2.game.players.Player; +import com.rs2.world.clip.ObjectDefinition; +import com.rs2.world.clip.Region; public class ClimbOther { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/Doors.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/Doors.java index fdf9d80d..9aac925f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/Doors.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/Doors.java @@ -1,11 +1,11 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.GameEngine; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.util.DoorData; +import com.rs2.GameEngine; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.util.DoorData; import org.json.JSONArray; import org.json.JSONObject; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleDoors.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleDoors.java index c9792d7c..4e1d3ead 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleDoors.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleDoors.java @@ -1,11 +1,11 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.GameEngine; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.util.DoorData; +import com.rs2.GameEngine; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.util.DoorData; import org.json.JSONArray; import org.json.JSONObject; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleGates.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleGates.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleGates.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleGates.java index a30fb2ad..4d7d5abe 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/DoubleGates.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/DoubleGates.java @@ -1,6 +1,6 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Aug 24, 2017 : 4:20:18 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/GateHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/GateHandler.java index b9736ac6..388b378f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/GateHandler.java @@ -1,12 +1,12 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; -import com.rebotted.GameEngine; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.world.ObjectManager; -import com.rebotted.world.clip.ObjectDefinition; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.world.ObjectManager; +import com.rs2.world.clip.ObjectDefinition; +import com.rs2.world.clip.Region; /** * GateHandler diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/PassDoor.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/PassDoor.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/PassDoor.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/PassDoor.java index 0d6f3f53..09118cf9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/PassDoor.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/PassDoor.java @@ -1,10 +1,10 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.Position; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.game.players.Position; /** * Passdoor diff --git a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/SingleGates.java b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/SingleGates.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/SingleGates.java rename to 2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/SingleGates.java index 7fe81360..0c6bee90 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/SingleGates.java +++ b/2006Scape Server/src/main/java/com/rs2/game/globalworldobjects/SingleGates.java @@ -1,6 +1,6 @@ -package com.rebotted.game.globalworldobjects; +package com.rs2.game.globalworldobjects; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * SingleGates diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/GameItem.java b/2006Scape Server/src/main/java/com/rs2/game/items/GameItem.java similarity index 90% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/GameItem.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/GameItem.java index a6135d3b..632755e3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/GameItem.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/GameItem.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items; +package com.rs2.game.items; public class GameItem { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/GroundItem.java b/2006Scape Server/src/main/java/com/rs2/game/items/GroundItem.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/GroundItem.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/GroundItem.java index 94e8f79f..de64375f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/GroundItem.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/GroundItem.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items; +package com.rs2.game.items; public class GroundItem { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/Inventory.java b/2006Scape Server/src/main/java/com/rs2/game/items/Inventory.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/Inventory.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/Inventory.java index 4df37841..86290950 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/Inventory.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/Inventory.java @@ -1,8 +1,8 @@ -package com.rebotted.game.items; +package com.rs2.game.items; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.players.Player; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.players.Player; /** * diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/Item.java b/2006Scape Server/src/main/java/com/rs2/game/items/Item.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/Item.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/Item.java index ffea555c..0724ef38 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/Item.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/Item.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items; +package com.rs2.game.items; -import com.rebotted.GameEngine; +import com.rs2.GameEngine; /** * Represents a single item. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java index 6866caff..d65c330b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java @@ -1,18 +1,18 @@ -package com.rebotted.game.items; +package com.rs2.game.items; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.skills.runecrafting.Tiaras; -import com.rebotted.game.items.impl.Greegree; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.MainFrameIDs; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.skills.runecrafting.Tiaras; +import com.rs2.game.items.impl.Greegree; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.MainFrameIDs; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; public class ItemAssistant { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java b/2006Scape Server/src/main/java/com/rs2/game/items/ItemConstants.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/ItemConstants.java index 37ea8e02..d0031a60 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/ItemConstants.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items; +package com.rs2.game.items; /** * Aug 14, 2017 : 2:03:05 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java b/2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java index 4192efd7..39ceb6e1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java @@ -1,11 +1,11 @@ -package com.rebotted.game.items; +package com.rs2.game.items; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; +import com.rs2.GameConstants; +import com.rs2.GameEngine; public class ItemData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemDefinition.java b/2006Scape Server/src/main/java/com/rs2/game/items/ItemDefinition.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/ItemDefinition.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/ItemDefinition.java index c8c84dc2..977c2ac8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemDefinition.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/ItemDefinition.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items; +package com.rs2.game.items; import java.io.*; import java.util.ArrayList; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemList.java b/2006Scape Server/src/main/java/com/rs2/game/items/ItemList.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/ItemList.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/ItemList.java index a46fdbcc..5cb8d8ce 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/ItemList.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/ItemList.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items; +package com.rs2.game.items; public class ItemList { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java b/2006Scape Server/src/main/java/com/rs2/game/items/UseItem.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/UseItem.java index f6175244..62830b03 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/UseItem.java @@ -1,31 +1,31 @@ -package com.rebotted.game.items; +package com.rs2.game.items; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.crafting.BattleStaffs; -import com.rebotted.game.content.skills.crafting.GemCutting; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.content.skills.crafting.LeatherMaking; -import com.rebotted.game.content.skills.crafting.SoftClay; -import com.rebotted.game.content.skills.farming.Farming; -import com.rebotted.game.content.skills.firemaking.Firemaking; -import com.rebotted.game.content.skills.fletching.ArrowMaking; -import com.rebotted.game.content.skills.fletching.LogCutting; -import com.rebotted.game.content.skills.fletching.LogCuttingInterface; -import com.rebotted.game.content.skills.fletching.Stringing; -import com.rebotted.game.content.skills.herblore.GrindingAction; -import com.rebotted.game.content.skills.herblore.Herblore; -import com.rebotted.game.content.skills.prayer.Ectofuntus; -import com.rebotted.game.content.skills.prayer.Ectofuntus.EctofuntusData; -import com.rebotted.game.content.skills.runecrafting.Tiaras; -import com.rebotted.game.items.impl.Dye; -import com.rebotted.game.items.impl.GodPages; -import com.rebotted.game.items.impl.WeaponPoison; -import com.rebotted.game.npcs.impl.MilkCow; -import com.rebotted.game.objects.impl.CrystalChest; -import com.rebotted.game.objects.impl.FlourMill; -import com.rebotted.game.objects.impl.Webs; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.crafting.BattleStaffs; +import com.rs2.game.content.skills.crafting.GemCutting; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.content.skills.crafting.LeatherMaking; +import com.rs2.game.content.skills.crafting.SoftClay; +import com.rs2.game.content.skills.farming.Farming; +import com.rs2.game.content.skills.firemaking.Firemaking; +import com.rs2.game.content.skills.fletching.ArrowMaking; +import com.rs2.game.content.skills.fletching.LogCutting; +import com.rs2.game.content.skills.fletching.LogCuttingInterface; +import com.rs2.game.content.skills.fletching.Stringing; +import com.rs2.game.content.skills.herblore.GrindingAction; +import com.rs2.game.content.skills.herblore.Herblore; +import com.rs2.game.content.skills.prayer.Ectofuntus; +import com.rs2.game.content.skills.prayer.Ectofuntus.EctofuntusData; +import com.rs2.game.content.skills.runecrafting.Tiaras; +import com.rs2.game.items.impl.Dye; +import com.rs2.game.items.impl.GodPages; +import com.rs2.game.items.impl.WeaponPoison; +import com.rs2.game.npcs.impl.MilkCow; +import com.rs2.game.objects.impl.CrystalChest; +import com.rs2.game.objects.impl.FlourMill; +import com.rs2.game.objects.impl.Webs; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author Ryan / Lmctruck30 diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java b/2006Scape Server/src/main/java/com/rs2/game/items/Weight.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/Weight.java index 497749f8..8f41480f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/Weight.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items; +package com.rs2.game.items; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * @author somedude, credits to Galkon for item weights diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java index cf64dc1e..ccd6f489 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java @@ -1,8 +1,8 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * Dye.java diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/EnchantStaff.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/EnchantStaff.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/EnchantStaff.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/EnchantStaff.java index 8e01f46c..deeb9ace 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/EnchantStaff.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/EnchantStaff.java @@ -1,9 +1,9 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; import java.util.HashMap; -import com.rebotted.game.items.Item; -import com.rebotted.game.players.Player; +import com.rs2.game.items.Item; +import com.rs2.game.players.Player; public class EnchantStaff { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/ExperienceLamp.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/ExperienceLamp.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/ExperienceLamp.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/ExperienceLamp.java index 40b05e4f..d4f481be 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/ExperienceLamp.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/ExperienceLamp.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class ExperienceLamp { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Fillables.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Fillables.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Fillables.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/Fillables.java index 3026ae16..2e972f48 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Fillables.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Fillables.java @@ -1,4 +1,4 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; public class Fillables { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Flowers.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/Flowers.java index 42f8757e..b44e3a0d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Flowers.java @@ -1,12 +1,12 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.clip.Region; /** * @author Faris diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodBooks.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/GodBooks.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodBooks.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/GodBooks.java index 7c4d5dea..8aecd359 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodBooks.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/GodBooks.java @@ -1,12 +1,12 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; import java.util.HashMap; import java.util.Map; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; /** * Handles the preaching of god books diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodPages.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/GodPages.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodPages.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/GodPages.java index 620fbb13..2c7ac15a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/GodPages.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/GodPages.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class GodPages { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Greegree.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/Greegree.java index fb13a3ca..c0bfdbda 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Greegree.java @@ -1,9 +1,9 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.players.Player; -import com.rebotted.world.Boundary; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.ItemData; +import com.rs2.game.players.Player; +import com.rs2.world.Boundary; public class Greegree { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/HandleEmpty.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/HandleEmpty.java similarity index 88% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/HandleEmpty.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/HandleEmpty.java index 2ef03216..be4a227e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/HandleEmpty.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/HandleEmpty.java @@ -1,8 +1,8 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Genesis diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/LightSources.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/LightSources.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/LightSources.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/LightSources.java index 5c7d85e4..0757a41d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/LightSources.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/LightSources.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Lightsources diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/PotionMixing.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/PotionMixing.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/PotionMixing.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/PotionMixing.java index 407f23e4..e5cac21e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/PotionMixing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/PotionMixing.java @@ -1,7 +1,7 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * @author Sanity diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/RareProtection.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/RareProtection.java index 79bdfb67..3cccf42c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/RareProtection.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/RareProtection.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Rare Protection diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Teles.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Teles.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Teles.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/Teles.java index d2508a3f..d6330ce4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/Teles.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/Teles.java @@ -1,6 +1,6 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * Teles diff --git a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/WeaponPoison.java b/2006Scape Server/src/main/java/com/rs2/game/items/impl/WeaponPoison.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/items/impl/WeaponPoison.java rename to 2006Scape Server/src/main/java/com/rs2/game/items/impl/WeaponPoison.java index ccd48184..aa1c50bc 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/items/impl/WeaponPoison.java +++ b/2006Scape Server/src/main/java/com/rs2/game/items/impl/WeaponPoison.java @@ -1,8 +1,8 @@ -package com.rebotted.game.items.impl; +package com.rs2.game.items.impl; import java.util.HashMap; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; /** * Manages weapon poisoning. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NPCDefinition.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NPCDefinition.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java index 77ef8721..31c8f748 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NPCDefinition.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NPCDefinition.java @@ -1,10 +1,10 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; import java.io.FileInputStream; import java.io.IOException; import java.util.List; -import com.rebotted.util.XStreamUtil; +import com.rs2.util.XStreamUtil; public class NPCDefinition { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/Npc.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/Npc.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/Npc.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/Npc.java index d541f6a5..d7e351bf 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/Npc.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/Npc.java @@ -1,13 +1,13 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.util.Stream; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.util.Stream; public class Npc { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcActions.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcActions.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java index 08454f0b..0ee690c2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcActions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java @@ -1,16 +1,16 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.content.skills.core.Fishing; -import com.rebotted.game.content.skills.crafting.Tanning; -import com.rebotted.game.content.skills.thieving.Pickpocket; -import com.rebotted.game.content.traveling.Sailing; -import com.rebotted.game.npcs.impl.Pets; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerAssistant; -import com.rebotted.game.shops.ShopAssistant; -import com.rebotted.game.shops.Shops; -import com.rebotted.util.Misc; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.content.skills.core.Fishing; +import com.rs2.game.content.skills.crafting.Tanning; +import com.rs2.game.content.skills.thieving.Pickpocket; +import com.rs2.game.content.traveling.Sailing; +import com.rs2.game.npcs.impl.Pets; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerAssistant; +import com.rs2.game.shops.ShopAssistant; +import com.rs2.game.shops.Shops; +import com.rs2.util.Misc; public class NpcActions { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java index 5c8257cb..9f0a3e40 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcData.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java @@ -1,12 +1,12 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; import java.util.ArrayList; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; public class NpcData { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java index 11271e55..fbb00bfa 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java @@ -1,32 +1,32 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.npcs.NpcAggressive; -import com.rebotted.game.content.combat.npcs.NpcCombat; -import com.rebotted.game.content.combat.npcs.NpcEmotes; -import com.rebotted.game.content.minigames.FightCaves; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.music.sound.CombatSounds; -import com.rebotted.game.content.randomevents.FreakyForester; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.randomevents.RiverTroll; -import com.rebotted.game.npcs.drops.ItemDrop; -import com.rebotted.game.npcs.drops.NPCDropsHandler; -import com.rebotted.game.npcs.impl.Pets; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.util.NpcSpawn; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.npcs.NpcAggressive; +import com.rs2.game.content.combat.npcs.NpcCombat; +import com.rs2.game.content.combat.npcs.NpcEmotes; +import com.rs2.game.content.minigames.FightCaves; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.music.sound.CombatSounds; +import com.rs2.game.content.randomevents.FreakyForester; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.randomevents.RiverTroll; +import com.rs2.game.npcs.drops.ItemDrop; +import com.rs2.game.npcs.drops.NPCDropsHandler; +import com.rs2.game.npcs.impl.Pets; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.util.NpcSpawn; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; import org.json.JSONArray; import org.json.JSONObject; @@ -1555,11 +1555,11 @@ public class NpcHandler { Gson gson = new Gson(); try { - Type collectionType = new TypeToken() { + Type collectionType = new TypeToken() { }.getType(); - com.rebotted.util.NpcData[] data = gson.fromJson(new FileReader("./data/cfg/npc.json"), collectionType); + com.rs2.util.NpcData[] data = gson.fromJson(new FileReader("./data/cfg/npc.json"), collectionType); - for (com.rebotted.util.NpcData npc : data) { + for (com.rs2.util.NpcData npc : data) { newNPCList(npc.getId(), npc.getName(), npc.getCombat(), npc.getHitpoints()); } } catch (FileNotFoundException fileex) { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcList.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcList.java similarity index 84% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcList.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcList.java index 5548dc71..4045e556 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcList.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcList.java @@ -1,4 +1,4 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; public class NpcList { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcSize.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcSize.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcSize.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/NpcSize.java index 6e1769cf..29b27867 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcSize.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/NpcSize.java @@ -1,4 +1,4 @@ -package com.rebotted.game.npcs; +package com.rs2.game.npcs; /** * NPC Sizes. diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/ItemDrop.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/drops/ItemDrop.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/ItemDrop.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/drops/ItemDrop.java index c6c5c42c..cc4e7a4c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/ItemDrop.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/drops/ItemDrop.java @@ -1,6 +1,6 @@ -package com.rebotted.game.npcs.drops; +package com.rs2.game.npcs.drops; -import com.rebotted.util.Misc; +import com.rs2.util.Misc; import java.util.Arrays; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/NPCDropsHandler.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/drops/NPCDropsHandler.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/NPCDropsHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/drops/NPCDropsHandler.java index 62151063..7449d333 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/NPCDropsHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/drops/NPCDropsHandler.java @@ -1,10 +1,10 @@ -package com.rebotted.game.npcs.drops; +package com.rs2.game.npcs.drops; import com.google.gson.Gson; -import com.rebotted.GameEngine; -import com.rebotted.game.items.ItemList; -import com.rebotted.util.Misc; -import com.rebotted.util.NpcDrop; +import com.rs2.GameEngine; +import com.rs2.game.items.ItemList; +import com.rs2.util.Misc; +import com.rs2.util.NpcDrop; import java.io.FileNotFoundException; import java.io.FileReader; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/MilkCow.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/impl/MilkCow.java similarity index 81% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/MilkCow.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/impl/MilkCow.java index 21e3d136..7096e70d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/MilkCow.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/impl/MilkCow.java @@ -1,9 +1,9 @@ -package com.rebotted.game.npcs.impl; +package com.rs2.game.npcs.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; /** * @author Tom diff --git a/2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/Pets.java b/2006Scape Server/src/main/java/com/rs2/game/npcs/impl/Pets.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/Pets.java rename to 2006Scape Server/src/main/java/com/rs2/game/npcs/impl/Pets.java index 543ed68b..d6ce202a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/npcs/impl/Pets.java +++ b/2006Scape Server/src/main/java/com/rs2/game/npcs/impl/Pets.java @@ -1,11 +1,11 @@ -package com.rebotted.game.npcs.impl; +package com.rs2.game.npcs.impl; -import com.rebotted.GameEngine; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerSave; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerSave; +import com.rs2.world.clip.Region; public class Pets { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/Object.java b/2006Scape Server/src/main/java/com/rs2/game/objects/Object.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/Object.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/Object.java index cee41016..d209548b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/Object.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/Object.java @@ -1,6 +1,6 @@ -package com.rebotted.game.objects; +package com.rs2.game.objects; -import com.rebotted.GameEngine; +import com.rs2.GameEngine; public class Object { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java b/2006Scape Server/src/main/java/com/rs2/game/objects/ObjectDefaults.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/ObjectDefaults.java index cdcab1d0..449fcf63 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/ObjectDefaults.java @@ -1,7 +1,7 @@ -package com.rebotted.game.objects; +package com.rs2.game.objects; -import com.rebotted.game.players.Player; -import com.rebotted.world.clip.ObjectDefinition; +import com.rs2.game.players.Player; +import com.rs2.world.clip.ObjectDefinition; /** * ObjectDefaults diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/Objects.java b/2006Scape Server/src/main/java/com/rs2/game/objects/Objects.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/Objects.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/Objects.java index 351eb282..0a19b4b9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/Objects.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/Objects.java @@ -1,6 +1,6 @@ -package com.rebotted.game.objects; +package com.rs2.game.objects; -import com.rebotted.world.clip.ObjectDefinition; +import com.rs2.world.clip.ObjectDefinition; public class Objects { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java b/2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java index 396792b6..3a10d6d7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java @@ -1,54 +1,54 @@ -package com.rebotted.game.objects; +package com.rs2.game.objects; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.guilds.Guilds; -import com.rebotted.game.content.minigames.Dueling; -import com.rebotted.game.content.minigames.FightPits; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.minigames.castlewars.CastleWarObjects; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.quests.QuestRewards; -import com.rebotted.game.content.random.Balloons; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.randomevents.FreakyForester; -import com.rebotted.game.content.skills.agility.AgilityShortcut; -import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.crafting.Spinning; -import com.rebotted.game.content.skills.farming.Farming; -import com.rebotted.game.content.skills.prayer.Ectofuntus; -import com.rebotted.game.content.skills.runecrafting.AbyssalHandler; -import com.rebotted.game.content.skills.runecrafting.RuneCraftingActions; -import com.rebotted.game.content.skills.smithing.Smelting; -import com.rebotted.game.content.skills.thieving.Stalls; -import com.rebotted.game.content.skills.thieving.ThieveOther; -import com.rebotted.game.content.skills.woodcutting.Woodcutting; -import com.rebotted.game.content.traveling.DesertCactus; -import com.rebotted.game.globalworldobjects.ClimbOther; -import com.rebotted.game.globalworldobjects.PassDoor; -import com.rebotted.game.globalworldobjects.ClimbOther.ClimbData; -import com.rebotted.game.items.impl.LightSources; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.npcs.impl.MilkCow; -import com.rebotted.game.objects.impl.AxeInLog; -import com.rebotted.game.objects.impl.BrimhavenVines; -import com.rebotted.game.objects.impl.Climbing; -import com.rebotted.game.objects.impl.FlourMill; -import com.rebotted.game.objects.impl.Levers; -import com.rebotted.game.objects.impl.OpenObject; -import com.rebotted.game.objects.impl.OtherObjects; -import com.rebotted.game.objects.impl.Pickable; -import com.rebotted.game.objects.impl.Searching; -import com.rebotted.game.objects.impl.UseOther; -import com.rebotted.game.objects.impl.Webs; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.Position; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.guilds.Guilds; +import com.rs2.game.content.minigames.Dueling; +import com.rs2.game.content.minigames.FightPits; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.minigames.castlewars.CastleWarObjects; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.quests.QuestRewards; +import com.rs2.game.content.random.Balloons; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.randomevents.FreakyForester; +import com.rs2.game.content.skills.agility.AgilityShortcut; +import com.rs2.game.content.skills.core.Mining; +import com.rs2.game.content.skills.crafting.Spinning; +import com.rs2.game.content.skills.farming.Farming; +import com.rs2.game.content.skills.prayer.Ectofuntus; +import com.rs2.game.content.skills.runecrafting.AbyssalHandler; +import com.rs2.game.content.skills.runecrafting.RuneCraftingActions; +import com.rs2.game.content.skills.smithing.Smelting; +import com.rs2.game.content.skills.thieving.Stalls; +import com.rs2.game.content.skills.thieving.ThieveOther; +import com.rs2.game.content.skills.woodcutting.Woodcutting; +import com.rs2.game.content.traveling.DesertCactus; +import com.rs2.game.globalworldobjects.ClimbOther; +import com.rs2.game.globalworldobjects.PassDoor; +import com.rs2.game.globalworldobjects.ClimbOther.ClimbData; +import com.rs2.game.items.impl.LightSources; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.npcs.impl.MilkCow; +import com.rs2.game.objects.impl.AxeInLog; +import com.rs2.game.objects.impl.BrimhavenVines; +import com.rs2.game.objects.impl.Climbing; +import com.rs2.game.objects.impl.FlourMill; +import com.rs2.game.objects.impl.Levers; +import com.rs2.game.objects.impl.OpenObject; +import com.rs2.game.objects.impl.OtherObjects; +import com.rs2.game.objects.impl.Pickable; +import com.rs2.game.objects.impl.Searching; +import com.rs2.game.objects.impl.UseOther; +import com.rs2.game.objects.impl.Webs; +import com.rs2.game.players.Player; +import com.rs2.game.players.Position; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; public class ObjectsActions { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/AxeInLog.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/AxeInLog.java similarity index 79% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/AxeInLog.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/AxeInLog.java index e060cd0a..ca75d350 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/AxeInLog.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/AxeInLog.java @@ -1,7 +1,7 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.game.objects.Object; -import com.rebotted.game.players.Player; +import com.rs2.game.objects.Object; +import com.rs2.game.players.Player; public class AxeInLog { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/BrimhavenVines.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/BrimhavenVines.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/BrimhavenVines.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/BrimhavenVines.java index 4b076588..47493946 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/BrimhavenVines.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/BrimhavenVines.java @@ -1,7 +1,7 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.game.content.skills.woodcutting.Woodcutting; -import com.rebotted.game.players.Player; +import com.rs2.game.content.skills.woodcutting.Woodcutting; +import com.rs2.game.players.Player; /** * @author Genesis diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Climbing.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Climbing.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java index 0ab7544a..df00a37d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Climbing.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java @@ -1,12 +1,12 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.items.impl.LightSources; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.items.impl.LightSources; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * Climbing handles stairs, ladders diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/CrystalChest.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/CrystalChest.java similarity index 88% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/CrystalChest.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/CrystalChest.java index 20d8ffd2..4a054df3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/CrystalChest.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/CrystalChest.java @@ -1,10 +1,10 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class CrystalChest { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/FlourMill.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/FlourMill.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/FlourMill.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/FlourMill.java index 0bf7ecc2..ce4e92dd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/FlourMill.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/FlourMill.java @@ -1,10 +1,10 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.world.clip.Region; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.world.clip.Region; /** * @author darkside1222 diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Levers.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Levers.java similarity index 84% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Levers.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/Levers.java index e4c07517..89300217 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Levers.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Levers.java @@ -1,10 +1,10 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Player; -import com.rebotted.world.clip.ObjectDefinition; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Player; +import com.rs2.world.clip.ObjectDefinition; /** * Levers diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/OpenObject.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/OpenObject.java index 7d0ba7b5..d3373f4f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OpenObject.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/OpenObject.java @@ -1,10 +1,10 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.GameEngine; -import com.rebotted.game.objects.ObjectDefaults; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.game.objects.ObjectDefaults; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.world.clip.Region; /** * Feb 17, 2018 : 6:44:26 AM diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java index 00b46ecb..43161c15 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java @@ -1,15 +1,15 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.traveling.DesertHeat; -import com.rebotted.game.objects.ObjectDefaults; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.ObjectDefinition; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.traveling.DesertHeat; +import com.rs2.game.objects.ObjectDefaults; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; +import com.rs2.world.clip.ObjectDefinition; +import com.rs2.world.clip.Region; public class OtherObjects { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Pickable.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Pickable.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Pickable.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/Pickable.java index d212d940..8fb0aff2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Pickable.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Pickable.java @@ -1,12 +1,12 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.players.Player; -import com.rebotted.world.Boundary; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.players.Player; +import com.rs2.world.Boundary; /** * Pickables diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Searching.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Searching.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Searching.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/Searching.java index 57d4c217..090982a8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Searching.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Searching.java @@ -1,6 +1,6 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class Searching { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/UseOther.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/UseOther.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/UseOther.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/UseOther.java index f0b762e6..bf1d652a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/UseOther.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/UseOther.java @@ -1,6 +1,6 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public class UseOther { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Webs.java b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Webs.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Webs.java rename to 2006Scape Server/src/main/java/com/rs2/game/objects/impl/Webs.java index 9d739b84..fa0c9173 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Webs.java +++ b/2006Scape Server/src/main/java/com/rs2/game/objects/impl/Webs.java @@ -1,9 +1,9 @@ -package com.rebotted.game.objects.impl; +package com.rs2.game.objects.impl; -import com.rebotted.GameEngine; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; /** * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Client.java b/2006Scape Server/src/main/java/com/rs2/game/players/Client.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/Client.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/Client.java index f8a8164f..f9b18739 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Client.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/Client.java @@ -1,9 +1,9 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import org.apache.mina.common.IoSession; -import com.rebotted.GameConstants; -import com.rebotted.util.Stream; +import com.rs2.GameConstants; +import com.rs2.util.Stream; public class Client extends Player { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/HighscoresHandler.java b/2006Scape Server/src/main/java/com/rs2/game/players/HighscoresHandler.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/HighscoresHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/HighscoresHandler.java index 3bc6d20c..ee6e1b17 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/HighscoresHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/HighscoresHandler.java @@ -1,6 +1,6 @@ -package com.rebotted.game.players; +package com.rs2.game.players; -import static com.rebotted.game.players.PlayerSave.loadPlayerInfo; +import static com.rs2.game.players.PlayerSave.loadPlayerInfo; import java.io.File; import java.util.ArrayList; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/MainFrameIDs.java b/2006Scape Server/src/main/java/com/rs2/game/players/MainFrameIDs.java similarity index 84% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/MainFrameIDs.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/MainFrameIDs.java index a2068764..cb4a6486 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/MainFrameIDs.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/MainFrameIDs.java @@ -1,4 +1,4 @@ -package com.rebotted.game.players; +package com.rs2.game.players; /** * Easy access to common interface IDs diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java b/2006Scape Server/src/main/java/com/rs2/game/players/Player.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/Player.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/Player.java index 5fc0c19b..ff5d2943 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Player.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/Player.java @@ -1,4 +1,4 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import java.util.ArrayList; import java.util.Calendar; @@ -10,89 +10,89 @@ import java.util.Queue; import com.everythingrs.hiscores.Hiscores; import org.apache.mina.common.IoSession; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.BankPin; -import com.rebotted.game.content.EmoteHandler; -import com.rebotted.game.content.combat.CombatAssistant; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.Specials; -import com.rebotted.game.content.combat.magic.Enchanting; -import com.rebotted.game.content.combat.prayer.PrayerData; -import com.rebotted.game.content.combat.prayer.PrayerDrain; -import com.rebotted.game.content.combat.range.DwarfCannon; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.content.consumables.Potions; -import com.rebotted.game.content.guilds.impl.RangersGuild; -import com.rebotted.game.content.minigames.Barrows; -import com.rebotted.game.content.minigames.Dueling; -import com.rebotted.game.content.minigames.FightPits; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.music.PlayList; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.SkillInterfaces; -import com.rebotted.game.content.skills.agility.Agility; -import com.rebotted.game.content.skills.agility.ApeAtollAgility; -import com.rebotted.game.content.skills.agility.BarbarianAgility; -import com.rebotted.game.content.skills.agility.GnomeAgility; -import com.rebotted.game.content.skills.agility.PyramidAgility; -import com.rebotted.game.content.skills.agility.WerewolfAgility; -import com.rebotted.game.content.skills.agility.WildernessAgility; -import com.rebotted.game.content.skills.cooking.Potatoes; -import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.crafting.GlassBlowing; -import com.rebotted.game.content.skills.farming.Allotments; -import com.rebotted.game.content.skills.farming.Bushes; -import com.rebotted.game.content.skills.farming.Compost; -import com.rebotted.game.content.skills.farming.Flowers; -import com.rebotted.game.content.skills.farming.FruitTree; -import com.rebotted.game.content.skills.farming.Herbs; -import com.rebotted.game.content.skills.farming.Hops; -import com.rebotted.game.content.skills.farming.Seedling; -import com.rebotted.game.content.skills.farming.SpecialPlantOne; -import com.rebotted.game.content.skills.farming.SpecialPlantTwo; -import com.rebotted.game.content.skills.farming.ToolLeprechaun; -import com.rebotted.game.content.skills.farming.WoodTrees; -import com.rebotted.game.content.skills.fletching.LogCuttingInterface; -import com.rebotted.game.content.skills.runecrafting.Runecrafting; -import com.rebotted.game.content.skills.slayer.Slayer; -import com.rebotted.game.content.skills.smithing.Smithing; -import com.rebotted.game.content.skills.smithing.SmithingInterface; -import com.rebotted.game.content.traveling.DesertCactus; -import com.rebotted.game.content.traveling.DesertHeat; -import com.rebotted.game.dialogues.DialogueHandler; -import com.rebotted.game.globalworldobjects.DoubleGates; -import com.rebotted.game.globalworldobjects.GateHandler; -import com.rebotted.game.globalworldobjects.SingleGates; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.Inventory; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.PotionMixing; -import com.rebotted.game.items.impl.Teles; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcActions; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.npcs.impl.Pets; -import com.rebotted.game.objects.ObjectsActions; -import com.rebotted.game.shops.ShopAssistant; -import com.rebotted.net.HostList; -import com.rebotted.net.Packet; -import com.rebotted.net.PacketSender; -import com.rebotted.net.StaticPacketBuilder; -import com.rebotted.net.packets.PacketHandler; -import com.rebotted.net.packets.impl.ChallengePlayer; -import com.rebotted.util.ISAACRandomGen; -import com.rebotted.util.Misc; -import com.rebotted.util.Stream; -import com.rebotted.world.Boundary; -import com.rebotted.world.ObjectManager; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.BankPin; +import com.rs2.game.content.EmoteHandler; +import com.rs2.game.content.combat.CombatAssistant; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.Specials; +import com.rs2.game.content.combat.magic.Enchanting; +import com.rs2.game.content.combat.prayer.PrayerData; +import com.rs2.game.content.combat.prayer.PrayerDrain; +import com.rs2.game.content.combat.range.DwarfCannon; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.content.consumables.Potions; +import com.rs2.game.content.guilds.impl.RangersGuild; +import com.rs2.game.content.minigames.Barrows; +import com.rs2.game.content.minigames.Dueling; +import com.rs2.game.content.minigames.FightPits; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.music.PlayList; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.SkillInterfaces; +import com.rs2.game.content.skills.agility.Agility; +import com.rs2.game.content.skills.agility.ApeAtollAgility; +import com.rs2.game.content.skills.agility.BarbarianAgility; +import com.rs2.game.content.skills.agility.GnomeAgility; +import com.rs2.game.content.skills.agility.PyramidAgility; +import com.rs2.game.content.skills.agility.WerewolfAgility; +import com.rs2.game.content.skills.agility.WildernessAgility; +import com.rs2.game.content.skills.cooking.Potatoes; +import com.rs2.game.content.skills.core.Mining; +import com.rs2.game.content.skills.crafting.GlassBlowing; +import com.rs2.game.content.skills.farming.Allotments; +import com.rs2.game.content.skills.farming.Bushes; +import com.rs2.game.content.skills.farming.Compost; +import com.rs2.game.content.skills.farming.Flowers; +import com.rs2.game.content.skills.farming.FruitTree; +import com.rs2.game.content.skills.farming.Herbs; +import com.rs2.game.content.skills.farming.Hops; +import com.rs2.game.content.skills.farming.Seedling; +import com.rs2.game.content.skills.farming.SpecialPlantOne; +import com.rs2.game.content.skills.farming.SpecialPlantTwo; +import com.rs2.game.content.skills.farming.ToolLeprechaun; +import com.rs2.game.content.skills.farming.WoodTrees; +import com.rs2.game.content.skills.fletching.LogCuttingInterface; +import com.rs2.game.content.skills.runecrafting.Runecrafting; +import com.rs2.game.content.skills.slayer.Slayer; +import com.rs2.game.content.skills.smithing.Smithing; +import com.rs2.game.content.skills.smithing.SmithingInterface; +import com.rs2.game.content.traveling.DesertCactus; +import com.rs2.game.content.traveling.DesertHeat; +import com.rs2.game.dialogues.DialogueHandler; +import com.rs2.game.globalworldobjects.DoubleGates; +import com.rs2.game.globalworldobjects.GateHandler; +import com.rs2.game.globalworldobjects.SingleGates; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.Inventory; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.PotionMixing; +import com.rs2.game.items.impl.Teles; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcActions; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.npcs.impl.Pets; +import com.rs2.game.objects.ObjectsActions; +import com.rs2.game.shops.ShopAssistant; +import com.rs2.net.HostList; +import com.rs2.net.Packet; +import com.rs2.net.PacketSender; +import com.rs2.net.StaticPacketBuilder; +import com.rs2.net.packets.PacketHandler; +import com.rs2.net.packets.impl.ChallengePlayer; +import com.rs2.util.ISAACRandomGen; +import com.rs2.util.Misc; +import com.rs2.util.Stream; +import com.rs2.world.Boundary; +import com.rs2.world.ObjectManager; public abstract class Player { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAction.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAction.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAction.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAction.java index cfe3760c..7ff90392 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAction.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAction.java @@ -1,4 +1,4 @@ -package com.rebotted.game.players; +package com.rs2.game.players; public class PlayerAction { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java index 00b0f071..4eb5bfe9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java @@ -1,36 +1,36 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import java.util.ArrayList; import java.util.Optional; import java.util.Random; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.content.combat.prayer.PrayerDrain; -import com.rebotted.game.content.minigames.FightPits; -import com.rebotted.game.content.minigames.PestControl; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.content.skills.SkillData; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.smithing.Superheat; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.LightSources; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.util.GameLogger; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.TileControl; -import com.rebotted.world.clip.PathFinder; -import com.rebotted.world.clip.Region; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.content.combat.prayer.PrayerDrain; +import com.rs2.game.content.minigames.FightPits; +import com.rs2.game.content.minigames.PestControl; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.content.skills.SkillData; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.smithing.Superheat; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.LightSources; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.util.GameLogger; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.TileControl; +import com.rs2.world.clip.PathFinder; +import com.rs2.world.clip.Region; public class PlayerAssistant { @@ -1818,7 +1818,7 @@ public class PlayerAssistant { player.getPlayerAssistant().movePlayer(3233, 3229, 0); player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source and pull requests are welcome!"); - player.getPacketSender().sendMessage("Source code: github.com/dginovker/2006rebotted"); + player.getPacketSender().sendMessage("Source code: github.com/2006-Scape/2006Scape"); player.getPacketSender().sendMessage("Discord: discord.gg/4zrA2Wy"); player.getDialogueHandler().sendDialogues(3115, 2224); player.isRunning2 = false; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerHandler.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/PlayerHandler.java index e333a03c..04563c6d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerHandler.java @@ -1,14 +1,14 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import java.net.InetSocketAddress; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.util.Misc; -import com.rebotted.util.Stream; -import com.rebotted.world.GlobalDropsHandler; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.util.Misc; +import com.rs2.util.Stream; +import com.rs2.world.GlobalDropsHandler; public class PlayerHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerSave.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerSave.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java index 678a1181..a6c3973b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/PlayerSave.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerSave.java @@ -1,4 +1,4 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import java.io.*; import java.nio.charset.StandardCharsets; @@ -6,7 +6,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Base64; -import com.rebotted.util.Misc; +import com.rs2.util.Misc; public class PlayerSave { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Position.java b/2006Scape Server/src/main/java/com/rs2/game/players/Position.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/Position.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/Position.java index b23d4693..6c0ab137 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Position.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/Position.java @@ -1,4 +1,4 @@ -package com.rebotted.game.players; +package com.rs2.game.players; /** * Position diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java b/2006Scape Server/src/main/java/com/rs2/game/players/Trading.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/Trading.java index f347819f..5576beed 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/Trading.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/Trading.java @@ -1,17 +1,17 @@ -package com.rebotted.game.players; +package com.rs2.game.players; import java.time.temporal.ValueRange; import java.util.concurrent.CopyOnWriteArrayList; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.util.GameLogger; -import com.rebotted.util.Misc; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.util.GameLogger; +import com.rs2.util.Misc; public class Trading { diff --git a/2006Redone Server/src/main/java/com/rebotted/game/players/antimacro/AntiSpam.java b/2006Scape Server/src/main/java/com/rs2/game/players/antimacro/AntiSpam.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/game/players/antimacro/AntiSpam.java rename to 2006Scape Server/src/main/java/com/rs2/game/players/antimacro/AntiSpam.java index 0db53535..47bb384a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/players/antimacro/AntiSpam.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/antimacro/AntiSpam.java @@ -1,6 +1,6 @@ -package com.rebotted.game.players.antimacro; +package com.rs2.game.players.antimacro; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; /** * AntiSpam diff --git a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/shops/ShopAssistant.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java rename to 2006Scape Server/src/main/java/com/rs2/game/shops/ShopAssistant.java index 72fe3188..c4653e74 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/shops/ShopAssistant.java @@ -1,14 +1,14 @@ -package com.rebotted.game.shops; +package com.rs2.game.shops; -import com.rebotted.GameConstants; -import com.rebotted.game.bots.BotHandler; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.ItemDefinition; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.GameLogger; +import com.rs2.GameConstants; +import com.rs2.game.bots.BotHandler; +import com.rs2.game.items.ItemData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.ItemDefinition; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.GameLogger; /** * Many Fixes/Things Added diff --git a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopHandler.java b/2006Scape Server/src/main/java/com/rs2/game/shops/ShopHandler.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/game/shops/ShopHandler.java rename to 2006Scape Server/src/main/java/com/rs2/game/shops/ShopHandler.java index 8342c192..8040dfab 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/shops/ShopHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/game/shops/ShopHandler.java @@ -1,12 +1,12 @@ -package com.rebotted.game.shops; +package com.rs2.game.shops; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.util.ShopData; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.util.ShopData; import org.json.JSONArray; import org.json.JSONObject; diff --git a/2006Redone Server/src/main/java/com/rebotted/game/shops/Shops.java b/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/game/shops/Shops.java rename to 2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java index a5a3c194..ae3ab3d1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/shops/Shops.java +++ b/2006Scape Server/src/main/java/com/rs2/game/shops/Shops.java @@ -1,9 +1,9 @@ -package com.rebotted.game.shops; +package com.rs2.game.shops; import java.util.HashMap; -import com.rebotted.game.content.randomevents.RandomEventHandler; -import com.rebotted.game.players.Player; +import com.rs2.game.content.randomevents.RandomEventHandler; +import com.rs2.game.players.Player; /** * Shops diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/PlayersOnlineWebsite.java b/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/PlayersOnlineWebsite.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java index 11eb6a7e..78caf181 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/PlayersOnlineWebsite.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/PlayersOnlineWebsite.java @@ -1,9 +1,10 @@ -package com.rebotted.integrations; +package com.rs2.integrations; import java.io.IOException; import java.net.URL; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.GameConstants; +import com.rs2.game.players.PlayerHandler; public class PlayersOnlineWebsite { @@ -12,7 +13,7 @@ public class PlayersOnlineWebsite { private static void setWebsitePlayersOnline(int amount) throws IOException { URL url; - url = new URL("https://rsrebotted.com/playersonline.php?pass=" + password + "&amount=" + amount); + url = new URL(GameConstants.WEBSITE_LINK + "/playersonline.php?pass=" + password + "&amount=" + amount); url.openStream().close(); } diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/RegisteredAccsWebsite.java b/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java similarity index 84% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/RegisteredAccsWebsite.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java index ab203b06..6290be7e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/RegisteredAccsWebsite.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/RegisteredAccsWebsite.java @@ -1,16 +1,18 @@ -package com.rebotted.integrations; +package com.rs2.integrations; import java.io.File; import java.io.IOException; import java.net.URL; +import com.rs2.GameConstants; + public class RegisteredAccsWebsite { static String password; private static boolean hasntwarned = true; private static void setAccountsRegistered(int amount) throws IOException { URL url; - url = new URL("https://rsrebotted.com/accountsregistered.php?pass=" + password + "&amount=" + amount); + url = new URL(GameConstants.WEBSITE_LINK + "/accountsregistered.php?pass=" + password + "&amount=" + amount); url.openStream().close(); } diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/SettingsLoader.java b/2006Scape Server/src/main/java/com/rs2/integrations/SettingsLoader.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/SettingsLoader.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/SettingsLoader.java index 08e113b5..ed3b2621 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/SettingsLoader.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/SettingsLoader.java @@ -1,9 +1,9 @@ -package com.rebotted.integrations; +package com.rs2.integrations; import org.json.JSONObject; -import com.rebotted.GameEngine; -import com.rebotted.integrations.discord.JavaCord; +import com.rs2.GameEngine; +import com.rs2.integrations.discord.JavaCord; import java.io.*; import java.util.stream.Collectors; diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/DiscordActivity.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/DiscordActivity.java index 6eab0571..07bb6e91 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/DiscordActivity.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/DiscordActivity.java @@ -1,6 +1,6 @@ -package com.rebotted.integrations.discord; +package com.rs2.integrations.discord; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.game.players.PlayerHandler; public class DiscordActivity { diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/JavaCord.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/JavaCord.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java index b591d1ac..25f22c94 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/JavaCord.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java @@ -1,11 +1,11 @@ -package com.rebotted.integrations.discord; +package com.rs2.integrations.discord; import org.javacord.api.DiscordApi; import org.javacord.api.DiscordApiBuilder; import org.javacord.api.entity.channel.TextChannel; import org.javacord.api.entity.message.MessageBuilder; import org.javacord.api.util.logging.ExceptionLogger; -import com.rebotted.integrations.discord.commands.*; +import com.rs2.integrations.discord.commands.*; import java.io.IOException; diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Commands.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Commands.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java index 5a6393bf..8c7a9615 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java @@ -1,4 +1,4 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Forum.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java similarity index 73% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Forum.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java index b9598e61..b746b3c1 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Forum.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Forum.java @@ -1,15 +1,17 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; +import com.rs2.GameConstants; + public class Forum implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::forum") || message.getContent().equalsIgnoreCase("::forums")) { - event.getChannel().sendMessage("https://rsrebotted.com/forums/index.php"); + event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/forums/index.php"); } } -} \ No newline at end of file +} diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Hiscores.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java similarity index 74% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Hiscores.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java index f514e5b3..c3ccd26e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Hiscores.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Hiscores.java @@ -1,15 +1,17 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; +import com.rs2.GameConstants; + public class Hiscores implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::hiscores") || message.getContent().equalsIgnoreCase("::highscores")) { - event.getChannel().sendMessage("https://rsrebotted.com/hiscores.html"); + event.getChannel().sendMessage(GameConstants.WEBSITE_LINK + "/hiscores.html"); } } -} \ No newline at end of file +} diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Issues.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java similarity index 76% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Issues.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java index 174464b5..83760dc6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Issues.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Issues.java @@ -1,4 +1,4 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; @@ -9,7 +9,7 @@ public class Issues implements MessageCreateListener { public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::issues") || message.getContent().equalsIgnoreCase("::bugs")) { - event.getChannel().sendMessage("https://github.com/dginovker/2006rebotted/issues"); + event.getChannel().sendMessage("https://github.com/2006-Scape/2006Scape/issues"); } } -} \ No newline at end of file +} diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java index 96330dae..e040e743 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Online.java @@ -1,10 +1,10 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; -import com.rebotted.integrations.discord.JavaCord; +import com.rs2.integrations.discord.JavaCord; public class Online implements MessageCreateListener { @Override diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Players.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Players.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java index 506d3347..3d3fa556 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Players.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Players.java @@ -1,10 +1,10 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.game.players.PlayerHandler; public class Players implements MessageCreateListener { @Override diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Vote.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java similarity index 64% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Vote.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java index b53136c2..5c73a72f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Vote.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Vote.java @@ -1,14 +1,17 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; + +import com.rs2.GameConstants; + public class Vote implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::vote")) { - event.getChannel().sendMessage("Visit https://rsrebotted.com/vote.html then type \"::claimvote\" in-game to receive your reward!"); + event.getChannel().sendMessage("Visit " + GameConstants.WEBSITE_LINK + "/vote.html then type \"::claimvote\" in-game to receive your reward!"); } } } diff --git a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Website.java b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java similarity index 75% rename from 2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Website.java rename to 2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java index a664561a..b391eb3b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Website.java +++ b/2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Website.java @@ -1,15 +1,17 @@ -package com.rebotted.integrations.discord.commands; +package com.rs2.integrations.discord.commands; import org.javacord.api.entity.message.Message; import org.javacord.api.event.message.MessageCreateEvent; import org.javacord.api.listener.message.MessageCreateListener; +import com.rs2.GameConstants; + public class Website implements MessageCreateListener { @Override public void onMessageCreate(MessageCreateEvent event) { Message message = event.getMessage(); if (message.getContent().equalsIgnoreCase("::website") || message.getContent().equalsIgnoreCase("::site")) { - event.getChannel().sendMessage("www.rsrebotted.com"); + event.getChannel().sendMessage(GameConstants.WEBSITE_LINK); } } -} \ No newline at end of file +} diff --git a/2006Redone Server/src/main/java/com/rebotted/net/CodecFactory.java b/2006Scape Server/src/main/java/com/rs2/net/CodecFactory.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/net/CodecFactory.java rename to 2006Scape Server/src/main/java/com/rs2/net/CodecFactory.java index abf3116d..51dd49e0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/CodecFactory.java +++ b/2006Scape Server/src/main/java/com/rs2/net/CodecFactory.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/ConnectionHandler.java b/2006Scape Server/src/main/java/com/rs2/net/ConnectionHandler.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/net/ConnectionHandler.java rename to 2006Scape Server/src/main/java/com/rs2/net/ConnectionHandler.java index 964e3d58..267fb472 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/ConnectionHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/net/ConnectionHandler.java @@ -1,11 +1,11 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; -import com.rebotted.game.players.Client; +import com.rs2.game.players.Client; public class ConnectionHandler implements IoHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/ConnectionThrottleFilter.java b/2006Scape Server/src/main/java/com/rs2/net/ConnectionThrottleFilter.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/net/ConnectionThrottleFilter.java rename to 2006Scape Server/src/main/java/com/rs2/net/ConnectionThrottleFilter.java index 7df9720e..54a0e960 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/ConnectionThrottleFilter.java +++ b/2006Scape Server/src/main/java/com/rs2/net/ConnectionThrottleFilter.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/GameCodecFactory.java b/2006Scape Server/src/main/java/com/rs2/net/GameCodecFactory.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/net/GameCodecFactory.java rename to 2006Scape Server/src/main/java/com/rs2/net/GameCodecFactory.java index 0886517e..c0c8475a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/GameCodecFactory.java +++ b/2006Scape Server/src/main/java/com/rs2/net/GameCodecFactory.java @@ -1,10 +1,10 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolEncoder; -import com.rebotted.util.ISAACRandomGen; +import com.rs2.util.ISAACRandomGen; /** * Provides access to the encoders and decoders for the 508 protocol. diff --git a/2006Redone Server/src/main/java/com/rebotted/net/HostList.java b/2006Scape Server/src/main/java/com/rs2/net/HostList.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/net/HostList.java rename to 2006Scape Server/src/main/java/com/rs2/net/HostList.java index 16768087..9e790078 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/HostList.java +++ b/2006Scape Server/src/main/java/com/rs2/net/HostList.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import java.net.InetSocketAddress; import java.util.HashMap; @@ -6,8 +6,8 @@ import java.util.Map; import org.apache.mina.common.IoSession; -import com.rebotted.Connection; -import com.rebotted.GameConstants; +import com.rs2.Connection; +import com.rs2.GameConstants; public class HostList { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/Packet.java b/2006Scape Server/src/main/java/com/rs2/net/Packet.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/net/Packet.java rename to 2006Scape Server/src/main/java/com/rs2/net/Packet.java index bdcf1d22..d71110e0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/Packet.java +++ b/2006Scape Server/src/main/java/com/rs2/net/Packet.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.common.IoSession; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/PacketBuffer.java b/2006Scape Server/src/main/java/com/rs2/net/PacketBuffer.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/net/PacketBuffer.java rename to 2006Scape Server/src/main/java/com/rs2/net/PacketBuffer.java index 2344b7be..36790768 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/PacketBuffer.java +++ b/2006Scape Server/src/main/java/com/rs2/net/PacketBuffer.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; /** * Represents a packet buffer. diff --git a/2006Redone Server/src/main/java/com/rebotted/net/PacketBuilder.java b/2006Scape Server/src/main/java/com/rs2/net/PacketBuilder.java similarity index 78% rename from 2006Redone Server/src/main/java/com/rebotted/net/PacketBuilder.java rename to 2006Scape Server/src/main/java/com/rs2/net/PacketBuilder.java index 622c9dd1..b2f0e44e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/PacketBuilder.java +++ b/2006Scape Server/src/main/java/com/rs2/net/PacketBuilder.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; /** * Packet builder interface diff --git a/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java b/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java rename to 2006Scape Server/src/main/java/com/rs2/net/PacketSender.java index f3998d51..2a9d2c24 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/PacketSender.java +++ b/2006Scape Server/src/main/java/com/rs2/net/PacketSender.java @@ -1,25 +1,25 @@ -package com.rebotted.net; +package com.rs2.net; import java.text.DecimalFormat; -import com.rebotted.Connection; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.combat.magic.MagicTeleports; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.runecrafting.Tiaras; -import com.rebotted.game.items.Item; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.Weight; -import com.rebotted.game.items.impl.LightSources; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.MainFrameIDs; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.Connection; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.combat.magic.MagicTeleports; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.runecrafting.Tiaras; +import com.rs2.game.items.Item; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.Weight; +import com.rs2.game.items.impl.LightSources; +import com.rs2.game.players.Client; +import com.rs2.game.players.MainFrameIDs; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; public class PacketSender { @@ -100,7 +100,7 @@ public class PacketSender { Weight.updateWeight(player); player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@."); player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome"); - player.getPacketSender().sendMessage("Source code at github.com/dginovker/2006rebotted"); + player.getPacketSender().sendMessage("Source code at github.com/2006-Scape/2006Scape"); player.getPacketSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy"); /*if (!hasBankpin) { //Kind of annoying. Maybe add Random % 10 or something. getActionSender().sendMessage("You do not have a bank pin it is highly recommended you set one."); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/RS2LoginProtocolDecoder.java b/2006Scape Server/src/main/java/com/rs2/net/RS2LoginProtocolDecoder.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/net/RS2LoginProtocolDecoder.java rename to 2006Scape Server/src/main/java/com/rs2/net/RS2LoginProtocolDecoder.java index f9ae3ef8..158cb7d3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/RS2LoginProtocolDecoder.java +++ b/2006Scape Server/src/main/java/com/rs2/net/RS2LoginProtocolDecoder.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import java.math.BigInteger; import java.net.InetSocketAddress; @@ -11,14 +11,14 @@ import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.ProtocolDecoderOutput; -import com.rebotted.Connection; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.game.players.PlayerSave; -import com.rebotted.util.HostBlacklist; -import com.rebotted.util.ISAACRandomGen; +import com.rs2.Connection; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.players.Client; +import com.rs2.game.players.PlayerHandler; +import com.rs2.game.players.PlayerSave; +import com.rs2.util.HostBlacklist; +import com.rs2.util.ISAACRandomGen; /** * Login protocol decoder. diff --git a/2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolDecoder.java b/2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolDecoder.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolDecoder.java rename to 2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolDecoder.java index fddd751e..9099730b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolDecoder.java +++ b/2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolDecoder.java @@ -1,12 +1,12 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; -import com.rebotted.game.players.Client; -import com.rebotted.util.ISAACRandomGen; +import com.rs2.game.players.Client; +import com.rs2.util.ISAACRandomGen; public class RS2ProtocolDecoder extends CumulativeProtocolDecoder { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolEncoder.java b/2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolEncoder.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolEncoder.java rename to 2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolEncoder.java index 032c05f5..f69a0099 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/RS2ProtocolEncoder.java +++ b/2006Scape Server/src/main/java/com/rs2/net/RS2ProtocolEncoder.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/StaticPacketBuilder.java b/2006Scape Server/src/main/java/com/rs2/net/StaticPacketBuilder.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/net/StaticPacketBuilder.java rename to 2006Scape Server/src/main/java/com/rs2/net/StaticPacketBuilder.java index 8f1669db..651ded33 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/StaticPacketBuilder.java +++ b/2006Scape Server/src/main/java/com/rs2/net/StaticPacketBuilder.java @@ -1,4 +1,4 @@ -package com.rebotted.net; +package com.rs2.net; /** * A mutable sequence of bytes used to construct the immutable diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/PacketHandler.java b/2006Scape Server/src/main/java/com/rs2/net/packets/PacketHandler.java similarity index 64% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/PacketHandler.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/PacketHandler.java index c7ea24e8..7054f9ba 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/PacketHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/PacketHandler.java @@ -1,49 +1,49 @@ -package com.rebotted.net.packets; +package com.rs2.net.packets; -import com.rebotted.GameConstants; -import com.rebotted.game.dialogues.Dialogue; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.impl.AttackPlayer; -import com.rebotted.net.packets.impl.Bank10; -import com.rebotted.net.packets.impl.Bank5; -import com.rebotted.net.packets.impl.BankAll; -import com.rebotted.net.packets.impl.BankX1; -import com.rebotted.net.packets.impl.InterfaceX; -import com.rebotted.net.packets.impl.ChallengePlayer; -import com.rebotted.net.packets.impl.ChangeAppearance; -import com.rebotted.net.packets.impl.ChangeRegions; -import com.rebotted.net.packets.impl.Chat; -import com.rebotted.net.packets.impl.ClickItem; -import com.rebotted.net.packets.impl.ClickNPC; -import com.rebotted.net.packets.impl.ClickObject; -import com.rebotted.net.packets.impl.ClickTab; -import com.rebotted.net.packets.impl.ClickingButtons; -import com.rebotted.net.packets.impl.ClickingInGame; -import com.rebotted.net.packets.impl.ClickingStuff; -import com.rebotted.net.packets.impl.Commands; -import com.rebotted.net.packets.impl.DropItem; -import com.rebotted.net.packets.impl.FollowPlayer; -import com.rebotted.net.packets.impl.IdleLogout; -import com.rebotted.net.packets.impl.ItemClick2; -import com.rebotted.net.packets.impl.ItemClick2OnGroundItem; -import com.rebotted.net.packets.impl.ItemClick3; -import com.rebotted.net.packets.impl.ItemOnGroundItem; -import com.rebotted.net.packets.impl.ItemOnItem; -import com.rebotted.net.packets.impl.ItemOnNpc; -import com.rebotted.net.packets.impl.ItemOnObject; -import com.rebotted.net.packets.impl.ItemOnPlayer; -import com.rebotted.net.packets.impl.MagicOnFloorItems; -import com.rebotted.net.packets.impl.MagicOnItems; -import com.rebotted.net.packets.impl.MagicOnObject; -import com.rebotted.net.packets.impl.MoveItems; -import com.rebotted.net.packets.impl.PickupItem; -import com.rebotted.net.packets.impl.PrivateMessaging; -import com.rebotted.net.packets.impl.RemoveItem; -import com.rebotted.net.packets.impl.Report; -import com.rebotted.net.packets.impl.SilentPacket; -import com.rebotted.net.packets.impl.Trade; -import com.rebotted.net.packets.impl.Walking; -import com.rebotted.net.packets.impl.WearItem; +import com.rs2.GameConstants; +import com.rs2.game.dialogues.Dialogue; +import com.rs2.game.players.Player; +import com.rs2.net.packets.impl.AttackPlayer; +import com.rs2.net.packets.impl.Bank10; +import com.rs2.net.packets.impl.Bank5; +import com.rs2.net.packets.impl.BankAll; +import com.rs2.net.packets.impl.BankX1; +import com.rs2.net.packets.impl.InterfaceX; +import com.rs2.net.packets.impl.ChallengePlayer; +import com.rs2.net.packets.impl.ChangeAppearance; +import com.rs2.net.packets.impl.ChangeRegions; +import com.rs2.net.packets.impl.Chat; +import com.rs2.net.packets.impl.ClickItem; +import com.rs2.net.packets.impl.ClickNPC; +import com.rs2.net.packets.impl.ClickObject; +import com.rs2.net.packets.impl.ClickTab; +import com.rs2.net.packets.impl.ClickingButtons; +import com.rs2.net.packets.impl.ClickingInGame; +import com.rs2.net.packets.impl.ClickingStuff; +import com.rs2.net.packets.impl.Commands; +import com.rs2.net.packets.impl.DropItem; +import com.rs2.net.packets.impl.FollowPlayer; +import com.rs2.net.packets.impl.IdleLogout; +import com.rs2.net.packets.impl.ItemClick2; +import com.rs2.net.packets.impl.ItemClick2OnGroundItem; +import com.rs2.net.packets.impl.ItemClick3; +import com.rs2.net.packets.impl.ItemOnGroundItem; +import com.rs2.net.packets.impl.ItemOnItem; +import com.rs2.net.packets.impl.ItemOnNpc; +import com.rs2.net.packets.impl.ItemOnObject; +import com.rs2.net.packets.impl.ItemOnPlayer; +import com.rs2.net.packets.impl.MagicOnFloorItems; +import com.rs2.net.packets.impl.MagicOnItems; +import com.rs2.net.packets.impl.MagicOnObject; +import com.rs2.net.packets.impl.MoveItems; +import com.rs2.net.packets.impl.PickupItem; +import com.rs2.net.packets.impl.PrivateMessaging; +import com.rs2.net.packets.impl.RemoveItem; +import com.rs2.net.packets.impl.Report; +import com.rs2.net.packets.impl.SilentPacket; +import com.rs2.net.packets.impl.Trade; +import com.rs2.net.packets.impl.Walking; +import com.rs2.net.packets.impl.WearItem; public class PacketHandler { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/PacketType.java b/2006Scape Server/src/main/java/com/rs2/net/packets/PacketType.java similarity index 59% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/PacketType.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/PacketType.java index 475551aa..6d2a44f4 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/PacketType.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/PacketType.java @@ -1,6 +1,6 @@ -package com.rebotted.net.packets; +package com.rs2.net.packets; -import com.rebotted.game.players.Player; +import com.rs2.game.players.Player; public interface PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/AttackPlayer.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/AttackPlayer.java index a3391b13..96af1ed8 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/AttackPlayer.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/AttackPlayer.java @@ -1,14 +1,14 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameConstants; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.magic.CastOnOther; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; +import com.rs2.GameConstants; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.magic.CastOnOther; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; public class AttackPlayer implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank10.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank10.java index ff662fe5..af986269 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank10.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank10.java @@ -1,9 +1,9 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Bank 10 Items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java index f27fc4ca..5054dbaf 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Bank5.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java @@ -1,9 +1,9 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Bank 5 Items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankAll.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankAll.java index 63f0b587..8f7737b7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankAll.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.ItemData; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Bank All Items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX1.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankX1.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX1.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankX1.java index bd0c3d15..f7e400c3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankX1.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/BankX1.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Bank X Items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChallengePlayer.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChallengePlayer.java similarity index 79% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChallengePlayer.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChallengePlayer.java index 91dc3497..604b2102 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChallengePlayer.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChallengePlayer.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; /** * Challenge Player diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeAppearance.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeAppearance.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeAppearance.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeAppearance.java index 3f083e1c..f2d494d5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeAppearance.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeAppearance.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Change appearance diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeRegions.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeRegions.java similarity index 67% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeRegions.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeRegions.java index a405dbfb..0e4e0c23 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ChangeRegions.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ChangeRegions.java @@ -1,12 +1,12 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.music.Music; -import com.rebotted.game.globalworldobjects.Doors; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.world.GlobalDropsHandler; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.music.Music; +import com.rs2.game.globalworldobjects.Doors; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.world.GlobalDropsHandler; /** * Change Regions diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Chat.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Chat.java similarity index 79% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Chat.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Chat.java index 7f85e619..6dbef47b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Chat.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Chat.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.Connection; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.antimacro.AntiSpam; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.Connection; +import com.rs2.game.players.Player; +import com.rs2.game.players.antimacro.AntiSpam; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; /** * Chat diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickItem.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickItem.java index 0c70047c..e424f662 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickItem.java @@ -1,24 +1,24 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.consumables.Beverages; -import com.rebotted.game.content.consumables.Kebabs; -import com.rebotted.game.content.consumables.Beverages.beverageData; -import com.rebotted.game.content.consumables.Food; -import com.rebotted.game.content.minigames.TreasureTrails; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.skills.herblore.Herblore; -import com.rebotted.game.content.skills.prayer.Prayer; -import com.rebotted.game.content.skills.woodcutting.BirdNest; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.impl.ExperienceLamp; -import com.rebotted.game.items.impl.Flowers; -import com.rebotted.game.items.impl.GodBooks; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.GameLogger; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.consumables.Beverages; +import com.rs2.game.content.consumables.Kebabs; +import com.rs2.game.content.consumables.Beverages.beverageData; +import com.rs2.game.content.consumables.Food; +import com.rs2.game.content.minigames.TreasureTrails; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.skills.herblore.Herblore; +import com.rs2.game.content.skills.prayer.Prayer; +import com.rs2.game.content.skills.woodcutting.BirdNest; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.impl.ExperienceLamp; +import com.rs2.game.items.impl.Flowers; +import com.rs2.game.items.impl.GodBooks; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.util.GameLogger; +import com.rs2.util.Misc; /** * Clicking an item, bury bone, eat food etc diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java index d04e0e49..9c02144b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickNPC.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java @@ -1,15 +1,15 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.content.combat.range.RangeData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.content.combat.range.RangeData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Click NPC diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickObject.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickObject.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickObject.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickObject.java index 50b104c2..4a33f04f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickObject.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickObject.java @@ -1,19 +1,19 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; import java.util.function.Consumer; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.minigames.castlewars.CastleWarObjects; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.skills.woodcutting.Woodcutting; -import com.rebotted.game.globalworldobjects.Doors; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.minigames.castlewars.CastleWarObjects; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.skills.woodcutting.Woodcutting; +import com.rs2.game.globalworldobjects.Doors; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.world.clip.Region; public class ClickObject implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickTab.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickTab.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickTab.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickTab.java index aa94653d..4a6f46e9 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickTab.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickTab.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class ClickTab implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingButtons.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingButtons.java index 9bc61022..1798d19a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingButtons.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingButtons.java @@ -1,39 +1,39 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.combat.CombatConstants; -import com.rebotted.game.content.combat.Specials; -import com.rebotted.game.content.combat.magic.*; -import com.rebotted.game.content.combat.prayer.ActivatePrayers; -import com.rebotted.game.content.music.Music; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.randomevents.SandwhichLady; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.cooking.CookingTutorialIsland; -import com.rebotted.game.content.skills.cooking.DairyChurn; -import com.rebotted.game.content.skills.crafting.LeatherMaking; -import com.rebotted.game.content.skills.crafting.Pottery; -import com.rebotted.game.content.skills.crafting.Spinning; -import com.rebotted.game.content.skills.crafting.Tanning; -import com.rebotted.game.content.skills.crafting.CraftingData.tanningData; -import com.rebotted.game.content.skills.fletching.LogCutting; -import com.rebotted.game.content.skills.herblore.Herblore; -import com.rebotted.game.content.skills.smithing.SilverCrafting; -import com.rebotted.game.content.skills.smithing.Smelting; -import com.rebotted.game.content.traveling.GnomeGlider; -import com.rebotted.game.dialogues.DialogueOptions; -import com.rebotted.game.items.GameItem; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.impl.EnchantStaff; -import com.rebotted.game.items.impl.ExperienceLamp; -import com.rebotted.game.items.impl.LightSources; -import com.rebotted.game.objects.impl.Climbing; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.game.content.combat.CombatConstants; +import com.rs2.game.content.combat.Specials; +import com.rs2.game.content.combat.magic.*; +import com.rs2.game.content.combat.prayer.ActivatePrayers; +import com.rs2.game.content.music.Music; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.randomevents.SandwhichLady; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.cooking.CookingTutorialIsland; +import com.rs2.game.content.skills.cooking.DairyChurn; +import com.rs2.game.content.skills.crafting.LeatherMaking; +import com.rs2.game.content.skills.crafting.Pottery; +import com.rs2.game.content.skills.crafting.Spinning; +import com.rs2.game.content.skills.crafting.Tanning; +import com.rs2.game.content.skills.crafting.CraftingData.tanningData; +import com.rs2.game.content.skills.fletching.LogCutting; +import com.rs2.game.content.skills.herblore.Herblore; +import com.rs2.game.content.skills.smithing.SilverCrafting; +import com.rs2.game.content.skills.smithing.Smelting; +import com.rs2.game.content.traveling.GnomeGlider; +import com.rs2.game.dialogues.DialogueOptions; +import com.rs2.game.items.GameItem; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.impl.EnchantStaff; +import com.rs2.game.items.impl.ExperienceLamp; +import com.rs2.game.items.impl.LightSources; +import com.rs2.game.objects.impl.Climbing; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; /** * Clicking most buttons diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingInGame.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingInGame.java similarity index 54% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingInGame.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingInGame.java index 2c57a13a..56790746 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingInGame.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingInGame.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class ClickingInGame implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingStuff.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingStuff.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingStuff.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingStuff.java index f33a9e4c..0abca27a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickingStuff.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingStuff.java @@ -1,9 +1,9 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; /** * Clicking stuff (interfaces) diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java index ca7722af..ad0d649b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java @@ -1,20 +1,20 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import static com.rebotted.util.GameLogger.writeLog; +import static com.rs2.util.GameLogger.writeLog; import java.util.Arrays; -import com.rebotted.Connection; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.bots.BotHandler; -import com.rebotted.game.content.combat.magic.SpellTeleport; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.*; -import com.rebotted.game.players.antimacro.AntiSpam; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.Region; +import com.rs2.Connection; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.bots.BotHandler; +import com.rs2.game.content.combat.magic.SpellTeleport; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.*; +import com.rs2.game.players.antimacro.AntiSpam; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; +import com.rs2.world.clip.Region; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/DropItem.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/DropItem.java index cda4f7de..4949d6cb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/DropItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/DropItem.java @@ -1,16 +1,16 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameConstants; -import com.rebotted.GameEngine; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.firemaking.LogData; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.npcs.impl.Pets; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.GameConstants; +import com.rs2.GameEngine; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.firemaking.LogData; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.npcs.impl.Pets; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Drop Item diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/FollowPlayer.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/FollowPlayer.java similarity index 74% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/FollowPlayer.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/FollowPlayer.java index c210e9a2..7801547d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/FollowPlayer.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/FollowPlayer.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; public class FollowPlayer implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/IdleLogout.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/IdleLogout.java similarity index 70% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/IdleLogout.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/IdleLogout.java index 181e61d5..e6c9c56a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/IdleLogout.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/IdleLogout.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * @author Andrew (Mr Extremez) diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/InterfaceX.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/InterfaceX.java similarity index 88% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/InterfaceX.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/InterfaceX.java index 8f9421cd..a4a84a64 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/InterfaceX.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/InterfaceX.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.smithing.Smelting; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.smithing.Smelting; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class InterfaceX implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2.java similarity index 78% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2.java index c022c890..76b33dcf 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.items.impl.HandleEmpty; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.items.impl.HandleEmpty; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Item Click 2 Or Alternative Item Option 1 diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2OnGroundItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2OnGroundItem.java similarity index 76% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2OnGroundItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2OnGroundItem.java index 0dfdbc40..a2e64618 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick2OnGroundItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick2OnGroundItem.java @@ -1,9 +1,9 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.skills.firemaking.Firemaking; -import com.rebotted.game.content.skills.firemaking.LogData; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.skills.firemaking.Firemaking; +import com.rs2.game.content.skills.firemaking.LogData; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class ItemClick2OnGroundItem implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick3.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick3.java similarity index 87% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick3.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick3.java index 14db528c..a30a7c74 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemClick3.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemClick3.java @@ -1,11 +1,11 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.skills.runecrafting.Runecrafting; -import com.rebotted.game.items.impl.HandleEmpty; -import com.rebotted.game.items.impl.Teles; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.game.content.skills.runecrafting.Runecrafting; +import com.rs2.game.items.impl.HandleEmpty; +import com.rs2.game.items.impl.Teles; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; /** * Item Click 3 Or Alternative Item Option 1 diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnGroundItem.java similarity index 80% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnGroundItem.java index 1c73c144..984a2399 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnGroundItem.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameEngine; -import com.rebotted.game.content.skills.firemaking.Firemaking; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.GameEngine; +import com.rs2.game.content.skills.firemaking.Firemaking; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; public class ItemOnGroundItem implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnItem.java similarity index 78% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnItem.java index ca4fc479..0064e1a0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnItem.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.items.UseItem; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.items.UseItem; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class ItemOnItem implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnNpc.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnNpc.java similarity index 89% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnNpc.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnNpc.java index 221bfff5..452f31a6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnNpc.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnNpc.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.items.UseItem; -import com.rebotted.game.npcs.NpcHandler; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.items.UseItem; +import com.rs2.game.npcs.NpcHandler; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class ItemOnNpc implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnObject.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnObject.java index bc83df2c..433d01d6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnObject.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnObject.java @@ -1,17 +1,17 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.combat.range.DwarfCannon; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.cooking.CookingTutorialIsland; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.content.skills.crafting.Pottery; -import com.rebotted.game.content.skills.crafting.Spinning; -import com.rebotted.game.items.UseItem; -import com.rebotted.game.items.impl.Fillables; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.world.Boundary; -import com.rebotted.world.clip.Region; +import com.rs2.game.content.combat.range.DwarfCannon; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.cooking.CookingTutorialIsland; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.content.skills.crafting.Pottery; +import com.rs2.game.content.skills.crafting.Spinning; +import com.rs2.game.items.UseItem; +import com.rs2.game.items.impl.Fillables; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.world.Boundary; +import com.rs2.world.clip.Region; public class ItemOnObject implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnPlayer.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnPlayer.java index 79fd5afb..0d132a64 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnPlayer.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnPlayer.java @@ -1,10 +1,10 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.Misc; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; +import com.rs2.util.Misc; /** * @author JaydenD12/Jaydennn diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnFloorItems.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnFloorItems.java similarity index 90% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnFloorItems.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnFloorItems.java index ae56642b..85bfeec6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnFloorItems.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnFloorItems.java @@ -1,13 +1,13 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.combat.magic.MagicData; -import com.rebotted.game.items.ItemData; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.combat.magic.MagicData; +import com.rs2.game.items.ItemData; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Magic on floor items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnItems.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnItems.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnItems.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnItems.java index 0f5efb37..83ecbebb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnItems.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnItems.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Magic on items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnObject.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnObject.java similarity index 74% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnObject.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnObject.java index 5a6547cb..10e664ec 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MagicOnObject.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnObject.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.skills.crafting.OrbCharging; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.skills.crafting.OrbCharging; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class MagicOnObject implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MoveItems.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MoveItems.java similarity index 86% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MoveItems.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/MoveItems.java index 6ce1fed1..af0df0e2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/MoveItems.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/MoveItems.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Move Items diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/PickupItem.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/PickupItem.java index 9a45ab32..639bc360 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PickupItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/PickupItem.java @@ -1,19 +1,19 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.minigames.castlewars.CastleWars; -import com.rebotted.game.content.music.sound.SoundList; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.firemaking.LogData; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.GameLogger; -import com.rebotted.world.GlobalDropsHandler; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.minigames.castlewars.CastleWars; +import com.rs2.game.content.music.sound.SoundList; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.firemaking.LogData; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; +import com.rs2.util.GameLogger; +import com.rs2.world.GlobalDropsHandler; /** * Pickup Item diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PrivateMessaging.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/PrivateMessaging.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PrivateMessaging.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/PrivateMessaging.java index bed6c37d..961a9fd7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/PrivateMessaging.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/PrivateMessaging.java @@ -1,13 +1,13 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.Connection; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.game.players.antimacro.AntiSpam; -import com.rebotted.net.packets.PacketType; -import com.rebotted.util.GameLogger; -import com.rebotted.util.Misc; +import com.rs2.Connection; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.game.players.antimacro.AntiSpam; +import com.rs2.net.packets.PacketType; +import com.rs2.util.GameLogger; +import com.rs2.util.Misc; /** * Private messaging, friends etc diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/RemoveItem.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/RemoveItem.java index aaf34fc0..6cc41986 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/RemoveItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/RemoveItem.java @@ -1,11 +1,11 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.random.PartyRoom; -import com.rebotted.game.content.skills.crafting.JewelryMaking; -import com.rebotted.game.items.Weight; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.random.PartyRoom; +import com.rs2.game.content.skills.crafting.JewelryMaking; +import com.rs2.game.items.Weight; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Remove Item diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Report.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Report.java similarity index 66% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Report.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Report.java index 58052882..5a1f7535 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Report.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Report.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; public class Report implements PacketType { diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ReportHandler.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ReportHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ReportHandler.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/ReportHandler.java index 2d54237f..01d1bbe5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ReportHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/ReportHandler.java @@ -1,12 +1,12 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class ReportHandler { @@ -133,7 +133,7 @@ public class ReportHandler { .format(new Date())); String day = new SimpleDateFormat("dd").format(new Date()); bw = new BufferedWriter(new FileWriter( - "C:/Users/Administrator/Dropbox/2006Redone - Reportabuses/" + "data/Reportabuses/" + file + " month;" + month + " day;" + day + " ms-id;" + time + ".txt", true)); bw.write(data); diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/SilentPacket.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/SilentPacket.java similarity index 58% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/SilentPacket.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/SilentPacket.java index f237fa94..2fe77250 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/SilentPacket.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/SilentPacket.java @@ -1,7 +1,7 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Slient Packet diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Trade.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Trade.java similarity index 83% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Trade.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Trade.java index 50df2c64..11d5b62b 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Trade.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Trade.java @@ -1,8 +1,8 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.GameConstants; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.GameConstants; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Trading diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java similarity index 92% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java index ab2c6333..b4377058 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java @@ -1,16 +1,16 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.content.skills.SkillHandler; -import com.rebotted.game.content.skills.cooking.Cooking; -import com.rebotted.game.content.skills.core.Fishing; -import com.rebotted.game.content.skills.smithing.Smelting; -import com.rebotted.game.items.ItemConstants; -import com.rebotted.game.items.impl.Greegree; -import com.rebotted.game.items.impl.Greegree.MonkeyData; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.content.skills.SkillHandler; +import com.rs2.game.content.skills.cooking.Cooking; +import com.rs2.game.content.skills.core.Fishing; +import com.rs2.game.content.skills.smithing.Smelting; +import com.rs2.game.items.ItemConstants; +import com.rs2.game.items.impl.Greegree; +import com.rs2.game.items.impl.Greegree.MonkeyData; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.net.packets.PacketType; /** * Walking packet diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/WearItem.java b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/WearItem.java similarity index 85% rename from 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/WearItem.java rename to 2006Scape Server/src/main/java/com/rs2/net/packets/impl/WearItem.java index c40bfef9..43bf576d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/WearItem.java +++ b/2006Scape Server/src/main/java/com/rs2/net/packets/impl/WearItem.java @@ -1,9 +1,9 @@ -package com.rebotted.net.packets.impl; +package com.rs2.net.packets.impl; -import com.rebotted.game.items.Weight; -import com.rebotted.game.items.impl.RareProtection; -import com.rebotted.game.players.Player; -import com.rebotted.net.packets.PacketType; +import com.rs2.game.items.Weight; +import com.rs2.game.items.impl.RareProtection; +import com.rs2.game.players.Player; +import com.rs2.net.packets.PacketType; /** * Wear Item diff --git a/2006Redone Server/src/main/java/com/rebotted/net/rsa/RSAKeyGen.java b/2006Scape Server/src/main/java/com/rs2/net/rsa/RSAKeyGen.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/net/rsa/RSAKeyGen.java rename to 2006Scape Server/src/main/java/com/rs2/net/rsa/RSAKeyGen.java index 11c48378..03bfcf5d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/rsa/RSAKeyGen.java +++ b/2006Scape Server/src/main/java/com/rs2/net/rsa/RSAKeyGen.java @@ -1,4 +1,4 @@ -package com.rebotted.net.rsa; +package com.rs2.net.rsa; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/rsa/rsapriv b/2006Scape Server/src/main/java/com/rs2/net/rsa/rsapriv similarity index 100% rename from 2006Redone Server/src/main/java/com/rebotted/net/rsa/rsapriv rename to 2006Scape Server/src/main/java/com/rs2/net/rsa/rsapriv diff --git a/2006Redone Server/src/main/java/com/rebotted/net/rsa/rsapub b/2006Scape Server/src/main/java/com/rs2/net/rsa/rsapub similarity index 100% rename from 2006Redone Server/src/main/java/com/rebotted/net/rsa/rsapub rename to 2006Scape Server/src/main/java/com/rs2/net/rsa/rsapub diff --git a/2006Redone Server/src/main/java/com/rebotted/tick/Scheduler.java b/2006Scape Server/src/main/java/com/rs2/tick/Scheduler.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/tick/Scheduler.java rename to 2006Scape Server/src/main/java/com/rs2/tick/Scheduler.java index fa7ab4f5..4d6bdc89 100644 --- a/2006Redone Server/src/main/java/com/rebotted/tick/Scheduler.java +++ b/2006Scape Server/src/main/java/com/rs2/tick/Scheduler.java @@ -1,4 +1,4 @@ -package com.rebotted.tick; +package com.rs2.tick; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/2006Redone Server/src/main/java/com/rebotted/tick/Tick.java b/2006Scape Server/src/main/java/com/rs2/tick/Tick.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/tick/Tick.java rename to 2006Scape Server/src/main/java/com/rs2/tick/Tick.java index 541fd00c..79249ed3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/tick/Tick.java +++ b/2006Scape Server/src/main/java/com/rs2/tick/Tick.java @@ -1,4 +1,4 @@ -package com.rebotted.tick; +package com.rs2.tick; /** * Represents a periodic task that can be scheduled with a {@link Scheduler}. diff --git a/2006Redone Server/src/main/java/com/rebotted/util/DoorData.java b/2006Scape Server/src/main/java/com/rs2/util/DoorData.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/util/DoorData.java rename to 2006Scape Server/src/main/java/com/rs2/util/DoorData.java index eedf7f9c..a067ec3d 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/DoorData.java +++ b/2006Scape Server/src/main/java/com/rs2/util/DoorData.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; public class DoorData { private final int id; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/GameLogger.java b/2006Scape Server/src/main/java/com/rs2/util/GameLogger.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/util/GameLogger.java rename to 2006Scape Server/src/main/java/com/rs2/util/GameLogger.java index 6cd910ee..05317247 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/GameLogger.java +++ b/2006Scape Server/src/main/java/com/rs2/util/GameLogger.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; import java.io.BufferedWriter; import java.io.File; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/GlobalDropData.java b/2006Scape Server/src/main/java/com/rs2/util/GlobalDropData.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/util/GlobalDropData.java rename to 2006Scape Server/src/main/java/com/rs2/util/GlobalDropData.java index 8dedd046..465d06b0 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/GlobalDropData.java +++ b/2006Scape Server/src/main/java/com/rs2/util/GlobalDropData.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; public class GlobalDropData { diff --git a/2006Redone Server/src/main/java/com/rebotted/util/HostBlacklist.java b/2006Scape Server/src/main/java/com/rs2/util/HostBlacklist.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/util/HostBlacklist.java rename to 2006Scape Server/src/main/java/com/rs2/util/HostBlacklist.java index fa966ac6..d71da12e 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/HostBlacklist.java +++ b/2006Scape Server/src/main/java/com/rs2/util/HostBlacklist.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; import java.io.BufferedReader; import java.io.FileReader; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/ISAACRandomGen.java b/2006Scape Server/src/main/java/com/rs2/util/ISAACRandomGen.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/util/ISAACRandomGen.java rename to 2006Scape Server/src/main/java/com/rs2/util/ISAACRandomGen.java index 5189e084..fff0e16f 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/ISAACRandomGen.java +++ b/2006Scape Server/src/main/java/com/rs2/util/ISAACRandomGen.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; public class ISAACRandomGen { diff --git a/2006Redone Server/src/main/java/com/rebotted/util/ItemData.java b/2006Scape Server/src/main/java/com/rs2/util/ItemData.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/util/ItemData.java rename to 2006Scape Server/src/main/java/com/rs2/util/ItemData.java index f65cb845..91cd7a34 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/ItemData.java +++ b/2006Scape Server/src/main/java/com/rs2/util/ItemData.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; public class ItemData { private final int id; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/Misc.java b/2006Scape Server/src/main/java/com/rs2/util/Misc.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/util/Misc.java rename to 2006Scape Server/src/main/java/com/rs2/util/Misc.java index 9ef027fe..5d7ec279 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/Misc.java +++ b/2006Scape Server/src/main/java/com/rs2/util/Misc.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/NpcData.java b/2006Scape Server/src/main/java/com/rs2/util/NpcData.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/util/NpcData.java rename to 2006Scape Server/src/main/java/com/rs2/util/NpcData.java index 91cc2a33..0a99f4d5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/NpcData.java +++ b/2006Scape Server/src/main/java/com/rs2/util/NpcData.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; public class NpcData { private final int id; diff --git a/2006Redone Server/src/main/java/com/rebotted/util/NpcDrop.java b/2006Scape Server/src/main/java/com/rs2/util/NpcDrop.java similarity index 82% rename from 2006Redone Server/src/main/java/com/rebotted/util/NpcDrop.java rename to 2006Scape Server/src/main/java/com/rs2/util/NpcDrop.java index 7d24929b..553267ec 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/NpcDrop.java +++ b/2006Scape Server/src/main/java/com/rs2/util/NpcDrop.java @@ -1,6 +1,6 @@ -package com.rebotted.util; +package com.rs2.util; -import com.rebotted.game.npcs.drops.ItemDrop; +import com.rs2.game.npcs.drops.ItemDrop; /** * @author SandroC diff --git a/2006Redone Server/src/main/java/com/rebotted/util/NpcSpawn.java b/2006Scape Server/src/main/java/com/rs2/util/NpcSpawn.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/util/NpcSpawn.java rename to 2006Scape Server/src/main/java/com/rs2/util/NpcSpawn.java index d3667fdf..6415eece 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/NpcSpawn.java +++ b/2006Scape Server/src/main/java/com/rs2/util/NpcSpawn.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; /** * @author SandroC diff --git a/2006Redone Server/src/main/java/com/rebotted/util/ShopData.java b/2006Scape Server/src/main/java/com/rs2/util/ShopData.java similarity index 97% rename from 2006Redone Server/src/main/java/com/rebotted/util/ShopData.java rename to 2006Scape Server/src/main/java/com/rs2/util/ShopData.java index 508b6ddd..58ee84b5 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/ShopData.java +++ b/2006Scape Server/src/main/java/com/rs2/util/ShopData.java @@ -1,4 +1,4 @@ -package com.rebotted.util; +package com.rs2.util; /** * @author SandroC diff --git a/2006Redone Server/src/main/java/com/rebotted/util/Stream.java b/2006Scape Server/src/main/java/com/rs2/util/Stream.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/util/Stream.java rename to 2006Scape Server/src/main/java/com/rs2/util/Stream.java index 710d90ea..9717d5cc 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/Stream.java +++ b/2006Scape Server/src/main/java/com/rs2/util/Stream.java @@ -1,6 +1,6 @@ -package com.rebotted.util; +package com.rs2.util; -import com.rebotted.GameConstants; +import com.rs2.GameConstants; public class Stream { diff --git a/2006Redone Server/src/main/java/com/rebotted/util/XStreamUtil.java b/2006Scape Server/src/main/java/com/rs2/util/XStreamUtil.java similarity index 91% rename from 2006Redone Server/src/main/java/com/rebotted/util/XStreamUtil.java rename to 2006Scape Server/src/main/java/com/rs2/util/XStreamUtil.java index fbdf00b3..334188b6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/util/XStreamUtil.java +++ b/2006Scape Server/src/main/java/com/rs2/util/XStreamUtil.java @@ -1,10 +1,10 @@ -package com.rebotted.util; +package com.rs2.util; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import com.rebotted.game.npcs.NPCDefinition; +import com.rs2.game.npcs.NPCDefinition; import com.thoughtworks.xstream.XStream; public class XStreamUtil { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java b/2006Scape Server/src/main/java/com/rs2/world/Boundary.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/world/Boundary.java rename to 2006Scape Server/src/main/java/com/rs2/world/Boundary.java index f34fd922..2cb964dd 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/Boundary.java +++ b/2006Scape Server/src/main/java/com/rs2/world/Boundary.java @@ -1,11 +1,11 @@ -package com.rebotted.world; +package com.rs2.world; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; +import com.rs2.game.npcs.Npc; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; /** * @author Andrew (Mr Extremez) - added all the boundaries * @author Jason http://www.rune-server.org/members/jason - made the system diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java b/2006Scape Server/src/main/java/com/rs2/world/Coordinate.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java rename to 2006Scape Server/src/main/java/com/rs2/world/Coordinate.java index de396a12..e6b260b6 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/Coordinate.java +++ b/2006Scape Server/src/main/java/com/rs2/world/Coordinate.java @@ -1,4 +1,4 @@ -package com.rebotted.world; +package com.rs2.world; /** * Representing a specific location. diff --git a/2006Redone Server/src/main/java/com/rebotted/world/GameObject.java b/2006Scape Server/src/main/java/com/rs2/world/GameObject.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/world/GameObject.java rename to 2006Scape Server/src/main/java/com/rs2/world/GameObject.java index 1ec60bb3..d3298fa3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/GameObject.java +++ b/2006Scape Server/src/main/java/com/rs2/world/GameObject.java @@ -1,4 +1,4 @@ -package com.rebotted.world; +package com.rs2.world; public final class GameObject { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/GlobalDropsHandler.java b/2006Scape Server/src/main/java/com/rs2/world/GlobalDropsHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/world/GlobalDropsHandler.java rename to 2006Scape Server/src/main/java/com/rs2/world/GlobalDropsHandler.java index b8b8afaf..ebf5f84a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/GlobalDropsHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/world/GlobalDropsHandler.java @@ -1,16 +1,16 @@ -package com.rebotted.world; +package com.rs2.world; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.GlobalDropData; -import com.rebotted.util.Misc; -import com.rebotted.util.ShopData; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.GlobalDropData; +import com.rs2.util.Misc; +import com.rs2.util.ShopData; import org.json.JSONArray; import org.json.JSONObject; diff --git a/2006Redone Server/src/main/java/com/rebotted/world/ItemHandler.java b/2006Scape Server/src/main/java/com/rs2/world/ItemHandler.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/world/ItemHandler.java rename to 2006Scape Server/src/main/java/com/rs2/world/ItemHandler.java index 890c6f9d..a825727c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/ItemHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/world/ItemHandler.java @@ -1,17 +1,17 @@ -package com.rebotted.world; +package com.rs2.world; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.rebotted.GameConstants; -import com.rebotted.game.items.GroundItem; -import com.rebotted.game.items.ItemAssistant; -import com.rebotted.game.items.ItemList; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.GameLogger; -import com.rebotted.util.ItemData; -import com.rebotted.util.Misc; +import com.rs2.GameConstants; +import com.rs2.game.items.GroundItem; +import com.rs2.game.items.ItemAssistant; +import com.rs2.game.items.ItemList; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.GameLogger; +import com.rs2.util.ItemData; +import com.rs2.util.Misc; import org.json.JSONArray; import org.json.JSONObject; @@ -173,7 +173,7 @@ public class ItemHandler { } } } - if (!com.rebotted.game.items.ItemData.itemStackable[itemId] && itemAmount > 0) { + if (!com.rs2.game.items.ItemData.itemStackable[itemId] && itemAmount > 0) { for (int j = 0; j < itemAmount; j++) { c.getPacketSender().createGroundItem(itemId, itemX, itemY, 1); GroundItem item = new GroundItem(itemId, itemX, itemY, c.getH(), 1, c.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName); @@ -348,7 +348,7 @@ public class ItemHandler { } public ItemList getItemList(int i) { - for (com.rebotted.game.items.ItemList element : itemList) { + for (com.rs2.game.items.ItemList element : itemList) { if (element != null) { if (element.itemId == i) { return element; diff --git a/2006Redone Server/src/main/java/com/rebotted/world/ObjectHandler.java b/2006Scape Server/src/main/java/com/rs2/world/ObjectHandler.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/world/ObjectHandler.java rename to 2006Scape Server/src/main/java/com/rs2/world/ObjectHandler.java index 6e9341c7..6b5d3fe7 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/ObjectHandler.java +++ b/2006Scape Server/src/main/java/com/rs2/world/ObjectHandler.java @@ -1,17 +1,17 @@ -package com.rebotted.world; +package com.rs2.world; import java.util.ArrayList; import java.util.List; -import com.rebotted.GameEngine; -import com.rebotted.game.content.skills.core.Mining; -import com.rebotted.game.content.skills.woodcutting.Woodcutting; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.game.content.skills.core.Mining; +import com.rs2.game.content.skills.woodcutting.Woodcutting; +import com.rs2.game.objects.Objects; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.clip.Region; /** * @author Sanity diff --git a/2006Redone Server/src/main/java/com/rebotted/world/ObjectManager.java b/2006Scape Server/src/main/java/com/rs2/world/ObjectManager.java similarity index 93% rename from 2006Redone Server/src/main/java/com/rebotted/world/ObjectManager.java rename to 2006Scape Server/src/main/java/com/rs2/world/ObjectManager.java index 20ef3e57..983b8f3c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/ObjectManager.java +++ b/2006Scape Server/src/main/java/com/rs2/world/ObjectManager.java @@ -1,19 +1,19 @@ -package com.rebotted.world; +package com.rs2.world; import java.util.ArrayList; -import com.rebotted.GameEngine; -import com.rebotted.event.CycleEvent; -import com.rebotted.event.CycleEventContainer; -import com.rebotted.event.CycleEventHandler; -import com.rebotted.game.content.quests.QuestAssistant; -import com.rebotted.game.objects.Object; -import com.rebotted.game.objects.Objects; -import com.rebotted.game.objects.impl.FlourMill; -import com.rebotted.game.players.Client; -import com.rebotted.game.players.Player; -import com.rebotted.game.players.PlayerHandler; -import com.rebotted.util.Misc; -import com.rebotted.world.clip.Region; +import com.rs2.GameEngine; +import com.rs2.event.CycleEvent; +import com.rs2.event.CycleEventContainer; +import com.rs2.event.CycleEventHandler; +import com.rs2.game.content.quests.QuestAssistant; +import com.rs2.game.objects.Object; +import com.rs2.game.objects.Objects; +import com.rs2.game.objects.impl.FlourMill; +import com.rs2.game.players.Client; +import com.rs2.game.players.Player; +import com.rs2.game.players.PlayerHandler; +import com.rs2.util.Misc; +import com.rs2.world.clip.Region; /** * @author Sanity diff --git a/2006Redone Server/src/main/java/com/rebotted/world/Tile.java b/2006Scape Server/src/main/java/com/rs2/world/Tile.java similarity index 94% rename from 2006Redone Server/src/main/java/com/rebotted/world/Tile.java rename to 2006Scape Server/src/main/java/com/rs2/world/Tile.java index 71f1dcc4..1af88d4c 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/Tile.java +++ b/2006Scape Server/src/main/java/com/rs2/world/Tile.java @@ -1,4 +1,4 @@ -package com.rebotted.world; +package com.rs2.world; public class Tile { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/TileControl.java b/2006Scape Server/src/main/java/com/rs2/world/TileControl.java similarity index 96% rename from 2006Redone Server/src/main/java/com/rebotted/world/TileControl.java rename to 2006Scape Server/src/main/java/com/rs2/world/TileControl.java index c764e8fb..24da8fd2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/TileControl.java +++ b/2006Scape Server/src/main/java/com/rs2/world/TileControl.java @@ -1,8 +1,8 @@ -package com.rebotted.world; +package com.rs2.world; -import com.rebotted.game.npcs.Npc; -import com.rebotted.game.npcs.NpcSize; -import com.rebotted.game.players.Client; +import com.rs2.game.npcs.Npc; +import com.rs2.game.npcs.NpcSize; +import com.rs2.game.players.Client; public class TileControl { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStream.java b/2006Scape Server/src/main/java/com/rs2/world/clip/ByteStream.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStream.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/ByteStream.java index 7e396f30..96fbca98 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStream.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/ByteStream.java @@ -1,4 +1,4 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; public class ByteStream { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStreamExt.java b/2006Scape Server/src/main/java/com/rs2/world/clip/ByteStreamExt.java similarity index 98% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStreamExt.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/ByteStreamExt.java index 9a5bc0d4..6beaec3a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/ByteStreamExt.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/ByteStreamExt.java @@ -1,4 +1,4 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; public final class ByteStreamExt { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/MemoryArchive.java b/2006Scape Server/src/main/java/com/rs2/world/clip/MemoryArchive.java similarity index 95% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/MemoryArchive.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/MemoryArchive.java index 05a70485..31443237 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/MemoryArchive.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/MemoryArchive.java @@ -1,4 +1,4 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; public class MemoryArchive { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/ObjectDefinition.java b/2006Scape Server/src/main/java/com/rs2/world/clip/ObjectDefinition.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/ObjectDefinition.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/ObjectDefinition.java index 247164c0..000cd3eb 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/ObjectDefinition.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/ObjectDefinition.java @@ -1,4 +1,4 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; public final class ObjectDefinition { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/PathFinder.java b/2006Scape Server/src/main/java/com/rs2/world/clip/PathFinder.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/PathFinder.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/PathFinder.java index b94f6861..55b5a3b2 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/PathFinder.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/PathFinder.java @@ -1,8 +1,8 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; import java.util.LinkedList; -import com.rebotted.game.players.Player; -import com.rebotted.util.Misc; +import com.rs2.game.players.Player; +import com.rs2.util.Misc; public class PathFinder { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/Region.java b/2006Scape Server/src/main/java/com/rs2/world/clip/Region.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/Region.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/Region.java index 17b042bd..9bfe7e41 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/Region.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/Region.java @@ -1,8 +1,8 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; import java.util.ArrayList; -import com.rebotted.game.objects.Objects; +import com.rs2.game.objects.Objects; public class Region { diff --git a/2006Redone Server/src/main/java/com/rebotted/world/clip/RegionFactory.java b/2006Scape Server/src/main/java/com/rs2/world/clip/RegionFactory.java similarity index 99% rename from 2006Redone Server/src/main/java/com/rebotted/world/clip/RegionFactory.java rename to 2006Scape Server/src/main/java/com/rs2/world/clip/RegionFactory.java index 539739b4..28642cca 100644 --- a/2006Redone Server/src/main/java/com/rebotted/world/clip/RegionFactory.java +++ b/2006Scape Server/src/main/java/com/rs2/world/clip/RegionFactory.java @@ -1,4 +1,4 @@ -package com.rebotted.world.clip; +package com.rs2.world.clip; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/2006Scape Server/src/main/resources/META-INF/MANIFEST.MF b/2006Scape Server/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..8a96ae3a --- /dev/null +++ b/2006Scape Server/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: com.rs2.GameEngine + diff --git a/2006Redone file_server/.gitignore b/2006Scape file_server/.gitignore similarity index 100% rename from 2006Redone file_server/.gitignore rename to 2006Scape file_server/.gitignore diff --git a/2006Redone file_server/cache/.scape-settings.dat b/2006Scape file_server/cache/.scape-settings.dat similarity index 100% rename from 2006Redone file_server/cache/.scape-settings.dat rename to 2006Scape file_server/cache/.scape-settings.dat diff --git a/2006Redone file_server/cache/main_file_cache.dat b/2006Scape file_server/cache/main_file_cache.dat similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.dat rename to 2006Scape file_server/cache/main_file_cache.dat diff --git a/2006Redone file_server/cache/main_file_cache.idx0 b/2006Scape file_server/cache/main_file_cache.idx0 similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.idx0 rename to 2006Scape file_server/cache/main_file_cache.idx0 diff --git a/2006Redone file_server/cache/main_file_cache.idx1 b/2006Scape file_server/cache/main_file_cache.idx1 similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.idx1 rename to 2006Scape file_server/cache/main_file_cache.idx1 diff --git a/2006Redone file_server/cache/main_file_cache.idx2 b/2006Scape file_server/cache/main_file_cache.idx2 similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.idx2 rename to 2006Scape file_server/cache/main_file_cache.idx2 diff --git a/2006Redone file_server/cache/main_file_cache.idx3 b/2006Scape file_server/cache/main_file_cache.idx3 similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.idx3 rename to 2006Scape file_server/cache/main_file_cache.idx3 diff --git a/2006Redone file_server/cache/main_file_cache.idx4 b/2006Scape file_server/cache/main_file_cache.idx4 similarity index 100% rename from 2006Redone file_server/cache/main_file_cache.idx4 rename to 2006Scape file_server/cache/main_file_cache.idx4 diff --git a/2006Redone file_server/libs/javac++.jar b/2006Scape file_server/libs/javac++.jar similarity index 100% rename from 2006Redone file_server/libs/javac++.jar rename to 2006Scape file_server/libs/javac++.jar diff --git a/2006Redone file_server/libs/netty-3.6.6.Final.jar b/2006Scape file_server/libs/netty-3.6.6.Final.jar similarity index 100% rename from 2006Redone file_server/libs/netty-3.6.6.Final.jar rename to 2006Scape file_server/libs/netty-3.6.6.Final.jar diff --git a/2006Redone file_server/libs/xpp3-1.1.4c.jar b/2006Scape file_server/libs/xpp3-1.1.4c.jar similarity index 100% rename from 2006Redone file_server/libs/xpp3-1.1.4c.jar rename to 2006Scape file_server/libs/xpp3-1.1.4c.jar diff --git a/2006Redone file_server/pom.xml b/2006Scape file_server/pom.xml similarity index 97% rename from 2006Redone file_server/pom.xml rename to 2006Scape file_server/pom.xml index 5ba5cc26..8daec6c9 100644 --- a/2006Redone file_server/pom.xml +++ b/2006Scape file_server/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 2006redone - com.rebotted + 2006Scape + com.rs2 1.0 @@ -115,4 +115,4 @@ - \ No newline at end of file + diff --git a/2006Redone file_server/runFileServer.sh b/2006Scape file_server/runFileServer.sh similarity index 100% rename from 2006Redone file_server/runFileServer.sh rename to 2006Scape file_server/runFileServer.sh diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/Constants.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/Constants.java similarity index 93% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/Constants.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/Constants.java index ac4612e7..dd3e8643 100644 --- a/2006Redone file_server/src/main/java/org/apollo/jagcached/Constants.java +++ b/2006Scape file_server/src/main/java/org/apollo/jagcached/Constants.java @@ -1,7 +1,7 @@ package org.apollo.jagcached; /** - * 2006Redone Development + * 2006Scape Development * * @author Ryley Kimmel * Jul 9, 2013 @@ -23,4 +23,4 @@ public final class Constants { super(); } -} \ No newline at end of file +} diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/FileServer.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/FileServer.java similarity index 97% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/FileServer.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/FileServer.java index 07e67874..7a07732c 100644 --- a/2006Redone file_server/src/main/java/org/apollo/jagcached/FileServer.java +++ b/2006Scape file_server/src/main/java/org/apollo/jagcached/FileServer.java @@ -76,7 +76,7 @@ public final class FileServer { System.out.println("************************************"); System.out.println("WARNING: I could not find the /cache folder. You are LIKELY running this in the wrong directory!"); System.out.println("In IntelliJ, fix it by clicking \"FileServer\" > Edit Configurations at the top of your screen"); - System.out.println("Then changing the \"Working Directory\" to be in \"2006rebotted/2006Redone file_server\", instead of just \"2006rebotted\""); + System.out.println("Then changing the \"Working Directory\" to be in \"2006Scape/2006Scape file_server\", instead of just \"2006Scape\""); System.out.println("************************************"); System.out.println("************************************"); System.out.println("************************************"); diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/ChannelRequest.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/HttpRequestWorker.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/JagGrabRequestWorker.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/JagGrabRequestWorker.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/JagGrabRequestWorker.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/JagGrabRequestWorker.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/OnDemandRequestWorker.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/OnDemandRequestWorker.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/OnDemandRequestWorker.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/OnDemandRequestWorker.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestDispatcher.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestDispatcher.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestDispatcher.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestDispatcher.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorker.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorker.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorker.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorker.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorkerPool.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorkerPool.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorkerPool.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/dispatch/RequestWorkerPool.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/fs/FileDescriptor.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/fs/FileDescriptor.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/fs/FileDescriptor.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/fs/FileDescriptor.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/fs/FileSystemConstants.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/fs/FileSystemConstants.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/fs/FileSystemConstants.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/fs/FileSystemConstants.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/fs/Index.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/fs/Index.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/fs/Index.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/fs/Index.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/fs/IndexedFileSystem.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/fs/IndexedFileSystem.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/fs/IndexedFileSystem.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/fs/IndexedFileSystem.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/FileServerHandler.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/FileServerHandler.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/FileServerHandler.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/FileServerHandler.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/HttpPipelineFactory.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/HttpPipelineFactory.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/HttpPipelineFactory.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/HttpPipelineFactory.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/JagGrabPipelineFactory.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/JagGrabPipelineFactory.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/JagGrabPipelineFactory.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/JagGrabPipelineFactory.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/NetworkConstants.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/NetworkConstants.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/NetworkConstants.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/NetworkConstants.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/OnDemandPipelineFactory.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/OnDemandPipelineFactory.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/OnDemandPipelineFactory.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/OnDemandPipelineFactory.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequest.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequest.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequest.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequest.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponse.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponse.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponse.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponse.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequest.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequest.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequest.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequest.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponse.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponse.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponse.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponse.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequest.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequest.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequest.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequest.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequestDecoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequestDecoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequestDecoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceRequestDecoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponse.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponse.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponse.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponse.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponseEncoder.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponseEncoder.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponseEncoder.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/net/service/ServiceResponseEncoder.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/resource/CombinedResourceProvider.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/resource/CombinedResourceProvider.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/resource/CombinedResourceProvider.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/resource/CombinedResourceProvider.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/resource/HypertextResourceProvider.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/resource/HypertextResourceProvider.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/resource/HypertextResourceProvider.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/resource/HypertextResourceProvider.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/resource/ResourceProvider.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/resource/ResourceProvider.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/resource/ResourceProvider.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/resource/ResourceProvider.java diff --git a/2006Redone file_server/src/main/java/org/apollo/jagcached/resource/VirtualResourceProvider.java b/2006Scape file_server/src/main/java/org/apollo/jagcached/resource/VirtualResourceProvider.java similarity index 100% rename from 2006Redone file_server/src/main/java/org/apollo/jagcached/resource/VirtualResourceProvider.java rename to 2006Scape file_server/src/main/java/org/apollo/jagcached/resource/VirtualResourceProvider.java diff --git a/README.md b/README.md index 45e67a6e..9377b54c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## How to Play -### Client (non-bottable download): https://github.com/dginovker/2006rebotted/releases/ +### Client (non-bottable download): https://github.com/2006-Scape/2006Scape/releases/ ### Parabot client (recommended): https://www.parabot.org/community/ ### Rune-Server project thread: [Project thread](https://www.rune-server.ee/runescape-development/rs2-server/projects/686444-2006rebotted-remake-server-will-allow-supply-creatable-bots.html) @@ -16,7 +16,7 @@ 2. Navigate to `2006Scape file_server` > `src` > `main` > `java` > `org.apollo.jagcached`, right click FileServer and hit Run [Image](https://i.imgur.com/tsg9q1Z.png) -3. Navigate to `2006Scape Server` > `src` > `main` > `java` > `com.rebotted`, right click GameEngine and hit Run [Image](https://i.imgur.com/HHooeVu.png) +3. Navigate to `2006Scape Server` > `src` > `main` > `java` > `com.rs2`, right click GameEngine and hit Run [Image](https://i.imgur.com/HHooeVu.png) 4. Navigate to `2006Scape Server` > `src` > `main` > `java`, right click Client and hit Run [Image](https://i.imgur.com/gSmqGLn.png) @@ -24,12 +24,8 @@ To compile any module from the command line, run `mvn clean install` -## How to get your code onto this project page - -See this [forum post](https://rsrebotted.com/forums/viewthread.php?forum=5&id=78). - ## Using Parabot with your local server: -- **1:** Download the latest `localhost_2006rebotted.jar` from [here](https://github.com/dginovker/2006rebotted/releases) (or, if testing server changes, compile it yourself like [this](https://i.imgur.com/uDrF0gl.png)) +- **1:** Download the latest `localhost_2006Scape.jar` from [here](https://github.com/2006-Scape/2006Scape/releases) (or, if testing server changes, compile it yourself like [this](https://i.imgur.com/uDrF0gl.png)) - **2:** Download the latest `Provider-version.jar` file from [here](http://v3.bdn.parabot.org/api/bot/download/default-provider?nightly=false) - **3:** Create a file called `localhost.json` in `{user}\Documents\Parabot\servers` - **4:** Put the following in the file @@ -41,7 +37,7 @@ See this [forum post](https://rsrebotted.com/forums/viewthread.php?forum=5&id=78 "client-class": "LocalGame", "locations":{ "provider": "pathToYourJar/Provider-1.21.5.jar", - "server": "pathToYourJar/localhost_2006rebotted.jar", + "server": "pathToYourJar/localhost_2006Scape.jar", "hooks": "http://bdn.parabot.org/data/hooks/carmeuses/2006rebotted_hooks.xml" } } @@ -56,10 +52,10 @@ java -jar Client-2.8.1.jar -login username password -loadlocal -v -clearcache ### Server source layout -- `2006Redone Server` contains all the server code; mark `src` as the Sources directory -- `2006Redone Client` contains all the client code; likewise mark `src` +- `2006Scape Server` contains all the server code; mark `src` as the Sources directory +- `2006Scape Client` contains all the client code; likewise mark `src` - If more than 2 arguments are passed in (can be anything), the client runs locally -- `2006Redone file_server` contains the file server code that is *required* to be running before a client can connect to a server. It must be running locally before a client can connect. `src` is the Sources directory +- `2006Scape file_server` contains the file server code that is *required* to be running before a client can connect to a server. It must be running locally before a client can connect. `src` is the Sources directory ## Building from command line diff --git a/pom.xml b/pom.xml index 3d835fb2..4c34d42d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.rebotted - 2006redone + com.rs2 + 2006Scape pom 1.0 - 2006Redone Client - 2006Redone file_server - 2006Redone Server + 2006Scape Client + 2006Scape file_server + 2006Scape Server - \ No newline at end of file +