MCHeli Rework 1.1.0-beta.3: Forge, NeoForge and Fabric on 26.3 and 1.21.1

.gitignore

@@ -19,6 +19,7 @@ eclipse/
 
 # Run directories
 run/
+run-*/
 run-data/
 logs/
 *.log

CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to this project are documented here. The format follows
 [Semantic Versioning](https://semver.org/). Pre-releases (`1.0.0-alpha.N`) mark the phases on the
 way to 1.0.0; see [docs/ROADMAP.md](docs/ROADMAP.md).
 
+## [1.1.0-beta.3] - 2026-10-30
+
+Phase 7 of the road to 1.1.0: the mod on NeoForge and Fabric as well as Forge, and on Minecraft
+1.21.1 as well as 26.3. Betas are not uploaded to CurseForge; download them from the GitHub
+releases, one jar per loader and Minecraft version. Worlds from 1.1.0-beta.2 and 1.0.0 load as
+before on 26.3. Players and servers need the same version, since the network protocol changed.
+
+### Added
+
+- NeoForge and Fabric jars for Minecraft 26.3, with the same features as the Forge one. Fabric
+  needs Fabric API. Worlds, the `mcheli` folder, content packs and configs carry over between
+  loaders.
+- Minecraft 1.21.1 on Forge, NeoForge and Fabric, with the same vehicles, weapons, HUD and
+  content packs as on 26.3. Vehicle icons come from the kind's item model, which picks each
+  vehicle by `custom_model_data`.
+- The log names the loader the mod runs on, next to the version.
+
+### Changed
+
+- Jar names carry the loader and the Minecraft version, such as `mcheli-forge-26.3-<version>.jar`
+  and `mcheli-fabric-1.21.1-<version>.jar`.
+- The configs are read by the mod itself instead of Forge's config system, which Fabric does not
+  have. The files, their place and their keys stay the same, so existing settings are kept. Edits
+  to `serverconfig/mcheli-server.toml` now apply on the next world start or `/mcheli reload`
+  instead of while the server runs; `/mcheli reload` now reads the server config again too.
+- The original content is imported again on the first start, since the recipes now name the
+  vehicle ingredient for every loader. The import writes the layout of the Minecraft version it runs
+  on, and imports again when the folder was made for another version.
+- Every packet travels under its own id (`mcheli:pilot_state` and so on) with the same encoding on
+  every loader. Clients and servers need the same version, since the network protocol changed.
+- Glass panes that bullets shoot through come from the `c:glass_panes` tag, which every loader
+  fills.
+
+### Developers
+
+- The code is split in three layers: `common` (no Minecraft), `minecraft-26.3` (Minecraft, no
+  loader) and a thin module per loader (`forge-26.3`, `neoforge-26.3`, `fabric-26.3`). The shared
+  code reaches the loader through `Platform` and `Registration`, and the loaders call
+  `CommonHooks` and `ClientHooks` from their events. Where NeoForge or Fabric has no event, a
+  mixin hooks in where Forge fires its own. See [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md).
+- `minecraft-1.21.1` holds the shared code backported to 1.21.1; `forge-1.21.1`, `neoforge-1.21.1`
+  and `fabric-1.21.1` are its loader modules. 1.21.1 development runs use `./run-1.21.1`.
+- Gradle 9.8.2, for Fabric Loom 1.19. NeoForge modules build with ModDevGradle.
+
 ## [1.1.0-beta.2] - 2026-10-29
 
 Phase 6 of the road to 1.1.0: content packs that servers send to their players, night glow and

README.md

@@ -2,7 +2,8 @@
 
 <img src="docs/images/mcheli-rework-icon.png" alt="MCHeli Rework icon" width="160">
 
-Helicopters, planes, tanks and ground vehicles for **Minecraft 26.3** on **Forge 66.1**.
+Helicopters, planes, tanks and ground vehicles for **Minecraft 26.3** and **1.21.1**, 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,
@@ -124,24 +125,28 @@ Reserved original, the code is source available rather than open source.
 
 ## Requirements
 
-| | Version |
-|---|---------|
-| Minecraft | 26.3 |
-| Forge | 66.1.0 or newer in the 66.x line |
-| Java | 25 (bundled with the Minecraft launcher) |
+| | 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) |
 
 ## Installing
 
