From 6f7d67ca9afa1744b180cd26a0ece0cd3682861f Mon Sep 17 00:00:00 2001 From: yu1745 <43715680+yu1745@users.noreply.github.com> Date: Sat, 8 Aug 2026 23:04:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20Fabric=E2=86=92Forge=20fluid=20tank?= =?UTF-8?q?=20capacity=20not=20converting=20droplets=20to=20mB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FluidStorageFluidHandler#getTankCapacity returned the raw Fabric Storage capacity (in droplets) without converting to Forge mB, unlike getFluidInTank/fill/drain which all convert via ForgeCompatUtil.toForgeBucket. As a result the Forge-side capacity appeared 81x too large (1 mB = 81 droplets), e.g. a 32-bucket tank showing as 2592 buckets. Return ForgeCompatUtil.toForgeBucket((int) view.getCapacity()) instead. --- .../fabric/impl/transfer/compat/FluidStorageFluidHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandler.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandler.java index 42f1146cca..4ac9deae9b 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandler.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/compat/FluidStorageFluidHandler.java @@ -53,7 +53,9 @@ public int getTanks() { @Override public int getTankCapacity(int tank) { StorageView view = slots.get(tank); - return view != null ? (int) view.getCapacity() : 0; + // Fabric Storage capacity is in droplets; convert via toForgeBucket to mB, + // otherwise the Forge-side capacity reads 81x too large (1 mB = 81 droplets). + return view != null ? ForgeCompatUtil.toForgeBucket((int) view.getCapacity()) : 0; } @Override From 45a267d401c652b0cd968e5bf6d35c74b8b1c756 Mon Sep 17 00:00:00 2001 From: wangyu Date: Thu, 13 Aug 2026 09:49:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build:=20=E7=BB=9F=E4=B8=80=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=A5=91=E7=BA=A6=20build.sh=EF=BC=88=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E8=B0=83=E7=94=A8=20./build.sh=20[--clean]=20[--out?= =?UTF-8?q?=20dir]=20=E2=86=92=20dist/*.jar=20+=20build-info.json=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100755 build.sh diff --git a/build.sh b/build.sh new file mode 100755 index 0000000000..6907f030eb --- /dev/null +++ b/build.sh @@ -0,0 +1,109 @@ +#!/usr/bin/env bash +# ═══════════════════════════════════════════════════════════════════════ +# build.sh — 统一构建契约（通用 Gradle 实现） +# +# 契约（所有 T0/T1 仓库一致，外部调用方式不得更改）： +# 用法: ./build.sh [--clean] [--out ] # 默认 out=dist +# 退出码: 0=成功；非 0=失败（原因写 stderr） +# 产出: /*.jar + /build-info.json +# build-info.json = { repo, version, source_commit, jars:[{file,sha256}], built_at } +# +# 内部实现可自由改写（gradle 目标、模块过滤、重命名、多产物、外部前置任务）。 +# 可选仓库级覆盖： +# - build-tasks.txt 存在则其内容（一行一个任务）替代默认 `build` 任务 +# - build-jars.txt 存在则只收集其中列出的 jar 文件名模式（每行一个 glob） +# ═══════════════════════════════════════════════════════════════════════ +set -euo pipefail +cd "$(dirname "$0")" + +OUT=dist +CLEAN=0 +while [ $# -gt 0 ]; do + case "$1" in + --clean) CLEAN=1 ;; + --out) shift; OUT="$2" ;; + *) echo "usage: $0 [--clean] [--out ]" >&2; exit 2 ;; + esac + shift +done + +if [ ! -x ./gradlew ]; then + echo "build.sh: 本仓库无 ./gradlew，请改写本脚本适配（或检查目录）" >&2 + exit 1 +fi + +TASKS=build +[ -f build-tasks.txt ] && TASKS="$(tr '\n' ' ' < build-tasks.txt)" + +if [ "$CLEAN" = 1 ]; then + ./gradlew clean --console=plain +fi +./gradlew $TASKS --console=plain + +rm -rf "$OUT" +mkdir -p "$OUT" + +# 收集产物 jar：排除 sources/dev 件；其余（含 shadow/-all）都收 +find . -path '*/build/libs/*.jar' ! -name '*-sources.jar' ! -name '*-dev.jar' -print0 \ + | while IFS= read -r -d '' j; do cp "$j" "$OUT/"; done + +# 可选过滤：build-jars.txt 每行一个 glob，只保留匹配的 jar +if [ -f build-jars.txt ]; then + python3 - "$OUT" <<'PYEOF' +import sys, glob, pathlib +out = pathlib.Path(sys.argv[1]) +keep = [p.strip() for p in pathlib.Path("build-jars.txt").read_text().splitlines() if p.strip()] +for j in list(out.glob("*.jar")): + if not any(j.match(k) for k in keep): + j.unlink() +PYEOF +fi + +if ! ls "$OUT"/*.jar >/dev/null 2>&1; then + echo "build.sh: 构建完成但未收集到任何产物 jar（检查 build 输出或 build-jars.txt 过滤）" >&2 + exit 1 +fi + +python3 - "$OUT" <<'PYEOF' +import hashlib, json, subprocess, sys, datetime, pathlib +out = pathlib.Path(sys.argv[1]) + +def sha256(p): + h = hashlib.sha256() + with open(p, "rb") as f: + for b in iter(lambda: f.read(1 << 20), b""): + h.update(b) + return h.hexdigest() + +def git_head(): + r = subprocess.run(["git", "rev-parse", "HEAD"], capture_output=True, text=True) + return r.stdout.strip() if r.returncode == 0 else None + +def git_remote(): + r = subprocess.run(["git", "remote", "get-url", "origin"], capture_output=True, text=True) + return r.stdout.strip() if r.returncode == 0 else None + +# version：gradle.properties 的 mod_version/version，否则 git describe +version = None +gp = pathlib.Path("gradle.properties") +if gp.exists(): + for line in gp.read_text().splitlines(): + line = line.strip() + if line.startswith("mod_version=") or line.startswith("version="): + version = line.split("=", 1)[1].strip() + break +if not version: + r = subprocess.run(["git", "describe", "--tags", "--always"], capture_output=True, text=True) + version = r.stdout.strip() or "unknown" + +jars = [{"file": j.name, "sha256": sha256(j)} for j in sorted(out.glob("*.jar"))] +info = { + "repo": git_remote(), + "version": version, + "source_commit": git_head(), + "jars": jars, + "built_at": datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"), +} +(out / "build-info.json").write_text(json.dumps(info, ensure_ascii=False, indent=2) + "\n") +print(f"build.sh: {len(jars)} jar(s) -> {out}/ version={version} commit={info['source_commit']}") +PYEOF