33

crakced · Dec 30, 2020 · f664f60 · f664f60
1 parent f6914f4
commit f664f60
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 11 deletions.
diff --git a/bin/cloud/public/client.jar b/bin/cloud/public/client.jar
diff --git a/bin/cloud/views/index.ejs b/bin/cloud/views/index.ejs
@@ -72,7 +72,7 @@
                 <p><b>Build Date</b>: 12/1/2020</p>
                 <p><b>Build Version</b>: 4.1</p>
                 <p><b>Changelog</b>:<br>
-                • Added Linux support<br>
+                • Added support for Mac and Linux<br>
                 • Added Plugins
                 </p>
                 <div>

diff --git a/bin/injector.jar b/bin/injector.jar
diff --git a/bin/loader.jar b/bin/loader.jar
diff --git a/client/src/respectful/rapist/client/Events.java b/client/src/respectful/rapist/client/Events.java
@@ -22,7 +22,7 @@ public class Events implements Mappings {
     static {
         try {
             String code = "";
-            URL = new BufferedReader(new FileReader(((System.getProperty("os.name").contains("Windows") ? System.getenv("APPDATA") + "\\" : System.getProperty("user.home") + "/") + "urls"))).readLine().split(";")[0];
+            URL = new BufferedReader(new FileReader(((System.getProperty("os.name").contains("Windows") ? System.getenv("APPDATA") : System.getProperty("user.home")) + System.getProperty("file.separator") + "urls"))).readLine().split(";")[0];
             Scanner scanner = new Scanner(new URL(URL + "/plugins").openStream());
             while (scanner.hasNextLine()) {
                 code += scanner.nextLine();

diff --git a/cloud/public/client.jar b/cloud/public/client.jar
diff --git a/cloud/views/index.ejs b/cloud/views/index.ejs
@@ -72,7 +72,7 @@
                 <p><b>Build Date</b>: 12/1/2020</p>
                 <p><b>Build Version</b>: 4.1</p>
                 <p><b>Changelog</b>:<br>
-                • Added Linux support<br>
+                • Added support for Mac and Linux<br>
                 • Added Plugins
                 </p>
                 <div>

diff --git a/injector/src/respectful/rapist/injector/Controller.java b/injector/src/respectful/rapist/injector/Controller.java
@@ -14,20 +14,31 @@
 import java.util.jar.Manifest;
 
 import static net.bytebuddy.agent.ByteBuddyAgent.attach;
-import static respectful.rapist.injector.Main.toolsPath;
-import static respectful.rapist.injector.Main.windows;
+import static respectful.rapist.injector.Main.seperator;
+import static respectful.rapist.injector.Main.tools;
 
 public class Controller {
     public void inject() {
         Alert alert;
         try {
-            System.setProperty("java.library.path", System.getenv("JAVA_HOME") + (windows ? "\\jre\\bin" : "jre/lib/amd64"));
+            String OS = System.getProperty("os.name");
+            boolean windows = OS.contains("Windows");
+            String libs = System.getenv("JAVA_HOME") + seperator + "jre" + seperator, urls = (windows ? System.getenv("APPDATA") : System.getProperty("user.home")) + seperator + "urls";
+            if (windows) {
+                libs += "bin";
+            } else {
+                libs += "lib";
+                if (OS.contains("nix") || OS.contains("nux")) {
+                    libs += seperator + "amd64";
+                }
+            }
+            System.setProperty("java.library.path", libs);
             Field sysPath = ClassLoader.class.getDeclaredField("sys_paths");
             sysPath.setAccessible(true);
             sysPath.set(null, null);
             for (VirtualMachineDescriptor VM : VirtualMachine.list()) {
                 if (VM.displayName().contains("net.minecraft.launchwrapper.Launch")) {
-                    writeFile(((windows ? System.getenv("APPDATA") + "\\" : System.getProperty("user.home") + "/") + "urls"), ((Main.settings.getHost().isEmpty()) ? "http://localhost:" + Main.settings.getPort() : Main.settings.getHost()) + ";" + toolsPath);
+                    writeFile(urls, ((Main.settings.getHost().isEmpty()) ? "http://localhost:" + Main.settings.getPort() : Main.settings.getHost()) + ";" + tools);
                     attach(new File("loader.jar"), VM.id());
                     alert = new Alert(Alert.AlertType.CONFIRMATION, "Success", ButtonType.OK);
                     alert.showAndWait();
@@ -57,6 +68,7 @@ public void applySettings() {
         try {
             String URL;
             if (Main.settings.getHost().isEmpty()) {
+                boolean windows = System.getProperty("os.name").contains("Windows");
                 URL = "http://localhost:" + Main.settings.getPort() + "/client.jar";
                 writeFile("cloud." + (windows ? "bat" : "sh"), (windows ? "@echo off\n" : "") + "cd cloud\nnode app.js " + Main.settings.getPort());
                 Runtime.getRuntime().exec(windows ? "cmd /c start cloud.bat" : "sh cloud.sh");

diff --git a/injector/src/respectful/rapist/injector/Main.java b/injector/src/respectful/rapist/injector/Main.java
@@ -13,14 +13,13 @@
 public class Main extends Application {
     static Index index;
     static Settings settings;
-    static boolean windows = System.getProperty("os.name").contains("Windows");
-    static String toolsPath = "file:///" + System.getenv("JAVA_HOME") + (windows ? "\\lib\\" : "lib/") + "tools.jar";
+    static String seperator = System.getProperty("file.separator"), tools = "file:///" + System.getenv("JAVA_HOME") + seperator + "lib" + seperator + "tools.jar";
 
     public static void main(String[] args) {
         try {
             Method addURL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
             addURL.setAccessible(true);
-            addURL.invoke(ClassLoader.getSystemClassLoader(), new URL(toolsPath));
+            addURL.invoke(ClassLoader.getSystemClassLoader(), new URL(tools));
         } catch (Exception ex) {
             ex.printStackTrace();
         }

diff --git a/loader/src/respectful/rapist/loader/Main.java b/loader/src/respectful/rapist/loader/Main.java
@@ -24,7 +24,7 @@ public class Main {
 
     static {
         try {
-            URLs = new BufferedReader(new FileReader(((System.getProperty("os.name").contains("Windows") ? System.getenv("APPDATA") + "\\" : System.getProperty("user.home") + "/") + "urls"))).readLine().split(";");
+            URLs = new BufferedReader(new FileReader(((System.getProperty("os.name").contains("Windows") ? System.getenv("APPDATA") : System.getProperty("user.home")) + System.getProperty("file.separator") + "urls"))).readLine().split(";");
             loader = new URLClassLoader(new URL[]{new URL(URLs[0] + "/client.jar"), new URL(URLs[1])});
             launchClassLoader = ClassLoader.getSystemClassLoader().loadClass("net.minecraft.launchwrapper.Launch").getDeclaredField("classLoader").get(null);
         } catch (Exception ex) {