diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-06-03 14:47:25 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-06-03 14:47:25 +0800 |
| commit | e9c230bfcd93b3bb6191a668891d99c1f241e5be (patch) | |
| tree | 9971f31b42a1eb6a03067030a3f70b844cc49a0b /default-plugin/src/main/java/me/shedaniel/rei/plugin/client | |
| parent | 572ebd36c32c0248f2c826cc518eeedbc0701287 (diff) | |
| download | RoughlyEnoughItems-e9c230bfcd93b3bb6191a668891d99c1f241e5be.tar.gz RoughlyEnoughItems-e9c230bfcd93b3bb6191a668891d99c1f241e5be.tar.bz2 RoughlyEnoughItems-e9c230bfcd93b3bb6191a668891d99c1f241e5be.zip | |
Use Java 16 features
Diffstat (limited to 'default-plugin/src/main/java/me/shedaniel/rei/plugin/client')
3 files changed, 3 insertions, 6 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/exclusionzones/DefaultRecipeBookExclusionZones.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/exclusionzones/DefaultRecipeBookExclusionZones.java index d41f58a32..5c775023b 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/exclusionzones/DefaultRecipeBookExclusionZones.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/exclusionzones/DefaultRecipeBookExclusionZones.java @@ -42,11 +42,10 @@ import java.util.List; public class DefaultRecipeBookExclusionZones implements ExclusionZonesProvider<RecipeUpdateListener> { @Override public Collection<Rectangle> provide(RecipeUpdateListener screen) { - if (!(screen instanceof AbstractContainerScreen) || !(((AbstractContainerScreen<?>) screen).getMenu() instanceof RecipeBookMenu) || + if (!(screen instanceof AbstractContainerScreen<?> containerScreen) || !(((AbstractContainerScreen<?>) screen).getMenu() instanceof RecipeBookMenu) || !Minecraft.getInstance().player.getRecipeBook().isOpen(((RecipeBookMenu<?>) ((AbstractContainerScreen<?>) screen).getMenu()).getRecipeBookType())) return Collections.emptyList(); RecipeBookComponent recipeBookWidget = screen.getRecipeBookComponent(); - AbstractContainerScreen<?> containerScreen = (AbstractContainerScreen<?>) screen; List<Rectangle> l = Lists.newArrayList(new Rectangle(containerScreen.leftPos - 4 - 145, containerScreen.topPos, 4 + 145 + 30, containerScreen.imageHeight)); int size = recipeBookWidget.tabButtons.size(); if (size > 0) 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 1db8d9667..c50590376 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 @@ -180,8 +180,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { @Override public boolean isSame(FavoriteEntry other) { - if (!(other instanceof GameModeFavoriteEntry)) return false; - GameModeFavoriteEntry that = (GameModeFavoriteEntry) other; + if (!(other instanceof GameModeFavoriteEntry that)) return false; return Objects.equals(gameMode, that.gameMode); } 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 3d57bf70b..08786e341 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 @@ -187,8 +187,7 @@ public class WeatherFavoriteEntry extends FavoriteEntry { @Override public boolean isSame(FavoriteEntry other) { - if (!(other instanceof WeatherFavoriteEntry)) return false; - WeatherFavoriteEntry that = (WeatherFavoriteEntry) other; + if (!(other instanceof WeatherFavoriteEntry that)) return false; return Objects.equals(weather, that.weather); } |