Make displays favorite miniature displays by default

shedaniel · Jul 16, 2023 · 19e35f6 · 19e35f6
1 parent d6f3417
commit 19e35f6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayCompositeWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayCompositeWidget.java
@@ -27,6 +27,8 @@
 import me.shedaniel.math.Point;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.config.ConfigObject;
+import me.shedaniel.rei.api.client.favorites.FavoriteEntry;
+import me.shedaniel.rei.api.client.favorites.FavoriteEntryType;
 import me.shedaniel.rei.api.client.gui.config.RecipeBorderType;
 import me.shedaniel.rei.api.client.gui.drag.DraggedAcceptorResult;
 import me.shedaniel.rei.api.client.gui.drag.DraggingContext;
@@ -82,10 +84,13 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
         if (ConfigObject.getInstance().isFavoritesEnabled() && containsMouse(mouse())) {
             if (ConfigObject.getInstance().getFavoriteKeyCode().matchesKey(keyCode, scanCode)) {
-                FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-
-                if (favoritesListWidget != null) {
-                    favoritesListWidget.displayHistory.addDisplay(getBounds().clone(), display.provideInternalDisplay());
+                FavoriteEntry favoriteEntry = FavoriteEntryType.registry().get(FavoriteEntryType.DISPLAY)
+                        .fromArgs(display.provideInternalDisplay())
+                        .get()
+                        .left()
+                        .orElse(null);
+                if (favoriteEntry != null) {
+                    ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
                     return true;
                 }
             }
@@ -102,10 +107,13 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
 
         if (ConfigObject.getInstance().isFavoritesEnabled() && containsMouse(mouseX, mouseY)) {
             if (ConfigObject.getInstance().getFavoriteKeyCode().matchesMouse(button)) {
-                FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-
-                if (favoritesListWidget != null) {
-                    favoritesListWidget.displayHistory.addDisplay(getBounds().clone(), display.provideInternalDisplay());
+                FavoriteEntry favoriteEntry = FavoriteEntryType.registry().get(FavoriteEntryType.DISPLAY)
+                        .fromArgs(display.provideInternalDisplay())
+                        .get()
+                        .left()
+                        .orElse(null);
+                if (favoriteEntry != null) {
+                    ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
                     return true;
                 }
             }

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
@@ -591,10 +591,6 @@ protected boolean doAction(double mouseX, double mouseY, int button) {
                     } else {
                         ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
                     }
-                    ConfigManager.getInstance().saveConfig();
-                    FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-                    if (favoritesListWidget != null)
-                        favoritesListWidget.updateSearch();
                     return true;
                 }
             }
@@ -673,10 +669,6 @@ public boolean keyPressedIgnoreContains(int keyCode, int scanCode, int modifiers
                     } else {
                         ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry);
                     }
-                    ConfigManager.getInstance().saveConfig();
-                    FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget();
-                    if (favoritesListWidget != null)
-                        favoritesListWidget.updateSearch();
                     return true;
                 }
             }