update website urls

Closes #393
- Sophanem city gates now functioning
Closes #392
- Improved rug travel, added missing travel options
Closes #391
- Added those curtains, along with many more curtains and other functional objects
Closes #390
- Dramen branch now untradeable/same with staff
Closes #389
- Lumbridge door should no longer get stuck, should fix other doors aswell
Closes #388
- Added Rasolo npc spawn
Closes #385
- Added missing fishing guild spawns
Closes #384
- Added missing port khazard npcs and a few other missing npcs too
Closes #379
- Added smelt x option
Closes #334
- Fixed dragon dagger store price and fixed high alch/low alch value for it
Closes #278
- Fixed strange numbers on runecrafting interface
Closes #244
-These were previously fixed

Also included:
- Added recieving random gems when mining (thanks to ben for pointing this out)
- Reduced door usage delay
- Random cleanup and deleted some unsued files/code
- Fixed many npc item drop names (thanks to iizyy for pointing them out)
- Fixed a few wizard tower doors
- Did more cleanup with the some of the old boundary methods
- Tidied up the discord commands and added the proper urls for them

.gitignore

@@ -1 +1,5 @@
 2006Redone\ Server/data/characters/
+.idea/
+.idea/workspace.xml
+**/.idea/workspace.xml
+**/.idea/*

.idea/$PRODUCT_WORKSPACE_FILE$

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/2006rebotted.iml

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/2006Redone Server/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/commons-lang3-3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/javac++.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/mina.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j-nop.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/slf4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/xpp3-1.1.4c.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone Server/libs/xstream-1.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/javac++.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mina.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/2006Redone Server/libs" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/2006Redone Server/libs" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="libs" level="project" />
+    <orderEntry type="library" name="commons-lang3-3.1" level="project" />
+  </component>
+</module>

.idea/artifacts/2006rebotted_jar.xml

@@ -0,0 +1,11 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="2006rebotted:jar">
+    <output-path>$PROJECT_DIR$/CompiledServer/artifacts/2006rebotted_jar</output-path>
+    <root id="archive" name="2006rebotted.jar">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="module-output" name="2006rebotted" />
+    </root>
+  </artifact>
+</component>

.idea/artifacts/localhost_2006rebotted_jar.xml

@@ -0,0 +1,11 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="localhost_2006rebotted:jar">
+    <output-path>$PROJECT_DIR$/CompiledServer/artifacts/localhost_2006rebotted_jar</output-path>
+    <root id="archive" name="localhost_2006rebotted.jar">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="module-output" name="2006rebotted" />
+    </root>
+  </artifact>
+</component>

.idea/checkstyle-idea.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="checkstyle-version" value="8.25" />
+        <entry key="copy-libs" value="true" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnly" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>

.idea/libraries/commons_lang3_3_1.xml

@@ -0,0 +1,17 @@
+<component name="libraryTable">
+  <library name="commons-lang3-3.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/commons-lang3-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/javac++.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mina.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/mysql-connector-java-5.1.23-bin.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/netty-3.6.6.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j-nop.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/slf4j.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xpp3-1.1.4c.jar!/" />
+      <root url="jar://$PROJECT_DIR$/2006Redone file_server/libs/xstream-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/libs.xml

@@ -0,0 +1,7 @@
+<component name="libraryTable">
+  <library name="libs">
+    <CLASSES />
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/CompiledServer" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.main.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/2006Redone_Server.test.iml" filepath="$PROJECT_DIR$/.idea/modules/2006Redone_Server.test.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/2006rebotted.iml" filepath="$PROJECT_DIR$/.idea/2006rebotted.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ArtifactsWorkspaceSettings">
+    <artifacts-to-build>
+      <artifact name="localhost_2006rebotted:jar" />
+    </artifacts-to-build>
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
+    <ignored path="$PROJECT_DIR$/CompiledServer/" />
+    <ignored path="$PROJECT_DIR$/2006Redone Server/.gradle/" />
+    <ignored path="$PROJECT_DIR$/2006Redone Server/build/" />
+    <ignored path="$PROJECT_DIR$/2006Redone Server/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$/2006Redone Server">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view />
+      </state>
+    </system>
+  </component>
+  <component name="FileColors">
+    <fileColor scope="Local Unit Tests" color="#161c22" />
+    <fileColor scope="Android Instrumented Tests" color="#161c22" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="225">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/2006Redone Client/src/Client.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="24">
+              <caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="192">
+              <caret line="16" selection-start-line="16" selection-end-line="16" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>math.sq</find>
+    </findStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="417" />
+    <option name="y" value="82" />
+    <option name="width" value="1232" />
+    <option name="height" value="682" />
+  </component>
+  <component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="2006rebotted" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2006rebotted" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="2006rebotted" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2006rebotted" type="462c0819:PsiDirectoryNode" />
+              <item name="2006Redone Server" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1581465119980" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Server" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Application.Client">
+    <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Client" />
+      <module name="2006rebotted" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="FileServer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="org.apollo.jagcached.FileServer" />
+      <module name="2006rebotted" />
+      <option name="WORKING_DIRECTORY" value="2006Redone file_server" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="org.apollo.jagcached.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="GameEngine" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.rebotted.GameEngine" />
+      <module name="2006Redone_Server.main" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/2006Redone Server" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.rebotted.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="Application.FileServer" />
+      <item itemvalue="Application.GameEngine" />
+      <item itemvalue="Application.Client" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.FileServer" />
+        <item itemvalue="Application.GameEngine" />
+        <item itemvalue="Application.Client" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="9c1d485e-b413-4c80-b742-7c5a88c1c73c" name="Default Changelist" comment="" />
+      <created>1572306880139</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1572306880139</updated>
+      <workItem from="1576853591840" duration="1190000" />
+      <workItem from="1576854792240" duration="1663000" />
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1920" height="1036" extended-state="6" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16207626" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32938644" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
+      <window_info anchor="bottom" id="Messages" order="10" visible="true" weight="0.32938644" />
+      <window_info anchor="bottom" id="Build" order="11" weight="0.32938644" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Maven" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Gradle" order="8" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER" />
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="WindowStateProjectService">
+    <state width="1877" height="266" key="GridCell.Tab.0.bottom" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.bottom/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+    <state width="1877" height="266" key="GridCell.Tab.0.center" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.center/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+    <state width="1877" height="266" key="GridCell.Tab.0.left" timestamp="1576858443105">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.left/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443105" />
+    <state width="1877" height="266" key="GridCell.Tab.0.right" timestamp="1576858443106">
+      <screen x="0" y="40" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="266" key="GridCell.Tab.0.right/0.40.1920.1040@0.40.1920.1040" timestamp="1576858443106" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/2006Redone Client/src/Client.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="24">
+          <caret line="3" column="18" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/2006Redone Server/src/main/java/com/rebotted/integrations/discord/commands/Online.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <last-edited>2006rebotted:jar</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.5" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>2006rebotted</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>commons-lang3-3.1</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

2006Redone Client/2006Redone Client.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

2006Redone Client/METAs/Local Client Meta/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Client
+

2006Redone Client/bin/.gitignore

@@ -0,0 +1,35 @@
+/Animable.class
+/Animable_Sub3.class
+/Animable_Sub4.class
+/Animable_Sub5.class
+/Animation.class
+/Background.class
+/Censor.class
+/Class11.class
+/Class13.class
+/Class18.class
+/Class21.class
+/Class29.class
+/Class30_Sub1.class
+/Class32.class
+/Class33.class
+/Class36.class
+/Class39.class
+/Class4.class
+/Class40.class
+/Class43.class
+/Class47.class
+/Class56.class
+/Class56_Sub1.class
+/Class56_Sub1_Sub1.class
+/Class56_Sub1_Sub2.class
+/Class6.class
+/Client.class
+/ClientSettings.class
+/CollisionMap.class
+/Decompressor.class
+/DrawingArea.class
+/DummyClass.class
+/Entity.class
+/EntityDef.class
+/Flo.class

2006Redone Client/run.bat

@@ -1,5 +0,0 @@
-@echo off
-title 2006Redone
-cd bin
-java Main
-pause

2006Redone Client/src/Client.java

@@ -0,0 +1,22 @@
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public final class Client {
+
+	public static void main(String[] args) {
+		ClientSettings.SERVER_IP = "127.0.0.1";
+		try {
+			Game game = new Game();
+			Game.nodeID = 10;
+			Game.portOff = 0;
+			Game.setHighMem();
+			Game.isMembers = true;
+			Signlink.storeid = 32;
+			Signlink.startpriv(InetAddress.getLocalHost());
+			game.createClientFrame(503, 765);
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

2006Redone Client/src/ClientSettings.java

@@ -7,19 +7,23 @@ import java.math.BigInteger;
 
 public class ClientSettings {
 	
+	public static String SNOW_MONTH = ".12";
 	/**
 	 * The Servers Name
 	 */
