Port to 1.21.6

Dianliang233 · Dianliang233 · commit c4aff128ea41 · 2025-06-21T16:24:11.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
-# v1.8.0+1.21.5
+# v1.8.0+1.21.6
 
 ## Changes
 
+- Support for Minecraft 1.21.6.
 - If an item can be looked up by Hey Wiki, a tooltip is added to the item in the inventory. This can be configured.
 - Added `/whatversion` command to open the Minecraft Wiki page for the current game version.
diff --git a/README.md b/README.md
@@ -270,7 +270,8 @@ The following table shows which versions are supported:
 
 | Git branch  | Minecraft version    | Supported?        | Is LTS? | Modloader        |
 |-------------|----------------------|-------------------|---------|------------------|
-| `master`    | 1.21.5               | Active (Latest)   | ?       | Fabric, Neoforge |
+| `master`    | 1.21.6               | Active (Latest)   | ?       | Fabric, Neoforge |
+| `mc/1.21.5` | 1.21.5               | EOL               | No      | Fabric, Neoforge |
 | `mc/1.21.4` | 1.21.4               | EOL               | No      | Fabric, Neoforge |
 | `mc/1.21.3` | 1.21.2, 1.21.3       | EOL               | No      | Fabric, Neoforge |
 | `mc/1.21.1` | 1.21, 1.21.1         | Active (LTS)      | Yes     | Fabric, Neoforge |
diff --git a/common/src/main/java/wiki/minecraft/heywiki/command/WhatStructureCommand.java b/common/src/main/java/wiki/minecraft/heywiki/command/WhatStructureCommand.java
@@ -50,7 +50,7 @@ public static LiteralCommandNode<ClientCommandRegistrationEvent.ClientCommandSou
 
             var playerManager = Objects.requireNonNull(server).getPlayerManager();
             var serverPlayer = playerManager.getPlayer(playerUuid);
