Fix: don't test JIT26CreateRegionLegacy more than once, add build and code assertions

Author: khanhduytran0

JavaApp/Makefile

@@ -12,6 +12,16 @@ TARGETS := $(TARGETS:$(SOURCEDIR)/%=$(OUTPUTDIR)/%.jar)
 JCFLAGS := -cp "$(subst $() $(),:,$(wildcard $(SOURCEDIR)/*/):$(wildcard libs/*/*.jar))" -XDignore.symbol.file
 
 all: $(TARGETS)
+	
+# Sometimes the CI produces empty class file resulting in broken jar, so we check and abort here
+check_empty_classes:
+	@set -e
+	@echo "Checking for empty class files"
+	$(eval EMPTY_CLASSES := $(shell find $(OUTPUTDIR) -name '*.class' -size 0))
+	@if [ -n "$(EMPTY_CLASSES)" ]; then \
+		echo "Error: found empty class files in $@: $(EMPTY_CLASSES)"; \
+		exit 1; \
+	fi
 
 # Rules for building java class
 $(CLASSES): $(OUTPUTDIR)/%.class: $(SOURCEDIR)/%.java
@@ -23,12 +33,12 @@ $(CLASSES): $(OUTPUTDIR)/%.class: $(SOURCEDIR)/%.java
 	@$(BOOTJDK)/javac $(JCFLAGS) -d $(OUTPUTDIR)/classes $<
 	@cp $(@:$(OUTPUTDIR)/$(TARGET)/%.class=$(OUTPUTDIR)/classes/%*.class) $(dir $@)/
 
-$(OUTPUTDIR)/launcher.jar: $(CLASSES)
+$(OUTPUTDIR)/launcher.jar: $(CLASSES) check_empty_classes
 	@set -e
 	@echo "Creating $@"
 	@$(BOOTJDK)/jar -cf $@ -C $(basename $@) .
 
-$(OUTPUTDIR)/lwjgl.jar: $(CLASSES)
+$(OUTPUTDIR)/lwjgl.jar: $(CLASSES) check_empty_classes
 	@set -e
 	@echo "Creating $@"
 	@mkdir -p $(OUTPUTDIR)/lwjgl_lib

Natives/JavaLauncher.m

@@ -104,7 +104,8 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
     BOOL requiresTXMWorkaround = DeviceRequiresTXMWorkaround();
     BOOL jit26AlwaysAttached = getPrefBool(@"debug.debug_always_attached_jit");
     if (requiresTXMWorkaround) {
-        void *result = JIT26CreateRegionLegacy(getpagesize());
+        static void *result;
+        if(!result) result = JIT26CreateRegionLegacy(getpagesize());
         if ((uint32_t)result != 0x690000E0) {
             munmap(result, getpagesize());
             // we can't continue since legacy script only allows calling breakpoint once
@@ -121,7 +122,7 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
                 }
             }
             [NSFileManager.defaultManager copyItemAtPath:inBundleScriptPath toPath:[NSString stringWithFormat:@"%s/UniversalJIT26.js", getenv("POJAV_HOME")] error:nil];
-            showDialog(localize(@"Error", nil), @"Support for legacy script has been removed. Please switch to Universal JIT script. To import it, long-press on Amethyst when enabling JIT in StikDebug and tap \"Assign Script\", then go to Amethyst's Documents directory and pick it.");
+            showDialog(localize(@"Error", nil), @"Support for legacy script has been removed. Please switch to Universal JIT script. To import it, long-press on Amethyst when enabling JIT in StikDebug and tap \"Assign Script\", then go to Amethyst's Documents directory and pick it. (on sideloaded StikDebug, the builtin script is named Amethyst-MeloNX.js)");
             [PLLogOutputView handleExitCode:1];
             return 1;
         }
@@ -142,6 +143,7 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
     BOOL launchJar = NO;
     NSString *gameDir;
     NSString *defaultJRETag;
+    NSCAssert(launchTarget, @"Unexpected nil launchTarget");
     if ([launchTarget isKindOfClass:NSDictionary.class]) {
         // Get preferred Java version from current profile
         int preferredJavaVersion = [PLProfiles resolveKeyForCurrentProfile:@"javaVersion"].intValue;

Natives/LauncherNavigationController.m

@@ -373,8 +373,9 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
         self.progressViewMain.observedProgress = nil;
         if (self.task.metadata) {
+            __block NSDictionary *metadata = self.task.metadata;
             [self invokeAfterJITEnabled:^{
-                UIKit_launchMinecraftSurfaceVC(self.view.window, self.task.metadata);
+                UIKit_launchMinecraftSurfaceVC(self.view.window, metadata);
             }];
         } else {
             [self reloadProfileList];