Add initial Hypertale Plus support!

Fox2Code · Fox2Code · commit 673a8ee7c666 · 2026-02-14T18:40:28.000+01:00
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This mod improves performance and reduces memory pressure on the Hytale server!
 Memory pressure is how much memory is allocated per second.
 When high, this makes the java garbage collector slow the server down a lot!
 
-Used spark a lot to help with performance profiling.
+Spark was used extensively a lot to help with performance profiling.
 
 Hypertale should be compatible with existing performance mods for Hytale!
 
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 org.gradle.java.installations.auto-download=true
 # Hypertale properties
-hypertale.version=0.0.7
+hypertale.version=1.0.0-dev
 hypertale.init=1
 
 # https://plugins.gradle.org/plugin/net.ltgt.errorprone
diff --git a/launcher/src/main/java/com/fox2code/hypertale/commands/HypertalePyroCommand.java b/launcher/src/main/java/com/fox2code/hypertale/commands/HypertalePyroCommand.java
@@ -54,6 +54,8 @@ final class HypertalePyroCommand extends AbstractCommand {
 	protected @Nullable CompletableFuture<Void> execute(@NonNull CommandContext commandContext) {
 		if (commandContext.isPlayer()) {
 			commandContext.sendMessage(PYRO_MESSAGE);
+		} else {
+			commandContext.sendMessage(PYRO_MESSAGE_ALT);
 		}
 		return null;
 	}
diff --git a/launcher/src/main/java/com/fox2code/hypertale/commands/HypertaleVersionCommand.java b/launcher/src/main/java/com/fox2code/hypertale/commands/HypertaleVersionCommand.java
@@ -36,7 +36,8 @@
 
 final class HypertaleVersionCommand extends AbstractCommand {
 	static final Message VERSION_MESSAGE = Message.join(HypertalePlugin.HYPERTALE,
-			Message.raw(": Hypertale version -> " + BuildConfig.HYPERTALE_VERSION));
+			Message.raw(": Hypertale version -> " + BuildConfig.HYPERTALE_VERSION +
+					" (" + HypertalePlugin.EDITION + ")"));
 
 	HypertaleVersionCommand() {
 		super("version", "Show Hypertale version!");
diff --git a/launcher/src/main/java/com/fox2code/hypertale/launcher/HypertaleAgent.java b/launcher/src/main/java/com/fox2code/hypertale/launcher/HypertaleAgent.java
@@ -64,5 +64,8 @@ static void tryLoadEarlyAgent() {
 								.getMethod("getInstrumentation").invoke(null);
 			} catch (Exception _) {}
 		}
+		if (instrumentation == null) {
+			instrumentation = MainPlus.tryGetInstrumentationFallback();
+		}
 	}
 }
diff --git a/launcher/src/main/java/com/fox2code/hypertale/launcher/Main.java b/launcher/src/main/java/com/fox2code/hypertale/launcher/Main.java
@@ -65,6 +65,7 @@ static void main(String[] args) throws IOException, InterruptedException {
 		} else if (!Boolean.getBoolean("hypertale.useInitWrapper")) {
 			System.setProperty("hypertale.initMethod", "direct");
 		}
