refactor: ask whether a world IS hyperspace, not which id it has

- replace the side-aware id accessor with a predicate
- fold the null check and the comparison into that one question
- drop the client-side delegate, the sky asks the world directly
- keep the raw id for the one caller that sends it on the wire

Author: StannisMod

src/main/java/zmaster587/advancedRocketry/client/render/planet/BoundarySky.java

@@ -148,7 +148,7 @@ public void render(float partialTicks, WorldClient world, Minecraft mc) {
         // the jump phase from — and not the seat the viewer happens to be on. Keyed on the seat, a
         // crew member who stood up mid-flight got a cell's descent ring in the transit corridor and
         // no corridor at all, which reads as the flight having stopped.
-        if (HyperspaceTunnel.isHyperspace(world)) {
+        if (zmaster587.advancedRocketry.space.HyperspaceWorld.isHyperspace(world)) {
             HyperspaceTunnel.render(partialTicks, world);
             GlStateManager.enableTexture2D();
             restoreState();

src/main/java/zmaster587/advancedRocketry/client/render/planet/HyperspaceTunnel.java

@@ -52,28 +52,6 @@ private HyperspaceTunnel() {
      */
     public static volatile long framesDrawn = 0L;
 
-    /**
-     * Whether {@code world} is hyperspace, i.e. whether this frame is being drawn during a jump.
-     *
-     * <p><b>The corridor is a property of the WORLD, not of what the viewer is sitting on.</b> It
-     * used to be read off the jump phase published on the seat dummy, which answers 0 for anyone
-     * riding nothing — so a crew member who stood up mid-flight lost the corridor, and with it the
-     * only thing in hyperspace that says the ship is moving (no bodies are synced there and the
-     * descent ring is suppressed). An empty, motionless sky reads as the flight having stopped. The
-     * posture was never the question; being in hyperspace is, and that is the same primary fact the
-     * server derives the phase from.</p>
-     *
-     * <p>The id comes from {@code PacketSlotDimSync}: a remote client cannot derive it, since
-     * hyperspace is registered server-side. Until it arrives {@link HyperspaceWorld#dimId()} is
-     * {@link Integer#MIN_VALUE}, which no real dimension id can equal, so an unsynced client draws
-     * no corridor rather than drawing one everywhere.</p>
-     */
-    public static boolean isHyperspace(net.minecraft.world.World world) {
-        int hyper = HyperspaceWorld.dimIdFor(world);
-        return world != null && hyper != Integer.MIN_VALUE
-                && world.provider.getDimension() == hyper;
-    }
-
     /**
      * Which way the SHIP is pointing, as {@code {yaw, pitch}} in degrees — the corridor's axis.
      *

src/main/java/zmaster587/advancedRocketry/space/HyperspaceWorld.java

@@ -104,10 +104,11 @@ public static WorldServer getIfLoaded() {
      * {@link #register()} minted, so a caller reasoning about worlds this JVM is simulating is
      * reading the fact rather than a report of one.
      *
-     * <p>Client-side code must not call this. Both ids live in JVM-global statics, so a client that
-     * hosted a single-player world earlier in the same launch still has one — and it names a world
-     * that is gone, not the server it is now connected to. Use {@link #dimIdFor(World)}, which picks
-     * by the side the world is on rather than by the caller's belief about where it runs.</p>
+     * <p>It exists for the one caller that needs the NUMBER rather than the answer: the slot-dim sync
+     * packet, which sends it. Anything asking whether a world IS hyperspace wants
+     * {@link #isHyperspace(World)} instead — both ids live in JVM-global statics, and a client that
+     * hosted a single-player world earlier in the same launch still has one of them, naming a world
+     * that is gone rather than the server it is now connected to.</p>
      */
     public static int dimId() {
         return dimId;
@@ -126,20 +127,23 @@ public static int dimId() {
     private static int adoptedDimId = Integer.MIN_VALUE;
 
     /**
-     * Which dimension hyperspace is, asked for the side {@code world} is on: the local registration
-     * on a server, the id the connected server reported on a client. {@link Integer#MIN_VALUE} when
-     * that side does not know, which no real dimension id equals - so an unsynced client answers
-     * "nowhere" rather than "everywhere".
+     * Is {@code world} hyperspace?
      *
-     * <p>The side is a property of the world, not something a call site should be trusted to know
-     * about itself: a tile entity, a world provider and a sky renderer all run on both, and each of
-     * them holds the world it is asking about.</p>
+     * <p>Asked as one question rather than handed out as an id, because the id alone is not an
+     * answer: which dimension hyperspace is depends on the SIDE, and the side is a property of the
+     * world, not something a call site should be trusted to know about itself — a tile entity, a
+     * world provider and a sky renderer all run on both. A server compares against the registration
+     * it made; a client against what its server reported, and against nothing else.</p>
+     *
+     * <p>False whenever this side does not know yet: an unsynced client says "not here" everywhere
+     * rather than picking a dimension at random. {@code null} is not hyperspace either.</p>
      */
-    public static int dimIdFor(World world) {
+    public static boolean isHyperspace(World world) {
         if (world == null) {
-            return dimId;
+            return false;
         }
-        return world.isRemote ? adoptedDimId : dimId;
+        int hyper = world.isRemote ? adoptedDimId : dimId;
+        return hyper != Integer.MIN_VALUE && world.provider.getDimension() == hyper;
     }
 
     /** Learn the server's hyperspace dim id. {@link Integer#MIN_VALUE} means "none yet" — ignored. */

src/main/java/zmaster587/advancedRocketry/tile/TileAdvancedFlightComputer.java

@@ -335,8 +335,7 @@ public void update() {
         // The single source of this gate is the ship's presence in the shared hyperspace world:
         // ships exist there exactly while parked mid-transit. Deliberate-exit and the exit-warning
         // channel stay OUTSIDE this gate when they land — they are the survival path mid-transit.
-        int hyperDim = zmaster587.advancedRocketry.space.HyperspaceWorld.dimIdFor(world);
-        if (hyperDim != Integer.MIN_VALUE && world.provider.getDimension() == hyperDim) {
+        if (zmaster587.advancedRocketry.space.HyperspaceWorld.isHyperspace(world)) {
             commandedVelocity = null;
             commandedAngVel = null;
             targetAttitude = null;
@@ -709,9 +708,7 @@ public zmaster587.advancedRocketry.space.ShipTransitManager.Phase getHudTransitP
         // Asking the transit registry first would make the readout depend on the ship being findable
         // under the id the registry happens to use, and a pilot who is demonstrably in hyperspace
         // would then be told nothing at all.
-        int hyperDim = zmaster587.advancedRocketry.space.HyperspaceWorld.dimIdFor(world);
-        if (world == null || hyperDim == Integer.MIN_VALUE
-                || world.provider.getDimension() != hyperDim) {
+        if (!zmaster587.advancedRocketry.space.HyperspaceWorld.isHyperspace(world)) {
             return zmaster587.advancedRocketry.space.ShipTransitManager.Phase.NONE;
         }
         // In hyperspace for certain. The registry only REFINES that into departing/arriving; when it

src/test/java/zmaster587/advancedRocketry/test/unit/HyperspaceDimIdIsAskedPerSideTest.java

@@ -1,6 +1,7 @@
 package zmaster587.advancedRocketry.test.unit;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import org.junit.After;
 import org.junit.Before;
@@ -17,7 +18,7 @@
  * <p>What is pinned here is the SERVER's answer, which needs no world to express. The client's half -
  * that a reader on a remote world picks the told value, and that the telling is forgotten when the
  * connection ends - is observable ONLY through a world that reports itself remote, so it belongs to a
- * client test and is deliberately not faked here. An assertion routed through {@code dimIdFor(null)}
+ * client test and is deliberately not faked here. An assertion routed through a world-less call
  * would read the server's field and stay green however the client's side behaved.</p>
  */
 public class HyperspaceDimIdIsAskedPerSideTest {
@@ -41,11 +42,10 @@ public void whatAServerReportedIsNeverTheServerSideAnswer() {
     }
 
     @Test
-    public void withNoWorldToAskAboutTheAnswerIsThisSidesOwn() {
+    public void nothingIsHyperspaceWhenThereIsNoWorldToAskAbout() {
         HyperspaceWorld.adoptFromServer(45);
 
-        assertEquals("a caller with no world in hand is server-side by construction - the client"
-                + " always has one - so it gets the local registration, absent here",
-                Integer.MIN_VALUE, HyperspaceWorld.dimIdFor(null));
+        assertFalse("a question about no world has one honest answer, and it is not a crash",
+                HyperspaceWorld.isHyperspace(null));
     }
 }