From 68bbe0fa3c663d58599c3c1ebaa7ef2924ede6b6 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 11 Jun 2022 00:12:55 +0800 Subject: Add default favorite entries --- .../main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java | 2 +- .../me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java | 2 +- .../me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java | 2 +- .../me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'default-plugin/src/main/java') diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index 8a61e3354..d74ac6ec6 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -321,7 +321,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin public void registerFavorites(FavoriteEntryType.Registry registry) { registry.register(GameModeFavoriteEntry.ID, GameModeFavoriteEntry.Type.INSTANCE); registry.getOrCrateSection(new TranslatableComponent(GameModeFavoriteEntry.TRANSLATION_KEY)) - .add(Stream.concat( + .add(true, Stream.concat( Arrays.stream(GameType.values()) .filter(type -> type.getId() >= 0), Stream.of((GameType) null) diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java index 7590a40da..eebe14207 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java @@ -167,7 +167,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { @Override public long hashIgnoreAmount() { - return gameMode == null ? -1 : gameMode.ordinal(); + return gameMode == null ? 31290831290L : gameMode.ordinal(); } @Override diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java index fc7b09141..30d7ae72b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/TimeFavoriteEntry.java @@ -199,7 +199,7 @@ public class TimeFavoriteEntry extends FavoriteEntry { @Override public long hashIgnoreAmount() { - return time == null ? -1 : time.ordinal(); + return time == null ? 31290831290L : time.ordinal(); } @Override diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java index 6ee322472..f49dd7cb9 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/WeatherFavoriteEntry.java @@ -173,7 +173,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry { @Override public long hashIgnoreAmount() { - return weather == null ? -1 : weather.ordinal(); + return weather == null ? 31290831290L : weather.ordinal(); } @Override -- cgit