Check early logger state before starting the game!

Author: Fox2Code

launcher/build.gradle

@@ -124,6 +124,9 @@ compileJava {
         ClassNode classNode = new ClassNode()
         ClassReader classReader = new ClassReader(hypertaleJavaPlugin.bytes)
         classReader.accept(classNode, 0)
+        if (classNode.permittedSubclasses != null) {
+            classNode.permittedSubclasses.clear()
+        }
         classNode.visitPermittedSubclass("com/hypixel/hytale/server/core/plugin/JavaPlugin")
         classNode.visitPermittedSubclass("com/hypixel/hytale/plugin/early/ClassTransformer")
         ClassWriter classWriter = new ClassWriter(0)

launcher/src/main/java/com/fox2code/hypertale/launcher/DependencyHelper.java

@@ -127,7 +127,7 @@ public static void loadDependency(Dependency dependency) {
 				}
 			} else {
 				if (!justDownloaded) {
-					// Assume file is corrupted if load failed.
+					// Assume the file is corrupted if the load failed.
 					if (file.exists() && !file.delete()) file.deleteOnExit();
 					loadDependency(dependency);
 					return;

launcher/src/main/java/com/fox2code/hypertale/launcher/Main.java

@@ -126,7 +126,7 @@ static void main(String[] args) throws IOException, InterruptedException {
 								EarlyLogger.log("Pre-patching the game with " + mainClass);
 								method.invoke(null, (Object) new String[]{input.getAbsolutePath(),
 										HypertalePaths.hypertalePrePatched.getAbsolutePath()});
-								if (HypertalePaths.hypertalePrePatched.isFile()) {
+								if (MainPlus.checkHytaleJarFile(HypertalePaths.hypertalePrePatched)) {
 									input = HypertalePaths.hypertalePrePatched;
 								}
 							} catch (Exception e) {
@@ -177,11 +177,11 @@ static void main(String[] args) throws IOException, InterruptedException {
 		EarlyLogger.start(false);
 		EarlyLogger.log("Version " + BuildConfig.HYPERTALE_VERSION);
 		File hytaleJar = HypertalePaths.getHytaleJar();
-		if (!hytaleJar.exists()) {
+		if (!hytaleJar.isFile()) {
 			EarlyLogger.log("Cannot find original HytaleServer.jar");
+			EarlyLogger.stop();
 			return;
 		}
-		// TODO: Detect singleplayer mode
 		HypertaleConfig.load();
 		HypertaleData cachedData = null;
 		if (HypertalePaths.hypertaleCacheJar.exists() &&
@@ -242,14 +242,21 @@ private static void launchGame(String[] args, boolean dev) throws IOException {
 				}
 			}
 		}
-		if (HypertalePaths.hypertaleCacheJar.exists()) {
+		if (HypertalePaths.hypertaleCacheJar.isFile()) {
+			if (!MainPlus.checkHytaleJarFile(HypertalePaths.hypertaleCacheJar)) {
+				EarlyLogger.log("Patched jar is invalid, or corrupted!");
+				return;
+			}
 			DependencyHelper.addFileToClasspath(HypertalePaths.hypertaleCacheJar);
 		} else if (!dev) {
 			throw new FileNotFoundException("Failed to get ./.hypertale/HytaleServer.jar");
 		}
 		for (DependencyHelper.Dependency dependency : DependencyHelper.patcherDependencies) {
 			DependencyHelper.loadDependency(dependency);
 		}
+		if (MainPlus.checkHaltLaunchGame(args)) {
+			return;
+		}
 		MixinLoader.preInitializeMixin();
 		PatchHelper.install();
 		if (modGatherer.getModSyncBootstrap() != null &&

launcher/src/main/java/com/fox2code/hypertale/launcher/MainPlus.java

@@ -23,6 +23,9 @@
  */
 package com.fox2code.hypertale.launcher;
 
+import com.fox2code.hypertale.loader.HypertaleConfig;
+
+import java.io.File;
 import java.io.IOException;
 import java.lang.instrument.Instrumentation;
 
@@ -48,4 +51,15 @@ static void patchAsClassPath() throws IOException {
 	static void launchPatchedAsClassPath(String[] args) throws IOException {
 		throw new IOException("Only premium versions of Hypertale can use this feature!");
 	}
+
+	static boolean checkHytaleJarFile(File file) {
+		if (HypertaleConfig.checkJarValidity()) {
+			throw new RuntimeException("Only premium versions of Hypertale can use this feature!");
+		}
+		return file.isFile();
+	}
+
+	static boolean checkHaltLaunchGame(String[] args) {
+		return false;
+	}
 }

patcher/src/main/java/com/fox2code/hypertale/loader/HypertaleConfig.java

@@ -43,6 +43,7 @@ public final class HypertaleConfig {
 	public static boolean optimizePluginOnlyAPIs = true;
 	public static boolean aggressivelyOptimizePluginOnlyAPIs = false;
 	public static boolean premiumHyperOptimizeClassPath = false;
+	public static boolean premiumCheckJarValidity = true;
 	public static int watchdogWarnLagAfter = 10;
 	public static int watchdogExitAfter = 30;
 
@@ -164,4 +165,8 @@ private static void fixupConfiguration() {
 	public static boolean hyperOptimizeClassPath() {
 		return HypertaleConfig.premiumHyperOptimizeClassPath && !PREMIUM;
 	}
+
+	public static boolean checkJarValidity() {
+		return HypertaleConfig.premiumCheckJarValidity && PREMIUM;
+	}
 }