From c00f1dd43f7ec193cd6bce85aa58f85e238ff03f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 17 Aug 2026 15:20:06 +0100 Subject: [PATCH] 26.3-snapshot-9 --- .../advancement/test/adventure_child.json | 1 - .../test/datagen/DataGeneratorTestEntrypoint.java | 11 +++++------ .../rendering/advancement/AdvancementTabMixin.java | 9 ++------- .../advancement/AdvancementWidgetMixin.java | 2 +- .../advancement/AdvancementsScreenMixin.java | 2 +- gradle.properties | 14 +++++++------- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json index 30c7cb14c1..6311385144 100644 --- a/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json +++ b/fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json @@ -7,7 +7,6 @@ }, "display": { "announce_to_chat": false, - "background": "minecraft:textures/gui/advancements/backgrounds/end.png", "description": { "translate": "advancements.test.adventure_child.description" }, diff --git a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java index b718167bce..013d8c234e 100644 --- a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java +++ b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java @@ -389,8 +389,8 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { @Override public void generateAdvancement(HolderLookup.Provider registryLookup, Consumer consumer) { AdvancementHolder root = Advancement.Builder.advancement() - .display( - SIMPLE_BLOCK, + .rootDisplay( + SIMPLE_BLOCK.asItem(), Component.translatable("advancements.test.root.title"), Component.translatable("advancements.test.root.description"), Identifier.withDefaultNamespace("textures/gui/advancements/backgrounds/end.png"), @@ -399,8 +399,8 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { .addCriterion("killed_something", KilledTrigger.TriggerInstance.playerKilledEntity()) .save(consumer, Identifier.fromNamespaceAndPath(MOD_ID, "test/root")); AdvancementHolder rootNotLoaded = Advancement.Builder.advancement() - .display( - SIMPLE_BLOCK, + .rootDisplay( + SIMPLE_BLOCK.asItem(), Component.translatable("advancements.test.root_not_loaded.title"), Component.translatable("advancements.test.root_not_loaded.description"), Identifier.withDefaultNamespace("textures/gui/advancements/backgrounds/end.png"), @@ -410,10 +410,9 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { .save(withConditions(consumer, NEVER_LOADED), Identifier.fromNamespaceAndPath(MOD_ID, "test/root_not_loaded")); AdvancementHolder adventureChild = Advancement.Builder.advancement() - .display(SIMPLE_BLOCK, + .display(SIMPLE_BLOCK.asItem(), Component.translatable("advancements.test.adventure_child.title"), Component.translatable("advancements.test.adventure_child.description"), - Identifier.withDefaultNamespace("textures/gui/advancements/backgrounds/end.png"), AdvancementType.GOAL, false, false, false ) diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementTabMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementTabMixin.java index c79fa5010b..b5112a956c 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementTabMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementTabMixin.java @@ -30,7 +30,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.advancements.AdvancementHolder; -import net.minecraft.advancements.AdvancementNode; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.navigation.ScreenRectangle; @@ -44,10 +43,6 @@ import net.fabricmc.fabric.impl.client.rendering.advancement.AdvancementRenderer @Mixin(AdvancementTab.class) abstract class AdvancementTabMixin { - @Shadow - @Final - private AdvancementNode rootNode; - @Shadow private double scrollX; @@ -77,7 +72,7 @@ abstract class AdvancementTabMixin { @ModifyExpressionValue(method = "extractContents", at = @At(value = "CONSTANT", args = "intValue=-1", ordinal = 0)) private int preBackgroundRender(int original, @Share("backgroundRenderer") LocalRef backgroundRenderer) { - AdvancementHolder holder = rootNode.holder(); + AdvancementHolder holder = root.getAdvancement(); backgroundRenderer.set(AdvancementRendererRegistryImpl.getBackgroundRenderer(holder.id())); return backgroundRenderer.get() == null || backgroundRenderer.get().shouldRenderOriginalBackground() ? original : Integer.MAX_VALUE; } @@ -87,7 +82,7 @@ abstract class AdvancementTabMixin { if (backgroundRenderer.get() != null) { AdvancementProgress progress = ((AdvancementWidgetAccessor) root).fabric_getProgress(); backgroundRenderer.get().extractAdvancementBackground( - new AdvancementRenderContextImpl.BackgroundImpl(graphics, rootNode.holder(), progress, bounds.get(), scrollX, scrollY) + new AdvancementRenderContextImpl.BackgroundImpl(graphics, root.getAdvancement(), progress, bounds.get(), scrollX, scrollY) ); } } diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementWidgetMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementWidgetMixin.java index 5c488b8af8..a55549ba37 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementWidgetMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementWidgetMixin.java @@ -104,7 +104,7 @@ abstract class AdvancementWidgetMixin { } @Inject(method = "extractHover", at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z")) - private void captureExtractTooltip(GuiGraphicsExtractor graphics, int xo, int yo, float fade, int screenxo, int screenyo, CallbackInfo ci, @Share("renderTooltip")LocalBooleanRef renderTooltip) { + private void captureExtractTooltip(GuiGraphicsExtractor graphics, int xo, int yo, float fade, int screenxo, int screenyo, int screenWidth, CallbackInfo ci, @Share("renderTooltip")LocalBooleanRef renderTooltip) { AdvancementRenderer.FrameRenderer frameRenderer = AdvancementRendererRegistryImpl.getFrameRenderer(advancementNode.holder().id()); renderTooltip.set(frameRenderer == null || frameRenderer.shouldRenderTooltip()); } diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementsScreenMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementsScreenMixin.java index 55f2cb10f0..699d92b8cf 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementsScreenMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementsScreenMixin.java @@ -40,7 +40,7 @@ abstract class AdvancementsScreenMixin { @WrapOperation(method = "extractWindow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/advancements/AdvancementTab;extractIcon(Lnet/minecraft/client/gui/GuiGraphicsExtractor;II)V")) private void wrapDrawIcon(AdvancementTab tab, GuiGraphicsExtractor graphics, int xo, int yo, Operation original, @Local(name = "mouseX") int mouseX, @Local(name = "mouseY") int mouseY) { - AdvancementHolder holder = tab.getRootNode().holder(); + AdvancementHolder holder = tab.getRootAdvancement(); if (AdvancementRendererRegistryImpl.getIconRenderer(holder.id()) != null) { boolean hovered = tab.isMouseOver(xo, yo, mouseX, mouseY); diff --git a/gradle.properties b/gradle.properties index 4b1a4302e9..dc9b999d77 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1024M org.gradle.parallel=true org.gradle.configuration-cache=false -version=0.157.1 -minecraft_version=26.3-snapshot-8 +version=0.157.2 +minecraft_version=26.3-snapshot-9 loader_version=0.18.4 installer_version=1.0.1 @@ -22,7 +22,7 @@ fabric-command-api-v2-version=3.1.0 fabric-content-registries-v0-version=14.2.2 fabric-crash-report-info-v1-version=1.0.5 fabric-data-attachment-api-v1-version=2.2.26 -fabric-data-generation-api-v1-version=27.1.2 +fabric-data-generation-api-v1-version=27.1.3 fabric-debug-api-v1-version=1.0.2 fabric-dimensions-v1-version=5.1.15 fabric-entity-events-v1-version=6.0.2 @@ -35,17 +35,17 @@ fabric-key-mapping-api-v1-version=2.0.6 fabric-lifecycle-events-v1-version=4.1.5 fabric-loot-api-v3-version=4.0.1 fabric-message-api-v1-version=7.0.8 -fabric-model-loading-api-v1-version=8.0.25 +fabric-model-loading-api-v1-version=8.0.26 fabric-networking-api-v1-version=6.3.6 fabric-object-builder-api-v1-version=24.1.5 fabric-particles-v1-version=5.0.22 fabric-permission-api-v1-version=1.0.5 fabric-recipe-api-v1-version=10.0.4 fabric-registry-sync-v0-version=7.1.6 -fabric-renderer-api-v1-version=17.0.5 -fabric-renderer-indigo-version=9.1.12 +fabric-renderer-api-v1-version=17.0.6 +fabric-renderer-indigo-version=9.1.13 fabric-rendering-fluids-v1-version=6.0.4 -fabric-rendering-v1-version=27.0.7 +fabric-rendering-v1-version=27.0.8 fabric-resource-conditions-api-v1-version=6.1.3 fabric-resource-loader-v0-version=3.3.24 fabric-resource-loader-v1-version=3.0.2