Rely on ScreenRegistry more on calculating the bounds

Signed-off-by: shedaniel <daniel@shedaniel.me>

3 files changed, 30 insertions, 9 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 585d13dc9..5bd37fb6a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -422,7 +422,8 @@ public class DefaultPlugin implements REIPlugin, BuiltinPlugin {
         registry.register(GameModeFavoriteEntry.ID, GameModeFavoriteEntry.Type.INSTANCE);
         registry.getOrCrateSection(new TranslatableComponent(GameModeFavoriteEntry.TRANSLATION_KEY))
                 .add(Stream.concat(
-                        Arrays.stream(GameType.values()),
+                        Arrays.stream(GameType.values())
+                        .filter(type -> type != GameType.NOT_SET),
                         Stream.of((GameType) null)
                 ).<FavoriteEntry>map(GameModeFavoriteEntry.Type.INSTANCE::fromArgs).toArray(FavoriteEntry[]::new));
         registry.register(WeatherFavoriteEntry.ID, WeatherFavoriteEntry.Type.INSTANCE);
@@ -434,12 +435,6 @@ public class DefaultPlugin implements REIPlugin, BuiltinPlugin {
     }
     
     @Override
-    public void registerSubsets(SubsetsRegistry registry) {
-//        registry.registerPathEntry("roughlyenoughitems:food", EntryStacks.of(Items.MILK_BUCKET));
-//        registry.registerPathEntry("roughlyenoughitems:food/roughlyenoughitems:cookies", EntryStacks.of(Items.COOKIE));
-    }
-    
-    @Override
     public int getPriority() {
         return -100;
     }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
index 4450a93b8..dbaec7371 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
@@ -124,11 +124,24 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             }
             
             @Override
-            public @Nullable Tooltip getTooltip(Point mouse) {
+            @Nullable
+            public Tooltip getTooltip(Point mouse) {
                 if (gameMode == null)
                     return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.dropdown"));
                 return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.entry", gameMode.getDisplayName().getString()));
             }
+    
+            @Override
+            public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                return hashCode() == o.hashCode();
+            }
+    
+            @Override
+            public int hashCode() {
+                return Objects.hash(getClass(), showcase, gameMode);
+            }
         };
     }
     
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java
index fcf3077bc..7cb1ac7e6 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/WeatherFavoriteEntry.java
@@ -143,11 +143,24 @@ public class WeatherFavoriteEntry extends FavoriteEntry {
             }
             
             @Override
-            public @Nullable Tooltip getTooltip(Point mouse) {
+            @Nullable
+            public Tooltip getTooltip(Point mouse) {
                 if (weather == null)
                     return Tooltip.create(mouse, new TranslatableComponent("text.rei.weather_button.tooltip.dropdown"));
                 return Tooltip.create(mouse, new TranslatableComponent("text.rei.weather_button.tooltip.entry", new TranslatableComponent(weather.getTranslateKey())));
             }
+    
+            @Override
+            public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                return hashCode() == o.hashCode();
+            }
+    
+            @Override
+            public int hashCode() {
+                return Objects.hash(getClass(), showcase, weather);
+            }
         };
     }