-	public final static String SERVER_NAME = "2006Redone";
+	public final static String SERVER_NAME = "2006rebotted";
 	/**
 	 * The Servers Website
 	 */
-	public final static String SERVER_WEBSITE = "www.2006redone.org";
+	public final static String SERVER_WEBSITE = "www.rsrebotted.com";
 	/**
 	 * The Servers Ip
+	 *
+	 * You don't have to change this, the client will automatically connect to the server
+	 * on localhost (Assuming you're running Client and LocalGame respectively)
+	 *
 	 */
-	public static String SERVER_IP = "35.226.247.68";
-	//public final static String SERVER_IP = "127.0.0.1";
+	public static String SERVER_IP = "127.0.0.1";
 	/**
 	 * The Npc Bits for the Server
 	 */
@@ -31,6 +35,4 @@ public class ClientSettings {
 	
 	public static final BigInteger RSA_MODULUS = new BigInteger("91553247461173033466542043374346300088148707506479543786501537350363031301992107112953015516557748875487935404852620239974482067336878286174236183516364787082711186740254168914127361643305190640280157664988536979163450791820893999053469529344247707567448479470137716627440246788713008490213212272520901741443");
 	public static final BigInteger RSA_EXPONENT = new BigInteger("65537");
-
-	
 }

2006Redone Client/src/Flo.java

