Phase 13: every loader on every supported version (1.1.0-beta.9)

CHANGELOG.md

@@ -7,6 +7,48 @@ way to 1.0.0; see [docs/ROADMAP.md](docs/ROADMAP.md).
 
 ## [Unreleased]
 
+## [1.1.0-beta.9] - 2026-11-07
+
+Phase 13 of the road to 1.1.0: every loader on every supported version. This beta ships 21 jars, one per
+loader and Minecraft version, from 1.20.6 to 26.3. Betas are not uploaded to CurseForge. Worlds from
+1.1.0-beta.8.1 load as before, and the network protocol is unchanged (11). Only the Forge 26.3 jar has been
+started from a launcher profile so far, and nobody has flown on the new jars yet; see the smoke test in
+[docs/TESTING.md](docs/TESTING.md) before relying on one.
+
+### Added
+
+- NeoForge and Fabric on Minecraft 26.3 catch up with Forge: everything from phases 8 to 12 now runs
+  there, from the drafting table and vehicle screen to smoke and sight zoom.
+- Minecraft 1.21.1 on Forge, NeoForge and Fabric gets everything from phases 8 to 12: fuel, equipment,
+  the vehicle screen, the drafting table, team manager, UAV stations and the workshop. On 1.21.1 the PVP
+  button of the team manager switches the server's PVP setting until a restart, since that version has
+  no game rule for it, and target markers ignore view bobbing.
+- Minecraft 26.2, 26.1, 1.21.11, 1.21.5 and 1.20.6 on Forge, NeoForge and Fabric, with everything 26.3 has. On
+  26.1 and older, teams pick from the sixteen chat colours, since those versions have no separate team
+  colours. On 1.21.5 and 1.20.6 the PVP button of the team manager switches the server's PVP setting until a
+  restart.
+
+### Changed
+
+- Forge, NeoForge and Fabric on 26.3, 26.2, 26.1, 1.21.11, 1.21.5, 1.21.1 and 1.20.6 are all built on every pull request.
+- 1.1.0 ships on 26.3, 26.2, 26.1, 1.21.11, 1.21.5, 1.21.1 and 1.20.6 on all three loaders (21 jars).
+  1.20.2 and 1.19.4 are on hold and not part of it.
+- Clients and servers on different loaders cannot play together, which the roadmap used to promise.
+  Each loader refuses the other at its own handshake, before the mod runs. A pack zip still works on
+  every loader when copied by hand.
+
+### Fixed
+
+- Fabric clients crashed at startup on 26.3 and 1.21.1, because `RollableCamera` sat in the mixin package.
+- Glow particles were invisible on Fabric 1.21.1: vanilla only draws the particle types on its own list.
+- On 1.21.1 the E-767 recipe failed to load, since its UAV station ingredient used the newer format.
+- On Forge 1.21.1, recipes that use gunpowder or feathers could not be crafted, since Forge names those
+  tags differently from the conventional ones our recipes use. The Forge modules on 1.21.x now define them.
+- Sounds that come from a content pack or the workshop were silent on Forge 26.3, engine loops and
+  one-shots alike, and left a sound channel open. Forge's sound engine on 1.21.11 and later never asks the
+  sound for its stream, so the file on disk was never read. Forge 1.21.11, 26.1, 26.2 and 26.3 now read it
+  from the sound engine's own library.
+
 ## [1.1.0-beta.8.1] - 2026-11-06
 
 A hotfix for the Forge 26.3 jar, with no other changes. Worlds from 1.1.0-beta.8 load as before, and
@@ -718,6 +760,7 @@ Phase 1: foundation and flyable helicopters.
 - Free look moved from Left Ctrl to Left Alt, because Left Ctrl is now the vanilla sprint key.
 - Roll damping runs per tick instead of per frame, so handling no longer depends on frame rate.
 
+[1.1.0-beta.9]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.9
 [1.1.0-beta.8.1]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.8.1
 [1.1.0-beta.8]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.8
 [1.1.0-beta.7]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.7

README.md

@@ -2,22 +2,21 @@
 
 <img src="docs/images/mcheli-rework-icon.png" alt="MCHeli Rework icon" width="160">
 
