From 77bdd2592820f9dc0dafdb07ffb1c97f82db8f35 Mon Sep 17 00:00:00 2001 From: Jennifer Chan Date: Tue, 23 May 2023 20:30:18 -0400 Subject: [PATCH] Update changelog and modify build workflow to include Create 0.5.1 --- .github/workflows/build.yml | 17 ++++++++++++++--- CHANGELOG.md | 9 ++++++--- build.gradle.kts | 5 +++-- gradle.properties | 1 + 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6474624..a7d11ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,16 +21,27 @@ jobs: strategy: matrix: java: [17] - loader: [fabric, forge] minecraft: ["1.19", "1.18"] - name: ${{matrix.loader}} ${{matrix.minecraft}} + include: + # FIXME: Build for Create Fabric 0.5.1 when that's out + - loader: fabric + loader_name: Fabric + create: "0.5.0" + - loader: forge + loader_name: Forge + create: "0.5.0" + - loader: forge + loader_name: Forge + create: "0.5.1" + + name: ${{matrix.loader_name}} ${{matrix.minecraft}} (Create ${{matrix.create}}) steps: - name: Checkout repository uses: actions/checkout@v3 with: - ref: refs/tags/${{matrix.loader}}-${{matrix.minecraft}}-${{github.ref_name}} + ref: refs/tags/${{matrix.loader}}-${{matrix.minecraft}}-${{matrix.create}}-${{github.ref_name}} - name: Setup Java ${{matrix.java}} uses: actions/setup-java@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 130a79c..97231ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ -- The lead car of each train now has a triangular tip, and is now colored differently to visually distinguish it from the train's other cars. The `map_style.colors.lead_car` config option can be used to change the color. -- Chain signals are now triangular, pointing towards the next signal. The colors still reflect the state of the signal. -- Signals can now be configured to display on either side of the track with the `map_view.signals_on` option. +- Hopefully fixes some crashes (especially on Forge) relating to trains not being on tracks. +- Signals are now displayed with the correct colors and at the correct angles. +- Different layers (signals, stations, etc.) can now be turned on or off in the Layers menu. +- Layers can be configured to only be visible at certain zoom levels. Check the `layers` section of the example config in the README for an example of how to set this up. + +Create 0.5.1 integration is happening as soon as Create Fabric 0.5.1 is out. diff --git a/build.gradle.kts b/build.gradle.kts index 9a8e20b..e6bd9fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,11 +13,12 @@ val mod_version: String by project val minecraft_version: String by project val maven_group: String by project val archives_base_name: String by project +val create_version_short: String by project version = mod_version group = maven_group -val archives_version = "$mod_version+mc$minecraft_version-fabric" +val archives_version = "$mod_version+mc$minecraft_version-fabric-create-$create_version_short" repositories { mavenCentral() @@ -124,7 +125,7 @@ modrinth { token.set(System.getenv("MODRINTH_TOKEN")) projectId.set(modrinth_id) versionNumber.set(mod_version) - versionName.set("CTM Fabric $mod_version") + versionName.set("CTM Fabric $mod_version (Create $create_version_short)") gameVersions.add(minecraft_version) loaders.add("fabric") dependencies { diff --git a/gradle.properties b/gradle.properties index a3c118e..5c8a2e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ fabric_api_version = 0.73.2+1.19.2 fabric_kotlin_version = 1.9.1+kotlin.1.8.10 create_version = 0.5.0.i-961 +create_version_short = 0.5.0 porting_lib_version = 2.1.811+1.19.2 ktor_version = 2.3.0 kotlin_json_version = 1.4.1