Dev1.3.0

.github/workflows/publish_1.21.2.yml

@@ -50,4 +50,4 @@ jobs:
               1.21.2
               1.21.3
 
-            version: mc1.21.2+mc1.21.3-1.2.4
+            version: mc1.21.2+mc1.21.3-1.3.0

.github/workflows/publish_1.21.4.yml

@@ -49,4 +49,4 @@ jobs:
             game-versions: |
               1.21.4
 
-            version: mc1.21.4-1.2.4
+            version: mc1.21.4-1.3.0

.github/workflows/publish_1.21.5.yml

@@ -49,4 +49,4 @@ jobs:
             game-versions: |
               1.21.5
 
-            version: mc1.21.5-1.2.4
+            version: mc1.21.5-1.3.0

.github/workflows/publish_1.21.6.yml

@@ -0,0 +1,54 @@
+name: publish_1.21.6.yml
+
+on: [ pull_request, workflow_dispatch ]
+
+permissions: write-all
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+        - name: 检查环境变量
+          run: env
+
+        - name: 签出存储库
+          uses: actions/checkout@v3
+          with:
+            submodules: true
+
+        - name: 设置 Java
+          uses: actions/setup-java@v2
+          with:
+            distribution: "temurin"
+            java-version: 21
+
+        - name: 使 Gradle Wrapper 可执行
+          if: ${{ runner.os != 'Windows' }}
+          run: chmod +x ./gradlew
+
+        - name: 构建
+          run: ./gradlew build -Ptarget_version=1.21.6
+
+        - name: 发布
+          uses: Kir-Antipov/mc-publish@v3.3
+          with:
+            curseforge-id: ${{ vars.CURSEFORGE_ID }}
+            curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+            modrinth-id: ${{ vars.MODRINTH_ID }}
+            modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+            version-type: release
+            changelog-file: CHANGELOG.md
+
+            java: 21
+
+            loaders: fabric
+
+            game-versions: |
+              1.21.6
+              1.21.7
+              1.21.8
+
+            version: mc1.21.6+mc1.21.7+mc1.21.8-1.3.0

.github/workflows/publish_1.21.9.yml

@@ -0,0 +1,53 @@
+name: publish_1.21.9.yml
+
+on: [ pull_request, workflow_dispatch ]
+
+permissions: write-all
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+        - name: 检查环境变量
+          run: env
+
+        - name: 签出存储库
+          uses: actions/checkout@v3
+          with:
+            submodules: true
+
+        - name: 设置 Java
+          uses: actions/setup-java@v2
+          with:
+            distribution: "temurin"
+            java-version: 21
+
+        - name: 使 Gradle Wrapper 可执行
+          if: ${{ runner.os != 'Windows' }}
+          run: chmod +x ./gradlew
+
+        - name: 构建
+          run: ./gradlew build -Ptarget_version=1.21.9
+
+        - name: 发布
+          uses: Kir-Antipov/mc-publish@v3.3
+          with:
+            curseforge-id: ${{ vars.CURSEFORGE_ID }}
+            curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+            modrinth-id: ${{ vars.MODRINTH_ID }}
+            modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+            version-type: release
+            changelog-file: CHANGELOG.md
+
+            java: 21
+
+            loaders: fabric
+
+            game-versions: |
+              1.21.9
+              1.21.10
+
+            version: mc1.21.9+mc1.21.10-1.3.0

.github/workflows/publish_1.21.yml

@@ -50,4 +50,4 @@ jobs:
               1.21
               1.21.1
 
-            version: mc1.21+mc1.21.1-1.2.4
+            version: mc1.21+mc1.21.1-1.3.0

CHANGELOG.md

@@ -1,3 +1,9 @@
-# 1.2.4
-* 修正部分项目结构以准备向后支持更新的版本
-* 测试 MC-Publish 的自动部署（QwQ
+# 1.3.0
+* 支持至 MC 1.21.10~
+* 支持在退出世界时与退出游戏时进行二次确认~
+  * 可在模组设置中开关
+
+# 1.3.0
+* Supports up to MC 1.21.10~
+* Supports secondary confirmation when exiting the world and exiting the game~
+    * Can be toggled in mod settings

README.md

@@ -4,6 +4,8 @@ Have a different Title Screen !
 
 拥有一个与众不同的标题屏幕!
 
+**芒果窗的主要功能已经完成更新，目前不考虑在此模组中增加新的功能，今后的工作仅在于问题修复与兼容后续版本。**
+
 ## 获取
 
 Modrinth: <https://modrinth.com/mod/fan-window>

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version '1.13-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -69,6 +69,7 @@ repositories {
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
     maven {
+        name = "fanfan"
         url = "https://maven.fanfan.moe/repository/maven-public/"
     }
 }

gradle.properties