-1. Install Forge 66.1.0 for Minecraft 26.3.
-2. Download `mcheli-26.3-<version>.jar` from the [releases](https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases).
-3. Drop it into the `mods` folder of your Forge 26.3 profile.
+1. Install Forge, NeoForge or Fabric for Minecraft 26.3 or 1.21.1. 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):
+   `mcheli-<loader>-<minecraft>-<version>.jar`, such as `mcheli-fabric-1.21.1-<version>.jar`.
+3. Drop it into the `mods` folder of that profile.
 4. Download `MC1.7.10_mcheli_1.0.3.zip` from the
    [MCHeli CurseForge page](https://www.curseforge.com/minecraft/mc-mods/mcheli-minecraft-helicopter-mod/files)
    and put it, still zipped, into a folder called `mcheli` next to `mods` (create it if needed):
 
    ```
    <game directory>/
-     mods/mcheli-26.3-<version>.jar
+     mods/mcheli-<loader>-<minecraft>-<version>.jar
      mcheli/MC1.7.10_mcheli_1.0.3.zip
    ```
 
@@ -151,8 +156,10 @@ be switched off. The zip can be deleted afterwards. Dedicated servers need the z
 place. Without it the game still starts, but there are no vehicles, and the chat says where the
 zip goes.
 
-Use a separate game directory for the Forge 26.3 profile. Mods built for other loaders or older
-versions in a shared `mods` folder will stop the game from starting.
+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.
 
 ## Controls
 
@@ -279,8 +286,8 @@ adds a small helicopter, the Rework Scout. To make your own, see
 ./gradlew build
 ```
 
-The jars, one per Minecraft version, end up in `build/release`. Java 25 is required; Gradle
-downloads one automatically if it is not installed. `./gradlew :forge-26.3:runClient` and
-`:forge-26.3:runServer` import the content from
+The jars, one per loader and Minecraft version, end up in `build/release`. Java 25 is required;
+Gradle downloads one automatically if it is not installed. `./gradlew :<loader>-26.3:runClient`
+and `:<loader>-26.3:runServer` (`forge`, `neoforge` or `fabric`) import the content from
 `Mod/MC1.7.10_mcheli_1.0.3.zip`, which you have to download yourself. See
 [DEVELOPMENT.md](docs/DEVELOPMENT.md) for details.

build.gradle

@@ -1,15 +1,24 @@
 plugins {
     id 'base'
     id 'net.minecraftforge.gradle' version '[7.0.17,8)' apply false
+    id 'net.neoforged.moddev' version '2.0.148' apply false
+    // Loom 1.19 needs Gradle 9.8. The plain plugin is for unobfuscated Minecraft (26.x), the remap
+    // one for versions that still ship obfuscated (1.21.1 and older).
+    id 'net.fabricmc.fabric-loom' version '1.19.3' apply false
+    id 'net.fabricmc.fabric-loom-remap' version '1.19.3' apply false
 }
 
 def platforms = providers.gradleProperty('platforms').get().split(',').collect { it.trim() }
 
-// One jar per Minecraft version, gathered in one folder for the release workflow.
+// One jar per loader and Minecraft version, gathered in one folder for the release workflow.
 def releaseJars = tasks.register('releaseJars', Sync) {
     group = 'build'
-    description = 'Collects the jar of every platform module into build/release.'
-    platforms.each { platform -> from(project(":$platform").tasks.named('jar')) }
+    description = 'Collects the jar of every loader module into build/release.'
+    platforms.each { platform ->
+        // On the obfuscated versions (1.x) Fabric's shippable jar is the remapped one.
+        def jarTask = platform.startsWith('fabric-1.') ? 'remapJar' : 'jar'
+        from(project(":$platform").tasks.named(jarTask))
+    }
     into layout.buildDirectory.dir('release')
 }