Added warning for 32-bit and > 1.8 Java versions (#264 )

* Added warning for 32-bit and > 1.8 Java versions * Clarify why
Remove rare protection, add all NPCs to a static list (#254 )
2026-07-02 16:49:03 +00:00 · 2019-12-10 19:21:45 -05:00 · 2019-12-09 22:59:54 -05:00 · 2019-12-09 18:50:39 -05:00 · 2019-12-07 21:19:44 -05:00 · 2019-12-07 21:16:18 -05:00
3155 changed files with 224449 additions and 83107 deletions
@@ -1 +1,5 @@
 2006Redone\ Server/data/characters/
+.idea/
+.idea/workspace.xml
+**/.idea/workspace.xml
+**/.idea/*
@@ -7,7 +7,7 @@
      <sourceFolder url="file://$MODULE_DIR$/2006Redone file_server/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/2006Redone Client/src" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library">
      <library>
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1,140 @@
+<?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/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    </list>
+    <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="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">
+    <option name="x" value="-7" />
+    <option name="width" value="1294" />
+    <option name="height" value="1407" />
+  </component>
+  <component name="ProjectId" id="1Sr1PyvKre5eWJ6XgOrqWrHM5hp" />
+  <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/2006Redone Client/METAs/Client Meta" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
+  </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.GameEngine">
+    <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="2006rebotted" />
+      <option name="WORKING_DIRECTORY" value="2006Redone Server" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="redone.*" />
+          <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.GameEngine" />
+        <item itemvalue="Application.FileServer" />
+        <item itemvalue="Application.Client" />
+      </list>
+    </recent_temporary>
+  </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>
+    </task>
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <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>
+</project>
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Client
+
@@ -0,0 +1,2 @@
+/Client.class
+/LocalGame.class
@@ -0,0 +1,7 @@
+/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/
+/* DO NOT EDIT */
+
+grant {
+  permission java.security.AllPermission;
+};
+
@@ -10,20 +10,19 @@ public class ClientSettings {
 	/**
 	 * 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.2006rebotted.tk";
 	/**
 	 * The Servers Ip
 	 *
-	 * You dont have to change this, the client will automatically connect to the server
-	 * on localhost
+	 * 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 = "2006rebotted.hopto.org";
 	/**
 	 * The Npc Bits for the Server
 	 */
@@ -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,13 @@ 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 String intToKOrMilLongName(int i) {
 		String s = String.valueOf(i);
@@ -4761,6 +4769,9 @@ public class Game extends RSApplet {
 					inputTaken = true;
 				}
 				if ((j == 13 || j == 10) && inputString.length() > 0) {
+					if (inputString.equals("::gfxtgl") || inputString.equals("::tglgfx") || inputString.equals("::togglerender") || inputString.equals("::togglegfx")) {
+						graphicsEnabled = !graphicsEnabled;
+					}
 					if (myPrivilege == 2) {
 						if (inputString.equals("::clientdrop")) {
 							dropClient();
@@ -9761,8 +9772,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) {
@@ -9774,6 +9787,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;
@@ -10632,7 +10646,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;
@@ -11407,6 +11421,7 @@ public class Game extends RSApplet {

 			Signlink.reporterror(s2);
 			resetLogout();
+			exception.printStackTrace();
 		}
 		return true;
 	}
@@ -11474,20 +11489,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() {
@@ -11515,6 +11535,16 @@ public class Game extends RSApplet {
 	}

 	public Game() {
+	    //Test if they're on 32-bit, warn them if they are
+		if (!System.getProperty("os.arch").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];
@@ -12149,7 +12179,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())
@@ -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";
+    }
+}
@@ -16,6 +16,7 @@ public final class Main {
 	 */

 	public static void main(String[] args) {
+		ClientSettings.SERVER_IP = "2006rebotted.hopto.org";
 		if (args.length > 1)
 		{
 			System.out.println("Running local");
@@ -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) {
@@ -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;
@@ -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();
 		}
@@ -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
 	};
 }
--- a/Show More
+++ b/Show More