Port to 1.21.6 (#633)

rosellle · shedaniel · web-flow · commit 2b8b696d241f · 2025-06-18T03:34:29.000+02:00
* Port to 1.21.6-rc1

* Bump for 1.21.6

---------

Co-authored-by: shedaniel &lt;daniel@shedaniel.me&gt;
diff --git a/.github/workflows/1.21.6_pr.yml b/.github/workflows/1.21.6_pr.yml
@@ -1,4 +1,4 @@
-name: Build PR snapshot (1.21.5)
+name: Build PR snapshot (1.21.6)
 
 on:
   pull_request:
@@ -7,7 +7,7 @@ on:
       - '**.properties'
       - '**/src/**'
     branches:
-      - "1.21.5"
+      - "1.21.6"
     types: [ opened, synchronize, reopened ]
 jobs:
   validate-gradle:
diff --git a/.github/workflows/1.21.6_push.yml b/.github/workflows/1.21.6_push.yml
@@ -1,4 +1,4 @@
-name: Build and Release (1.21.5)
+name: Build and Release (1.21.6)
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - '**/src/**'
       - '.github/**'
     branches:
-      - "1.21.5"
+      - "1.21.6"
   workflow_dispatch:
     inputs:
       norelease:
diff --git a/common/src/main/java/dev/architectury/platform/Platform.java b/common/src/main/java/dev/architectury/platform/Platform.java
@@ -73,7 +73,7 @@ private static void updateLoaderCache() {
     }
     
     public static String getMinecraftVersion() {
-        return SharedConstants.getCurrentVersion().getId();
+        return SharedConstants.getCurrentVersion().id();
     }
     
     /**
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -128,7 +128,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSE_API_KEY
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", "1.21.5-Snapshot", project.minecraft_version
+                gameVersions.addAll "Java 21", "1.21.6-Snapshot", project.minecraft_version
             }
         }
 
diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinAbstractContainerScreen.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinAbstractContainerScreen.java
@@ -42,7 +42,7 @@ public void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float
         ClientGuiEvent.RENDER_CONTAINER_BACKGROUND.invoker().render((AbstractContainerScreen<?>) (Object) this, graphics, mouseX, mouseY, delta);
     }
     
-    @Inject(method = "render",
+    @Inject(method = "renderContents",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;renderLabels(Lnet/minecraft/client/gui/GuiGraphics;II)V",
                     ordinal = 0, shift = At.Shift.AFTER))
     public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGuiGraphics.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGuiGraphics.java
@@ -42,17 +42,17 @@ public abstract class MixinGuiGraphics {
     @Unique
     private static ThreadLocal<TooltipEventPositionContextImpl> tooltipPositionContext = ThreadLocal.withInitial(TooltipEventPositionContextImpl::new);
     
-    @Inject(method = "renderTooltip(Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V", at = @At("HEAD"))
+    @Inject(method = "setTooltipForNextFrame(Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V", at = @At("HEAD"))
     private void preRenderTooltipItem(Font font, ItemStack stack, int x, int y, CallbackInfo ci) {
         ClientTooltipEvent.additionalContexts().setItem(stack);
     }
     
-    @Inject(method = "renderTooltip(Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V", at = @At("RETURN"))
-    private void postRenderTooltipItem(Font font, ItemStack stack, int x, int y, CallbackInfo ci) {
+    @Inject(method = "renderTooltip", at = @At("RETURN"))
+    private void postRenderTooltipItem(Font font, List<ClientTooltipComponent> list, int i, int j, ClientTooltipPositioner clientTooltipPositioner, ResourceLocation resourceLocation, CallbackInfo ci) {
         ClientTooltipEvent.additionalContexts().setItem(null);
     }
     
-    @Inject(method = "renderTooltipInternal", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "renderTooltip", at = @At("HEAD"), cancellable = true)
     private void renderTooltip(Font font, List<ClientTooltipComponent> list, int x, int y, ClientTooltipPositioner positioner, @Nullable ResourceLocation background, CallbackInfo ci) {
         if (!list.isEmpty()) {
             var positionContext = tooltipPositionContext.get();
@@ -65,13 +65,13 @@ private void renderTooltip(Font font, List<ClientTooltipComponent> list, int x,
         }
     }
     
-    @ModifyVariable(method = "renderTooltipInternal",
+    @ModifyVariable(method = "renderTooltip",
             at = @At(value = "HEAD"), ordinal = 0, argsOnly = true)
     private int modifyTooltipX(int original) {
         return tooltipPositionContext.get().getTooltipX();
     }
     
-    @ModifyVariable(method = "renderTooltipInternal",
+    @ModifyVariable(method = "renderTooltip",
             at = @At(value = "HEAD"), ordinal = 1, argsOnly = true)
     private int modifyTooltipY(int original) {
         return tooltipPositionContext.get().getTooltipY();
diff --git a/fabric/src/main/java/dev/architectury/networking/fabric/NetworkManagerImpl.java b/fabric/src/main/java/dev/architectury/networking/fabric/NetworkManagerImpl.java
@@ -54,7 +54,7 @@ public <T extends CustomPacketPayload> void registerC2S(CustomPacketPayload.Type
                 LOGGER.info("Registering C2S receiver with id {}", type.id());
                 PayloadTypeRegistry.playC2S().register(type, codec);
                 ServerPlayNetworking.registerGlobalReceiver(type, (payload, fabricContext) -> {
-                    var context = context(fabricContext.player(), fabricContext.player().server, false);
+                    var context = context(fabricContext.player(), fabricContext.player().getServer(), false);
                     receiver.receive(payload, context);
                 });
             }
diff --git a/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/RenderTypeRegistryImpl.java b/fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/RenderTypeRegistryImpl.java
@@ -19,17 +19,17 @@
 
 package dev.architectury.registry.client.rendering.fabric;
 
-import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.minecraft.client.renderer.RenderType;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Fluid;
 
 public class RenderTypeRegistryImpl {
-    public static void register(RenderType type, Block... blocks) {
-        BlockRenderLayerMap.INSTANCE.putBlocks(type, blocks);
+    public static void register(ChunkSectionLayer type, Block... blocks) {
+        BlockRenderLayerMap.putBlocks(type, blocks);
     }
     
-    public static void register(RenderType type, Fluid... fluids) {
-        BlockRenderLayerMap.INSTANCE.putFluids(type, fluids);
+    public static void register(ChunkSectionLayer type, Fluid... fluids) {
+        BlockRenderLayerMap.putFluids(type, fluids);
     }
 }
diff --git a/fabric/src/main/java/dev/architectury/registry/level/entity/trade/fabric/TradeRegistryImpl.java b/fabric/src/main/java/dev/architectury/registry/level/entity/trade/fabric/TradeRegistryImpl.java
@@ -34,7 +34,7 @@ public static void registerVillagerTrade0(ResourceKey<VillagerProfession> profes
     
     public static void registerTradeForWanderingTrader(TradeRegistry.WandererTradeType type, VillagerTrades.ItemListing... trades) {
         TradeOfferHelper.registerWanderingTraderOffers(builder -> {
-            builder.addAll(switch (type) {
+            builder.addOffersToPool(switch (type) {
                 case BUYING_TRADES -> TradeOfferHelper.WanderingTraderOffersBuilder.BUY_ITEMS_POOL;
                 case GENERIC_TRADES -> TradeOfferHelper.WanderingTraderOffersBuilder.SELL_COMMON_ITEMS_POOL;
                 case RARE_TRADES -> TradeOfferHelper.WanderingTraderOffersBuilder.SELL_SPECIAL_ITEMS_POOL;
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -34,9 +34,9 @@
   },
   "icon": "icon.png",
   "depends": {
-    "minecraft": "~1.21.4-",
-    "fabricloader": ">=0.15.11",
-    "fabric-api": ">=0.100.0"
+    "minecraft": "~1.21.6~",
+    "fabricloader": ">=0.15.4",
+    "fabric-api": ">=0.127.0"
   },
   "breaks": {
     "optifabric": "<1.13.0"
diff --git a/gradle.properties b/gradle.properties
@@ -3,23 +3,23 @@ org.gradle.daemon=false
 
 platforms=fabric,neoforge
 
-minecraft_version=1.21.5
-supported_version=1.21.5
+minecraft_version=1.21.6
+supported_version=1.21.6
 
 artifact_type=release
 
 archives_base_name=architectury
 archives_base_name_snapshot=architectury-snapshot
-base_version=16.1
+base_version=17.0
 maven_group=dev.architectury
 version_suffix=
 
-fabric_loader_version=0.16.10
-fabric_api_version=0.119.5+1.21.5
-mod_menu_version=11.0.1
+fabric_loader_version=0.16.14
+fabric_api_version=0.127.0+1.21.6
+mod_menu_version=15.0.0-beta.1
 
 forge_version=51.0.0
-neoforge_version=21.5.1-beta
+neoforge_version=21.6.4-beta
 
 # Set to empty if not snapshots
 neoforge_pr=
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -121,7 +121,7 @@ unifiedPublishing {
         displayName = "[NeoForge $rootProject.supported_version] v$project.version"
         releaseType = "$rootProject.artifact_type"
         changelog = releaseChangelog()
-        gameVersions = ["1.21.5"]
+        gameVersions = ["1.21.6"]
         gameLoaders = ["neoforge"]
         mainPublication renameJarForPublication
 
diff --git a/neoforge/src/main/java/dev/architectury/registry/client/rendering/forge/RenderTypeRegistryImpl.java b/neoforge/src/main/java/dev/architectury/registry/client/rendering/forge/RenderTypeRegistryImpl.java
@@ -21,17 +21,18 @@
 
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Fluid;
 
 public class RenderTypeRegistryImpl {
-    public static void register(RenderType type, Block... blocks) {
+    public static void register(ChunkSectionLayer type, Block... blocks) {
         for (Block block : blocks) {
             ItemBlockRenderTypes.setRenderLayer(block, type);
         }
     }
     
-    public static void register(RenderType type, Fluid... fluids) {
+    public static void register(ChunkSectionLayer type, Fluid... fluids) {
         for (Fluid fluid : fluids) {
             ItemBlockRenderTypes.setRenderLayer(fluid, type);
         }
diff --git a/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java b/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java
@@ -54,8 +54,8 @@ public void accept(String message) {
     }
     
     public void render(GuiGraphics graphics, DeltaTracker delta) {
-        graphics.pose().pushPose();
-        graphics.pose().scale(0.5f, 0.5f, 1f);
+        graphics.pose().pushMatrix();
+        graphics.pose().scale(0.5f, 0.5f);
         var minecraft = Minecraft.getInstance();
         var currentMills = Util.getMillis();
         var lineHeight = minecraft.font.lineHeight;
@@ -82,7 +82,7 @@ public void render(GuiGraphics graphics, DeltaTracker delta) {
             }
         }
         
-        graphics.pose().popPose();
+        graphics.pose().popMatrix();
     }
     
     private record Message(Component text, long created) {
diff --git a/testmod-common/src/main/java/dev/architectury/test/registry/objects/ItemWithTooltip.java b/testmod-common/src/main/java/dev/architectury/test/registry/objects/ItemWithTooltip.java
@@ -59,10 +59,10 @@ public int getWidth(Font font) {
         
         @Override
         public void renderImage(Font font, int x, int y, int w, int h, GuiGraphics graphics) {
-            graphics.pose().pushPose();
-            graphics.pose().translate(0, 0, 400);
+            graphics.pose().pushMatrix();
+            graphics.pose().translate(0, 0);
             graphics.drawString(font, "Count: " + component.count, x + getWidth(font) / 2, y + (getHeight(font) - font.lineHeight) / 2, 0xFF00FF00);
-            graphics.pose().popPose();
+            graphics.pose().popMatrix();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private static void updateLoaderCache() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public static String getMinecraftVersion() {`
`76`		`- return SharedConstants.getCurrentVersion().getId();`
	`76`	`+ return SharedConstants.getCurrentVersion().id();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ unifiedPublishing {`
`128`	`128`	`curseforge {`
`129`	`129`	`token = CURSE_API_KEY`
`130`	`130`	`id = rootProject.curseforge_id`
`131`		`- gameVersions.addAll "Java 21", "1.21.5-Snapshot", project.minecraft_version`
	`131`	`+ gameVersions.addAll "Java 21", "1.21.6-Snapshot", project.minecraft_version`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float`
`42`	`42`	`ClientGuiEvent.RENDER_CONTAINER_BACKGROUND.invoker().render((AbstractContainerScreen<?>) (Object) this, graphics, mouseX, mouseY, delta);`
`43`	`43`	`}`
`44`	`44`
`45`		`- @Inject(method = "render",`
	`45`	`+ @Inject(method = "renderContents",`
`46`	`46`	`at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;renderLabels(Lnet/minecraft/client/gui/GuiGraphics;II)V",`
`47`	`47`	`ordinal = 0, shift = At.Shift.AFTER))`
`48`	`48`	`public void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public <T extends CustomPacketPayload> void registerC2S(CustomPacketPayload.Type`
`54`	`54`	`LOGGER.info("Registering C2S receiver with id {}", type.id());`
`55`	`55`	`PayloadTypeRegistry.playC2S().register(type, codec);`
`56`	`56`	`ServerPlayNetworking.registerGlobalReceiver(type, (payload, fabricContext) -> {`
`57`		`- var context = context(fabricContext.player(), fabricContext.player().server, false);`
	`57`	`+ var context = context(fabricContext.player(), fabricContext.player().getServer(), false);`
`58`	`58`	`receiver.receive(payload, context);`
`59`	`59`	`});`
`60`	`60`	`}`