@@ -3,46 +3,61 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 
-# 1.21 | 1.21.5
-target_version=1.21.5
+# 1.21 | 1.21.10
+target_version=1.21.10
 
 v121_yarn_mappings=1.21+build.1
 v1211_yarn_mappings=1.21.1+build.1
 v1212_yarn_mappings=1.21.2+build.1
 v1213_yarn_mappings=1.21.3+build.1
 v1214_yarn_mappings=1.21.4+build.1
 v1215_yarn_mappings=1.21.5+build.1
+v1216_yarn_mappings=1.21.6+build.1
+v1217_yarn_mappings=1.21.7+build.8
+v1218_yarn_mappings=1.21.8+build.1
+v1219_yarn_mappings=1.21.9+build.1
+v12110_yarn_mappings=1.21.10+build.2
 
 v121_modmenu_version=11.0.3
 v1211_modmenu_version=11.0.3
 v1212_modmenu_version=12.0.0
 v1213_modmenu_version=12.0.0
 v1214_modmenu_version=13.0.3
 v1215_modmenu_version=14.0.0-rc.2
+v1216_modmenu_version=15.0.0
+v1217_modmenu_version=15.0.0
+v1218_modmenu_version=15.0.0
+v1219_modmenu_version=16.0.0-rc.1
+v12110_modmenu_version=16.0.0-rc.1
 
 v121_cloth_config_api_version=15.0.140
 v1211_cloth_config_api_version=15.0.140
 v1212_cloth_config_api_version=16.0.143
 v1213_cloth_config_api_version=16.0.143
 v1214_cloth_config_api_version=17.0.144
 v1215_cloth_config_api_version=18.0.145
+v1216_cloth_config_api_version=19.0.147
+v1217_cloth_config_api_version=19.0.147
+v1218_cloth_config_api_version=19.0.147
+v1219_cloth_config_api_version=20.0.149
+v12110_cloth_config_api_version=20.0.149
 
 v121_versioned_scr=1.21
 v1211_versioned_scr=1.21
 v1212_versioned_scr=1.21.2
 v1213_versioned_scr=1.21.2
 v1214_versioned_scr=1.21.4
 v1215_versioned_scr=1.21.5
+v1216_versioned_scr=1.21.6
+v1217_versioned_scr=1.21.6
+v1218_versioned_scr=1.21.6
+v1219_versioned_scr=1.21.9
+v12110_versioned_scr=1.21.9
 
 loader_version=0.16.14
-loom_version=1.10-SNAPSHOT
+loom_version=1.13-SNAPSHOT
 
-mod_version=1.2.4
+mod_version=1.3.0
 maven_group=cn.mangofanfan
 archives_base_name=fanwindow
 
-# loom_libraries_base=https://bmclapi2.bangbang93.com/maven/
-loom_resources_base=https://bmclapi2.bangbang93.com/assets/
-loom_version_manifests=https://bmclapi2.bangbang93.com/mc/game/version_manifest.json
-loom_experimental_versions=https://maven.fabricmc.net/net/minecraft/experimental_versions.json
-# loom_fabric_repository=https://repository.hanbings.io/proxy/

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,5 +1,9 @@
 pluginManagement {
     repositories {
+        maven {
+            name = "fanfan"
+            url = "https://maven.fanfan.moe/repository/maven-public/"
+        }
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'

src/client/java/cn/mangofanfan/fanwindow/client/FanwindowClient.java

@@ -1,5 +1,6 @@
 package cn.mangofanfan.fanwindow.client;
 
+import cn.mangofanfan.fanwindow.client.function.MinecraftVersionGetter;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
@@ -12,6 +13,7 @@ public void onInitializeClient() {
 
         Logger logger = LoggerFactory.getLogger("FanWindowClient");
         GlobalState globalState = GlobalState.getInstance();
+        logger.info("Running on Minecraft Version: {}", MinecraftVersionGetter.getMinecraftVersion());
 
         if (FabricLoader.getInstance().isModLoaded("modmenu")) {
             logger.info("ModMenu is loaded. Specifical support enabled.");

src/client/java/cn/mangofanfan/fanwindow/client/config/BgPicture.java

@@ -24,13 +24,16 @@ public enum BgPicture {
      * 棘巧试炼的官方艺术作品 1.21
      */
     Tricky_Trials_Artwork_png("Tricky_Trials_Artwork.png"),
+    /**
+     * 铜器时代 1.21.9
+     */
+    The_Copper_Age_Key_Art_png("The_Copper_Age_Key_Art.png"),
 
     /**
      * 末影龙
      */
     Ender_Dragon_png("Ender_Dragon.png");
 
-    // TODO 重构自定义模式
 
     private final String picName;
     BgPicture(String image) {
@@ -94,6 +97,10 @@ public int[] getPicSize() {
                 size[0] = 1600;
                 size[1] = 900;
                 break;
+            case The_Copper_Age_Key_Art_png:
+                size[0] = 1920;
+                size[1] = 1350;
+                break;
         }
         return size;
     }