Fix JEI overlay when the recipe book is open

mezz · mezz · commit ee33b5d69f6c · 2025-07-31T22:58:55.000+09:00
diff --git a/Common/src/main/java/mezz/jei/common/platform/IPlatformScreenHelper.java b/Common/src/main/java/mezz/jei/common/platform/IPlatformScreenHelper.java
@@ -23,13 +23,13 @@ public interface IPlatformScreenHelper {
 
 	int getYSize(AbstractContainerScreen<?> containerScreen);
 
-	ImmutableRect2i getBookArea(AbstractRecipeBookScreen<?> screen);
-
 	ImmutableRect2i getToastsArea();
 
 	List<RecipeBookTabButton> getTabButtons(RecipeBookComponent<?> recipeBookComponent);
 
 	<T extends RecipeBookMenu> RecipeBookComponent<?> getRecipeBookComponent(AbstractRecipeBookScreen<T> screen);
 
+	ImmutableRect2i getBookArea(RecipeBookComponent<?> guiRecipeBook);
+
 	boolean canLoseFocus(EditBox editBox);
 }
diff --git a/Fabric/src/main/java/mezz/jei/fabric/platform/ScreenHelper.java b/Fabric/src/main/java/mezz/jei/fabric/platform/ScreenHelper.java
@@ -45,12 +45,14 @@ public int getYSize(AbstractContainerScreen<?> containerScreen) {
 	}
 
 	@Override
