Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private static boolean openGuideOnClientInternal(
if (preserveLabelState && currentGuideScreen != null) {
screen.setLabelStatePreserved(currentGuideScreen);
}
minecraft.setScreen(screen);
setGuideScreen(minecraft, screen);
return true;
}

Expand Down Expand Up @@ -307,10 +307,17 @@ private static boolean parseDocumentAndSetScreen(
if (preserveLabelState && currentGuideScreen != null) {
screen.setLabelStatePreserved(currentGuideScreen);
}
minecraft.setScreen(screen);
setGuideScreen(minecraft, screen);
return true;
}

private static void setGuideScreen(Minecraft minecraft, GuideScreen screen) {
if (minecraft.player != null && minecraft.player.containerMenu != minecraft.player.inventoryMenu) {
minecraft.player.closeContainer();
}
minecraft.setScreen(screen);
}

public static boolean isPreviewLocation(ResourceLocation location) {
return AgeratumConstants.Preview.NAMESPACE.equals(location.getNamespace());
}
Expand Down
Loading