mmo-ref/mc-fabric-api
1
0
Fork 0
mirror of https://github.com/FabricMC/fabric synced 2026-08-19 06:26:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

26.3-snapshot-9

Browse source
This commit is contained in:
modmuss50 2026-08-17 15:20:06 +01:00
parent d4a3cef764
commit c00f1dd43f
6 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
fabric-data-generation-api-v1/src/testmod/generated/data/fabric-data-gen-api-v1-testmod/advancement/test/adventure_child.json
View file

@ -7,7 +7,6 @@
},
"display": {
"announce_to_chat": false,
"background": "minecraft:textures/gui/advancements/backgrounds/end.png",
"description": {
"translate": "advancements.test.adventure_child.description"
},

11
fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java
View file

@ -389,8 +389,8 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint {
@Override
public void generateAdvancement(HolderLookup.Provider registryLookup, Consumer<AdvancementHolder> 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
)

9
fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementTabMixin.java
View file

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

2
fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementWidgetMixin.java
View file

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

2
fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/advancement/AdvancementsScreenMixin.java
View file

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

14
gradle.properties
View file

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