imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 11:57:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Port to 1.21.6 (#633)

Browse Source 
* Port to 1.21.6-rc1

* Bump for 1.21.6

---------

Co-authored-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
ellellie
2025-06-18 13:34:29 +12:00
committed by GitHub
parent 9038d94f46
commit 2b8b696d24
15 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/1.21.5_pr.yml → .github/workflows/1.21.6_pr.yml vendored
View File

@@ -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:

4
.github/workflows/1.21.5_push.yml → .github/workflows/1.21.6_push.yml vendored
View File

@@ -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:

2
common/src/main/java/dev/architectury/platform/Platform.java
View File

@@ -73,7 +73,7 @@ public final class Platform {
}
public static String getMinecraftVersion() {
return SharedConstants.getCurrentVersion().getId();
return SharedConstants.getCurrentVersion().id();
}
/**

2
fabric/build.gradle
View File

@@ -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
}
}

2
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinAbstractContainerScreen.java
View File

@@ -42,7 +42,7 @@ public abstract class MixinAbstractContainerScreen extends Screen {
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) {

12
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGuiGraphics.java
View File

@@ -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 @@ public abstract class MixinGuiGraphics {
}
}
@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();

2
fabric/src/main/java/dev/architectury/networking/fabric/NetworkManagerImpl.java
View File

@@ -54,7 +54,7 @@ public class NetworkManagerImpl {
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);
});
}

12
fabric/src/main/java/dev/architectury/registry/client/rendering/fabric/RenderTypeRegistryImpl.java
View File

@@ -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);
}
}

2
fabric/src/main/java/dev/architectury/registry/level/entity/trade/fabric/TradeRegistryImpl.java
View File

@@ -34,7 +34,7 @@ public class TradeRegistryImpl {
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;

6
fabric/src/main/resources/fabric.mod.json
View File

@@ -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"

14
gradle.properties
View File

@@ -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=

2
neoforge/build.gradle
View File

@@ -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

5
neoforge/src/main/java/dev/architectury/registry/client/rendering/forge/RenderTypeRegistryImpl.java
View File

@@ -21,17 +21,18 @@ package dev.architectury.registry.client.rendering.forge;
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);
}

6
testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java
View File

@@ -54,8 +54,8 @@ public class ClientOverlayMessageSink extends ConsoleMessageSink {
}
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 class ClientOverlayMessageSink extends ConsoleMessageSink {
}
}
graphics.pose().popPose();
graphics.pose().popMatrix();
}
private record Message(Component text, long created) {

6
testmod-common/src/main/java/dev/architectury/test/registry/objects/ItemWithTooltip.java
View File

@@ -59,10 +59,10 @@ public class ItemWithTooltip extends Item {
@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();
}
}
}