add history overlay

Common/src/main/java/mezz/jei/common/config/ClientConfig.java

@@ -33,6 +33,10 @@ public final class ClientConfig implements IClientConfig {
 	private final Supplier<Boolean> holdShiftToShowBookmarkTooltipFeaturesEnabled;
 	private final Supplier<Boolean> dragToRearrangeBookmarksEnabled;
 
+	// history
+	private final Supplier<Boolean> historyEnabled;
+	private final Supplier<Integer> maxHistoryRows;
+
 	// advanced
 	private final Supplier<Boolean> lowMemorySlowSearchEnabled;
 	private final Supplier<Boolean> catchRenderErrorsEnabled;
@@ -112,6 +116,19 @@ public ClientConfig(IConfigSchemaBuilder schema) {
 			"Drag bookmarks to rearrange them in the list."
 		);
 
+		historyEnabled = bookmarks.addBoolean(
+			"HistoryEnabled",
+			false,
+			"Enable the history overlay."
+		);
+		maxHistoryRows = bookmarks.addInteger(
+			"MaxHistoryRows",
+			1,
+			0,
+			5,
+			"Max number of rows in the history overlay."
+		);
+
 		IConfigCategoryBuilder advanced = schema.addCategory("advanced");
 		lowMemorySlowSearchEnabled = advanced.addBoolean(
 			"LowMemorySlowSearchEnabled",
@@ -256,6 +273,16 @@ public boolean isDragToRearrangeBookmarksEnabled() {
 		return dragToRearrangeBookmarksEnabled.get();
 	}
 
+	@Override
+	public boolean isHistoryEnabled() {
+		return historyEnabled.get();
+	}
+
+	@Override
+	public int getMaxHistoryRows() {
+		return maxHistoryRows.get();
+	}
+
 	@Override
 	public int getDragDelayMs() {
 		return dragDelayMs.get();

Common/src/main/java/mezz/jei/common/config/IClientConfig.java

@@ -32,6 +32,10 @@ public interface IClientConfig {
 
 	boolean isDragToRearrangeBookmarksEnabled();
 
+	boolean isHistoryEnabled();
+
+	int getMaxHistoryRows();
+
 	int getDragDelayMs();
 
 	int getSmoothScrollRate();

Gui/src/main/java/mezz/jei/gui/overlay/bookmarks/BookmarkOverlay.java

@@ -5,6 +5,8 @@
 import mezz.jei.api.ingredients.ITypedIngredient;
 import mezz.jei.api.runtime.IBookmarkOverlay;
 import mezz.jei.api.runtime.IScreenHelper;
+import mezz.jei.common.Internal;
+import mezz.jei.common.config.IClientConfig;
 import mezz.jei.common.config.IClientToggleState;
 import mezz.jei.common.input.IInternalKeyMappings;
 import mezz.jei.common.util.ImmutablePoint2i;
@@ -27,6 +29,7 @@
 import mezz.jei.gui.overlay.IngredientGridWithNavigation;
 import mezz.jei.gui.overlay.IngredientListSlot;
 import mezz.jei.gui.overlay.ScreenPropertiesCache;
+import mezz.jei.gui.overlay.bookmarks.history.HistoryOverlay;
 import mezz.jei.gui.overlay.elements.IElement;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -51,23 +54,29 @@ public class BookmarkOverlay implements IRecipeFocusSource, IBookmarkOverlay {
 
 	// display elements
 	private final IngredientGridWithNavigation contents;
+	private final HistoryOverlay historyOverlay;
 	private final GuiIconToggleButton bookmarkButton;
 
 	// data
 	private final BookmarkList bookmarkList;
 	private final IClientToggleState toggleState;
+	private final IClientConfig clientConfig;
 
 	public BookmarkOverlay(
 		BookmarkList bookmarkList,
 		IngredientGridWithNavigation contents,
+		HistoryOverlay historyOverlay,
 		IClientToggleState toggleState,
+		IClientConfig clientConfig,
 		IScreenHelper screenHelper,
 		IInternalKeyMappings keyBindings
 	) {
 		this.bookmarkList = bookmarkList;
 		this.toggleState = toggleState;
+		this.clientConfig = clientConfig;
 		this.bookmarkButton = BookmarkButton.create(this, bookmarkList, toggleState, keyBindings);
 		this.contents = contents;
+		this.historyOverlay = historyOverlay;
 		this.screenPropertiesCache = new ScreenPropertiesCache(screenHelper);
 		this.bookmarkDragManager = new BookmarkDragManager(this);
 		bookmarkList.addSourceListChangedListener(() -> {
@@ -77,6 +86,12 @@ public BookmarkOverlay(
 				.updateScreen(minecraft.screen)
 				.update();
 		});
+		historyOverlay.getHistoryList().addSourceListChangedListener(() -> {
+				Minecraft minecraft = Minecraft.getInstance();
+				this.getScreenPropertiesUpdater()
+					.updateScreen(minecraft.screen)
+					.update();
+		});
 	}
 
 	public boolean isListDisplayed() {
@@ -103,8 +118,17 @@ private void updateBounds(IGuiProperties guiProperties) {
 		ImmutableRect2i displayArea = getDisplayArea(guiProperties);
 		Set<ImmutableRect2i> guiExclusionAreas = this.screenPropertiesCache.getGuiExclusionAreas();
 		ImmutablePoint2i mouseExclusionArea = this.screenPropertiesCache.getMouseExclusionArea();
-
 		ImmutableRect2i availableContentsArea = displayArea.cropBottom(BUTTON_SIZE + INNER_PADDING);
+		if (clientConfig.isHistoryEnabled()) {
+			int historyRows = clientConfig.getMaxHistoryRows();
+			availableContentsArea  = availableContentsArea.cropBottom(historyRows * HistoryOverlay.SLOT_HEIGHT);
+			ImmutableRect2i historyArea = displayArea
+				.insetBy(BORDER_MARGIN)
+				.moveUp(BUTTON_SIZE + INNER_PADDING)
+				.keepBottom(historyRows * HistoryOverlay.SLOT_HEIGHT);
+			this.historyOverlay.updateBounds(historyArea, guiExclusionAreas, mouseExclusionArea);
+			this.historyOverlay.updateLayout();
+		}
 		this.contents.updateBounds(availableContentsArea, guiExclusionAreas, mouseExclusionArea);
 		this.contents.updateLayout(false);
 
@@ -138,6 +162,7 @@ public void drawScreen(Minecraft minecraft, GuiGraphics guiGraphics, int mouseX,
 		if (isListDisplayed()) {
 			this.bookmarkDragManager.updateDrag(mouseX, mouseY);
 			this.contents.draw(minecraft, guiGraphics, mouseX, mouseY, partialTicks);
+			this.historyOverlay.draw(minecraft, guiGraphics, mouseX, mouseY, partialTicks);
 		}
 		if (this.screenPropertiesCache.hasValidScreen()) {
 			this.bookmarkButton.draw(guiGraphics, mouseX, mouseY, partialTicks);
@@ -148,6 +173,7 @@ public void drawTooltips(Minecraft minecraft, GuiGraphics guiGraphics, int mouse
 		if (isListDisplayed()) {
 			if (!this.bookmarkDragManager.drawDraggedItem(guiGraphics, mouseX, mouseY)) {
 				this.contents.drawTooltips(minecraft, guiGraphics, mouseX, mouseY);
+				this.historyOverlay.drawTooltips(minecraft, guiGraphics, mouseX, mouseY);
 			}
 		}
 		if (this.screenPropertiesCache.hasValidScreen()) {
@@ -158,15 +184,15 @@ public void drawTooltips(Minecraft minecraft, GuiGraphics guiGraphics, int mouse
 	@Override
 	public Stream<IClickableIngredientInternal<?>> getIngredientUnderMouse(double mouseX, double mouseY) {
 		if (isListDisplayed()) {
-			return this.contents.getIngredientUnderMouse(mouseX, mouseY);
+			return Stream.concat(this.contents.getIngredientUnderMouse(mouseX, mouseY),this.historyOverlay.getIngredientUnderMouse(mouseX, mouseY));
 		}
 		return Stream.empty();
 	}
 
 	@Override
 	public Stream<IDraggableIngredientInternal<?>> getDraggableIngredientUnderMouse(double mouseX, double mouseY) {
 		if (isListDisplayed()) {
-			return this.contents.getDraggableIngredientUnderMouse(mouseX, mouseY);
+			return Stream.concat(this.contents.getDraggableIngredientUnderMouse(mouseX, mouseY),this.historyOverlay.getDraggableIngredientUnderMouse(mouseX, mouseY));
 		}
 		return Stream.empty();
 	}

Gui/src/main/java/mezz/jei/gui/overlay/bookmarks/history/HistoryInputHandler.java

@@ -0,0 +1,35 @@
+package mezz.jei.gui.overlay.bookmarks.history;
+
+import mezz.jei.common.input.IInternalKeyMappings;
+import mezz.jei.gui.input.CombinedRecipeFocusSource;
+import mezz.jei.gui.input.IUserInputHandler;
+import mezz.jei.gui.input.UserInput;
+import mezz.jei.gui.input.handlers.FocusInputHandler;
+import net.minecraft.client.gui.screens.Screen;
+
+import java.util.Optional;
+
+public class HistoryInputHandler implements IUserInputHandler {
+
+    private final HistoryList historyList;
+    private final CombinedRecipeFocusSource focusSource;
+    private final FocusInputHandler focusInputHandler;
+
+    public HistoryInputHandler(HistoryList historyList, CombinedRecipeFocusSource focusSource, FocusInputHandler focusInputHandler) {
+        this.historyList = historyList;
+        this.focusSource = focusSource;
+        this.focusInputHandler = focusInputHandler;
+    }
+
+    @Override
+    public Optional<IUserInputHandler> handleUserInput(Screen screen, UserInput input, IInternalKeyMappings keyBindings) {
+        Optional<IUserInputHandler> result = focusInputHandler.handleUserInput(screen, input, keyBindings);
+        if ((input.is(keyBindings.getShowRecipe()) || input.is(keyBindings.getShowUses())) && result.isPresent()) {
+            focusSource.getIngredientUnderMouse(input, keyBindings)
+                    .filter(clicked -> clicked.getElement().isVisible())
+                    .findFirst()
+                    .ifPresent(clicked -> historyList.add(clicked.getElement()));
+        }
+        return result;
+    }
+}

Gui/src/main/java/mezz/jei/gui/overlay/bookmarks/history/HistoryList.java

@@ -0,0 +1,52 @@
+package mezz.jei.gui.overlay.bookmarks.history;
+
+import mezz.jei.gui.overlay.IIngredientGridSource;
+import mezz.jei.gui.overlay.elements.IElement;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class HistoryList implements IIngredientGridSource {
+
+    private final List<IElement<?>> elements = new ArrayList<>();
+    private final List<SourceListChangedListener> listeners = new ArrayList<>();
+    private int maxSize;
+
+    public void setMaxSize(int maxSize) {
+        this.maxSize = maxSize;
+    }
+
+    public void add(IElement<?> element) {
+        if (elements.contains(element)) {
+            return;
+        }
+        elements.addFirst(element);
+        if (elements.size() > maxSize) {
+            elements.removeLast();
+        }
+        notifyListeners();
+    }
+
+    public void remove(IElement<?> element) {
+        elements.remove(element);
+        notifyListeners();
+    }
+
+    @Override
+    public @Unmodifiable List<IElement<?>> getElements() {
+        return Collections.unmodifiableList(elements);
+    }
+
+    @Override
+    public void addSourceListChangedListener(SourceListChangedListener listener) {
+        listeners.add(listener);
+    }
+
+    private void notifyListeners() {
+        for (SourceListChangedListener listener : listeners) {
+            listener.onSourceListChanged();
+        }
+    }
+}