feat: port to 26.2

BREAKING CHANGE: port to 26.2

Author: pynickle

.github/workflows/release.yml

@@ -6,44 +6,41 @@ on:
       - "master"
 
 permissions:
-  contents: write # to be able to publish a GitHub release
-  issues: write # to be able to comment on released issues
-  pull-requests: write # to be able to comment on released pull requests
-  id-token: write # to enable use of OIDC for npm provenance
+  contents: write
+  issues: write
+  pull-requests: write
+  id-token: write
 
 jobs:
   publish:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v4
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
         with:
-          version: 10
+          bun-version: latest
 
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
+          distribution: temurin
           java-version: 25
 
       - name: Make Gradle Wrapper executable
         run: chmod +x ./gradlew
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: "lts/*"
-          cache: pnpm
-
       - name: Install dependencies
-        run: pnpm install
+        run: bun install --frozen-lockfile
 
       - name: Build And Release
         env:
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: npx semantic-release
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bunx semantic-release

.releaserc.json

@@ -47,9 +47,9 @@
     [
       "semantic-release-minecraft",
       {
-        "game_versions": ["26.1", "26.1.1", "26.1.2"],
+        "game_versions": ["26.2"],
         "mod_loaders": "${ loader }",
-        "display_name": "[${ name } 26.1] ${ nextRelease.version }",
+        "display_name": "[${ name } 26.2] ${ nextRelease.version }",
         "glob": "${ loader }/build/libs/better_client-${ nextRelease.version }.jar",
         "dependencies": [
           {

bun.lock

@@ -11,7 +11,7 @@ dependencies {
 
     implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    implementation "dev.isxander:yet-another-config-lib:${yacl_version}+26.1-fabric"
+    implementation "dev.isxander:yet-another-config-lib:${yacl_version}+26.2-fabric"
 
     implementation "com.github.ramixin:mixson-fabric:${mixson_version}"
 }

common/build.gradle

@@ -291,7 +291,7 @@ private static void renderBiomeTitle(GuiGraphicsExtractor guiGraphics, Minecraft
     }
 
     private static boolean shouldHideDisplay(Minecraft mc) {
-        return (mc.options.hideGui && config.hideInF1) || (mc.getDebugOverlay().showDebugScreen() && config.hideInF3);
+        return (mc.gui.hud.isHidden() && config.hideInF1) || (mc.getDebugOverlay().showDebugScreen() && config.hideInF3);
     }
 
     private static Component getBiomeName(ResourceKey<Biome> key) {

common/src/main/java/com/euphony/better_client/client/events/BiomeTitleEvent.java

@@ -19,7 +19,7 @@ public static void clientLevelPre(ClientLevel clientLevel) {
 
         Minecraft minecraft = Minecraft.getInstance();
         // 检查是否有输入框正在被使用（额外的安全检查）
-        if (minecraft.screen != null && isInputFieldFocused(minecraft)) {
+        if (minecraft.gui.screen() != null && isInputFieldFocused(minecraft)) {
             wasKeyPressed = isKeyPressed;
             return;
         }
@@ -41,10 +41,10 @@ public static void fullBrightnessToggle(Minecraft minecraft) {
     }
 
     private static boolean isInputFieldFocused(Minecraft minecraft) {
-        if (minecraft.screen == null) return false;
+        if (minecraft.gui.screen() == null) return false;
 
         // 检查当前焦点组件是否为输入框
-        var focusedWidget = minecraft.screen.getFocused();
+        var focusedWidget = minecraft.gui.screen().getFocused();
         return focusedWidget instanceof EditBox || focusedWidget instanceof MultiLineEditBox;
     }
 }

common/src/main/java/com/euphony/better_client/client/events/FullBrightnessEvent.java

@@ -19,7 +19,7 @@ public static void clientLevelPre(ClientLevel clientLevel) {
 
         Minecraft minecraft = Minecraft.getInstance();
         Player player = minecraft.player;
-        if (minecraft.screen != null
+        if (minecraft.gui.screen() != null
                 || minecraft.player == null
                 || player.isSpectator()
                 || player.isSpectator()

common/src/main/java/com/euphony/better_client/client/events/InvisibleItemFrameEvent.java

@@ -34,7 +34,7 @@ public static void clientLevelPost(ClientLevel clientLevel) {
         LocalPlayer player = minecraft.player;
 
         // 如果有界面打开则不处理
-        if (minecraft.screen != null || player == null) {
+        if (minecraft.gui.screen() != null || player == null) {
             return;
         }
 

common/src/main/java/com/euphony/better_client/client/events/TradingHudEvent.java

@@ -4,13 +4,14 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.client.gui.Hud;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.core.Holder;
 import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.util.Mth;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
@@ -98,8 +99,8 @@ public static void render(GuiGraphicsExtractor graphics, DeltaTracker deltaTrack
 
         Minecraft minecraft = Minecraft.getInstance();
         LocalPlayer player = minecraft.player;
-        if (player == null || minecraft.options.hideGui) return;
-        if (minecraft.screen != null && minecraft.screen.showsActiveEffects()) return;
+        if (player == null || minecraft.gui.hud.isHidden()) return;
+        if (minecraft.gui.screen() != null && minecraft.gui.screen().showsActiveEffects()) return;
 
         better_client$resetStateWhenContextChanges(minecraft, player);
 
@@ -178,7 +179,7 @@ public static boolean shouldHideVanillaEffectHud() {
         graphics.outline(x, y, ROW_WIDTH, ROW_HEIGHT, BORDER_COLOR);
         graphics.blitSprite(
                 RenderPipelines.GUI_TEXTURED,
-                Gui.getMobEffectSprite(effect.getEffect()),
+                Hud.getMobEffectSprite(effect.getEffect()),
                 x + 3,
                 y + 3,
                 ICON_SIZE,
@@ -251,8 +252,8 @@ public static boolean shouldHideVanillaEffectHud() {
     private static Identifier better_client$getEffectId(MobEffectInstance effect) {
         return effect.getEffect()
                 .unwrapKey()
-                .map(key -> key.identifier())
-                .orElseGet(() -> Gui.getMobEffectSprite(effect.getEffect()));
+                .map(ResourceKey::identifier)
+                .orElseGet(() -> Hud.getMobEffectSprite(effect.getEffect()));
     }
 
     private record EffectKey(Identifier id, int amplifier) {

common/src/main/java/com/euphony/better_client/client/renderer/PotionBarRenderer.java

@@ -26,7 +26,7 @@ public static void render(GuiGraphicsExtractor ctx, DeltaTracker tickCounter) {
 
         Minecraft client = Minecraft.getInstance();
         LocalPlayer player = client.player;
-        if (player == null || client.options.hideGui) return;
+        if (player == null || client.gui.hud.isHidden()) return;
         if (player.isCreative() || player.isSpectator()) return;
 
         better_client$refreshTotemCounts(player);