+		MainPlus.setEditionProperties();
 		if (args.length == 0 && !isRunningFromTerminal()) {
 			// Avoid running a server from a double click.
 			System.out.println("[Hypertale] File double click detected! Skipping running!");
@@ -164,6 +165,14 @@ static void main(String[] args) throws IOException, InterruptedException {
 			EarlyLogger.log("Version " + BuildConfig.HYPERTALE_VERSION);
 			launchGame(EmptyArrays.EMPTY_STRING_ARRAY, true);
 			return;
+		} else if (args.length == 1 && "--patch-class-path".equals(args[0])) {
+			if (Boolean.getBoolean("hypertale.premium")) {
+				EarlyLogger.start(false);
+				MainPlus.patchAsClassPath();
+			} else {
+				System.out.println("This feature is only available on premium builds of Hypertale!");
+			}
+			return;
 		}
 		EarlyLogger.start(false);
 		EarlyLogger.log("Version " + BuildConfig.HYPERTALE_VERSION);
@@ -201,6 +210,12 @@ static void main(String[] args) throws IOException, InterruptedException {
 		if (args.length == 1 && "--noop".equals(args[0])) {
 			return;
 		}
+		if (HypertaleConfig.hyperOptimizeClassPath()) {
+			MainPlus.launchPatchedAsClassPath(args);
+			return;
+		} else if (HypertaleConfig.premiumHyperOptimizeClassPath) {
+			EarlyLogger.log("HyperOptimizeClassPath is only supported on premium builds of Hypertale!");
+		}
 		try {
 			launchGame(args, false);
 		} catch (LinkageError e) {
@@ -263,6 +278,15 @@ private static void launchGame(String[] args, boolean dev) throws IOException {
 
 	private static void runPatcher(HypertaleData actualData) throws IOException, InterruptedException {
 		EarlyLogger.log("Patching HytaleServer...");
+		execSelf("--run-patcher");
+		actualData.modifiedJarSize = HypertalePaths.hypertaleCacheJar.length();
+		actualData.writeTo(HypertalePaths.hypertaleCacheData);
+	}
+
+	public static void execSelf(String arg) throws IOException, InterruptedException {
+		if (!EarlyLogger.isDirectLogging()) {
+			throw new IllegalStateException("Invalid state!");
+		}
 		EarlyLogger.stop();
 		ArrayList<String> command = new ArrayList<>();
 		if (System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("win")) {
@@ -272,14 +296,12 @@ private static void runPatcher(HypertaleData actualData) throws IOException, Int
 		}
 		command.add("-jar");
 		command.add(HypertalePaths.getHypertaleExecJar().getAbsolutePath());
-		command.add("--run-patcher");
+		command.add(arg);
 		int returnCode = new ProcessBuilder(command).inheritIO().start().waitFor();
 		if (returnCode != 0 || !HypertalePaths.hypertaleCacheJar.exists()) {
 			throw new IOException("Patch failed with return code is " + returnCode);
 		}
 		EarlyLogger.start(true);
-		actualData.modifiedJarSize = HypertalePaths.hypertaleCacheJar.length();
-		actualData.writeTo(HypertalePaths.hypertaleCacheData);
 	}
 
 	// https://errorprone.info/bugpattern/SystemConsoleNull
diff --git a/launcher/src/main/java/com/fox2code/hypertale/launcher/MainPlus.java b/launcher/src/main/java/com/fox2code/hypertale/launcher/MainPlus.java
@@ -0,0 +1,51 @@
+/*
+ * MIT License
+ * 
+ * Copyright (c) 2026 Fox2Code
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.fox2code.hypertale.launcher;
+
+import java.io.IOException;
+import java.lang.instrument.Instrumentation;
+
+/**
+ * This class is overwritten by Hypertale Plus
+ */
+final class MainPlus {
+	static void setEditionProperties() {
+		System.setProperty("hypertale.edition", "OSS");
+		System.setProperty("hypertale.premium", "false");
+	}
+
+	static Instrumentation tryGetInstrumentationFallback() {
+		return null;
+	}
+
+	@SuppressWarnings("DoNotCallSuggester")
+	static void patchAsClassPath() throws IOException {
+		throw new IOException("Only premium versions of Hypertale can use this feature!");
+	}
+
+	@SuppressWarnings("DoNotCallSuggester")
+	static void launchPatchedAsClassPath(String[] args) throws IOException {
+		throw new IOException("Only premium versions of Hypertale can use this feature!");
+	}
+}
diff --git a/launcher/src/main/java/com/fox2code/hypertale/launcher/PatchHelper.java b/launcher/src/main/java/com/fox2code/hypertale/launcher/PatchHelper.java
@@ -36,12 +36,18 @@
 import java.util.function.Consumer;
 
 final class PatchHelper {
+	private static boolean installed = false;
+
+	private PatchHelper() {}
+
 	@SuppressWarnings("unchecked")
 	private static final Consumer<BiFunction<String, byte[], byte[]>> initCLSetClassTransformer =
 			(Consumer<BiFunction<String, byte[], byte[]>>)
 					System.getProperties().get("hypertale.initCLSetClassTransformer");
 
 	static void install() {
+		if (installed) return;
+		installed = true;
 		Instrumentation instrumentation = HypertaleAgent.getInstrumentation();
 		if (instrumentation != null) {
 			EarlyLogger.log("Using agent transformer for patching!");
diff --git a/launcher/src/main/java/com/fox2code/hypertale/loader/HypertaleModLoader.java b/launcher/src/main/java/com/fox2code/hypertale/loader/HypertaleModLoader.java
@@ -75,6 +75,9 @@ public static void loadHypertaleMods(
 			HypertaleModGatherer modGatherer, boolean libraries,
 			LinkedHashMap<File, JsonObject> loadedModsEarly) throws IOException {
 		for (File file : (libraries ? modGatherer.getLibraries() : modGatherer.getHypertaleMods())) {
+			if (loadedModsEarly.containsKey(file)) {
+				continue;
+			}
 			try (JarFile jarFile = new JarFile(file)) {
 				JarEntry hypertaleModInfo = jarFile.getJarEntry("manifest.json");
 				if (hypertaleModInfo == null) continue;
diff --git a/launcher/src/main/java/com/fox2code/hypertale/loader/HypertalePlugin.java b/launcher/src/main/java/com/fox2code/hypertale/loader/HypertalePlugin.java
@@ -44,6 +44,8 @@
 import java.util.Objects;
 
 public final class HypertalePlugin extends JavaPlugin {
+	public static final String EDITION = System.getProperty("hypertale.edition", "OSS");
+	public static final boolean PREMIUM = Boolean.getBoolean("hypertale.premium");
 	private static final boolean INVALID_INSTALLATION =
 			HypertalePlugin.class.getClassLoader() != JavaPlugin.class.getClassLoader();
 	private static final boolean USE_HYPERTALE_INIT = Boolean.getBoolean("hypertale.useInitWrapper");
@@ -88,6 +90,9 @@ protected void start() {
 		if (INVALID_INSTALLATION) return;
 		HypertaleModLoader.loadModsLate();
 		this.getLogger().atInfo().log("Successfully loaded!");
+		if (PREMIUM) {
+			this.getLogger().atInfo().log("Thank you for supporting Hypertale!");
+		}
 	}
 
 	private void tryInstallHypertaleFromModFolder() throws IOException {
diff --git a/launcher/src/main/java/com/fox2code/hypertale/utils/NetUtils.java b/launcher/src/main/java/com/fox2code/hypertale/utils/NetUtils.java
@@ -128,7 +128,6 @@ private static Charset charsetFromContentTypeImpl(String contentType) {
 			if (start == -1) return DEFAULT_ENCODING;
 			start += 10;
 		}
-		start += 9;
 		int end = contentType.indexOf(';', start);
 		if (end == -1) end = contentType.length();
 		try {
diff --git a/patcher/src/main/java/com/fox2code/hypertale/launcher/EarlyLogger.java b/patcher/src/main/java/com/fox2code/hypertale/launcher/EarlyLogger.java
@@ -96,4 +96,8 @@ public static void installLoggerFunction(Consumer<String> loggerFunction) {
 			}
 		}
 	}
+
+	static boolean isDirectLogging() {
+		return printStream != null;
+	}
 }
diff --git a/patcher/src/main/java/com/fox2code/hypertale/loader/HypertaleConfig.java b/patcher/src/main/java/com/fox2code/hypertale/loader/HypertaleConfig.java
@@ -37,10 +37,12 @@ public final class HypertaleConfig {
 	private static final String HYPERTALE_CONFIG_COMMENT =
 			"Configuration for Hypertale " + BuildConfig.HYPERTALE_VERSION + "\n" +
 			"Do not modify unless you know what you are doing!";
+	private static final boolean PREMIUM = Boolean.getBoolean("hypertale.premium");
 	public static String hytaleBranch = "release";
 	public static String secondaryJarName = "Server.jar";
 	public static boolean optimizePluginOnlyAPIs = true;
 	public static boolean aggressivelyOptimizePluginOnlyAPIs = false;
+	public static boolean premiumHyperOptimizeClassPath = false;
 	public static int watchdogWarnLagAfter = 10;
 	public static int watchdogExitAfter = 30;
 
@@ -144,6 +146,9 @@ public static int patchConfigFlags() {
 				configFlags |= 0x02;
 			}
 		}
+		if (premiumHyperOptimizeClassPath && PREMIUM) {
+			configFlags |= 0x04;
+		}
 		return configFlags;
 	}
 
@@ -155,4 +160,8 @@ private static void fixupConfiguration() {
 			secondaryJarName = "Server.jar";
 		}
 	}
+
+	public static boolean hyperOptimizeClassPath() {
+		return HypertaleConfig.premiumHyperOptimizeClassPath && !PREMIUM;
+	}
 }
diff --git a/patcher/src/main/java/com/fox2code/hypertale/patcher/Optimizer.java b/patcher/src/main/java/com/fox2code/hypertale/patcher/Optimizer.java
@@ -117,7 +117,7 @@ private static void tryOptimiseInvokeStatic(MethodNode methodNode, MethodInsnNod
 							((nextX = nextX.getNext()) != null && nextX.getOpcode() == ISTORE) &&
 							((nextX = nextX.getNext()) != null && nextX.getOpcode() == ICONST_0) &&
 							((nextX = nextX.getNext()) != null && nextX.getOpcode() == ISTORE)) &&
-					// Ignore self constructor, unless we know it's bad, not very precise.
+					// Ignore self-constructor, unless we know it's bad, not very precise.
 					!(next.getOpcode() != PUTSTATIC && next2.getOpcode() != AASTORE &&
 							methodNode.name.equals("<clinit>")))) {
 				return;
diff --git a/patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatches.java b/patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatches.java
@@ -32,7 +32,7 @@ public final class HypertalePatches {
 	private static final ArrayList<HypertalePatch> noPatches = new ArrayList<>();
 	private static final ArrayList<HypertalePatch> globalHypertalePatches = new ArrayList<>();
 	private static final HashMap<String, ArrayList<HypertalePatch>> hypertaleClassPatches = new HashMap<>();
-	private static void addPatch(HypertalePatch hypertalePatch) {
+	static void addPatch(HypertalePatch hypertalePatch) {
 		if (hypertalePatch.targets == null) {
 			globalHypertalePatches.add(hypertalePatch);
 		} else {
@@ -58,6 +58,7 @@ private static void addPatch(HypertalePatch hypertalePatch) {
 		addPatch(new PatchHytaleLogFormatter());
 		addPatch(new PatchRedirectToOptimisedGetPlayers());
 		addPatch(new PatchRedirectToOptimisedGetChunkIfInMemory());
+		HypertalePatchesPlus.registerPatches();
 	}
 
 	public static ClassNode patchClassNode(ClassNode classNode) {
diff --git a/patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatchesPlus.java b/patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatchesPlus.java
@@ -0,0 +1,31 @@
+/*
+ * MIT License
+ * 
+ * Copyright (c) 2026 Fox2Code
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.fox2code.hypertale.patcher.patches;
+
+/**
+ * This class is overwritten by Hypertale Plus
+ */
+final class HypertalePatchesPlus {
+	static void registerPatches() {}
+}

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ final class HypertalePyroCommand extends AbstractCommand {`
`54`	`54`	`protected @Nullable CompletableFuture<Void> execute(@NonNull CommandContext commandContext) {`
`55`	`55`	`if (commandContext.isPlayer()) {`
`56`	`56`	`commandContext.sendMessage(PYRO_MESSAGE);`
	`57`	`+ } else {`
	`58`	`+ commandContext.sendMessage(PYRO_MESSAGE_ALT);`
`57`	`59`	`}`
`58`	`60`	`return null;`
`59`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,8 @@ static void tryLoadEarlyAgent() {`
`64`	`64`	`.getMethod("getInstrumentation").invoke(null);`
`65`	`65`	`} catch (Exception _) {}`
`66`	`66`	`}`
	`67`	`+ if (instrumentation == null) {`
	`68`	`+ instrumentation = MainPlus.tryGetInstrumentationFallback();`
	`69`	`+ }`
`67`	`70`	`}`
`68`	`71`	`}`