diff --git a/2006Redone Client/src/Game.java b/2006Redone Client/src/Game.java index 557773ae..75660100 100644 --- a/2006Redone Client/src/Game.java +++ b/2006Redone Client/src/Game.java @@ -3,11 +3,9 @@ * 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; @@ -11537,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]; diff --git a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar index 9813e8db..a4eb0e49 100644 Binary files a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar and b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar differ diff --git a/CompiledServer/artifacts/local_client_jar/2006rebotted.jar b/CompiledServer/artifacts/local_client_jar/2006rebotted.jar deleted file mode 100644 index 6706ffe0..00000000 Binary files a/CompiledServer/artifacts/local_client_jar/2006rebotted.jar and /dev/null differ diff --git a/CompiledServer/artifacts/local_client_jar/run.bat b/CompiledServer/artifacts/local_client_jar/run.bat deleted file mode 100644 index f969614c..00000000 --- a/CompiledServer/artifacts/local_client_jar/run.bat +++ /dev/null @@ -1,2 +0,0 @@ -"C:\Program Files\Java\jdk1.8.0_201\bin\java.exe" -jar 2006rebotted.jar -pause \ No newline at end of file diff --git a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar index 1cd8f052..68b3eea4 100644 Binary files a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar and b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar differ diff --git a/CompiledServer/production/2006rebotted/Game.class b/CompiledServer/production/2006rebotted/Game.class index 3c5257d7..bfbea00c 100644 Binary files a/CompiledServer/production/2006rebotted/Game.class and b/CompiledServer/production/2006rebotted/Game.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/npcs/NpcAggressive.class b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/npcs/NpcAggressive.class index 2835dba9..023ebebd 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/npcs/NpcAggressive.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/npcs/NpcAggressive.class differ diff --git a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class index 594e497d..870cb7b5 100644 Binary files a/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class and b/CompiledServer/production/2006rebotted/com/rebotted/net/packets/impl/Commands.class differ