diff --git a/src/deploaderStub/java/com/falsepattern/deploader/Stub.java b/src/deploaderStub/java/com/falsepattern/deploader/DeploaderStub.java similarity index 97% rename from src/deploaderStub/java/com/falsepattern/deploader/Stub.java rename to src/deploaderStub/java/com/falsepattern/deploader/DeploaderStub.java index 805f071..94aba11 100644 --- a/src/deploaderStub/java/com/falsepattern/deploader/Stub.java +++ b/src/deploaderStub/java/com/falsepattern/deploader/DeploaderStub.java @@ -45,7 +45,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarInputStream; -public final class Stub { +public final class DeploaderStub { private static final String BLACKBOARD_MARKER = "FPLIB_DEPLOADER"; private static final String BLACKBOARD_RUN_DEPLOADER_MARKER = "FPLIB_RUN_DEPLOADER"; private static boolean rfbDetected = false; @@ -61,7 +61,7 @@ public final class Stub { if (deploader != null) { return; } - Stub scanner = new Stub(); + DeploaderStub scanner = new DeploaderStub(); @SuppressWarnings("resource") URLClassLoader cl = classLoader(); for (URL url: cl.getURLs()) { @@ -169,7 +169,7 @@ public final class Stub { try { ((Method)runDepLoader).invoke(null); } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException("Could not run FalsePatternLib deploader!", e); + throw new RuntimeException("FalsePatternLib Deploader exited with an exception.", e); } } diff --git a/src/main/java/com/falsepattern/lib/internal/asm/CoreLoadingPlugin.java b/src/main/java/com/falsepattern/lib/internal/asm/CoreLoadingPlugin.java index a6c5561..4176278 100644 --- a/src/main/java/com/falsepattern/lib/internal/asm/CoreLoadingPlugin.java +++ b/src/main/java/com/falsepattern/lib/internal/asm/CoreLoadingPlugin.java @@ -21,7 +21,7 @@ */ package com.falsepattern.lib.internal.asm; -import com.falsepattern.deploader.Stub; +import com.falsepattern.deploader.DeploaderStub; import com.falsepattern.lib.internal.FPLog; import com.falsepattern.lib.internal.Tags; import com.falsepattern.lib.internal.logging.CrashImprover; @@ -55,7 +55,7 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin { private static boolean obfuscated; static { - Stub.bootstrap(false); + DeploaderStub.bootstrap(false); FPLog.LOG.info("Removing skill issues..."); try { Class.forName("thermos.Thermos"); @@ -66,7 +66,7 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin { //Scan for dependencies now FPLog.LOG.info("Scanning for deps..."); long start = System.nanoTime(); - Stub.runDepLoader(); + DeploaderStub.runDepLoader(); long end = System.nanoTime(); FPLog.LOG.info("Scanned in " + (end - start) / 1000000 + "ms"); //Initializing the rest diff --git a/src/main/java/com/falsepattern/lib/internal/asm/RFBLoadingPlugin.java b/src/main/java/com/falsepattern/lib/internal/asm/RFBLoadingPlugin.java index b20b1af..0f76cfe 100644 --- a/src/main/java/com/falsepattern/lib/internal/asm/RFBLoadingPlugin.java +++ b/src/main/java/com/falsepattern/lib/internal/asm/RFBLoadingPlugin.java @@ -22,7 +22,7 @@ package com.falsepattern.lib.internal.asm; -import com.falsepattern.deploader.Stub; +import com.falsepattern.deploader.DeploaderStub; import com.gtnewhorizons.retrofuturabootstrap.RfbApiImpl; import com.gtnewhorizons.retrofuturabootstrap.api.RfbPlugin; import lombok.val; @@ -43,7 +43,7 @@ public class RFBLoadingPlugin implements RfbPlugin { exc.invoke(loader, "com.falsepattern.lib.internal.config.EarlyConfig"); exc.invoke(loader, "com.falsepattern.lib.internal.core.LowLevelCallMultiplexer"); } catch (Exception ignored) {} - Stub.bootstrap(true); - Stub.runDepLoader(); + DeploaderStub.bootstrap(true); + DeploaderStub.runDepLoader(); } }