Release 1.1.0-beta.8

CHANGELOG.md

@@ -7,6 +7,44 @@ way to 1.0.0; see [docs/ROADMAP.md](docs/ROADMAP.md).
 
 ## [Unreleased]
 
+## [1.1.0-beta.8] - 2026-11-06
+
+Phase 12 of the road to 1.1.0: the second half of the vehicle workshop. Betas are not uploaded to
+CurseForge, and this one ships the Forge 26.3 jar only. Worlds from 1.1.0-beta.7 load as before.
+Players and servers need the same version, since the network protocol changed (11).
+
+### Added
+
+- Workshop Paint tab: import a PNG for the whole vehicle or for any part, by dropping it on the window
+  or pasting its path, and see it on the model straight away. Painting itself happens in your own image
+  editor. Files that are not real PNGs are refused with the reason.
+- `PartTexture` definition key: draws one object of a model with its own texture, whatever paint the
+  vehicle wears. An object named `$cockpit` now draws with the hull, so a cockpit can have its own.
+- Workshop Sound tab: import an OGG for the engine, the rotor or any of the vehicle's weapons, play it,
+  set its volume or pitch, and drag a pitch curve. OGG files the game cannot play, such as Opus, are
+  refused with the reason.
+- `SoundPitchCurve`, `RotorSound`, `RotorSoundVolume`, `RotorSoundPitchCurve` and `WeaponSound`
+  definition keys. A second loop plays alongside the engine, loops can follow the throttle along a
+  curve, and a vehicle can have its own sound for a weapon without changing the weapon's file.
+- Pack browser, from the Packs button in the workshop: every pack you have or the server sent, with its
+  author, version, size and contents, and the reason for any that cannot be used. Drop a zip on it to
+  install the pack.
+- Author credits: a pack vehicle's item names its pack and author, and so does `/mcheli packs`.
+- Sending a vehicle to a server: Send to server in the workshop offers your pack to the server's
+  operators, who decide with `/mcheli pending`, `/mcheli approve` and `/mcheli reject`. Approved packs
+  reach every player with no restart. This is off unless the server sets `packs.allowSubmissions`;
+  `packs.requireApproval` is on by default.
+
+### Fixed
+
+- A sound a content pack brought for a weapon or anything else played once by the server was silent. Only
+  engine loops could use pack sounds.
+
+### Changed
+
+- Network protocol 11.
+- The roadmap's texture brush is dropped: textures are imported per part as PNGs.
+
 ## [1.1.0-beta.7] - 2026-11-06
 
 Phase 11 of the road to 1.1.0: the first half of the vehicle workshop. Betas are not uploaded to
@@ -667,6 +705,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.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
 [1.1.0-beta.6]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.6
 [1.1.0-beta.5]: https://github.com/JnH-Projects/MCHeli-Rework-Forge/releases/tag/v1.1.0-beta.5

README.md

@@ -9,11 +9,12 @@ MCHeli Rework is a ground-up port of MCHeli 1.0.3, a mod that stopped at Minecra
 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 11 (`1.1.0-beta.7`). Every helicopter, plane,
+> **Status:** on the way to 1.1.0, now at phase 12 (`1.1.0-beta.8`). 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. Betas ship the
+> 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).
@@ -33,13 +34,14 @@ Phase 4 clips (click a picture to open the video):
 
 ## Screenshots
 
-The vehicle workshop in a development build (`1.1.0-beta.7`): bring a model
-from Blockbench or Blender, place its parts on it, tune it and fly it. The helicopter here is the
-example pack's Rework Scout. Every earlier phase is in the
-[screenshot gallery](docs/SCREENSHOTS.md).
+The vehicle workshop in a development build (`1.1.0-beta.8`): bring a model
+from Blockbench or Blender, place its parts on it, tune it and fly it, then give it textures and
+sounds of its own. Every earlier phase is in the [screenshot gallery](docs/SCREENSHOTS.md).
 
 | | |
 |---|---|