-Helicopters, planes, tanks and ground vehicles for **Minecraft 26.3** and **1.21.1**, on **Forge**,
-**NeoForge** and **Fabric**.
+Helicopters, planes, tanks and ground vehicles for **Minecraft 26.3**, **26.2**, **26.1**,
+**1.21.11**, **1.21.5**, **1.21.1** and **1.20.6**, on **Forge**, **NeoForge** and **Fabric**.
 
 MCHeli Rework is a ground-up port of MCHeli 1.0.3, a mod that stopped at Minecraft 1.7.10. Every
 system is rewritten for the modern game, while the original vehicle definitions, models,
 textures and sounds load unchanged.
 
-> **Status:** on the way to 1.1.0, now at phase 12 (`1.1.0-beta.8.1`). Every helicopter, plane,
+> **Status:** on the way to 1.1.0, now at phase 13 (`1.1.0-beta.9`). Every helicopter, plane,
 > tank, car and ground vehicle can be placed, crewed and driven with the original handling, all
 > 229 weapons fire, and the scripted HUDs, fuel, the vehicle screen and all of the original's
 > equipment are in, down to UAV stations, the drafting table and the team manager. The vehicle
 > workshop builds new vehicles in game from a Blockbench or Blender model, with their own textures
-> and sounds, and sends them to a server for its operators to approve. Betas ship the
-> Forge 26.3 jar only; 1.1.0 ships on Forge and Fabric for every version from 1.19.4 to 26.3, and
-> on NeoForge from 1.20.6 (see [supported versions](docs/ROADMAP.md#supported-versions)). See the
-> [roadmap](docs/ROADMAP.md).
+> and sounds, and sends them to a server for its operators to approve. From `1.1.0-beta.9` on,
+> every jar ships: Forge, NeoForge and Fabric for every version from 1.20.6 to 26.3 (see
+> [supported versions](docs/ROADMAP.md#supported-versions)). See the [roadmap](docs/ROADMAP.md).
 
 ## Showcase video
 
@@ -84,16 +83,21 @@ Reserved original, the code is source available rather than open source.
 
 ## Requirements
 
-| | Minecraft 26.3 | Minecraft 1.21.1 |
-|---|---|---|
-| Forge | 66.1.0 or newer in the 66.x line | 52.1.0 or newer |
-| NeoForge | 26.3.0.99 or newer | 21.1.200 or newer |
-| Fabric | Loader 0.20 and Fabric API | Loader 0.16 and Fabric API |
-| Java | 25 (bundled with the launcher) | 21 (bundled with the launcher) |
+| Minecraft | Forge | NeoForge | Fabric | Java |
+|---|---|---|---|---|
+| 26.3 | 66.1.0 or newer in 66.x | 26.3.0.99 or newer | Loader 0.20 and Fabric API | 25 |
+| 26.2 | 65.1.5 or newer in 65.x | 26.2.0.93 or newer | Loader 0.20 and Fabric API | 25 |
+| 26.1 | 62.0.9 or newer in 62.x | 26.1.2.126 or newer | Loader 0.20 and Fabric API | 25 |
+| 1.21.11 | 61.2.4 or newer in 61.x | 21.11.48 or newer | Loader 0.16 and Fabric API | 21 |
+| 1.21.5 | 55.1.18 or newer in 55.x | 21.5.101 or newer | Loader 0.16 and Fabric API | 21 |
+| 1.21.1 | 52.1.0 or newer | 21.1.200 or newer | Loader 0.16 and Fabric API | 21 |
+| 1.20.6 | 50.2.14 or newer in 50.x | 20.6.144 or newer | Loader 0.16 and Fabric API | 21 |
+
+The launcher bundles the right Java for each version.
 
 ## Installing
 
-1. Install Forge, NeoForge or Fabric for Minecraft 26.3 or 1.21.1. On Fabric, also install
+1. Install Forge, NeoForge or Fabric for Minecraft 26.3, 26.2, 26.1, 1.21.11, 1.21.5, 1.21.1 or 1.20.6. On Fabric, also install
    [Fabric API](https://modrinth.com/mod/fabric-api).
 2. Download the jar for your loader from the
    [releases](https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases):
@@ -118,7 +122,8 @@ zip goes.
 Use a separate game directory for each loader and version. Mods built for other loaders or older
 versions in a shared `mods` folder will stop the game from starting. Worlds and the `mcheli`
 folder can move between loaders on the same Minecraft version: the imported content, content packs
-and configs are the same files on all three. Do not open a 26.3 world in 1.21.1.
+and configs are the same files on all three. Do not open a world in an older Minecraft version than
+the one that last saved it.
 
 ## Playing
 

common/src/main/java/com/jnhprojects/mcheli/content/ImportTarget.java

@@ -15,5 +15,14 @@ public enum ImportTarget {
      * the vehicle's model by {@code custom_model_data} (see {@link LegacyImporter#ICONS_FILE}), and
      * recipe ingredients are {@code {"item": ...}} and {@code {"tag": ...}} objects.
      */
-    V1_21_1
+    V1_21_1,
+    /**
+     * Minecraft 1.20.6: the 1.21.1 layout, except that data folders still have their plural names.
+     */
+    V1_20_6;
+
+    /** The folder under {@code data/<namespace>} that holds recipes on this target. */
+    public String recipeFolder() {
+        return this == V1_20_6 ? "recipes" : "recipe";
+    }
 }

common/src/main/java/com/jnhprojects/mcheli/content/LegacyImporter.java

@@ -1,5 +1,6 @@
 package com.jnhprojects.mcheli.content;
 
+import com.jnhprojects.mcheli.content.throwable.ThrowableDefinition;
 import com.jnhprojects.mcheli.content.aircraft.AircraftDefinition;
 import com.jnhprojects.mcheli.content.recipe.LegacyRecipe;
 
@@ -47,12 +48,12 @@ public final class LegacyImporter {
      * Bump whenever the output changes, so existing installs import again. 2: recipes craft the
      * generic vehicle items of 1.1.0. 3: vehicle ingredients name their type for every loader, and
      * the output depends on the {@link ImportTarget}. 4: recipes may use the equipment
-     * items, so the E-767 is crafted with a UAV station.
+     * items, so the E-767 is crafted with a UAV station. 5: on 1.21.1, smoke grenades get icon numbers too.
      */
-    public static final int FORMAT = 4;
+    public static final int FORMAT = 5;
 
     /**
-     * Written at the pack root for {@link ImportTarget#V1_21_1}: each original vehicle's
+     * Written at the pack root for every target but {@link ImportTarget#MODERN}: each original vehicle's
      * {@code custom_model_data}, as {@code name=index}, which the mod puts on the vehicle's stack.
      */
     public static final String ICONS_FILE = "item_icons.properties";
@@ -77,7 +78,7 @@ private LegacyImporter(Path packRoot, ImportTarget target) {
         this.target = target;
         this.packRoot = packRoot;
         this.assetsOut = packRoot.resolve("assets/mcheli");
-        this.recipesOut = packRoot.resolve("data/mcheli/recipe");
+        this.recipesOut = packRoot.resolve("data/mcheli/" + target.recipeFolder());
     }
 
     /**
@@ -116,7 +117,7 @@ private Summary importFrom(Path zipPath) throws IOException {
         writeTranslations();
 
         ContentRegistry content = ContentRegistry.load(assetsOut);
-        Map<String, Integer> icons = target == ImportTarget.V1_21_1 ? writeKindModels(content) : Map.of();
+        Map<String, Integer> icons = target != ImportTarget.MODERN ? writeKindModels(content) : Map.of();
         LegacyRecipe.Generated recipes = LegacyRecipe.generate(content, target, icons);
         for (Map.Entry<String, String> e : recipes.files().entrySet()) {
             write(recipesOut.resolve(e.getKey()), e.getValue());
@@ -289,6 +290,9 @@ private Map<String, Integer> writeKindModels(ContentRegistry content) throws IOE
         for (AircraftDefinition def : content.all()) {
             byKind.computeIfAbsent(def.kind(), k -> new ArrayList<>()).add(def.name());
         }
+        for (ThrowableDefinition def : content.throwables()) {
+            byKind.computeIfAbsent("throwable", k -> new ArrayList<>()).add(def.name());
+        }
         Map<String, Integer> icons = new TreeMap<>();
         for (Map.Entry<String, List<String>> e : byKind.entrySet()) {
             List<String> names = e.getValue();

common/src/main/java/com/jnhprojects/mcheli/content/recipe/LegacyRecipe.java

@@ -199,7 +199,7 @@ private static void appendResult(StringBuilder json, Vehicle result, int count,
     private static String model(Vehicle result, ImportTarget target) {
         return switch (target) {
             case MODERN -> "\"minecraft:item_model\": \"mcheli:" + result.name() + '"';
-            case V1_21_1 -> "\"minecraft:custom_model_data\": " + result.icon();
+            case V1_21_1, V1_20_6 -> "\"minecraft:custom_model_data\": " + result.icon();
         };
     }
 
@@ -208,7 +208,7 @@ private static String ingredient(String name, int damage, Predicate<String> modI
         String lower = name.trim().toLowerCase(Locale.ROOT);
         if (lower.startsWith("mcheli:")) {
             if (EQUIPMENT_ITEMS.contains(lower)) {
-                return '"' + lower + '"';
+                return target == ImportTarget.MODERN ? '"' + lower + '"' : "{\"item\": \"" + lower + "\"}";
             }
             if (!modItems.test(lower)) {
                 throw new InvalidRecipeException(lower + " does not exist (yet)");

common/src/main/java/com/jnhprojects/mcheli/physics/AircraftRotation.java

@@ -1,5 +1,6 @@
 package com.jnhprojects.mcheli.physics;
 
+import org.joml.Matrix3d;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
@@ -12,6 +13,9 @@
  * {@code rotY(-yaw) * rotX(pitch) * rotZ(roll)}.
  */
 public final class AircraftRotation {
+    /** Below this cosine of the middle angle, {@link #rollInXyzOrder} treats the first and last as one axis. */
+    private static final double GIMBAL_LOCK = 1.0E-9;
+
     private AircraftRotation() {
     }
 
@@ -69,6 +73,39 @@ public static float cameraRoll(float yaw, float pitch, float roll, float viewYaw
         return (float) Math.toDegrees(Math.atan2(onLeft, onUp));
     }
 
+    /**
+     * Angles for a view matrix built as {@code rotationXYZ(pitch, yaw + PI, roll)}, the way Forge
+     * builds it on Minecraft 1.20.6, so that the matrix comes out as a camera roll stacked on top of
+     * the other two rotations. Fed the plain angles that matrix applies the roll around the world's
+     * Z axis instead: a bank would look like a bank going south, the opposite one going north, and a
+     * change of pitch going east or west.
+     *
+     * @param yaw   the camera yaw, in degrees
+     * @param pitch the camera pitch, in degrees
+     * @param roll  the roll as {@link #cameraRoll} returns it, in degrees
+     * @return {@code {yaw, pitch, roll}} in degrees, to pass on to that matrix
+     */
+    public static float[] rollInXyzOrder(float yaw, float pitch, float roll) {
+        Matrix3d view = new Matrix3d()
+                .rotationZ(Math.toRadians(-roll))
+                .rotateX(Math.toRadians(pitch))
+                .rotateY(Math.toRadians(yaw) + Math.PI);
+        // The matrix above equals rotX(x) * rotY(y) * rotZ(z); read those three back from it.
+        double cosY = Math.hypot(view.m00, view.m10);
+        double x;
+        double z;
+        if (cosY > GIMBAL_LOCK) {
+            x = Math.atan2(-view.m21, view.m22);
+            z = Math.atan2(-view.m10, view.m00);
+        } else {
+            // Looking along X: the first and last rotation turn around the same axis, so Z can stay 0.
+            x = Math.atan2(view.m12, view.m11);
+            z = 0.0;
+        }
+        double y = Math.atan2(view.m20, cosY);
+        return new float[]{(float) Math.toDegrees(y - Math.PI), (float) Math.toDegrees(x), (float) Math.toDegrees(z)};
+    }
+
     public static float wrap(float degrees) {
         float d = degrees % 360.0F;
         if (d >= 180.0F) {

common/src/test/java/com/jnhprojects/mcheli/content/recipe/LegacyRecipeTargetTest.java

@@ -59,6 +59,14 @@ void minecraft1211RecipesUseObjectsAndCustomModelData() {
                 """, LegacyRecipe.toJson(AH_6X, LINE, true, "mcheli:ah-6"::equals, ImportTarget.V1_21_1));
     }
 
+    @Test
+    void equipmentIngredientsFollowTheTarget() {
+        assertTrue(LegacyRecipe.toJson(AH_6X, "mcheli:uav_station,coal", false, name -> false, ImportTarget.V1_21_1)
+                .contains("{\"item\": \"mcheli:uav_station\"}"));
+        assertTrue(LegacyRecipe.toJson(AH_6X, "mcheli:uav_station,coal", false, name -> false, ImportTarget.MODERN)
+                .contains("\"mcheli:uav_station\""));
+    }
+
     @Test
     void minecraft1211ShapelessIngredientsAreObjectsToo() {
         String json = LegacyRecipe.toJson(AH_6X, "iron_block,coal", false, name -> false, ImportTarget.V1_21_1);

common/src/test/java/com/jnhprojects/mcheli/physics/AircraftRotationTest.java

@@ -1,10 +1,12 @@
 package com.jnhprojects.mcheli.physics;
 
+import org.joml.Matrix4f;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Checks the camera tilt against the hull. The camera rotation is rebuilt the way
@@ -68,4 +70,56 @@ void cameraUpStaysOnTheHullsSideOfTheView() {
         assertEquals(expected.y, cameraUp.y, EPSILON);
         assertEquals(expected.z, cameraUp.z, EPSILON);
     }
+
+    /** The view matrix Forge builds on Minecraft 1.20.6 from what its camera angle event returns. */
+    private static Matrix4f forgeView(float[] angles) {
+        return new Matrix4f().rotationXYZ((float) Math.toRadians(angles[1]), (float) (Math.toRadians(angles[0]) + Math.PI), (float) Math.toRadians(angles[2]));
+    }
+
+    /** The inverse of {@link #camera}: what every other version builds as its view matrix. */
+    private static Matrix4f expectedView(float yaw, float pitch, float roll) {
+        return new Matrix4f().rotation(camera(yaw, pitch, roll).conjugate());
+    }
+
+    private static void assertSameRotation(Matrix4f expected, Matrix4f actual) {
+        Vector3f[] axes = {new Vector3f(1.0F, 0.0F, 0.0F), new Vector3f(0.0F, 1.0F, 0.0F), new Vector3f(0.0F, 0.0F, 1.0F)};
+        for (Vector3f axis : axes) {
+            Vector3f a = expected.transformDirection(new Vector3f(axis));
+            Vector3f b = actual.transformDirection(new Vector3f(axis));
+            assertEquals(a.x, b.x, EPSILON);
+            assertEquals(a.y, b.y, EPSILON);
+            assertEquals(a.z, b.z, EPSILON);
+        }
+    }
+
+    @Test
+    void rollInXyzOrderBuildsTheSameViewOnEveryHeading() {
+        for (float yaw = -180.0F; yaw <= 180.0F; yaw += 15.0F) {
+            for (float pitch = -80.0F; pitch <= 80.0F; pitch += 20.0F) {
+                for (float roll = -170.0F; roll <= 170.0F; roll += 34.0F) {
+                    assertSameRotation(expectedView(yaw, pitch, roll), forgeView(AircraftRotation.rollInXyzOrder(yaw, pitch, roll)));
+                }
+            }
+        }
+    }
+
+    @Test
+    void rollInXyzOrderSurvivesGimbalLock() {
+        // Due east or west and level, a hair of roll leaves the middle angle at its limit.
+        for (float yaw : new float[]{-90.0F, 90.0F}) {
+            for (float roll : new float[]{0.0F, 1.0E-4F, -1.0E-4F, 1.0F}) {
+                assertSameRotation(expectedView(yaw, 0.0F, roll), forgeView(AircraftRotation.rollInXyzOrder(yaw, 0.0F, roll)));
+            }
+        }
+    }
+
+    @Test
+    void forgesPlainAnglesWouldBeWrong() {
+        // Why rollInXyzOrder exists: going east, the plain angles do not give the same view at all.
+        Matrix4f expected = expectedView(-90.0F, 0.0F, -30.0F);
+        Matrix4f plain = forgeView(new float[]{-90.0F, 0.0F, -30.0F});
+        Vector3f expectedUp = expected.transformDirection(new Vector3f(0.0F, 1.0F, 0.0F));
+        Vector3f plainUp = plain.transformDirection(new Vector3f(0.0F, 1.0F, 0.0F));
+        assertTrue(expectedUp.distance(plainUp) > 0.1F);
+    }
 }