Use Java 16 features

8 files changed, 34 insertions, 34 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
index 25687723f..cd488e436 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
@@ -157,14 +157,14 @@ public class ClientHelperImpl implements ClientHelper {
     
     @Override
     public void sendDeletePacket() {
-        if (Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen) {
+        if (Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen inventoryScreen) {
             Minecraft.getInstance().player.containerMenu.setCarried(ItemStack.EMPTY);
-            ((CreativeModeInventoryScreen) Minecraft.getInstance().screen).isQuickCrafting = false;
+            inventoryScreen.isQuickCrafting = false;
             return;
         }
         NetworkManager.sendToServer(RoughlyEnoughItemsNetwork.DELETE_ITEMS_PACKET, new FriendlyByteBuf(Unpooled.buffer()));
-        if (Minecraft.getInstance().screen instanceof AbstractContainerScreen) {
-            ((AbstractContainerScreen<?>) Minecraft.getInstance().screen).isQuickCrafting = false;
+        if (Minecraft.getInstance().screen instanceof AbstractContainerScreen<?> containerScreen) {
+            containerScreen.isQuickCrafting = false;
         }
     }
     
@@ -252,16 +252,16 @@ public class ClientHelperImpl implements ClientHelper {
         } else {
             screen = new DefaultDisplayViewingScreen(map, builder.getPreferredOpenedCategory());
         }
-        if (screen instanceof DisplayScreen) {
+        if (screen instanceof DisplayScreen displayScreen) {
             for (EntryStack<?> stack : builder.getUsagesFor()) {
-                ((DisplayScreen) screen).addIngredientToNotice(stack);
+                displayScreen.addIngredientToNotice(stack);
             }
             for (EntryStack<?> stack : builder.getRecipesFor()) {
-                ((DisplayScreen) screen).addResultToNotice(stack);
+                displayScreen.addResultToNotice(stack);
             }
         }
-        if (Minecraft.getInstance().screen instanceof DisplayScreen) {
-            REIRuntimeImpl.getInstance().storeDisplayScreen((DisplayScreen) Minecraft.getInstance().screen);
+        if (Minecraft.getInstance().screen instanceof DisplayScreen displayScreen) {
+            REIRuntimeImpl.getInstance().storeDisplayScreen(displayScreen);
         }
         Minecraft.getInstance().setScreen(screen);
         return true;
@@ -281,8 +281,8 @@ public class ClientHelperImpl implements ClientHelper {
         public ViewSearchBuilder fillPreferredOpenedCategory() {
             if (getPreferredOpenedCategory() == null) {
                 Screen currentScreen = Minecraft.getInstance().screen;
-                if (currentScreen instanceof DisplayScreen) {
-                    setPreferredOpenedCategory(((DisplayScreen) currentScreen).getCurrentCategoryId());
+                if (currentScreen instanceof DisplayScreen displayScreen) {
+                    setPreferredOpenedCategory(displayScreen.getCurrentCategoryId());
                 }
             }
             return this;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
index be27f26ae..956bfd62a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/REIRuntimeImpl.java
@@ -155,8 +155,8 @@ public class REIRuntimeImpl implements REIRuntime {
         
         this.previousScreen = previousScreen;
         
-        if (previousScreen instanceof AbstractContainerScreen) {
-            this.previousContainerScreen = (AbstractContainerScreen<?>) previousScreen;
+        if (previousScreen instanceof AbstractContainerScreen<?> containerScreen) {
+            this.previousContainerScreen = containerScreen;
         }
     }
     
@@ -217,8 +217,8 @@ public class REIRuntimeImpl implements REIRuntime {
     
     public void onInitializeClient() {
         ClientGuiEvent.INIT_PRE.register((screen, access) -> {
-            if (previousContainerScreen != screen && screen instanceof AbstractContainerScreen)
-                previousContainerScreen = (AbstractContainerScreen<?>) screen;
+            if (previousContainerScreen != screen && screen instanceof AbstractContainerScreen<?> containerScreen)
+                previousContainerScreen = containerScreen;
             return EventResult.pass();
         });
         ClientTickEvent.CLIENT_POST.register(minecraft -> {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
index c36abe3c5..7a4017e45 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
@@ -477,8 +477,7 @@ public class ScreenOverlayImpl extends ScreenOverlay {
         if (OverlaySearchField.isHighlighting) {
             matrices.pushPose();
             matrices.translate(0, 0, 200f);
-            if (Minecraft.getInstance().screen instanceof AbstractContainerScreen) {
-                AbstractContainerScreen<?> containerScreen = (AbstractContainerScreen<?>) Minecraft.getInstance().screen;
+            if (Minecraft.getInstance().screen instanceof AbstractContainerScreen<?> containerScreen) {
                 int x = containerScreen.leftPos, y = containerScreen.topPos;
                 for (Slot slot : containerScreen.getMenu().slots) {
                     if (!slot.hasItem() || !ENTRY_LIST_WIDGET.matches(EntryStacks.of(slot.getItem()))) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
index 32fe6b841..7c6505c98 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
@@ -182,7 +182,8 @@ public class Menu extends WidgetWithBounds implements LateRenderable {
     private void buildEntries(Collection<MenuEntry> entries) {
         this.entries.clear();
         this.entries.addAll(entries);
-        this.entries.sort(Comparator.comparing(entry -> entry instanceof SubSubsetsMenuEntry ? 0 : 1).thenComparing(entry -> entry instanceof SubSubsetsMenuEntry ? ((SubSubsetsMenuEntry) entry).text : ""));
+        this.entries.sort(Comparator.comparing(entry -> entry instanceof SubSubsetsMenuEntry ? 0 : 1)
+                .thenComparing(entry -> entry instanceof SubSubsetsMenuEntry menuEntry ? menuEntry.text : ""));
         for (MenuEntry entry : this.entries) {
             entry.parent = this;
         }
@@ -221,7 +222,7 @@ public class Menu extends WidgetWithBounds implements LateRenderable {
         fill(matrices, bounds.x, bounds.y, bounds.getMaxX(), bounds.getMaxY(), containsMouse(mouseX, mouseY) ? (REIRuntime.getInstance().isDarkThemeEnabled() ? -17587 : -1) : -6250336);
         fill(matrices, innerBounds.x, innerBounds.y, innerBounds.getMaxX(), innerBounds.getMaxY(), -16777216);
         boolean contains = innerBounds.contains(mouseX, mouseY);
-        MenuEntry focused = getFocused() instanceof MenuEntry ? (MenuEntry) getFocused() : null;
+        MenuEntry focused = getFocused() instanceof MenuEntry menuEntry ? menuEntry : null;
         int currentY = (int) (innerBounds.y - scrolling.scrollAmount);
         for (MenuEntry child : children()) {
             boolean containsMouse = contains && mouseY >= currentY && mouseY < currentY + child.getEntryHeight();
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
index 185e9e67d..4ff812960 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/entries/SubSubsetsMenuEntry.java
@@ -171,18 +171,18 @@ public class SubSubsetsMenuEntry extends MenuEntry {
     
     private void setFiltered(List<EntryStack<?>> filteredStacks, Menu subsetsMenu, SubSubsetsMenuEntry subSubsetsMenuEntry, boolean filtered) {
         for (MenuEntry entry : subSubsetsMenuEntry.entries) {
-            if (entry instanceof EntryStackSubsetsMenuEntry) {
-                if (((EntryStackSubsetsMenuEntry) entry).isFiltered() != filtered) {
+            if (entry instanceof EntryStackSubsetsMenuEntry menuEntry) {
+                if (menuEntry.isFiltered() != filtered) {
                     if (!filtered) {
-                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next, ((EntryStackSubsetsMenuEntry) entry).stack));
+                        filteredStacks.removeIf(next -> EntryStacks.equalsExact(next, menuEntry.stack));
                     } else {
-                        filteredStacks.add(((EntryStackSubsetsMenuEntry) entry).stack.normalize());
+                        filteredStacks.add(menuEntry.stack.normalize());
                     }
                 }
                 if (subsetsMenu != null)
-                    ((EntryStackSubsetsMenuEntry) entry).recalculateFilter(subsetsMenu);
-            } else if (entry instanceof SubSubsetsMenuEntry) {
-                setFiltered(filteredStacks, subsetsMenu, (SubSubsetsMenuEntry) entry, filtered);
+                    menuEntry.recalculateFilter(subsetsMenu);
+            } else if (entry instanceof SubSubsetsMenuEntry menuEntry) {
+                setFiltered(filteredStacks, subsetsMenu, menuEntry, filtered);
             }
         }
     }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java
index a19702753..b8f08fdef 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListWidget.java
@@ -298,8 +298,8 @@ public class EntryListWidget extends WidgetWithBounds implements OverlayListWidg
                 }
             }
             for (Widget child : children()) {
-                if (child.containsMouse(mouseX, mouseY) && child instanceof EntryWidget) {
-                    if (((EntryWidget) child).cancelDeleteItems(stack)) {
+                if (child.containsMouse(mouseX, mouseY) && child instanceof EntryWidget widget) {
+                    if (widget.cancelDeleteItems(stack)) {
                         return;
                     }
                 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/FavoritesListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/FavoritesListWidget.java
index 1f221d0e8..fe195531e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/FavoritesListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/FavoritesListWidget.java
@@ -159,8 +159,8 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableSt
         }
         if (favoritePanel.bounds.contains(mouseX, mouseY)) {
             for (AddFavoritePanel.Row row : favoritePanel.rows.get()) {
-                if (row instanceof AddFavoritePanel.SectionEntriesRow) {
-                    for (AddFavoritePanel.SectionEntriesRow.SectionFavoriteWidget widget : ((AddFavoritePanel.SectionEntriesRow) row).widgets) {
+                if (row instanceof AddFavoritePanel.SectionEntriesRow entriesRow) {
+                    for (AddFavoritePanel.SectionEntriesRow.SectionFavoriteWidget widget : entriesRow.widgets) {
                         if (widget.containsMouse(mouseX, mouseY)) {
                             Entry entry = new Entry(widget.entry.copy(), entrySize());
                             entry.size.setAs(entrySize() * 100);
@@ -185,8 +185,8 @@ public class FavoritesListWidget extends WidgetWithBounds implements DraggableSt
         }
         if (favoritePanel.bounds.contains(mouse)) {
             for (AddFavoritePanel.Row row : favoritePanel.rows.get()) {
-                if (row instanceof AddFavoritePanel.SectionEntriesRow) {
-                    for (AddFavoritePanel.SectionEntriesRow.SectionFavoriteWidget widget : ((AddFavoritePanel.SectionEntriesRow) row).widgets) {
+                if (row instanceof AddFavoritePanel.SectionEntriesRow entriesRow) {
+                    for (AddFavoritePanel.SectionEntriesRow.SectionFavoriteWidget widget : entriesRow.widgets) {
                         if (widget.containsMouse(mouse)) {
                             return ClientEntryStacks.of(widget.entry.getRenderer(false)).copy();
                         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java
index f58270b3a..728214a43 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java
@@ -136,9 +136,9 @@ public class TabWidget extends WidgetWithBounds implements DraggableStackProvide
     @Override
     @Nullable
     public DraggableStack getHoveredStack(DraggingContext<Screen> context, double mouseX, double mouseY) {
-        if (isShown() && renderer instanceof EntryStack && containsMouse(mouseX, mouseY)) {
+        if (isShown() && renderer instanceof EntryStack<?> entryStack && containsMouse(mouseX, mouseY)) {
             return new DraggableStack() {
-                EntryStack<?> stack = ((EntryStack<?>) renderer).copy();
+                EntryStack<?> stack = entryStack.copy();
                 
                 @Override
                 public EntryStack<?> getStack() {