Remove patch meant for an older version of Hypertale that caused issues!

+ Some goodies for Hypertale Plus

Author: Fox2Code

launcher/src/main/java/com/fox2code/hypertale/io/HypertaleData.java

@@ -29,14 +29,15 @@
 public final class HypertaleData {
 	// Note: We don't need backward compatibility for the format version,
 	// since if the format version is different, other fields would be different too.
-	private static final int HYPERTALE_CACHE_FORMAT_VERSION = 1;
+	private static final int HYPERTALE_CACHE_FORMAT_VERSION = 2;
 	private final int hypertaleCacheFormatVersion;
 	public long hypertaleJarSize;
 	public long originalJarSize;
 	public long modifiedJarSize;
 	public int patchConfigFlags;
 	public int modHash;
 	public long prePatcherSize;
+	public int hypertalePlus;
 
 	public HypertaleData(File file) throws IOException {
 		try (DataInputStream dataInputStream = new DataInputStream(
@@ -53,6 +54,7 @@ public HypertaleData(File file) throws IOException {
 				this.patchConfigFlags = dataInputStream.readInt();
 				this.modHash = dataInputStream.readInt();
 				this.prePatcherSize = dataInputStream.readLong();
+				this.hypertalePlus = dataInputStream.readInt();
 			}
 		}
 	}
@@ -64,6 +66,7 @@ public HypertaleData() {
 		this.modifiedJarSize = 0;
 		this.patchConfigFlags = 0;
 		this.modHash = 0;
+		this.hypertalePlus = 0;
 	}
 
 	public void writeTo(File file) throws IOException {
@@ -79,6 +82,7 @@ public void writeTo(File file) throws IOException {
 			dataOutputStream.writeInt(this.patchConfigFlags);
 			dataOutputStream.writeInt(this.modHash);
 			dataOutputStream.writeLong(this.prePatcherSize);
+			dataOutputStream.writeInt(this.hypertalePlus);
 		}
 	}
 
@@ -91,14 +95,15 @@ public boolean equals(Object obj) {
 				this.modifiedJarSize == hypertaleData.modifiedJarSize &&
 				this.patchConfigFlags == hypertaleData.patchConfigFlags &&
 				this.modHash == hypertaleData.modHash &&
-				this.prePatcherSize == hypertaleData.prePatcherSize;
+				this.prePatcherSize == hypertaleData.prePatcherSize &&
+				this.hypertalePlus == hypertaleData.hypertalePlus;
 	}
 
 	@Override
 	public int hashCode() {
 		return Objects.hash(this.hypertaleCacheFormatVersion,
 				this.hypertaleJarSize, this.originalJarSize,
 				this.modifiedJarSize, this.patchConfigFlags, this.modHash,
-				this.prePatcherSize);
+				this.prePatcherSize, this.hypertalePlus);
 	}
 }

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

@@ -233,6 +233,7 @@ static void main(String[] args) throws IOException, InterruptedException {
 		actualData.modHash = modGatherer.getModHash();
 		actualData.prePatcherSize = HypertalePaths.hypertalePrePatcher.isFile() ?
 				HypertalePaths.hypertalePrePatcher.length() : 0;
+		actualData.hypertalePlus = MainPlus.hypertalePlusValue();
 		if (args.length == 1 && "--dry".equals(args[0])) {
 			return;
 		}

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

@@ -69,4 +69,8 @@ static boolean forceOffline() {
 		// Hypertale Offline Edition overwrite this method
 		return false;
 	}
+
+	public static int hypertalePlusValue() {
+		return 0;
+	}
 }

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

