diff --git a/.idea/2006rebotted.iml b/.idea/2006rebotted.iml index 09faeb4e..423f009a 100644 --- a/.idea/2006rebotted.iml +++ b/.idea/2006rebotted.iml @@ -7,7 +7,7 @@ - + diff --git a/.idea/artifacts/2006rebotted_jar.xml b/.idea/artifacts/2006rebotted_jar.xml new file mode 100644 index 00000000..a9e6b87b --- /dev/null +++ b/.idea/artifacts/2006rebotted_jar.xml @@ -0,0 +1,42 @@ + + + $PROJECT_DIR$/CompiledServer/artifacts/2006rebotted_jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/localhost_2006rebotted_jar.xml b/.idea/artifacts/localhost_2006rebotted_jar.xml new file mode 100644 index 00000000..6d48b6af --- /dev/null +++ b/.idea/artifacts/localhost_2006rebotted_jar.xml @@ -0,0 +1,42 @@ + + + $PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 048d263d..fb83acef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..da4d252a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1572306880139 + + + + + + + \ No newline at end of file diff --git a/2006Redone Client/META-INF/MANIFEST.MF b/2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF similarity index 100% rename from 2006Redone Client/META-INF/MANIFEST.MF rename to 2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF diff --git a/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF b/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF new file mode 100644 index 00000000..1ab257b7 --- /dev/null +++ b/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Client + diff --git a/2006Redone Server/src/redone/game/players/Client.java b/2006Redone Server/src/redone/game/players/Client.java index 944310f7..99466140 100644 --- a/2006Redone Server/src/redone/game/players/Client.java +++ b/2006Redone Server/src/redone/game/players/Client.java @@ -657,11 +657,10 @@ public class Client extends Player { getActionSender().sendMessage("Welcome to @blu@" + Constants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + Constants.TEST_VERSION + "@bla@."); getActionSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome"); getActionSender().sendMessage("Source code at github.com/dginovker/2006rebotted"); - getActionSender().sendMessage("Welcome to the Beta! A reset will occur before main release -"); getActionSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy"); - if (!hasBankpin) { - getActionSender().sendMessage("You do not, have a bank pin it is highly recommened you set one."); - } + /*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."); + }*/ } getPlayerAssistant().firstTimeTutorial(); getItemAssistant().sendWeapon(playerEquipment[playerWeapon], ItemAssistant.getItemName(playerEquipment[playerWeapon])); diff --git a/2006Redone Server/src/redone/integrations/discord/DiscordActivity.java b/2006Redone Server/src/redone/integrations/discord/DiscordActivity.java index 965379c3..eee5be87 100644 --- a/2006Redone Server/src/redone/integrations/discord/DiscordActivity.java +++ b/2006Redone Server/src/redone/integrations/discord/DiscordActivity.java @@ -7,7 +7,7 @@ public class DiscordActivity { private static int count = 50; public static void updateActivity() { - if (!JavaCord.token.equals("")) { + if (JavaCord.token != null && !JavaCord.token.equals("")) { if (count == 0) { if (PlayerHandler.getPlayerCount() != 1) { JavaCord.api.updateActivity(PlayerHandler.getPlayerCount() + " Players Online"); diff --git a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar new file mode 100644 index 00000000..3d059404 Binary files /dev/null and b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar differ diff --git a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar new file mode 100644 index 00000000..e61c53ca Binary files /dev/null and b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class index 7c0e272f..981af45f 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class index 06f8d2da..1ade79cc 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class index 6fde7b8b..8d50ddc2 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$3.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class index 8c32f8ad..068b6e9d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client$4.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Client.class b/CompiledServer/production/2006rebotted/redone/game/players/Client.class index b3e7b9b1..9960c8a3 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Client.class and b/CompiledServer/production/2006rebotted/redone/game/players/Client.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class index fc0f7474..1b9d8925 100644 Binary files a/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class and b/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class differ diff --git a/README.md b/README.md index 3fa3a76f..04301652 100644 --- a/README.md +++ b/README.md @@ -38,27 +38,13 @@ Step 12: Click File -> Project Structure Step 13: Set Project SDK to 1.8, Project Language Level to 8, & Project Compiler Output to any valid folder [Image](https://i.imgur.com/9PJDk0Q.png) -Step 14: Click "Modules" and make sure it looks like what I have highlighted. If it doesn't, join the Discord and I'll help you create one. ([Image](https://i.imgur.com/NBAnk0A.png)) +Step 14: Hit OK in the project structure screen -Step 15: Click "Dependencies", then click the "Add" arrow and select "JARs or directories"([Image](https://i.imgur.com/tGI9QNI.png)) +Step 15: Start the FileServer [Image](https://i.imgur.com/moNKg9u.png) -Step 16: Navigate to your 2006rebotted folder, open `2006Redone file_server` > `libs`. Holding "Shift" on your keyboard, select all the .jar files in the `libs` folder there, and hit OK. ([Image](https://i.imgur.com/Yv3SX1q.png)) +Step 16: Start the Server [Image](https://i.imgur.com/uUw522i.png) -Step 17: Hit OK in the project structure screen after all your JARs are imported: ([Image](https://i.imgur.com/Yv3SX1q.png)) - -Step 18: Navigate to the FileServer class (`2006Redone file_server/src/org/apollo/jagcached/FileServer.java`), Right Click -> Run. It will fail since we need to start it in the right directory: [Image](https://i.imgur.com/LFkr39U.png) - -Step 19: To fix the directory issue, click FileServer and hit Edit Configurations at the top: [Image](https://i.imgur.com/lJdBPCs.png) - -Step 20: Under Working Directory, add `2006Redone file_server` to the path (on Windows, you may need a \\ for paths instead of a /. Not sure): [Image](https://i.imgur.com/ANkbgBl.png) - -Step 21: Navigate to the Server class (`2006Redone Server/src/redone/Server.java`), Right Click -> Run. It will fail since we need to start it in the right directory - -Step 22: To fix the directory issue, click Server and hit Edit Configurations at the top - -Step 23: Under Working Directory, add `2006Redone Server` to the path ([Image]("/home/dr_cookie/Projects/2006rebotted/2006Redone Client/src/Client.java")) - -Step 24: Navigate to the Client class (`2006Redone Client/src/Client.java`), Right Click -> Run. +Step 17: Start the Client [Image](https://i.imgur.com/dHTiU0I.png) # Using Parabot with your local server: