diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-07-17 02:26:36 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 00:38:18 +0900 |
| commit | 8a9d2627450d0f496690ebd052f71d3b5b5eda4b (patch) | |
| tree | 893f5edcb906431ccbe287dab7eae3c8f0188619 /runtime/src | |
| parent | 86f38210276a7d32cab8e5f802717fa7536e0e42 (diff) | |
| download | RoughlyEnoughItems-8a9d2627450d0f496690ebd052f71d3b5b5eda4b.tar.gz RoughlyEnoughItems-8a9d2627450d0f496690ebd052f71d3b5b5eda4b.tar.bz2 RoughlyEnoughItems-8a9d2627450d0f496690ebd052f71d3b5b5eda4b.zip | |
Make displays favorite miniature displays by default
Diffstat (limited to 'runtime/src')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayCompositeWidget.java | 24 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java | 8 |
2 files changed, 16 insertions, 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 index a2a1b915f..a613374c8 100644 --- 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 com.mojang.blaze3d.vertex.PoseStack; 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 class DisplayCompositeWidget extends DelegateWidgetWithBounds implements 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 class DisplayCompositeWidget extends DelegateWidgetWithBounds implements 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 index be2de31eb..3f4b9e769 100644 --- 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 @@ -608,10 +608,6 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { } else { ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry); } - ConfigManager.getInstance().saveConfig(); - FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget(); - if (favoritesListWidget != null) - favoritesListWidget.updateSearch(); return true; } } @@ -698,10 +694,6 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { } else { ConfigObject.getInstance().getFavoriteEntries().add(favoriteEntry); } - ConfigManager.getInstance().saveConfig(); - FavoritesListWidget favoritesListWidget = ScreenOverlayImpl.getFavoritesListWidget(); - if (favoritesListWidget != null) - favoritesListWidget.updateSearch(); return true; } } |