MCHeli Rework 1.1.0-beta.1

.github/workflows/build.yml

@@ -31,12 +31,12 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: mcheli-${{ github.sha }}
-          path: build/libs/*.jar
+          path: build/release/*.jar
           if-no-files-found: error
           retention-days: 14
 
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-reports
-          path: build/reports/tests/
+          path: "*/build/reports/tests/"

.github/workflows/release.yml

@@ -50,7 +50,8 @@ jobs:
           if [ "${{ steps.version.outputs.prerelease }}" = "true" ]; then
             flags+=(--prerelease)
           fi
-          gh release create "$GITHUB_REF_NAME" build/libs/*.jar \
+          # One jar per Minecraft version, gathered by the releaseJars task.
+          gh release create "$GITHUB_REF_NAME" build/release/*.jar \
             --title "MCHeli Rework ${{ steps.version.outputs.version }}" \
             --notes-file release-notes.md \
             "${flags[@]}"

CHANGELOG.md

@@ -5,6 +5,53 @@ 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.1] - 2026-10-29
+
+Phase 5 of the road to 1.1.0: the groundwork that content packs, older Minecraft versions and
+the vehicle workshop build on. Betas are not uploaded to CurseForge; download them from the GitHub
+releases. Worlds from 1.0.0 load with their vehicles and items.
+
+### Added
+
+- `/mcheli` shows where the vehicles were loaded from and how many there are; `/mcheli list
+  [helicopter|plane|tank|vehicle]` lists them.
+- `/mcheli give <players> <vehicle> [count]` for operators, with the vehicle names suggested.
+- `/mcheli reload` for operators: reads the vehicle and weapon definitions again without
+  restarting. Vehicles already in the world switch to the new values on the spot and keep their
+  ammunition; models and textures edited on disk show up straight away, without F3 + T.
+- Server config, `serverconfig/mcheli-server.toml` in each world: whether explosions break blocks
+  and start fires, a damage multiplier for vehicles, infinite ammunition, and a list of vehicles
+  that cannot be placed. Edits apply while the server runs.
+- Boats destroyed on the water (by a torpedo or anything else) cook off: three explosions with
+  fireballs within about five seconds, the first from the fuel, the second from the ammunition
+  still aboard, the last and biggest sized by the fuel load like a crash. Then the burning wreck
+  slowly goes under, stern first and listing, and settles on the bottom.
+- Content can now bring textures, models and sounds while the game runs, without a resource
+  reload. Nothing uses this yet beyond `/mcheli reload`; content packs (beta.2) will.
+
+### Changed
+
+- Vehicle items: there is now one item per vehicle kind (Helicopter, Plane, Tank, Ground Vehicle)
+  that remembers which vehicle it places, instead of one item per vehicle. They look and are named
+  as before. Items from 1.0.0 still work and turn into the new ones as soon as they are in a
+  player's inventory; items in chests change when taken out. To give one by command, use
+  `/mcheli give` (plain `/give mcheli:ah-64` no longer exists for new items).
+- The imported content is converted again on the first start, since the crafting recipes now
+  make the new items. This takes a few seconds, once.
+- The source is split into a version-free `common` module and a module per Minecraft version
+  (`forge-26.3` for now), and a release attaches one jar per Minecraft version. Nothing changes for
+  players.
+
+### Fixed
+
+- Boats and other floating vehicles sat about a third of a block too deep, so the Zodiac was
+  almost under water. They now float as high as in the original.
+- Static launchers and guns that turn with the gunner's view, such as the Type 93 and Mk 32
+  torpedo tubes, only fired straight ahead. They fire where the gunner looks again.
+- On Windows, converting the content again could fail with "access denied" when another program
+  had the old `mcheli/imported` folder open, leaving the game without vehicles until the next
+  start. The old folder is now moved aside first, and the swap is retried.
+
 ## [1.0.0] - 2026-10-28
 
 First release. Everything from the alpha and beta versions, shipped as a code-only jar. The
@@ -317,4 +364,5 @@ 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.1]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.1
 [1.0.0]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.0.0

README.md

@@ -27,6 +27,14 @@ Phase 4 clips (click a picture to open the video):
 
 ## Screenshots
 
+Phase 5 in a development build (`1.1.0-beta.1`): a patrol boat hit by a torpedo cooks off and
+sinks.
+
+| | |
+|---|---|
+| ![A patrol boat exploding on a river after a torpedo hit, burning debris arcing over the shore](docs/images/phase-5/patrol-boat-cook-off.png) | ![The wreck of the patrol boat resting on the riverbed, listing and still smoking](docs/images/phase-5/patrol-boat-wreck.png) |
+| Torpedo hit: fuel and ammunition cook off in three blasts | The wreck settles on the bottom, still smoking |
+
 Phase 4 in a development build: the original's scripted HUDs, pilot gunner mode and lock-on.
 
 | | |
@@ -196,6 +204,26 @@ Each seat fires the weapons its vehicle assigns to it; the pilot also fires a gu
 while that seat has no player. Creative players have unlimited ammunition. A small readout at the
 bottom right shows hit points, the weapon, ammunition, reload, heat, lock and flares.
 
+## Commands and server settings
+
+| Command | Who | What it does |
+|---------|-----|--------------|
+| `/mcheli` | everyone | Where the vehicles were loaded from, and how many of each kind |
+| `/mcheli list [helicopter\|plane\|tank\|vehicle]` | everyone | The loaded vehicles by name |
+| `/mcheli give <players> <vehicle> [count]` | operators | Hands out vehicles, for example `/mcheli give @s ah-64` |
+| `/mcheli reload` | operators | Reads the vehicle and weapon files again without a restart |
+
+Each world has `serverconfig/mcheli-server.toml` (created on first start, edits apply while the
+server runs):
+
+| Setting | Default | Meaning |
+|---------|---------|---------|
+| `explosions.breakBlocks` | `true` | Weapons and crashes break blocks (the `mobGriefing` rule applies too) |
+| `explosions.startFires` | `true` | Incendiary weapons and crashes start fires |
+| `vehicles.damageFactor` | `1.0` | Multiplies the damage vehicles take; `0.5` makes them twice as tough |
+| `vehicles.disabled` | `[]` | Vehicles that cannot be placed, by name, such as `["ah-64", "f-35b"]` |
+| `weapons.infiniteAmmo` | `false` | Vehicle weapons never run out of ammunition |
+
 ## Documentation
 
 * [Changelog](CHANGELOG.md)
@@ -212,7 +240,8 @@ bottom right shows hit points, the weapon, ammunition, reload, heat, lock and fl
 ./gradlew build
 ```
 
-The jar ends up in `build/libs`. Java 25 is required; Gradle downloads one automatically if it is
-not installed. `./gradlew runClient` and `runServer` import the content from
+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
 `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,106 +1,18 @@
 plugins {
-    id 'java'
-    id 'idea'
-    id 'eclipse'
-    id 'net.minecraftforge.gradle' version '[7.0.17,8)'
+    id 'base'
+    id 'net.minecraftforge.gradle' version '[7.0.17,8)' apply false
 }
 
-version = mod_version
-group = mod_group
+def platforms = providers.gradleProperty('platforms').get().split(',').collect { it.trim() }
 
-base {
-    archivesName = "mcheli-${minecraft_version}"
+// One jar per 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')) }
+    into layout.buildDirectory.dir('release')
 }
 
-// Minecraft 26.x ships Java 25 to players, so the mod targets it as well.
-java.toolchain.languageVersion = JavaLanguageVersion.of(25)
-
-// The original MCHeli 1.0.3 download. Players supply their own copy; development runs and the
-// import test use this one (git-ignored, see docs/DEVELOPMENT.md).
-def legacyZip = file('Mod/MC1.7.10_mcheli_1.0.3.zip').absolutePath
-
-minecraft {
-    runs {
-        configureEach {
-            workingDir = layout.projectDirectory.dir('run')
-            systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
-            systemProperty 'mcheli.legacyZip', legacyZip
-        }
-
-        register('client')
-
-        register('server') {
-            args '--nogui'
-        }
-    }
-}
-
-repositories {
-    minecraft.mavenizer(it)
-    maven fg.forgeMaven
-    maven fg.minecraftLibsMaven
-    mavenCentral()
-}
-
-dependencies {
-    implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
-    annotationProcessor "net.minecraftforge:eventbus-validator:${eventbus_version}"
-
-    testImplementation platform("org.junit:junit-bom:${junit_version}")
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
-    options.compilerArgs.addAll(['-Xlint:deprecation', '-Xlint:unchecked'])
-}
-
-tasks.named('test', Test) {
-    useJUnitPlatform()
-    systemProperty 'mcheli.resources', file('src/main/resources').absolutePath
-    // The content tests import the original zip once into build/legacy-content (TestResources)
-    // and are skipped where the zip is absent, such as on CI.
-    systemProperty 'mcheli.legacyZip', legacyZip
-    systemProperty 'mcheli.testContent', layout.buildDirectory.dir('legacy-content').get().asFile.absolutePath
-}
-
-def expandProps = [
-        mod_id               : mod_id,
-        mod_name             : mod_name,
-        mod_version          : version,
-        mod_authors          : mod_authors,
-        mod_license          : mod_license,
-        minecraft_version_range: minecraft_version_range,
-        forge_version_range  : forge_version_range,
-        loader_version_range : loader_version_range,
-]
-
-tasks.named('processResources', ProcessResources) {
-    inputs.properties(expandProps)
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
-        expand expandProps
-    }
-}
-
-tasks.named('jar', Jar) {
-    // EMB4's content is never redistributed: players import it from their own copy of the original
-    // zip (LegacyContent). The repository no longer holds it, but the jar is packed from
-    // build/sourceSets/main, which can still have copies from older builds and from the IDE.
-    exclude { FileTreeElement element ->
-        String path = element.relativePath.pathString
-        !element.directory && path.startsWith('assets/mcheli/') && !path.startsWith('assets/mcheli/lang/')
-    }
-    exclude 'data/mcheli/recipe/**'
-    includeEmptyDirs = false
-    manifest {
-        attributes([
-                'Specification-Title'   : mod_id,
-                'Specification-Vendor'  : 'JnH Projects',
-                'Specification-Version' : '1',
-                'Implementation-Title'  : mod_name,
-                'Implementation-Version': version,
-                'Implementation-Vendor' : 'JnH Projects',
-        ])
-    }
+tasks.named('build') {
+    dependsOn releaseJars
 }

common/build.gradle

@@ -0,0 +1,48 @@
+plugins {
+    id 'java-library'
+}
+
+version = mod_version
+group = mod_group
+
+// The platform modules compile these sources again with their own toolchain. Building them on
+// their own here, with no Minecraft or loader on the classpath, is what keeps them version-free.
+java.toolchain.languageVersion = JavaLanguageVersion.of(25)
+
+repositories {
+    // Minecraft's library mirror has everything the game ships; Maven Central is the fallback.
+    maven { url = 'https://libraries.minecraft.net/' }
+    mavenCentral()
+}
+
+dependencies {
+    // Provided at runtime by Minecraft on every supported version.
+    compileOnly "org.slf4j:slf4j-api:${slf4j_version}"
+    compileOnly "org.jspecify:jspecify:${jspecify_version}"
+    compileOnly "org.joml:joml:${joml_version}"
+
+    testImplementation "org.slf4j:slf4j-api:${slf4j_version}"
+    testImplementation "org.jspecify:jspecify:${jspecify_version}"
+    testImplementation "org.joml:joml:${joml_version}"
+    testImplementation platform("org.junit:junit-bom:${junit_version}")
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+    options.compilerArgs.addAll(['-Xlint:deprecation', '-Xlint:unchecked'])
+}
+
+// The original MCHeli 1.0.3 download, kept by developers in Mod/ (git-ignored, see docs/DEVELOPMENT.md).
+def legacyZip = rootProject.file('Mod/MC1.7.10_mcheli_1.0.3.zip').absolutePath
+
+tasks.named('test', Test) {
+    useJUnitPlatform()
+    systemProperty 'mcheli.resources', file('src/main/resources').absolutePath
+    systemProperty 'mcheli.commonSources', file('src/main/java').absolutePath
+    // The content tests import the original zip once into build/legacy-content (TestResources)
+    // and are skipped where the zip is absent, such as on CI.
+    systemProperty 'mcheli.legacyZip', legacyZip
+    systemProperty 'mcheli.testContent', layout.buildDirectory.dir('legacy-content').get().asFile.absolutePath
+}