Merge branch 'master' of https://github.com/dginovker/09HDscape

.idea/09HDscape.iml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file:///production/09HDscape" />
-    <output-test url="file:///test/09HDscape" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/09HDscape-client">
       <sourceFolder url="file://$MODULE_DIR$/09HDscape-client/src" isTestSource="false" />
@@ -18,16 +16,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/09HDscape-client/lib/gluegen-rt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/09HDscape-client/lib/jogl.jar!/" />
+          <root url="jar://$MODULE_DIR$/09HDscape-client/clientlibs.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

09HDscape-management-server/src/org/keldagrim/world/WorldDatabase.java

@@ -8,8 +8,6 @@ import org.keldagrim.net.packet.IoBuffer;
 import org.keldagrim.world.info.CountryFlag;
 import org.keldagrim.world.info.WorldInfo;
 
-import com.sun.xml.internal.ws.util.StringUtils;
-
 /**
  * Holds all the world servers.
  * @author Emperor
@@ -84,7 +82,19 @@ public class WorldDatabase {
 	private static void putCountryInfo(IoBuffer buffer) {
 		for (CountryFlag country : CountryFlag.values()) {
 			buffer.putSmart(country.getId());
-			buffer.putJagString(StringUtils.capitalize(country.name().toLowerCase()));
+			buffer.putJagString(capitalize(country.name().toLowerCase()));
+		}
+	}
+	/*
+     * Stole this from a library so we don't need the dependency
+	 */
+	private static String capitalize(String name) {
+		if (name != null && name.length() != 0) {
+			char[] chars = name.toCharArray();
+			chars[0] = Character.toUpperCase(chars[0]);
+			return new String(chars);
+		} else {
+			return name;
 		}
 	}
 

09HDscape-server/.gitignore

@@ -10,7 +10,6 @@ data/profile/**
 .class**
 /bin/
 /out/
-data/cache/
 *.iml
 *.eml
 *.userlibraries

09HDscape-server/src/org/crandor/Main.java

@@ -1,10 +1,5 @@
 package org.crandor;
 
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.crandor.game.system.SystemLogger;
 import org.crandor.game.system.SystemShutdownHook;
 import org.crandor.game.system.mysql.SQLManager;

README.md

@@ -0,0 +1,56 @@
+# 09HDscape
+Open source 2009 Runescape Remake
+
+
+# Setting up the project
+Requirements:
+- General knowledge of git
+- General knowledge of SQL
+- Intellij
+
+Be sure to check the debugging section when something goes wrong.
+
+At any point, if you need help, you are free to join our Discord server at: https://discord.gg/4zrA2Wy
+
+## Step 1:
+- Fork this repository to your repo
+
+## Step 2: Setting up IntelliJ
+- Open IntelliJ
+- Click `File` > `New` > `Project from Version Control`
+  - Paste the URL of your forked repository in the URL field, click Done
+  - Wait for the repository to clone
+- Click `File` > `Project Structure` > `Modules` > `09HDscape` > `Paths` > `Inherit project compile output path`
+  - Hit `OK`
+- Click `File` > `Project Structure` > `Project` > Change the Project Compiler Output to the folder where the project exists on your computer
+  
+## Step 3: Setting up the Database
+Since this portion of the guide is operating-system specific, you will either need basic database knowledge or a bit of help. Below are the things that need to be configured.
+- Configure root@localhost to have a blank password
+- Create a table in root named `server` and another named `global`
+- Import `09HDscape-server/server.sql` and `09HDscape-server/global.sql` into their respective tables
+- Start the database
+
+## Step 4: Running the Server & Client
+- Run the management-server
+  - In IntelliJ, navigate to `09HDscape-management-server/src/org/keldagrim/Main.java`, right click > Run
+- Run the server
+  - In IntelliJ, navigate to `09HDscape-server/src/org/crandor/Main.java`, right click > Run
+    - It will fail
+  - Top right there should be `Main (1)` in a dropdown, click it then select `Edit Configurations`
+  - Change the working directory to `09HDscape-server` so it can find `server.properties`
+- Run the client
+  - In IntelliJ, navigate to `09HDscape-client/src/org/runite/GameLaunch.java`, right click > Run
+  
+You should now be set up!
+
+## Debugging
+
+Errors could not find library:
+- Click `File` > `Project Structure` > `Modules` > `09HDscape` > `Paths` > `Inherit project compile output path`
+  - Now click `Dependencies`
+  - Click the `+` on the right-hand side > `JARs or directories`
+  - Add the following things:
+    - `09HDscape-client/lib` directory
+    - `09HDscape-client/clientlibs.jar` file
+    - `09HDscape-management-server/lib` director