From b8d4725e7b32f8412f379bfd7fec9b50905eddd4 Mon Sep 17 00:00:00 2001 From: iceBear67 Date: Sat, 26 Sep 2026 03:14:00 +0000 Subject: [PATCH] update 26.3 dependencies and pack mods - polymer 0.18.0+26.3-rc-1 -> 0.18.2+26.3 (first 26.3 final build) - fabric-api 0.160.5 -> 0.161.0, loom 1.18.1 -> 1.18.2 - pack: move squaremap, syncmatica, farmers-delight (+polymer patch), jei, worldedit, lithium to their 26.3 builds; bump fabric-api, polymer - lithium now resolved from Modrinth instead of CurseForge (same mod, same author) - docs: fix stale hurtMarked reference, drop carpet snapshot warning Co-Authored-By: Claude Opus 5.5 (1M context) --- AGENTS.md | 4 ++-- Dockerfile | 12 ++++-------- build.gradle | 4 ++-- gradle.properties | 2 +- logs/2026-09-15-1.log.gz | Bin 0 -> 180 bytes server-deploy/pack/index.toml | 18 +++++++++--------- server-deploy/pack/mods/fabric-api.pw.toml | 8 ++++---- .../pack/mods/farmers-delight-polymer.pw.toml | 8 ++++---- .../mods/farmers-delight-refabricated.pw.toml | 8 ++++---- server-deploy/pack/mods/jei.pw.toml | 8 ++++---- server-deploy/pack/mods/lithium.pw.toml | 14 +++++++------- server-deploy/pack/mods/polymer.pw.toml | 8 ++++---- server-deploy/pack/mods/squaremap.pw.toml | 8 ++++---- server-deploy/pack/mods/syncmatica.pw.toml | 8 ++++---- server-deploy/pack/mods/worldedit.pw.toml | 8 ++++---- server-deploy/pack/pack.toml | 2 +- 16 files changed, 58 insertions(+), 62 deletions(-) create mode 100644 logs/2026-09-15-1.log.gz diff --git a/AGENTS.md b/AGENTS.md index 655fb8b..8c046ec 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,7 +60,7 @@ javap -cp ~/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-me - **配置**:数值参数进 `GameConfig`(`io.ib67.sfcraft.config`)对应特性的嵌套类,运行期通过注入的 `GameConfigService#get()` **每次现读,不要缓存**(否则 `/sfcraft reload` 不生效)。注册时烘焙进组件的值(如耐久)天然不可热重载,属已知限制。需要在重载时重建的东西(如炼药锅配方)监听 `callback.SFConfigReload`。 - **i18n**:玩家可见文本一律 `Component.translatable`,键加进 `assets/sfcraft/lang/zh_cn.json` **和** `en_us.json`(⚠️ 越界,需许可)。**禁止**硬编码中文/英文 literal。不要引入 server-translations 依赖——玩家装服务器材质包,lang 由客户端解析。物品显示名 = `ITEM_NAME` 组件挂 translatable。 -- **纯服务端**:假设代码总在服务端运行;玩家移动是客户端权威,服务端改玩家速度矢量要置 `entity.hurtMarked = true`。 +- **纯服务端**:假设代码总在服务端运行;玩家移动是客户端权威,服务端改玩家速度矢量要置 `entity.syncVelocity = true`(26.2 及以前叫 `hurtMarked`)。 ## 踩过的坑 @@ -86,7 +86,7 @@ javap -cp ~/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-me - `MobEffects.SLOWNESS`(不是 MOVEMENT_SLOWDOWN);`SimpleContainer` 没有 addListener 了(覆写 `setChanged()` 持久化) - `GameProfile` 是 record(`name()`/`id()`);`sendOverlayMessage`/`sendSystemMessage` 取代 `displayClientMessage`;命令权限 `Commands.LEVEL_GAMEMASTERS.check(source.permissions())` -**Polymer(0.18.0+26.3-rc-1 —— 上游还没出 26.3 正式版构建,先用 rc-1 那版)**: +**Polymer(0.18.2+26.3)**: - `PacketContext` 在 `net.fabricmc.fabric.api.networking.v1.context.PacketContext` - BE 类型必须 `PolymerBlockUtils.registerBlockEntity`,实体类型必须 `PolymerEntityUtils.registerType`(`RegistryHelper` 已封装) diff --git a/Dockerfile b/Dockerfile index cd40447..586803f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,8 @@ RUN cd /mod && \ cp /mod/build/libs/sfcraft-*-all.jar /sfcraft.jar FROM base AS justbackup-builder -# 跟随 MC 版本的分支。26.3 分支需先在上游仓库建好，否则此处会直接失败—— -# 这是刻意的:默认分支仍是 26.2(fabric.mod.json 要求 minecraft ~26.2), -# 构建进 26.3 镜像只会在加载时才报错,不如在构建期暴露。 +# 跟随 MC 版本的分支(默认分支仍是 26.2,fabric.mod.json 要求 minecraft ~26.2)。 +# 分支不存在时这里会直接失败——刻意如此,比把 26.2 的 mod 打进 26.3 镜像、到加载时才报错好。 ARG JUSTBACKUP_REF=26.3 RUN git clone -b "$JUSTBACKUP_REF" https://github.com/saltedfishclub/justbackup /mod RUN cd /mod && \ @@ -25,11 +24,8 @@ RUN cd /mod && \ cp /mod/build/libs/justbackup-*.jar /justbackup.jar FROM base AS carpet-builder -# 同上。carpet 的 depends 写的是 minecraft >26.2,能装上但 mixin 是按旧版编译的, -# 跑在 26.3 上会在 mixin apply 阶段炸,所以同样必须切到 26.3 分支。 -# ⚠️ 注意:26.3 分支目前只是合了上游 master,而上游自己还停在 26.3-snapshot-9 -# (对 26.3 正式版有 100+ 处编译错误)。等 gnembon 跟上 26.3 正式版、我们再合一次 -# 之前,这一层产出的 carpet 装进 26.3 服务器大概率仍然会崩。 +# 同上。carpet 的 depends 写的是 minecraft >26.2,旧分支能装上但 mixin 是按旧版编译的, +# 跑在 26.3 上会在 mixin apply 阶段炸,所以同样必须切到 26.3 分支(= 我们的补丁 + 合入上游 v26.3)。 ARG CARPET_REF=26.3 RUN git clone -b "$CARPET_REF" https://github.com/saltedfishclub/fabric-carpet /mod RUN cd /mod && \ diff --git a/build.gradle b/build.gradle index 35ec42a..cb104d4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'maven-publish' id("io.freefair.lombok") version "9.5.0" id("com.gradleup.shadow") version "9.3.1" - id 'net.fabricmc.fabric-loom' version '1.18.1' + id 'net.fabricmc.fabric-loom' version '1.18.2' } version = project.mod_version @@ -37,7 +37,7 @@ dependencies { shadow("org.apache.commons:commons-compress:1.28.0") shadow("io.ib67.kiwi:lang:1.2.3-SNAPSHOT") shadow('com.github.houbb:pinyin:0.4.0') - def polymerVersion = "0.18.0+26.3-rc-1" + def polymerVersion = "0.18.2+26.3" implementation include("eu.pb4:polymer-core:$polymerVersion") implementation include("eu.pb4:polymer-virtual-entity:$polymerVersion") implementation include("eu.pb4:polymer-resource-pack:$polymerVersion") diff --git a/gradle.properties b/gradle.properties index 2f04609..3d3aab1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ archives_base_name=sfcraft # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.160.5+26.3 +fabric_version=0.161.0+26.3 diff --git a/logs/2026-09-15-1.log.gz b/logs/2026-09-15-1.log.gz new file mode 100644 index 0000000000000000000000000000000000000000..0da2a485b1a9ca572b7f9cfc084f6687c8b97904 GIT binary patch literal 180 zcmV;l089TLiwFP!00000|BE&>wK6rdGBJr&hz?0DE>S4YFUn3W()aXp^N+Psa7ism zO)g1IQOL