Prevent Naldo shader startup crash

Use vanilla autojoin after resource loading, gate manual reconnect by mapped overlay and safe screens, skip first-run onboarding. Rebuilt Java17 bridge 1.0.3 and 61 targeted tests pass.

altoclef/SpaceBridge.java

@@ -27,6 +27,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * scheduler tick itself (bridge alive), while {@code observed_at} is refreshed
  * only by a snapshot that actually ran on the client thread. At most one
  * snapshot is ever queued, so rendering load cannot build a backlog.
+ *
+ * <p>Connect contract: primary autojoin is vanilla {@code --server/--port},
+ * which sequences itself after resource/shader load. The manual fallback in
+ * this bridge only fires on a Title/Disconnected screen with no resource
+ * reload overlay (connecting mid-reload NPEs WorldRenderer via
+ * ShaderProgram.addSampler), on the client thread only.
  */
 public final class SpaceBridge implements ClientModInitializer {
     private static final MappingResolver MAP = FabricLoader.getInstance().getMappingResolver();
@@ -35,6 +41,9 @@ public final class SpaceBridge implements ClientModInitializer {
     private volatile String lastCommand = "";
     private final AtomicBoolean snapshotPending = new AtomicBoolean(false);
     private long connectAttempt;
+    private long connectAttempts;
+    private volatile String connectState = "startup";
+    private String lastGate = "";
     private long creditsSince;
     private boolean creditsObserved;
     private boolean enteredEnd;
@@ -179,9 +188,38 @@ public final class SpaceBridge implements ClientModInitializer {
             System.out.println("[space-altoclef] local bridge ready on 127.0.0.1:" + port);
         } catch (Exception err) { throw new RuntimeException("Space bridge failed", err); }
     }
-    private void connect(Object client) throws Exception {
-        if (System.currentTimeMillis() - connectAttempt < 30000) return;
+    private void connect(Object client, Object currentScreen) throws Exception {
+        // Gated manual connect: NEVER while a resource/shader reload overlay
+        // is up (that NPEs WorldRenderer via ShaderProgram.addSampler on a
+        // half-built reload), and never while vanilla is already connecting.
+        // Primary autojoin is vanilla --server/--port; this is only the
+        // safe-reconnect fallback for Title/Disconnected screens.
+        // Pinned Yarn 1.19.4+build.2: METHOD emh ()Lesx; aJ method_18506 getOverlay
+        // (owner class_310 MinecraftClient, returns class_4071 Overlay).
+        Object overlay = method(client, "class_310", "method_18506", "()Lnet/minecraft/class_4071;",
+                                new Class<?>[0]);
+        boolean title = currentScreen != null
+                && (mc("class_442").isInstance(currentScreen) || mc("class_419").isInstance(currentScreen));
+        boolean connecting = currentScreen != null && mc("class_412").isInstance(currentScreen);
+        String screenName = currentScreen == null ? "<none>" : currentScreen.getClass().getName();
+        if (overlay != null) {
+            gate("waiting resource reload (overlay=" + overlay.getClass().getName() + ")");
+            return;
+        }
+        if (connecting) {
+            connectState = "connecting (vanilla ConnectScreen)";
+            return;
+        }
+        if (!title) {
+            gate("waiting title screen (screen=" + screenName + ")");
+            return;
+        }
+        if (System.currentTimeMillis() - connectAttempt < 30000) {
+            connectState = "retry waits 30s throttle (screen=" + screenName + ")";
+            return;
+        }
         connectAttempt = System.currentTimeMillis();
+        connectAttempts++;
         String address = System.getenv().getOrDefault("ALTOCLEF_SERVER", "127.0.0.1:25568");
         Object parsed = method(null, "class_639", "method_2950", "(Ljava/lang/String;)Lnet/minecraft/class_639;",
                                new Class<?>[]{String.class}, address);
@@ -191,7 +229,16 @@ public final class SpaceBridge implements ClientModInitializer {
                "(Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V",
                new Class<?>[]{mc("class_437"), mc("class_310"), mc("class_639"), mc("class_642")},
                screen(client), client, parsed, info);
-        System.out.println("[space-altoclef] connecting to " + address);
+        connectState = "connecting to " + address + " (attempt " + connectAttempts + ")";
+        System.out.println("[space-altoclef] connecting to " + address + " (attempt " + connectAttempts + ")");
+    }
+    /** Throttled gate diagnostic: log only when the reason changes. */
+    private void gate(String reason) {
+        connectState = reason;
+        if (!reason.equals(lastGate)) {
+            lastGate = reason;
+            System.out.println("[space-altoclef] connect gated: " + reason);
+        }
     }
     private String currentDimension() throws Exception {
         // Upstream WorldHelper.getCurrentDimension is package-private static;
@@ -224,8 +271,10 @@ public final class SpaceBridge implements ClientModInitializer {
             data.put("credits_screen", credits);
             data.put("credits_observed", creditsObserved);
             data.put("entered_end", enteredEnd);
+            data.put("connect_state", connectState);
+            data.put("connect_attempts", connectAttempts);
             if (player == null) {
-                if (executor != null && !credits) connect(client);
+                if (executor != null && !credits) connect(client, currentScreen);
             } else {
                 String dimension = currentDimension();
                 if ("END".equals(dimension)) enteredEnd = true;

altoclef/build.py

@@ -52,7 +52,7 @@ def build():
             ],
             check=True,
         )
-        metadata = {"schemaVersion": 1, "id": "space_altoclef_bridge", "version": "1.0.2",
+        metadata = {"schemaVersion": 1, "id": "space_altoclef_bridge", "version": "1.0.3",
                     "name": "Space AltoClef Bridge", "environment": "client",
                     "entrypoints": {"client": ["space.minecraft.SpaceBridge"]},
                     "depends": {"fabricloader": ">=0.16.2", "minecraft": "1.19.4",

altoclef_stack.py

@@ -152,10 +152,17 @@ class AltoClefStack:
         shutil.copyfile(MOD_CACHE / "fabric-api-0.87.2+1.19.4.jar", mods / "fabric-api-0.87.2+1.19.4.jar")
         shutil.copyfile(SOURCE / "altoclef/space-altoclef-bridge.jar", mods / "space-altoclef-bridge.jar")
         settings = CLIENT / "options.txt"
+        defaults = ("maxFps:20\nrenderDistance:4\nsimulationDistance:4\nentityDistanceScaling:0.5\n"
+                    "graphicsMode:0\nparticles:2\nsoundCategory_master:0.0\nuseVbo:true\n"
+                    "pauseOnLostFocus:false\nfullscreen:false\nshowSubtitles:false\n"
+                    # 1.19.4 first-run accessibility onboarding would park the
+                    # headless client on a setup screen; skip it when present.
+                    "onboardAccessibility:false\n")
         if not settings.exists():
-            settings.write_text("maxFps:20\nrenderDistance:4\nsimulationDistance:4\nentityDistanceScaling:0.5\n"
-                                "graphicsMode:0\nparticles:2\nsoundCategory_master:0.0\nuseVbo:true\n"
-                                "pauseOnLostFocus:false\nfullscreen:false\nshowSubtitles:false\n")
+            settings.write_text(defaults)
+        elif "onboardAccessibility" not in settings.read_text(errors="replace"):
+            with settings.open("a", encoding="utf-8") as out:
+                out.write("onboardAccessibility:false\n")
         config_dir = CLIENT / "altoclef/configs"
         config_dir.mkdir(parents=True, exist_ok=True)
         config = config_dir / "beat_minecraft.json"
@@ -164,10 +171,16 @@ class AltoClefStack:
                                          "placeSpawnNearEndPortal":False,"requiredBeds":10}))
         # Match Java's offline UUID algorithm without changing server auth.
         player_uuid = str(uuid.UUID(bytes=hashlib.md5(("OfflinePlayer:" + USERNAME).encode()).digest(), version=3))
+        # Primary autojoin is vanilla --server/--port (supported by official
+        # 1.19.4 and minecraft_launcher_lib 7.1): vanilla sequences the connect
+        # itself after resource/shader load, so the bridge never has to force
+        # a connect mid-reload. The bridge keeps only a readiness-gated
+        # safe-reconnect fallback for Title/Disconnected screens.
         return launcher.command.get_minecraft_command(version, str(CLIENT), {
             "username": USERNAME, "uuid": player_uuid, "token": "0",
             "executablePath": str(java), "jvmArguments": ["-Xms256M", "-Xmx2G", "-XX:ActiveProcessorCount=2"],
             "customResolution":True, "resolutionWidth":"640", "resolutionHeight":"360",
+            "server": "127.0.0.1", "port": "25568",
         })
 
     def _loading_grace(self) -> bool:

tests/test_altoclef_stack.py

@@ -88,6 +88,64 @@ def test_boot_resets_launch_clocks_before_startup():
     assert "_reset_launch_clocks()" in source
     assert source.index("_reset_launch_clocks()") < source.index("minecraft_ready.wait")
 
+def _bridge_source() -> str:
+    return (Path(module.__file__).parents[0] / "altoclef" / "SpaceBridge.java").read_text(encoding="utf-8")
+
+def test_bridge_gates_manual_connect_on_readiness():
+    # Pinned Yarn 1.19.4+build.2: TitleScreen class_442, DisconnectedScreen
+    # class_419, ConnectScreen class_412, overlay via getOverlay. The manual
+    # connect must take the current screen and refuse while a reload overlay
+    # is up or vanilla is already connecting.
+    source = _bridge_source()
+    assert "class_442" in source and "class_419" in source
+    # Pinned Yarn 1.19.4+build.2 row: METHOD emh ()Lesx; aJ method_18506
+    # getOverlay. The live runtime is intermediary, so the mapped ID (not the
+    # Yarn name) must be used.
+    assert "method_18506" in source
+    assert '"getOverlay"' not in source
+    assert "connect(client, currentScreen)" in source
+    assert "mc(\"class_412\").isInstance(currentScreen)" in source
+    import re
+    assert not re.search(r"(?<!, )connect\(client\)", source), \
+        "ungated single-arg connect call remains"
+
+def test_bridge_reports_connect_diagnostics():
+    source = _bridge_source()
+    assert '"connect_state"' in source and '"connect_attempts"' in source
+
+def test_built_bridge_jar_matches_source_version():
+    import json as _json
+    import zipfile as _zip
+    jar = Path(module.__file__).parents[0] / "altoclef" / "space-altoclef-bridge.jar"
+    meta = _json.loads(_zip.ZipFile(jar).read("fabric.mod.json").decode())
+    assert meta["version"] == "1.0.3"
+    assert "space/minecraft/SpaceBridge.class" in _zip.ZipFile(jar).namelist()
+
+def test_client_uses_vanilla_autojoin_and_skips_onboarding(runner, monkeypatch, tmp_path):
+    import sys as _sys
+    seen: dict = {}
+    fake_launcher = SimpleNamespace(
+        fabric=SimpleNamespace(install_fabric=lambda *a, **k: None),
+        command=SimpleNamespace(
+            get_minecraft_command=lambda *a, **k: (seen.update(a[2]), ["java"])[1]),
+    )
+    monkeypatch.setitem(_sys.modules, "minecraft_launcher_lib", fake_launcher)
+    monkeypatch.setattr(module, "CLIENT", tmp_path / "client")
+    monkeypatch.setattr(module, "MOD_CACHE", tmp_path / "cache")
+    monkeypatch.setattr(module, "_download",
+                        lambda url, path, sha=None: (path.parent.mkdir(parents=True, exist_ok=True),
+                                                    path.write_bytes(b"x"))[1])
+    assert runner._ensure_client(Path("java")) == ["java"]
+    # Vanilla --server/--port autojoin via ViaProxy; bridge keeps only fallback.
+    assert seen.get("server") == "127.0.0.1"
+    assert seen.get("port") == "25568"
+    options = (tmp_path / "client" / "options.txt").read_text(encoding="utf-8")
+    assert "onboardAccessibility:false" in options
+    # Second ensure must not duplicate the key.
+    runner._ensure_client(Path("java"))
+    options = (tmp_path / "client" / "options.txt").read_text(encoding="utf-8")
+    assert options.count("onboardAccessibility:false") == 1
+
 def test_survival_verified_requires_explicit_survival():
     good = {"connected": True, "error": "", "creative": False}
     assert module.AltoClefStack._survival_verified(good) is True