diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-06-11 01:13:58 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-06-11 01:13:58 +0800 |
| commit | 92a438eef6f217d7b2d3ee21c6efb68ac2498d0a (patch) | |
| tree | ad45925f49339f39494455a62e991ae2573fd817 /default-plugin/src | |
| parent | b99ba98ffeaff540a15dd7b188a9793539fd2bb7 (diff) | |
| parent | 0e2a66156d69bb6d8d37a1c05f59abde42d62ebc (diff) | |
| download | RoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.tar.gz RoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.tar.bz2 RoughlyEnoughItems-92a438eef6f217d7b2d3ee21c6efb68ac2498d0a.zip | |
Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19
# Conflicts:
# api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandler.java
# default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java
# fabric/src/main/java/me/shedaniel/rei/impl/client/gui/fabric/ScreenOverlayImplImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/AbstractDisplayViewingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/AutoCraftingEvaluator.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/QueuedTooltip.java
Diffstat (limited to 'default-plugin/src')
4 files changed, 4 insertions, 4 deletions
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 a22a4df40..0b6bab7ee 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 @@ -349,7 +349,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin public void registerFavorites(FavoriteEntryType.Registry registry) { registry.register(GameModeFavoriteEntry.ID, GameModeFavoriteEntry.Type.INSTANCE); registry.getOrCrateSection(Component.translatable(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 ed3614f1d..2537b44df 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 d03e88797..a390af657 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 @@ -201,7 +201,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 fceb2a973..65286cad5 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 @@ -175,7 +175,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry { @Override public long hashIgnoreAmount() { - return weather == null ? -1 : weather.ordinal(); + return weather == null ? 31290831290L : weather.ordinal(); } @Override |