-	public ImmutableRect2i getBookArea(AbstractRecipeBookScreen<?> screen) {
-		RecipeBookComponent<?> guiRecipeBook = getRecipeBookComponent(screen);
+	public ImmutableRect2i getBookArea(RecipeBookComponent<?> guiRecipeBook) {
 		if (guiRecipeBook.isVisible()) {
-			int i = (guiRecipeBook.width - 147) / 2 - guiRecipeBook.xOffset;
-			int j = (guiRecipeBook.height - 166) / 2;
-			return new ImmutableRect2i(i, j, 147, 166);
+			return new ImmutableRect2i(
+				guiRecipeBook.getXOrigin(),
+				guiRecipeBook.getYOrigin(),
+				RecipeBookComponent.IMAGE_WIDTH,
+				RecipeBookComponent.IMAGE_HEIGHT
+			);
 		}
 		return ImmutableRect2i.EMPTY;
 	}
diff --git a/Fabric/src/main/resources/jei.accesswidener b/Fabric/src/main/resources/jei.accesswidener
@@ -12,6 +12,8 @@ accessible field net/minecraft/client/gui/screens/recipebook/RecipeBookComponent
 accessible field net/minecraft/client/gui/screens/recipebook/RecipeBookComponent height I
 accessible field net/minecraft/client/gui/screens/recipebook/RecipeBookComponent xOffset I
 accessible field net/minecraft/client/gui/screens/recipebook/RecipeBookComponent tabButtons Ljava/util/List;
+accessible method net/minecraft/client/gui/screens/recipebook/RecipeBookComponent getXOrigin ()I
+accessible method net/minecraft/client/gui/screens/recipebook/RecipeBookComponent getYOrigin ()I
 
 accessible field net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen recipeBookComponent Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;
 
diff --git a/Gui/src/main/java/mezz/jei/gui/plugins/AbstractContainerScreenHandler.java b/Gui/src/main/java/mezz/jei/gui/plugins/AbstractContainerScreenHandler.java
@@ -4,10 +4,8 @@
 import mezz.jei.api.gui.handlers.IScreenHandler;
 import mezz.jei.common.platform.IPlatformScreenHelper;
 import mezz.jei.common.platform.Services;
-import mezz.jei.common.util.ImmutableRect2i;
 import mezz.jei.gui.GuiProperties;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import org.jetbrains.annotations.Nullable;
 
@@ -22,14 +20,6 @@ public class AbstractContainerScreenHandler<T extends AbstractContainerMenu> imp
 		int y = screenHelper.getGuiTop(containerScreen);
 		int width = screenHelper.getXSize(containerScreen);
 		int height = screenHelper.getYSize(containerScreen);
-		if (containerScreen instanceof AbstractRecipeBookScreen<?> r) {
-			ImmutableRect2i bookArea = screenHelper.getBookArea(r);
-			if (!bookArea.isEmpty()) {
-				width += (x - bookArea.getX());
-				x = bookArea.getX();
-			}
-		}
-
 		if (x < 0) {
 			width -= x;
 			x = 0;
diff --git a/Library/src/main/java/mezz/jei/library/plugins/vanilla/gui/RecipeBookGuiHandler.java b/Library/src/main/java/mezz/jei/library/plugins/vanilla/gui/RecipeBookGuiHandler.java
@@ -3,6 +3,7 @@
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.common.platform.IPlatformScreenHelper;
 import mezz.jei.common.platform.Services;
+import mezz.jei.common.util.ImmutableRect2i;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
@@ -24,13 +25,15 @@ public List<Rect2i> getGuiExtraAreas(T containerScreen) {
 
 		RecipeBookComponent<?> guiRecipeBook = screenHelper.getRecipeBookComponent(containerScreen);
 		if (guiRecipeBook.isVisible()) {
-			List<Rect2i> tabAreas = new ArrayList<>();
+			List<Rect2i> extraAreas = new ArrayList<>();
+			ImmutableRect2i bookArea = screenHelper.getBookArea(guiRecipeBook);
+			extraAreas.add(bookArea.toMutable());
 			for (RecipeBookTabButton tab : screenHelper.getTabButtons(guiRecipeBook)) {
 				if (tab.visible) {
-					tabAreas.add(new Rect2i(tab.getX(), tab.getY(), tab.getWidth(), tab.getHeight()));
+					extraAreas.add(new Rect2i(tab.getX(), tab.getY(), tab.getWidth(), tab.getHeight()));
 				}
 			}
-			return tabAreas;
+			return extraAreas;
 		}
 		return Collections.emptyList();
 	}
diff --git a/NeoForge/src/main/java/mezz/jei/neoforge/platform/ScreenHelper.java b/NeoForge/src/main/java/mezz/jei/neoforge/platform/ScreenHelper.java
@@ -45,12 +45,14 @@ public int getYSize(AbstractContainerScreen<?> containerScreen) {
 	}
 
 	@Override
-	public ImmutableRect2i getBookArea(AbstractRecipeBookScreen<?> screen) {
-		RecipeBookComponent<?> guiRecipeBook = getRecipeBookComponent(screen);
+	public ImmutableRect2i getBookArea(RecipeBookComponent<?> guiRecipeBook) {
 		if (guiRecipeBook.isVisible()) {
-			int i = (guiRecipeBook.width - 147) / 2 - guiRecipeBook.xOffset;
-			int j = (guiRecipeBook.height - 166) / 2;
-			return new ImmutableRect2i(i, j, 147, 166);
+			return new ImmutableRect2i(
+				guiRecipeBook.getXOrigin(),
+				guiRecipeBook.getYOrigin(),
+				RecipeBookComponent.IMAGE_WIDTH,
+				RecipeBookComponent.IMAGE_HEIGHT
+			);
 		}
 		return ImmutableRect2i.EMPTY;
 	}
diff --git a/NeoForge/src/main/resources/META-INF/accesstransformer.cfg b/NeoForge/src/main/resources/META-INF/accesstransformer.cfg
@@ -43,3 +43,6 @@ public net.minecraft.client.gui.components.toasts.ToastManager visibleToasts
 public net.minecraft.client.gui.GuiGraphics blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIII)V
 public net.minecraft.client.gui.GuiGraphics blitNineSlicedSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/resources/metadata/gui/GuiSpriteScaling$NineSlice;IIIII)V
 public net.minecraft.client.gui.GuiGraphics blitTiledSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIIIII)V
+
+public net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getXOrigin()I
+public net.minecraft.client.gui.screens.recipebook.RecipeBookComponent getYOrigin()I

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,14 @@ public int getYSize(AbstractContainerScreen<?> containerScreen) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- public ImmutableRect2i getBookArea(AbstractRecipeBookScreen<?> screen) {`
`49`		`- RecipeBookComponent<?> guiRecipeBook = getRecipeBookComponent(screen);`
	`48`	`+ public ImmutableRect2i getBookArea(RecipeBookComponent<?> guiRecipeBook) {`
`50`	`49`	`if (guiRecipeBook.isVisible()) {`
`51`		`- int i = (guiRecipeBook.width - 147) / 2 - guiRecipeBook.xOffset;`
`52`		`- int j = (guiRecipeBook.height - 166) / 2;`
`53`		`- return new ImmutableRect2i(i, j, 147, 166);`
	`50`	`+ return new ImmutableRect2i(`
	`51`	`+ guiRecipeBook.getXOrigin(),`
	`52`	`+ guiRecipeBook.getYOrigin(),`
	`53`	`+ RecipeBookComponent.IMAGE_WIDTH,`
	`54`	`+ RecipeBookComponent.IMAGE_HEIGHT`
	`55`	`+ );`
`54`	`56`	`}`
`55`	`57`	`return ImmutableRect2i.EMPTY;`
`56`	`58`	`}`