@@ -2,6 +2,9 @@
 // Jad home page: http://www.kpdus.com/jad.html
 // Decompiler options: packimports(3) 
 
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
 public final class Flo {
 
 	public static void unpackConfig(StreamLoader streamLoader) {
@@ -17,6 +20,12 @@ public final class Flo {
 			cache[j].readValues(stream);
 		}
 	}
+	
+	public static String getTodaysDate() {
+		Calendar date = new GregorianCalendar();
+		return date.get(Calendar.DAY_OF_MONTH) + "."+ (date.get(Calendar.MONTH) + 1) + "." + date.get(Calendar.YEAR);
+	}
+
 
 	private void readValues(Stream stream) {
 		do {
@@ -25,6 +34,10 @@ public final class Flo {
 				return;
 			} else if (i == 1) {
 				anInt390 = stream.read3Bytes();
+				Calendar date = new GregorianCalendar();
+				if ((date.get(Calendar.MONTH) + 1) == 12) {
+					anInt390 = 0xffffff;
+				}
 				method262(anInt390);
 			} else if (i == 2) {
 				anInt391 = stream.readUnsignedByte();

2006Redone Client/src/Game.java

@@ -1,8 +1,11 @@
+/**
+ * NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
+ * THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
+ */
+
+import javax.swing.*;
 import java.applet.AppletContext;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics;
+import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -20,8 +23,19 @@ import java.text.DecimalFormatSymbols;
 import java.util.Calendar;
 import java.util.Date;
 
+/**
+ * NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
+ * THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
+ */
 @SuppressWarnings("serial")
 public class Game extends RSApplet {
+	
+	private boolean graphicsEnabled = true;
+	
+	public static int random(final float range) {
+		return (int) (java.lang.Math.random() * (range + 1));
+	}
+    
 
 	public static String intToKOrMilLongName(int i) {
 		String s = String.valueOf(i);
@@ -385,7 +399,11 @@ public class Game extends RSApplet {
 					}
 					if (l == 0) {
 						if (i1 > 0 && i1 < 110) {
+							try {
 							textDrawingArea.method389(false, 4, 0, chatMessages[k], i1);
+							} catch (Exception e) {
+								
+							}
 						}
 						j++;
 					}
@@ -510,9 +528,9 @@ public class Game extends RSApplet {
 		}
 	}
 
-	public void processMenuClick() {
+	public boolean processMenuClick() {
 		if (activeInterfaceType != 0) {
-			return;
+			return false;
 		}
 		int j = super.clickMode3;
 		if (spellSelected == 1 && super.saveClickX >= 516 && super.saveClickY >= 160 && super.saveClickX <= 765 && super.saveClickY <= 205) {
@@ -602,7 +620,7 @@ public class Game extends RSApplet {
 						if (RSInterface.interfaceCache[j2].parentID == backDialogID) {
 							activeInterfaceType = 3;
 						}
-						return;
+						return true;
 					}
 				}
 			}
@@ -616,6 +634,7 @@ public class Game extends RSApplet {
 				determineMenuSize();
 			}
 		}
+		return false;
 	}
 
 	public void saveMidi(boolean flag, byte abyte0[]) {
@@ -1133,10 +1152,10 @@ public class Game extends RSApplet {
 												if (itemDef.actions != null && itemDef.actions[l3] != null) {
 													menuActionName[menuActionRow] = itemDef.actions[l3] + " @lre@" + itemDef.name;
 													if (l3 == 3) {
-														menuActionID[menuActionRow] = 493;
+															menuActionID[menuActionRow] = 493;
 													}
 													if (l3 == 4) {
-														menuActionID[menuActionRow] = 847;
+															menuActionID[menuActionRow] = 847;
 													}
 													menuActionCmd1[menuActionRow] = itemDef.id;
 													menuActionCmd2[menuActionRow] = k2;
@@ -1169,20 +1188,30 @@ public class Game extends RSApplet {
 										if (class9_1.isInventoryInterface && itemDef.actions != null) {
 											for (int i4 = 2; i4 >= 0; i4--) {
 												if (itemDef.actions[i4] != null) {
-													menuActionName[menuActionRow] = itemDef.actions[i4] + " @lre@" + itemDef.name;
-													if (i4 == 0) {
-														menuActionID[menuActionRow] = 74;
+													if (shiftDown)
+													{
+														menuActionName[menuActionRow] = "Drop @lre@" + itemDef.name;
+														menuActionCmd1[menuActionRow] = itemDef.id;
+														menuActionCmd2[menuActionRow] = k2;
+														menuActionCmd3[menuActionRow] = class9_1.id;
 													}
-													if (i4 == 1) {
-														menuActionID[menuActionRow] = 454;
+													else
+													{
+														menuActionName[menuActionRow] = itemDef.actions[i4] + " @lre@" + itemDef.name; //Seems like it's Wear + SPACE + ItemName.
+														if (i4 == 0) {
+															menuActionID[menuActionRow] = 74;
+														}
+														if (i4 == 1) {
+															menuActionID[menuActionRow] = 454;
+														}
+														if (i4 == 2) {
+															menuActionID[menuActionRow] = 539;
+														}
+														menuActionCmd1[menuActionRow] = itemDef.id;
+														menuActionCmd2[menuActionRow] = k2;
+														menuActionCmd3[menuActionRow] = class9_1.id;
+														menuActionRow++;
 													}
-													if (i4 == 2) {
-														menuActionID[menuActionRow] = 539;
-													}
-													menuActionCmd1[menuActionRow] = itemDef.id;
-													menuActionCmd2[menuActionRow] = k2;
-													menuActionCmd3[menuActionRow] = class9_1.id;
-													menuActionRow++;
 												}
 											}
 
@@ -1212,7 +1241,6 @@ public class Game extends RSApplet {
 													menuActionRow++;
 												}
 											}
-
 										}
 										menuActionName[menuActionRow] = "Examine @lre@" + itemDef.name + (showInfo ? " @gre@(@whi@" + (class9_1.inv[k2] - 1) + "@gre@)" : "");
 										menuActionID[menuActionRow] = 1125;
@@ -3028,8 +3056,7 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			super.clickMode3 = 0;
 		}
-		processMenuClick();
-		if (fullScreenBackDialogID == -1) {
+		if (!processMenuClick()) {
 			processMainScreenClick();
 			processTabClick();
 			processChatModeClick();
@@ -3432,6 +3459,10 @@ public class Game extends RSApplet {
 		if (l >= 2000) {
 			l -= 2000;
 		}
+		if (l == 696) {
+			minimapInt1 = 0;
+            anInt1184 = 120;
+        }
 		if (l == 582) {
 			NPC npc = npcArray[i1];
 			if (npc != null) {
@@ -4200,7 +4231,7 @@ public class Game extends RSApplet {
 		if (l == 447) {
 		    if (shiftDown)
 			{
-				doAction(2); //Drop?
+				doAction(2); //1=Examine, 2=Drop, 3=wear?, 4= does some really wack shit in the inventory
 				needDrawTabArea = true;
 				return;
 			}
@@ -4213,6 +4244,7 @@ public class Game extends RSApplet {
 			needDrawTabArea = true;
 			return;
 		}
+
 		if (l == 1226) {
 			int j1 = i1 >> 14 & 0x7fff;
 			ObjectDef class46 = ObjectDef.forID(j1);
@@ -4741,7 +4773,7 @@ public class Game extends RSApplet {
 					inputDialogState = 0;
 					inputTaken = true;
 				}
-			} else if (backDialogID == -1 && fullScreenBackDialogID == -1) {
+			} else {
 				if (j >= 32 && j <= 122 && inputString.length() < 80) {
 					inputString += (char) j;
 					inputTaken = true;
@@ -4751,7 +4783,10 @@ public class Game extends RSApplet {
 					inputTaken = true;
 				}
 				if ((j == 13 || j == 10) && inputString.length() > 0) {
-					if (myPrivilege == 2) {
+					if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) {
+						graphicsEnabled = !graphicsEnabled;
+					}
+					if (myPrivilege >= 0) {
 						if (inputString.equals("::clientdrop")) {
 							dropClient();
 						}
@@ -4770,18 +4805,6 @@ public class Game extends RSApplet {
 						if (inputString.equals("::dataon")) {
 							showInfo = !showInfo;
 						}
-						if (inputString.equals("::clip")) {
-							for (int k1 = 0; k1 < 4; k1++) {
-								for (int i2 = 1; i2 < 103; i2++) {
-									for (int k2 = 1; k2 < 103; k2++) {
-										aClass11Array1230[k1].anIntArrayArray294[i2][k2] = 0;
-									}
-
-								}
-
-							}
-
-						}
 					}
 					if (inputString.startsWith("::")) {
 						stream.createFrame(103);
@@ -4860,10 +4883,8 @@ public class Game extends RSApplet {
 						myPlayer.anInt1513 = j2;
 						myPlayer.anInt1531 = i3;
 						myPlayer.textCycle = 150;
-						if (myPrivilege == 2 || myPrivilege == 3) {
-							pushMessage(myPlayer.textSpoken, 2, "@cr2@" + myPlayer.name);
-						} else if (myPrivilege == 1) {
-							pushMessage(myPlayer.textSpoken, 2, "@cr1@" + myPlayer.name);
+						if (myPrivilege >= 1) {
+							pushMessage(myPlayer.textSpoken, 2, "@cr" + Math.min(2, myPrivilege) + "@" + myPlayer.name);
 						} else {
 							pushMessage(myPlayer.textSpoken, 2, myPlayer.name);
 						}
@@ -5332,6 +5353,16 @@ public class Game extends RSApplet {
 		chatNames[0] = s1;
 		chatMessages[0] = s;
 	}
+	
+	public void processMinimapActions() {
+        int x = super.mouseX;
+        int y = super.mouseY;
+        if (x >= 551 && x <= 577 && y >= 7 && y <= 40) {
+            menuActionName[1] = "Face North";
+            menuActionID[1] = 696;
+            menuActionRow = 2;
+        }
+	}
 
 	public void processTabClick() {
 		if (super.clickMode3 == 1) {
@@ -5370,11 +5401,11 @@ public class Game extends RSApplet {
 				tabID = 6;
 				tabAreaAltered = true;
 			}
-			if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
+			/*if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
 				needDrawTabArea = true;
 				tabID = 7;
 				tabAreaAltered = true;
-			}
+			}*/
 			if (super.saveClickX >= 572 && super.saveClickX <= 602 && super.saveClickY >= 466 && super.saveClickY < 503 && tabInterfaceIDs[8] != -1) {
 				needDrawTabArea = true;
 				tabID = 8;
@@ -5528,9 +5559,9 @@ public class Game extends RSApplet {
 		menuActionName[0] = "Cancel";
 		menuActionID[0] = 1107;
 		menuActionRow = 1;
-		if(fullScreenBackDialogID != -1) {
+		 if (fullScreenInterfaceId != -1) {
 			anInt886 = 0;
-			buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenBackDialogID], super.mouseX, 0, super.mouseY, 0);
+			buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenInterfaceId], super.mouseX, 0, super.mouseY, 0);
 			if (anInt886 != anInt1026) {
 				anInt1026 = anInt886;
 			}
@@ -5574,6 +5605,7 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			anInt1039 = anInt886;
 		}
+		processMinimapActions();
 		boolean flag = false;
 		while (!flag) {
 			flag = true;
@@ -5750,7 +5782,6 @@ public class Game extends RSApplet {
 				backDialogID = -1;
 				openInterfaceID = -1;
 				invOverlayInterfaceID = -1;
-				fullScreenBackDialogID = -1;
 				fullScreenInterfaceId = -1;
 				anInt1018 = -1;
 				aBoolean1149 = false;
@@ -5957,7 +5988,6 @@ public class Game extends RSApplet {
 			}
 
 		}
-
 		int j3 = j2;
 		int k3 = j1;
 		anIntArrayArray901[j2][j1] = 99;
@@ -6536,7 +6566,7 @@ public class Game extends RSApplet {
 			}
 			catch(IOException _ex)
 			{
-				s = "connection problem";
+				s = "Connection problem -- Make sure FileServer is running!!";
 				expectedCRCs[8] = 0;
 			}
 			catch(Exception _ex)
@@ -7454,9 +7484,9 @@ public class Game extends RSApplet {
 	}
 
 	public void drawGameScreen() {
-		if (fullScreenBackDialogID != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
+		if (fullScreenInterfaceId != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
 			if (loadingStage == 2) {
-				method119(anInt945, fullScreenBackDialogID);
+				method119(anInt945, fullScreenInterfaceId);
 				if (fullScreenInterfaceId != -1)
 					method119(anInt945, fullScreenInterfaceId);
 				anInt945 = 0;
@@ -7465,15 +7495,8 @@ public class Game extends RSApplet {
 				Texture.lineOffsets = gameScreenOffsets;
 				DrawingArea.setAllPixelsToZero();
 				welcomeScreenRaised = true;
-				RSInterface rSInterface = RSInterface.interfaceCache[fullScreenBackDialogID];
-				if (rSInterface.width == 512 && rSInterface.height == 334
-						&& rSInterface.type == 0) {
-					rSInterface.width = 765;
-					rSInterface.height = 503;
-				}
-				drawInterface(0, 0, rSInterface, 0);
-				if (fullScreenInterfaceId != -1) {
-					RSInterface class13_1 = RSInterface.interfaceCache[fullScreenInterfaceId];
+				if (openInterfaceID != -1) {
+					RSInterface class13_1 = RSInterface.interfaceCache[openInterfaceID];
 					if (class13_1.width == 512 && class13_1.height == 334
 							&& class13_1.type == 0) {
 						class13_1.width = 765;
@@ -7481,6 +7504,13 @@ public class Game extends RSApplet {
 					}
 					drawInterface(0, 0, class13_1, 0);
 				}
+				RSInterface rSInterface = RSInterface.interfaceCache[fullScreenInterfaceId];
+				if (rSInterface.width == 512 && rSInterface.height == 334
+						&& rSInterface.type == 0) {
+					rSInterface.width = 765;
+					rSInterface.height = 503;
+				}
+				drawInterface(0, 0, rSInterface, 0);
 				if (!menuOpen) {
 					processRightClick();
 					drawTooltip();
@@ -8456,10 +8486,12 @@ public class Game extends RSApplet {
 		if (anInt1055 == 1) {
 			multiOverlay.drawSprite(472, 296);
 		}
+		int k = 20;
+		int i1 = 0xffff00;
+		int x = baseX + (myPlayer.x - 6 >> 7);
+	    int y = baseY + (myPlayer.y - 6 >> 7);
 		if (fpsOn) {
 			char c = '\u01FB';
-			int k = 20;
-			int i1 = 0xffff00;
 			if (super.fps < 15) {
 				i1 = 0xff0000;
 			}
@@ -8474,6 +8506,20 @@ public class Game extends RSApplet {
 			aTextDrawingArea_1271.method380("Mem:" + j1 + "k", c, 0xffff00, k);
 			k += 15;
 		}
+	 	if (showInfo) {
+            if (super.fps < 15)
+                i1 = 0xff0000;
+            aTextDrawingArea_1271.method385(0xffff00, "Fps:" + super.fps, 285, 5);
+            Runtime runtime = Runtime.getRuntime();
+            int j1 = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L);
+            i1 = 0xffff00;
+            if (j1 > 0x2000000 && lowMem)
+                i1 = 0xff0000;
+            k += 15;
+            aTextDrawingArea_1271.method385(0xffff00, "Mem:" + j1 + "k", 299, 5);
+            aTextDrawingArea_1271.method385(0xffff00, "Mouse X: " + super.mouseX + " , Mouse Y: " + super.mouseY, 314, 5);
+            aTextDrawingArea_1271.method385(0xffff00, "Coords: " + x + ", " + y, 329, 5);
+        }
 		if (anInt1104 != 0) {
 			int j = anInt1104 / 50;
 			int l = j / 60;
@@ -9491,13 +9537,13 @@ public class Game extends RSApplet {
 		if (loginScreenState == 3) {
 			chatTextDrawingArea.method382(0xffff00, c / 2, "Create a free account", c1 / 2 - 60, true);
 			int k = c1 / 2 - 35;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account you need to", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "To create a new account just click", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "go back to the main " + ClientSettings.SERVER_NAME + " webpage", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "\"Cancel\" below, and click \"Existing User\".", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "and choose the red 'create account'", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "Log in with any credentials you want and an", k, true);
 			k += 15;
-			chatTextDrawingArea.method382(0xffffff, c / 2, "button at the top right of that page.", k, true);
+			chatTextDrawingArea.method382(0xffffff, c / 2, "account will automatically be created for you.", k, true);
 			k += 15;
 			int j1 = c / 2;
 			int i2 = c1 / 2 + 50;
@@ -9751,8 +9797,10 @@ public class Game extends RSApplet {
 			int j13 = stream.readUnsignedByte();
 			int k15 = anInt1268 + (j13 >> 4 & 7);
 			int l16 = anInt1269 + (j13 & 7);
-			if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104)
+
+			if (k15 >= 0 && l16 >= 0 && k15 < 104 && l16 < 104) {
 				method130(-1, -1, j8, i11, l16, k5, plane, k15, 0);
+			}
 			return;
 		}
 		if (j == 151) {
@@ -9764,6 +9812,7 @@ public class Game extends RSApplet {
 			int i15 = k12 >> 2;
 			int k16 = k12 & 3;
 			int l17 = anIntArray1177[i15];
+			//System.out.println("id: " + j10 + " x:" + (this.baseX + anInt1268) + " y:" + (this.baseY + anInt1269));
 			if (l4 >= 0 && k7 >= 0 && l4 < 104 && k7 < 104)
 				method130(-1, j10, k16, l17, k7, i15, plane, l4, 0);
 			return;
@@ -10622,7 +10671,7 @@ public class Game extends RSApplet {
 			}
 			if (pktType == 174) {
 				int id = inStream.readUnsignedWord();
-				int type = inStream.readUnsignedByte();
+				int type = /*inStream.readUnsignedByte()*/1;
 				int delay = inStream.readUnsignedWord();
 				int volume = inStream.readUnsignedByte();
 				sound[currentSound] = id;
@@ -10852,10 +10901,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -10987,10 +11032,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11052,9 +11093,6 @@ public class Game extends RSApplet {
 				if (backDialogID != -1) {
 					backDialogID = -1;
 				}
-				if (fullScreenBackDialogID != k15) {
-					fullScreenBackDialogID = k15;
-				}
 				if (fullScreenInterfaceId != k15) {
 					fullScreenInterfaceId = k9;
 				}
@@ -11186,61 +11224,30 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
-				if (fullScreenInterfaceId != -1) {
-					fullScreenInterfaceId = -1;
-				}
-				/*if (openInterfaceID != l7) {
-					openInterfaceID = l7;
-				}*/
 				if (inputDialogState != 0) {
 					inputDialogState = 0;
 					inputTaken = true;
 				}
-				/*
-        		 * 15244 = main Interface ID
-        		 * 17511 = Question Type
-        		 * 15819 = Christmas Type
-        		 * 15812 = Security Type
-        		 * 15801 = Item Scam Type
-        		 * 15791 = Password Safety
-        		 * 15774 = Good/Bad Password
-        		 * 15767 = Drama Type
-        		 */
-				
+				// 17511 = Question Type
+				// 15819 = Christmas Type
+				// 15812 = Security Type
+				// 15801 = Item Scam Type
+				// 15791 = Password Safety 
+				// 15774 = Good/Bad Password
+				// 15767 = Drama Type 
 				if (l7 == 15244) {
-					openInterfaceID = 15812;//secondary/bottom part
-            		fullScreenBackDialogID = 15244;
-				/*} else if (l7 == 17511) {
-        			openInterfaceID = 17511;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15819) {
-        			openInterfaceID = 15819;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15812) {
-        			openInterfaceID = 15812;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15801) {
-        			openInterfaceID = 15801;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15791) {
-        			openInterfaceID = 15791;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15774) {
-        			openInterfaceID = 15774;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15767) {
-        			openInterfaceID = 15767;
-            		fullScreenBackDialogID = 15244;*/
-        		} else {
-        			openInterfaceID = l7;
-        		}
+					if (Flo.getTodaysDate().contains(ClientSettings.SNOW_MONTH)) {
+						openInterfaceID = 15819;
+					} else {
+						openInterfaceID = 15801;
+					}
+					fullScreenInterfaceId = 15244;
+				} else {
+					openInterfaceID = l7;
+				}
 				aBoolean1149 = false;
 				pktType = -1;
-				return true;
+                return true;
 			}
 			if (pktType == 218) {
 				int i8 = inStream.method438();
@@ -11306,10 +11313,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11363,10 +11366,6 @@ public class Game extends RSApplet {
 					needDrawTabArea = true;
 					tabAreaAltered = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11397,6 +11396,7 @@ public class Game extends RSApplet {
 
 			Signlink.reporterror(s2);
 			resetLogout();
+			exception.printStackTrace();
 		}
 		return true;
 	}
@@ -11464,20 +11464,25 @@ public class Game extends RSApplet {
 		Model.anInt1685 = super.mouseX - 4;
 		Model.anInt1686 = super.mouseY - 4;
 		DrawingArea.setAllPixelsToZero();
-		// xxx disables graphics if(graphicsEnabled){
-		worldController.method313(xCameraPos, yCameraPos, xCameraCurve, zCameraPos, j, yCameraCurve);
-		worldController.clearObj5Cache();
-		updateEntities();
-		drawHeadIcon();
+		if(graphicsEnabled){
+			worldController.method313(xCameraPos, yCameraPos, xCameraCurve, zCameraPos, j, yCameraCurve);
+			worldController.clearObj5Cache();
+			updateEntities();
+			drawHeadIcon();
+		}
+		// Allow tabs to work
 		method37(k2);
+		// Allow stuff inside the tabs to work
 		draw3dScreen();
+		// Show overlays on main screen
 		aRSImageProducer_1165.drawGraphics(4, super.graphics, 4);
-		xCameraPos = l;
-		zCameraPos = i1;
-		yCameraPos = j1;
-		yCameraCurve = k1;
-		xCameraCurve = l1;
-		// }
+		if(graphicsEnabled) {
+			xCameraPos = l;
+			zCameraPos = i1;
+			yCameraPos = j1;
+			yCameraCurve = k1;
+			xCameraCurve = l1;
+		}
 	}
 
 	public void closeOpenInterfaces() {
@@ -11493,10 +11498,6 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			aBoolean1149 = false;
 		}
-		if (fullScreenBackDialogID != -1) {
-			fullScreenBackDialogID = -1;
-			welcomeScreenRaised = true;
-		}
 		if (fullScreenInterfaceId != -1) {
 			fullScreenInterfaceId = -1;
 		}
@@ -11505,6 +11506,16 @@ public class Game extends RSApplet {
 	}
 
 	public Game() {
+	    //Test if they're on 32-bit, warn them if they are
+		if (!System.getProperty("sun.arch.data.model").contains("64"))
+		{
+			JOptionPane.showMessageDialog(null, "You're running 32-bit java. This will definitely cause problems.\nYou can get the right Java 8 at AdoptOpenJDK.net", "You're running 32-bit Java!", JOptionPane.INFORMATION_MESSAGE);
+			System.out.println("Please upgrade to 64-bit java to avoid problems! (AdoptOpenJDK.net)");
+		}
+		if (Double.parseDouble(System.getProperty("java.specification.version")) >= 1.9) {
+			JOptionPane.showMessageDialog(null, "You're not running Java 8. If you're using Parabot, this will cause problems!\nYou can get Java 8 from AdoptOpenJDK.net", "You're not running Java 8!", JOptionPane.INFORMATION_MESSAGE);
+			System.out.println("Please downgrade to Java 8 to avoid problems! (AdoptOpenJDK.net)");
+		}
 		server = ClientSettings.SERVER_IP;
 		anIntArrayArray825 = new int[104][104];
 		friendsNodeIDs = new int[200];
@@ -11690,7 +11701,6 @@ public class Game extends RSApplet {
 	public static int anInt854;
 	public int anInt855;
 	public int openInterfaceID;
-	public int fullScreenBackDialogID = -1;
 	public int fullScreenInterfaceId = -1;
 	public int xCameraPos;
 	public int zCameraPos;
@@ -12086,7 +12096,7 @@ public class Game extends RSApplet {
 	public int anInt1289;
 	public static int tiara;
 	public static int anInt1290;
-	public boolean showInfo = true;
+	public boolean showInfo = false;
 	public static int anInt1401 = 256;
 	public static int[] anIntArray385 = new int[] { 12800, 12800, 12800, 12800, 12800, 12800,
 	12800, 12800, 12800, 12800, 12800, 12800,
@@ -12139,7 +12149,7 @@ public class Game extends RSApplet {
 		this.anInt1187 += (j << 1);
 	}
 
-	public final void keyPressed(KeyEvent keyevent)
+	public void keyPressed(KeyEvent keyevent)
 	{
 		super.keyPressed(keyevent);
 		switch (keyevent.getKeyCode())

2006Redone Client/src/ItemDef.java

@@ -190,7 +190,11 @@ public final class ItemDef {
 
 		cacheIndex = (cacheIndex + 1) % 10;
 		ItemDef itemDef = cache[cacheIndex];
-		stream.currentOffset = streamIndices[i];
+		try {
+			stream.currentOffset = streamIndices[i];
+		} catch (Exception e) {
+			System.out.println("Itemdef issue? Apparently this ID is out of bounds: " + e);
+		}
 		itemDef.id = i;
 		itemDef.setDefaults();
 		itemDef.readValues(stream);

2006Redone Client/src/LocalGame.java

@@ -0,0 +1,28 @@
+/**
+ * NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
+ * THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
+ */
+
+import java.applet.AppletContext;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.URL;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * NOTICE: IF YOU CHANGE ANYTHING IN GAME.JAVA, PLEASE COPY-PASTE THE WHOLE CLASS OVER TO LOCALGAME.JAVA
+ * THIS IS TO ALLOW LOCAL PARABOT TO CONTINUE TO WORK
+ */
+@SuppressWarnings("serial")
+public class LocalGame extends Game {
+    public LocalGame() {
+        super();
+        server = "127.0.0.1";
+    }
+}

2006Redone Client/src/Main.java

@@ -3,7 +3,20 @@ import java.net.UnknownHostException;
 
 public final class Main {
 
+	/*
+
+	DEAR DEVELOPER!
+
+	If you want to run the client locally, the easiest way to do that is run the class "Client.java" instead!
+
+	If you REALLY want to use this class, add two random program arguments.
+	But seriously, Client.java is just a copy-paste of this class and does it locally. Use that instead!
+
+
+	 */
+
 	public static void main(String[] args) {
+		ClientSettings.SERVER_IP = "2006rebotted.hopto.org";
 		if (args.length > 1)
 		{
 			System.out.println("Running local");

2006Redone Client/src/RSApplet.java

@@ -284,7 +284,7 @@ public class RSApplet extends Applet implements Runnable, MouseListener, MouseMo
 	}
 
 	@Override
-	public final void mouseMoved(MouseEvent mouseevent) {
+	public void mouseMoved(MouseEvent mouseevent) {
 		int i = mouseevent.getX();
 		int j = mouseevent.getY();
 		if (gameFrame != null) {

2006Redone Client/src/RSFrame.java

@@ -10,7 +10,7 @@ final class RSFrame extends Frame {
 	public RSFrame(RSApplet RSApplet_, int i, int j) {
 		rsApplet = RSApplet_;
 		setTitle(ClientSettings.SERVER_NAME);
-		setResizable(true);
+		setResizable(false);
 		setMinimumSize(new Dimension(i + 8, j + 28));
 		setVisible(true);
 		toFront();

2006Redone Client/src/RSInterface.java

@@ -111,6 +111,14 @@ public final class RSInterface {
 						rsInterface.actions[l3] = null;
 					}
 				}
+				if(rsInterface.parentID == 3822) {
+					rsInterface.actions[2] = "Sell 10";
+					rsInterface.actions[3] = "Sell X";
+				}
+				if(rsInterface.id == 3900) {
+					rsInterface.actions[2] = "Buy 10";
+					rsInterface.actions[3] = "Buy X";
+				}
 			}
 			if (rsInterface.type == 3) {
 				rsInterface.aBoolean227 = stream.readUnsignedByte() == 1;

2006Redone Client/src/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") + "/.2006redone_file_system/";
+		String path = System.getProperty("user.home") + "/.2006rebotted_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:/.2006redone_file_system/");
+		File file = new File("C:/.2006rebotted_file_system/");
 		if (!file.exists()) {
 			file.mkdirs();
 		}

2006Redone Client/src/SizeConstants.java

@@ -34,31 +34,31 @@ final class SizeConstants {
 		173, 228, 121, 83, 133, 68, 0
 	};
 	public static final int[] packetSizes = {
-		0, 0, 0, 0, 6, 0, 0, 0, 4, 0, 
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-		0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 
-		0, 0, 0, 0, -2, 4, 3, 0, 0, 0, 
-		0, 0, 0, 0, 5, 0, 0, 6, 0, 0, 
-		9, 0, 0, -2, 0, 0, 0, 0, 0, 0, 
-		-2, 1, 0, 0, 2, -2, 0, 0, 0, 0, 
-		6, 3, 2, 4, 2, 4, 0, 0, 0, 4, 
-		0, -2, 0, 0, 7, 2, 0, 6, 0, 0, 
-		0, 0, 0, 0, 0, 0, 0, 2, 0, 1, 
-		0, 2, 0, 0, -1, 4, 1, 0, 0, 0, 
-		1, 0, 0, 0, 2, 0, 0, 15, 0, 0, 
-		0, 4, 4, 0, 0, 0, -2, 0, 0, 0, 
-		0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 
-		0, 0, 2, 0, 0, 0, 0, 14, 0, 0, 
-		0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 
-		4, 0, 0, 0, 2, 0, 6, 0, 0, 0, 
-		0, 3, 0, 0, 5, 0, 10, 6, 0, 0, 
-		0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 
-		0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 
-		4, 0, 0, 0, 0, 0, 3, 0, 2, 0, 
-		0, 0, 0, 0, -2, 7, 0, 0, 2, 0, 
-		0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
-		8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-		2, -2, 0, 0, 0, 0, 6, 0, 4, 3, 
-		0, 0, 0, -1, 6, 0, 0
+		0, 0, 0, 0, 6, 0, 0, 0, 4, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //10
+		0, 0, 0, 0, 1, 0, 0, 0, 0, 0, //20
+		0, 0, 0, 0, -2, 4, 3, 0, 0, 0, //30
+		0, 0, 0, 0, 5, 0, 0, 6, 0, 0, //40
+		9, 0, 0, -2, 0, 0, 0, 0, 0, 0, //50
+		-2, 1, 0, 0, 2, -2, 0, 0, 0, 0, //60
+		6, 3, 2, 4, 2, 4, 0, 0, 0, 4, //70
+		0, -2, 0, 0, 7, 2, 0, 6, 0, 0, //80
+		0, 0, 0, 0, 0, 0, 0, 2, 0, 1, //90
+		0, 2, 0, 0, -1, 4, 1, 0, 0, 0, //100
+		1, 0, 0, 0, 2, 0, 0, 15, 0, 0, //110
+		0, 4, 4, 0, 0, 0, -2, 0, 0, 0, //120
+		0, 0, 0, 0, 6, 0, 0, 0, 0, 0, //130
+		0, 0, 2, 0, 0, 0, 0, 14, 0, 0, //140
+		0, 4, 0, 0, 0, 0, 3, 0, 0, 0, //150
+		4, 0, 0, 0, 2, 0, 6, 0, 0, 0, //160
+		0, 3, 0, 0, 5, 0, 10, 6, 0, 0, //170
+		0, 0, 0, 0, 0, 2, 0, 0, 0, 0, //180
+		0, 0, 0, 0, 0, 0, -1, 0, 0, 0, //190
+		4, 0, 0, 0, 0, 0, 3, 0, 2, 0, //200
+		0, 0, 0, 0, -2, 7, 0, 0, 2, 0, //210
+		0, 1, 0, 0, 0, 0, 0, 0, 0, 0, //220
+		8, 0, 0, 0, 0, 0, 0, 0, 0, 0, //230
+		2, -2, 0, 0, 0, 0, 6, 0, 4, 3, //240
+		0, 0, 0, -1, 6, 0, 0//250
 	};
 }

2006Redone Client/src/TextDrawingArea.java

@@ -200,7 +200,11 @@ public final class TextDrawingArea extends DrawingArea {
 					if (flag1) {
 						method392(aByteArrayArray1491[c], i + anIntArray1494[c] + 1, k + anIntArray1495[c] + 1, anIntArray1492[c], anIntArray1493[c], 0);
 					}
+					try {
 					method392(aByteArrayArray1491[c], i + anIntArray1494[c], k + anIntArray1495[c], anIntArray1492[c], anIntArray1493[c], j);
+					} catch (Exception e) {
+						
+					}
 				}
 				i += anIntArray1496[c];
 			}

2006Redone Server/.classpath

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="libs/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="libs/mina.jar"/>
-	<classpathentry kind="lib" path="libs/mysql-connector-java-5.1.23-bin.jar"/>
-	<classpathentry kind="lib" path="libs/slf4j-nop.jar"/>
-	<classpathentry kind="lib" path="libs/slf4j.jar"/>
-	<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
-	<classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

2006Redone Server/.gitignore

@@ -0,0 +1,6 @@
+/bin/
+.gradle
+.settings
+.classpath
+.project
+settings.gradle

2006Redone Server/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Jun 18 15:12:25 EDT 2019
-gradle.version=4.10

2006Redone Server/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>2006Redone</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

2006Redone Server/.settings/org.eclipse.jdt.core.prefs

@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

2006Redone Server/.settings/org.eclipse.jdt.ui.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_2006Redone
-formatter_settings_version=12

2006Redone Server/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

2006Redone Server/README.md

@@ -0,0 +1,15 @@
+# 2006rebotted - 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.
+Contained within is an implementation of the Runescape network protocol roughly around version 508.
+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.
+
+

2006Redone Server/build.bat

@@ -1,3 +0,0 @@
-@echo off
-java -jar libs/javac++.jar src libs bin
-pause

2006Redone Server/build.gradle

@@ -0,0 +1,78 @@
+
+plugins {
+	id 'java-library'
+}
+
+repositories {
+	jcenter()
+	flatDir {
+        dirs 'libs'
+   }
+}
+
+dependencies {
+	// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
+	compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
+
+	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
+	compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.10.1'
+
+	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
+	compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.10.1'
+
+	// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+	compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.1'
+
+	// https://mvnrepository.com/artifact/org.json/json
+	compile group: 'org.json', name: 'json', version: '20190722'
+
+	// https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor
+	compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '4.3.1'
+
+	// https://mvnrepository.com/artifact/org.apache.mina/mina-core
+	compile group: 'org.apache.mina', name: 'mina-core', version: '1.1.7'
+
+	// https://mvnrepository.com/artifact/mysql/mysql-connector-java
+	compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.18'
+
+	// https://mvnrepository.com/artifact/io.netty/netty-all
+	compile group: 'io.netty', name: 'netty-all', version: '4.1.44.Final'
+
+	// https://mvnrepository.com/artifact/com.neovisionaries/nv-websocket-client
+	compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
+
+	// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+	compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.3.1'
+
+	// https://mvnrepository.com/artifact/com.squareup.okio/okio
+	compile group: 'com.squareup.okio', name: 'okio', version: '2.4.3'
+
+	// https://mvnrepository.com/artifact/org.slf4j/slf4j-api
+	compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+
+	// https://mvnrepository.com/artifact/org.ogce/xpp3
+	compile group: 'org.ogce', name: 'xpp3', version: '1.1.6'
+
+	// https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream
+	compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.11.1'
+	
+	// https://mvnrepository.com/artifact/org.javacord/javacord-api
+	compile group: 'org.javacord', name: 'javacord-api', version: '3.0.4'
+	
+	// https://mvnrepository.com/artifact/org.javacord/javacord-core
+	compile group: 'org.javacord', name: 'javacord-core', version: '3.0.4'
+
+	// From libs flatdir
+	compile name: 'everythingrs-api'
+}
+
+jar {
+    manifest {
+        attributes 'Implementation-Title': '2006rebotted',
+                   'Implementation-Version': '0.1.0',
+                   'Main-Class': 'com.rebotted.GameEngine'
+    }
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}