@@ -48,6 +48,7 @@ public final class HypertaleConfig {
 	public static boolean premiumHyperOptimizeClassPath = false; // Optimize the entire classpath as a whole
 	public static boolean premiumCheckJarValidity = true; // Check if the patched jar bytecode is valid before starting
 	public static boolean premiumOfflineMode = false; // Disable the ability for plugins to connect to the internet
+	public static boolean proAutoInhibitFix = true; // Make Hypertale query online for resources
 	public static int watchdogWarnLagAfter = 10; // Time after which a stacktrace will be dumped
 	public static int watchdogExitAfter = 60; // Time after which hypertale assume the server crashed
 
@@ -181,4 +182,8 @@ public static boolean isUnsupportedConfiguration() {
 	public static boolean isOfflineMode() {
 		return PREMIUM && HypertaleConfig.premiumOfflineMode;
 	}
+
+	public static boolean isInhibitFix() {
+		return PREMIUM && HypertaleConfig.proAutoInhibitFix;
+	}
 }

patcher/src/main/java/com/fox2code/hypertale/patcher/HypertaleASMConstants.java

@@ -75,6 +75,7 @@ public interface HypertaleASMConstants {
 	String FloodLightCalculation = "com/hypixel/hytale/server/core/universe/world/lighting/FloodLightCalculation";
 	String FullBrightLightCalculation = "com/hypixel/hytale/server/core/universe/world/lighting/FullBrightLightCalculation";
 	String ChunkStore = "com/hypixel/hytale/server/core/universe/world/storage/ChunkStore";
+	String EntityStore$UUIDSystem = "com/hypixel/hytale/server/core/universe/world/storage/EntityStore$UUIDSystem";
 	String IndexedStorageChunkStorageProvider = "com/hypixel/hytale/server/core/universe/world/storage/provider/IndexedStorageChunkStorageProvider";
 	String IndexedStorageChunkSaver = "com/hypixel/hytale/server/core/universe/world/storage/provider/IndexedStorageChunkStorageProvider$IndexedStorageChunkSaver";
 	String WorldMapManager = "com/hypixel/hytale/server/core/universe/world/worldmap/WorldMapManager";

patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatch.java

@@ -33,6 +33,7 @@ abstract class HypertalePatch implements Opcodes, HypertaleASMConstants {
 	static final Void ALL_CLASSES = null;
 	final String[] targets;
 
+	@SuppressWarnings("VoidUsed")
 	HypertalePatch(Void ignored) {
 		this.targets = null;
 		this.checkAccess();

patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatchHotfix.java

@@ -0,0 +1,62 @@
+/*
+ * 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;
+
+import com.fox2code.hypertale.utils.HytaleVersion;
+import org.objectweb.asm.tree.ClassNode;
+
+abstract class HypertalePatchHotfix extends HypertalePatch {
+	private final String forHypertaleVersion;
+
+	@SuppressWarnings("VoidUsed")
+	HypertalePatchHotfix(String forHypertaleVersion, Void ignored) {
+		super(ignored);
+		this.forHypertaleVersion = forHypertaleVersion;
+	}
+
+	HypertalePatchHotfix(String forHypertaleVersion, String target) {
+		super(target);
+		this.forHypertaleVersion = forHypertaleVersion;
+	}
+
+	HypertalePatchHotfix(String forHypertaleVersion, String[] targets) {
+		super(targets);
+		this.forHypertaleVersion = forHypertaleVersion;
+	}
+
+	HypertalePatchHotfix(String forHypertaleVersion, String target, String... targets) {
+		super(target, targets);
+		this.forHypertaleVersion = forHypertaleVersion;
+	}
+
+	@Override
+	public final ClassNode transform(ClassNode classNode) {
+		if (HytaleVersion.HYTALE_VERSION.equals(this.forHypertaleVersion)) {
+			return this.transformHotfix(classNode);
+		}
+		return classNode;
+	}
+
+	public abstract ClassNode transformHotfix(ClassNode classNode);
+}

patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatches.java

@@ -32,7 +32,12 @@ 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 final boolean loaded;
+
 	static void addPatch(HypertalePatch hypertalePatch) {
+		if (loaded) {
+			throw new IllegalStateException("Cannot add patch after HypertalePatches has been loaded");
+		}
 		if (hypertalePatch.targets == null) {
 			globalHypertalePatches.add(hypertalePatch);
 		} else {
@@ -45,6 +50,16 @@ static void addPatch(HypertalePatch hypertalePatch) {
 	}
 
 	static {
+		// Hypertale premium register its patches on its own.
+		if (!Boolean.getBoolean("hypertale.premium")) {
+			autoRegisterPatches();
+		}
+		HypertalePatchesPlus.registerPatches();
+		loaded = true;
+	}
+
+	// Callback to allow Hypertale plus to register default patches
+	static void autoRegisterPatches() {
 		addPatch(new PatchMat4f());
 		addPatch(new PatchPluginClassLoader());
 		addPatch(new PatchWorld());
@@ -57,11 +72,10 @@ static void addPatch(HypertalePatch hypertalePatch) {
 		addPatch(new PatchPlugins());
 		addPatch(new PatchExtraAuthenticationData());
 		addPatch(new PatchHytaleLogFormatter());
-		addPatch(new PatchUniverse());
 		addPatch(new PatchInventory());
 		addPatch(new PatchRedirectToOptimisedGetPlayers());
 		addPatch(new PatchRedirectToOptimisedGetChunkIfInMemory());
-		HypertalePatchesPlus.registerPatches();
+
 	}
 
 	public static ClassNode patchClassNode(ClassNode classNode) {

patcher/src/main/java/com/fox2code/hypertale/patcher/patches/HypertalePatchesPlus.java

@@ -27,5 +27,9 @@
  * This class is overwritten by Hypertale Plus
  */
 final class HypertalePatchesPlus {
+	static boolean autoRegisterPatches() {
+		return true;
+	}
+
 	static void registerPatches() {}
 }

patcher/src/main/java/com/fox2code/hypertale/patcher/patches/PatchPluginClassLoader.java

@@ -52,6 +52,15 @@ public ClassNode transform(ClassNode classNode) {
 				injection.add(new JumpInsnNode(Opcodes.IFEQ, skip));
 				injection.add(new InsnNode(Opcodes.ICONST_1));
 				injection.add(new InsnNode(Opcodes.IRETURN));
+				injection.add(new VarInsnNode(Opcodes.ALOAD, varInsnNode.var));
+				injection.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
+						StackTraceElement, "getMethodName", "()L" + ASMString + ";", false));
+				injection.add(new LdcInsnNode("hypertale"));
+				injection.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
+						ASMString, "startsWith", "(L" + ASMString + ";)Z", false));
+				injection.add(new JumpInsnNode(Opcodes.IFEQ, skip));
+				injection.add(new InsnNode(Opcodes.ICONST_1));
+				injection.add(new InsnNode(Opcodes.IRETURN));
 				injection.add(skip);
 				isFromThirdPartyPlugin.instructions.insertBefore(ldcInsnNode, injection);
 				break;