+| ![The Paint tab: the model's parts listed on the left, the helicopter in the middle with blue rotor blades, a red cockpit panel and a green hull, and the blade texture previewed on the right](docs/images/phase-12/workshop-paint.png) | ![The Sound tab: Engine, Rotor and a weapon listed on the left, and on the right the engine's sound file, Play and Clear buttons, its volume, and a pitch curve with five points](docs/images/phase-12/workshop-sound.png) |
+| A PNG per part, showing on the model straight away | An OGG for the engine, with its pitch following the throttle along a curve |
 | ![The workshop editor: a small helicopter on a grid, a hit box outlined around its cockpit, coloured handles on its parts, and the main rotor selected with arrows, its axis and its values in the side panel](docs/images/phase-11/workshop-editor.png) | ![The tuning page beside the helicopter, listing hit points, top speed, gravity, turn rates, fuel and armor](docs/images/phase-11/workshop-tuning.png) |
 | Place every part by dragging it on the model | Tune how it flies; values you changed stand out from the defaults |
 | ![The workshop's first screen: vehicles in the packs on the left, and a form for a new vehicle with a dropped OBJ file on the right](docs/images/phase-11/workshop-import.png) | ![The view from the helicopter's cockpit in flight over a desert coast, with the instruments on the HUD](docs/images/phase-11/workshop-test-flight.png) |

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