-            var serverWorld = Objects.requireNonNull(serverPlayer).getServerWorld();
+            var serverWorld = Objects.requireNonNull(serverPlayer).getWorld();
             var chunkPos = new ChunkPos(block);
             Chunk chunk = serverWorld.getChunk(chunkPos.x, chunkPos.z, ChunkStatus.STRUCTURE_REFERENCES, false);
             if (chunk == null) {
diff --git a/common/src/main/java/wiki/minecraft/heywiki/command/WhatVersionCommand.java b/common/src/main/java/wiki/minecraft/heywiki/command/WhatVersionCommand.java
@@ -19,7 +19,7 @@ public class WhatVersionCommand {
     public static LiteralCommandNode<ClientCommandSourceStack> register(
             CommandDispatcher<ClientCommandSourceStack> dispatcher) {
         return dispatcher.register(literal("whatversion").executes(ctx -> {
-            var article = WikiPage.versionArticle(SharedConstants.getGameVersion().getName());
+            var article = WikiPage.versionArticle(SharedConstants.getGameVersion().name());
             if (article != null) {
                 article.openInBrowserCommand(null);
             }
diff --git a/common/src/main/java/wiki/minecraft/heywiki/gui/screen/CallbackGameMenuScreen.java b/common/src/main/java/wiki/minecraft/heywiki/gui/screen/CallbackGameMenuScreen.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.sound.SoundCategory;
 
 import java.util.Objects;
 
@@ -26,7 +27,7 @@ public static void openWithParent(Screen parent, boolean showMenu) {
                                                                                  .isRemote();
         if (integratedServer) {
             client.setScreen(new CallbackGameMenuScreen(showMenu, () -> client.setScreen(parent)));
-            client.getSoundManager().pauseAll();
+            client.getSoundManager().pauseAllExcept(SoundCategory.MUSIC, SoundCategory.UI);
         } else {
             client.setScreen(new CallbackGameMenuScreen(true, () -> client.setScreen(parent)));
         }
diff --git a/common/src/main/java/wiki/minecraft/heywiki/gui/screen/ConfirmWikiPageScreen.java b/common/src/main/java/wiki/minecraft/heywiki/gui/screen/ConfirmWikiPageScreen.java
@@ -155,7 +155,7 @@ protected synchronized void init() {
                                                                      .setStyle(
                                                                              Style.EMPTY.withColor(Formatting.GRAY)
                                                                                         .withUnderline(true)),
-                                                         this.textRenderer, false, 3),
+                                                         this.textRenderer, false, false, 3),
                          positioner -> positioner.marginY(3))
                     .setCentered(false);
         } else {
@@ -173,7 +173,7 @@ protected synchronized void init() {
                                                          this.message.copy()
                                                                      .setStyle(Style.EMPTY.withColor(Formatting.GRAY)
                                                                                           .withUnderline(true)),
-                                                         this.textRenderer, false, 3))
+                                                         this.textRenderer, false, false, 3))
                     .setCentered(false);
             excerptTextLayout
                     .add(new NarratedMultilineTextWidget(
diff --git a/common/src/main/java/wiki/minecraft/heywiki/gui/widget/SuggestionEntryWidget.java b/common/src/main/java/wiki/minecraft/heywiki/gui/widget/SuggestionEntryWidget.java
@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget.Entry;
 import net.minecraft.client.render.RenderLayer;
@@ -12,6 +13,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Language;
+import net.minecraft.util.math.ColorHelper;
 import org.apache.commons.codec.binary.Hex;
 import org.jetbrains.annotations.Nullable;
 import wiki.minecraft.heywiki.wiki.SearchProvider;
@@ -58,12 +60,12 @@ public void render(DrawContext DrawContext, int index, int y, int x, int rowWidt
                        int mouseY, boolean hovered, float delta) {
         int iconSize = 20;
 
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         var icon = this.getIconTexture();
         if (icon != null) {
-            DrawContext.drawTexture(RenderLayer::getGuiTextured, this.getIconTexture(), x + 22, y, 0.0F, 0.0F, iconSize,
-                                    iconSize, iconSize,
-                                    iconSize);
+            DrawContext.drawTexture(RenderPipelines.GUI_TEXTURED, this.getIconTexture(),
+                                    x + 22, y, 0.0F, 0.0F,
+                                    iconSize, iconSize, iconSize, iconSize,
+                                    ColorHelper.getWhite(1.0F));
         }
 
         MutableText name;
diff --git a/fabric/src/main/java/wiki/minecraft/heywiki/fabric/mixin/TitleScreenMixin.java b/fabric/src/main/java/wiki/minecraft/heywiki/fabric/mixin/TitleScreenMixin.java
@@ -18,7 +18,9 @@
 
 @Mixin(TitleScreen.class)
 public class TitleScreenMixin extends Screen {
-    @Shadow @Final private static Logger LOGGER;
+    @Shadow
+    @Final
+    private static Logger LOGGER;
 
     protected TitleScreenMixin(Text title) {
         super(title);
@@ -28,29 +30,26 @@ protected TitleScreenMixin(Text title) {
     private PressableTextWidget wikiButton;
 
     @Redirect(method = "render", at = @At(value = "INVOKE",
-                                          target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Ljava/lang/String;III)I"))
-    private int drawTextWithShadow(DrawContext drawContext, TextRenderer textRenderer, String text, int x, int y,
-                                   int color) {
+                                          target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Ljava/lang/String;III)V"))
+    private void drawTextWithShadow(DrawContext drawContext, TextRenderer textRenderer, String text, int x, int y,
+                                    int color) {
         try {
             int width = textRenderer.getWidth(text);
             if (!this.children().contains(wikiButton)) {
                 this.wikiButton = this.addDrawableChild(
                         new PressableTextWidget(x, y, width, 10, Text.literal(text),
                                                 (button) -> {
                                                     var article = WikiPage.versionArticle(
-                                                            SharedConstants.getGameVersion().getName());
+                                                            SharedConstants.getGameVersion().name());
                                                     if (article != null) {
                                                         article.openInBrowser(this);
                                                     }
                                                 },
                                                 this.textRenderer));
             }
-
-            return 0;
         } catch (Exception e) {
             LOGGER.error("Failed to draw wiki button", e);
             drawContext.drawTextWithShadow(textRenderer, text, x, y, color);
-            return 0;
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -5,21 +5,21 @@ archives_base_name=heywiki
 maven_group=wiki.minecraft.heywiki
 enabled_platforms=fabric,neoforge
 enabled_platforms_snapshot=fabric
-mod_version=1.8.0+1.21.5
+mod_version=1.8.0+1.21.6
 # Loader versions
-minecraft_version=1.21.5
-minecraft_version_range=1.21.5
-yarn_mappings=1.21.5+build.1
+minecraft_version=1.21.6
+minecraft_version_range=1.21.6
+yarn_mappings=1.21.6+build.1
 fabric_loader_version=0.16.14
-fabric_api_version=0.126.0+1.21.5
-neoforge_version=21.5.2-beta
+fabric_api_version=0.127.0+1.21.6
+neoforge_version=21.6.11-beta
 # Dependency versions
-architectury_version=16.1.4
-cloth_config_version=18.0.145
+architectury_version=17.0.6
+cloth_config_version=19.0.147
 rei_version=19.0.806
 emi_version=1.1.22+1.21.1
 jei_minecraft_version=1.21.1
 jei_version=19.21.1.304
-modmenu_version=14.0.0-rc.2
+modmenu_version=15.0.0-beta.2
 mcbrowser_version=1.2.2
 mcef_version=2.1.6-1.21.4
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -21,14 +21,14 @@ config = "heywiki-common.mixins.json"
 [[dependencies.heywiki]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21.2.0-beta,)"
+versionRange = "[21.6.0-beta,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.heywiki]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.2,)"
+versionRange = "[1.21.6,)"
 ordering = "NONE"
 side = "CLIENT"
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class WhatVersionCommand {`
`19`	`19`	`public static LiteralCommandNode<ClientCommandSourceStack> register(`
`20`	`20`	`CommandDispatcher<ClientCommandSourceStack> dispatcher) {`
`21`	`21`	`return dispatcher.register(literal("whatversion").executes(ctx -> {`
`22`		`- var article = WikiPage.versionArticle(SharedConstants.getGameVersion().getName());`
	`22`	`+ var article = WikiPage.versionArticle(SharedConstants.getGameVersion().name());`
`23`	`23`	`if (article != null) {`
`24`	`24`	`article.openInBrowserCommand(null);`
`25`	`25`	`}`