@@ -144,6 +144,7 @@ <T extends Definition> void folder(ContentSource source, String folder, Function
                 if (result.isValid()) {
                     T def = result.definition();
                     def.setPack(source.pack());
+                    def.setCredit(source.manifest());
                     if (def instanceof AircraftDefinition vehicle) {
                         fillHull(source, vehicle);
                     }

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

@@ -1,5 +1,8 @@
 package com.jnhprojects.mcheli.content;
 
+import com.jnhprojects.mcheli.content.pack.PackManifest;
+import org.jspecify.annotations.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -15,6 +18,7 @@ public abstract class Definition {
     private final String name;
     private final Map<String, Consumer<String>> handlers = new HashMap<>();
     private String pack = "";
+    private @Nullable PackManifest credit;
 
     protected Definition(String name) {
         this.name = name;
@@ -38,6 +42,15 @@ void setPack(String pack) {
         this.pack = pack;
     }
 
+    /** What the pack this came from says about itself, for credits; {@code null} for the import. */
+    public @Nullable PackManifest credit() {
+        return credit;
+    }
+
+    void setCredit(@Nullable PackManifest credit) {
+        this.credit = credit;
+    }
+
     protected abstract void registerKeys(KeyTable keys);
 
     /**

common/src/main/java/com/jnhprojects/mcheli/content/aircraft/AircraftDefinition.java

@@ -13,6 +13,7 @@
 import com.jnhprojects.mcheli.content.aircraft.part.WeaponBayPart;
 import com.jnhprojects.mcheli.content.aircraft.part.WeaponPart;
 import com.jnhprojects.mcheli.content.aircraft.part.WheelPart;
+import com.jnhprojects.mcheli.model.PartTextures;
 import org.jspecify.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -51,6 +52,8 @@ public abstract class AircraftDefinition extends Definition {
     public final Map<String, String> localizedNames = new LinkedHashMap<>();
     public String category = "zzz";
     public final List<String> textures = new ArrayList<>();
+    /** Texture names by part, which a part draws with whatever paint the vehicle wears. */
+    public final Map<String, String> partTextures = new LinkedHashMap<>();
     public boolean smoothShading = true;
     public boolean hideEntity;
     public float particlesScale = 1.0F;
@@ -164,6 +167,14 @@ public abstract class AircraftDefinition extends Definition {
     public float soundRange;
     public float soundVolume = 1.0F;
     public float soundPitch = 1.0F;
+    /** How the engine's pitch follows the throttle, or {@code null} for what the kind does. */
+    public @Nullable PitchCurve soundPitchCurve;
+    /** A second loop alongside the engine, or empty for none. */
+    public String rotorSound = "";
+    public float rotorSoundVolume = 1.0F;
+    public @Nullable PitchCurve rotorSoundPitchCurve;
+    /** This vehicle's own sounds for weapons, by weapon name. */
+    public final Map<String, WeaponSound> weaponSounds = new LinkedHashMap<>();
 
     // Cargo racks
     public final List<RackDefinition> racks = new ArrayList<>();
@@ -330,6 +341,13 @@ protected void registerKeys(KeyTable keys) {
         });
         keys.put("Category", v -> category = v.toUpperCase(Locale.ROOT).replaceAll("[,;:]", ".").replaceAll("[ \t]", ""));
         keys.put("AddTexture", v -> textures.add(lower(v)));
+        keys.put("PartTexture", v -> {
+            String[] s = split(v);
+            if (s.length != 2) {
+                throw new IllegalArgumentException("PartTexture needs a part and a texture");
+            }
+            partTextures.put(PartTextures.partName(s[0]), lower(s[1]));
+        });
         keys.put("SmoothShading", v -> smoothShading = toBool(v));
         keys.put("HideEntity", v -> hideEntity = toBool(v));
         keys.put("ParticlesScale", v -> particlesScale = toFloat(v, 0.0F, 50.0F));
@@ -525,6 +543,18 @@ protected void registerKeys(KeyTable keys) {
         keys.put("SoundRange", v -> soundRange = toFloat(v, 1.0F, 1000.0F));
         keys.put("SoundVolume", v -> soundVolume = toFloat(v, 0.0F, 10.0F));
         keys.put("SoundPitch", v -> soundPitch = toFloat(v, 0.0F, 10.0F));
+        keys.put("SoundPitchCurve", v -> soundPitchCurve = PitchCurve.parse(v));
+        keys.put("RotorSound", v -> rotorSound = lower(v));
+        keys.put("RotorSoundVolume", v -> rotorSoundVolume = toFloat(v, 0.0F, 10.0F));
+        keys.put("RotorSoundPitchCurve", v -> rotorSoundPitchCurve = PitchCurve.parse(v));
+        keys.put("WeaponSound", v -> {
+            String[] s = split(v);
+            if (s.length < 2) {
+                throw new IllegalArgumentException("WeaponSound needs a weapon and a sound");
+            }
+            Float pitch = s.length >= 3 ? toFloat(s[2], PitchCurve.MIN_PITCH, PitchCurve.MAX_PITCH) : null;
+            weaponSounds.put(lower(s[0]), new WeaponSound(lower(s[1]), pitch));
+        });
 
         keys.put("AddRecipe", v -> {
             shapedRecipe = true;

common/src/main/java/com/jnhprojects/mcheli/content/aircraft/PitchCurve.java

@@ -0,0 +1,101 @@
+package com.jnhprojects.mcheli.content.aircraft;
+
+import java.util.Locale;
+
+/**
+ * How an engine or rotor loop's pitch follows the throttle, from {@code SoundPitchCurve} and
+ * {@code RotorSoundPitchCurve}: points of {@code throttle:pitch} with straight lines between them.
+ * <pre>
+ * SoundPitchCurve = 0:0.6, 0.5:0.9, 1:1.4
+ * </pre>
+ * Throttle runs from 0 to 1. Pitch stays within {@value #MIN_PITCH} to {@value #MAX_PITCH}, all the
+ * sound engine will play, so a curve never promises something that cannot be heard.
+ */
+public final class PitchCurve {
+    public static final float MIN_PITCH = 0.5F;
+    public static final float MAX_PITCH = 2.0F;
+
+    private final float[] throttle;
+    private final float[] pitch;
+
+    private PitchCurve(float[] throttle, float[] pitch) {
+        this.throttle = throttle;
+        this.pitch = pitch;
+    }
+
+    /**
+     * @throws IllegalArgumentException when the text is not a curve; the message is meant for the
+     *                                  pack's author
+     */
+    public static PitchCurve parse(String text) {
+        String[] points = text.split(",");
+        if (points.length < 2) {
+            throw new IllegalArgumentException("a pitch curve needs at least two throttle:pitch points");
+        }
+        float[] x = new float[points.length];
+        float[] y = new float[points.length];
+        for (int i = 0; i < points.length; i++) {
+            String[] parts = points[i].split(":");
+            if (parts.length != 2) {
+                throw new IllegalArgumentException("\"" + points[i].trim() + "\" is not throttle:pitch");
+            }
+            x[i] = Float.parseFloat(parts[0].trim());
+            y[i] = Math.clamp(Float.parseFloat(parts[1].trim()), MIN_PITCH, MAX_PITCH);
+            if (x[i] < 0.0F || x[i] > 1.0F) {
+                throw new IllegalArgumentException("throttle " + parts[0].trim() + " is outside 0 to 1");
+            }
+            if (i > 0 && x[i] <= x[i - 1]) {
+                throw new IllegalArgumentException("the throttle values of a pitch curve must rise from left to right");
+            }
+        }
+        return new PitchCurve(x, y);
+    }
+
+    /** The pitch at a throttle. Beyond its first and last points the curve stays level. */
+    public float at(float value) {
+        if (value <= throttle[0]) {
+            return pitch[0];
+        }
+        for (int i = 1; i < throttle.length; i++) {
+            if (value <= throttle[i]) {
+                float f = (value - throttle[i - 1]) / (throttle[i] - throttle[i - 1]);
+                return pitch[i - 1] + (pitch[i] - pitch[i - 1]) * f;
+            }
+        }
+        return pitch[pitch.length - 1];
+    }
+
+    public int size() {
+        return throttle.length;
+    }
+
+    public float throttle(int point) {
+        return throttle[point];
+    }
+
+    public float pitch(int point) {
+        return pitch[point];
+    }
+
+    /** The same curve with one point at another pitch. */
+    public PitchCurve withPitch(int point, float value) {
+        float[] y = pitch.clone();
+        y[point] = Math.clamp(value, MIN_PITCH, MAX_PITCH);
+        return new PitchCurve(throttle, y);
+    }
+
+    /** The curve as a definition value, which {@link #parse} reads back. */
+    public String text() {
+        StringBuilder out = new StringBuilder();
+        for (int i = 0; i < throttle.length; i++) {
+            out.append(i > 0 ? ", " : "").append(number(throttle[i])).append(':').append(number(pitch[i]));
+        }
+        return out.toString();
+    }
+
+    private static String number(float value) {
+        String text = String.format(Locale.ROOT, "%.3f", value);
+        text = text.replaceAll("0+$", "");
+        return text.endsWith(".") ? text.substring(0, text.length() - 1) : text;
+    }
+}

common/src/main/java/com/jnhprojects/mcheli/content/aircraft/WeaponSound.java

@@ -0,0 +1,14 @@
+package com.jnhprojects.mcheli.content.aircraft;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * What one weapon sounds like on this vehicle, from {@code WeaponSound = weapon, sound[, pitch]}.
+ * Weapon files are shared between vehicles, so a vehicle with its own gun sound says so here rather
+ * than in the weapon's file.
+ *
+ * @param sound the sound's name, as in {@code sounds/<name>.ogg}
+ * @param pitch the pitch to play it at, or {@code null} for what the weapon's file says
+ */
+public record WeaponSound(String sound, @Nullable Float pitch) {
+}

common/src/main/java/com/jnhprojects/mcheli/content/pack/ContentPack.java

@@ -235,7 +235,7 @@ public Path assets() {
     }
 
     public ContentSource contentSource() {
-        return new ContentSource(id(), assets());
+        return new ContentSource(id(), assets(), manifest);
     }
 
     /** Paths of the pack's files relative to its top, in order. */

common/src/main/java/com/jnhprojects/mcheli/content/pack/ContentSource.java

@@ -1,19 +1,27 @@
 package com.jnhprojects.mcheli.content.pack;
 
+import org.jspecify.annotations.Nullable;
+
 import java.nio.file.Path;
 
 /**
  * One place definitions are read from: the {@code assets/mcheli} folder of a content pack, or of
  * the imported 1.0.3 content.
  *
- * @param pack   id of the pack, {@link #ORIGINAL} for the import
- * @param assets the {@code assets/mcheli} folder, possibly inside a zip file system; it need not
- *               exist
+ * @param pack     id of the pack, {@link #ORIGINAL} for the import
+ * @param assets   the {@code assets/mcheli} folder, possibly inside a zip file system; it need not
+ *                 exist
+ * @param manifest what the pack says about itself, for crediting its author, or {@code null} for
+ *                 the import
  */
-public record ContentSource(String pack, Path assets) {
+public record ContentSource(String pack, Path assets, @Nullable PackManifest manifest) {
     /** Pack id of the imported 1.0.3 content. No content pack may use it. */
     public static final String ORIGINAL = "original";
 
+    public ContentSource(String pack, Path assets) {
+        this(pack, assets, null);
+    }
+
     public boolean isOriginal() {
         return ORIGINAL.equals(pack);
     }