Use Java 16 features

27 files changed, 104 insertions, 102 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
index 1957b2ef1..336a80088 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
@@ -88,8 +88,7 @@ public abstract class FavoriteEntry {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof FavoriteEntry)) return false;
-        FavoriteEntry that = (FavoriteEntry) o;
+        if (!(o instanceof FavoriteEntry that)) return false;
         FavoriteEntry unwrapped = getUnwrapped();
         FavoriteEntry thatUnwrapped = that.getUnwrapped();
         return unwrapped == thatUnwrapped || unwrapped.isSame(thatUnwrapped);
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
index 3427a8fbe..3eba93af1 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widgets.java
@@ -147,10 +147,10 @@ public final class Widgets {
         
         @Override
         public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
-            if (element instanceof GuiComponent)
-                ((GuiComponent) element).setBlitOffset(getZ());
-            if (element instanceof net.minecraft.client.gui.components.Widget)
-                ((net.minecraft.client.gui.components.Widget) element).render(matrices, mouseX, mouseY, delta);
+            if (element instanceof GuiComponent component)
+                component.setBlitOffset(getZ());
+            if (element instanceof net.minecraft.client.gui.components.Widget widget)
+                widget.render(matrices, mouseX, mouseY, delta);
         }
         
         @Override
@@ -168,8 +168,8 @@ public final class Widgets {
         public void setFocused(@Nullable GuiEventListener guiEventListener) {
             if (guiEventListener == element) {
                 super.setFocused(element);
-            } else if (element instanceof ContainerEventHandler) {
-                ((ContainerEventHandler) element).setFocused(guiEventListener);
+            } else if (element instanceof ContainerEventHandler handler) {
+                handler.setFocused(guiEventListener);
             }
         }
         
@@ -185,8 +185,8 @@ public final class Widgets {
     }
     
     public static WidgetWithBounds wrapRenderer(Rectangle bounds, Renderer renderer) {
-        if (renderer instanceof Widget)
-            return wrapWidgetWithBounds((Widget) renderer, bounds);
+        if (renderer instanceof Widget widget)
+            return wrapWidgetWithBounds(widget, bounds);
         return new RendererWrappedWidget(renderer, bounds);
     }
     
@@ -195,8 +195,8 @@ public final class Widgets {
     }
     
     public static WidgetWithBounds wrapWidgetWithBounds(Widget widget, Rectangle bounds) {
-        if (widget instanceof WidgetWithBounds)
-            return (WidgetWithBounds) widget;
+        if (widget instanceof WidgetWithBounds withBounds)
+            return withBounds;
         if (bounds == null)
             return new DelegateWidget(widget);
         return new DelegateWidgetWithBounds(widget, bounds);
@@ -218,8 +218,8 @@ public final class Widgets {
         
         @Override
         public List<? extends GuiEventListener> children() {
-            if (renderer instanceof GuiEventListener)
-                return Collections.singletonList((GuiEventListener) renderer);
+            if (renderer instanceof GuiEventListener listener)
+                return Collections.singletonList(listener);
             return Collections.emptyList();
         }
         
@@ -388,13 +388,13 @@ public final class Widgets {
                     if (predicate.test(listener)) {
                         return (T) listener;
                     }
-                    if (listener instanceof ContainerEventHandler) {
-                        List<? extends GuiEventListener> children = ((ContainerEventHandler) listener).children();
+                    if (listener instanceof ContainerEventHandler handler) {
+                        List<? extends GuiEventListener> children = handler.children();
                         if (!children.isEmpty()) {
                             stack.push(children.iterator());
                         }
-                    } else if (listener instanceof WidgetHolder) {
-                        List<? extends GuiEventListener> children = ((WidgetHolder) listener).children();
+                    } else if (listener instanceof WidgetHolder holder) {
+                        List<? extends GuiEventListener> children = holder.children();
                         if (!children.isEmpty()) {
                             stack.push(children.iterator());
                         }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java
index a6ecf3f29..468b40759 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java
@@ -37,8 +37,8 @@ public final class ClientEntryStacks {
     private ClientEntryStacks() {}
     
     public static EntryStack<?> of(Renderer renderer) {
-        if (renderer instanceof EntryStack) {
-            return (EntryStack<?>) renderer;
+        if (renderer instanceof EntryStack<?> stack) {
+            return stack;
         }
         
         return EntryStack.of(BuiltinClientEntryTypes.RENDERING, renderer);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/category/CategoryIdentifier.java b/api/src/main/java/me/shedaniel/rei/api/common/category/CategoryIdentifier.java
index 6d72d3ed1..a1f0e20bf 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/category/CategoryIdentifier.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/category/CategoryIdentifier.java
@@ -32,15 +32,15 @@ import org.jetbrains.annotations.ApiStatus;
 @ApiStatus.NonExtendable
 public interface CategoryIdentifier<D extends Display> extends Identifiable {
     static <D extends Display> CategoryIdentifier<D> of(String str) {
-        return of(new ResourceLocation(str));
+        return Internals.getCategoryIdentifier(str);
     }
     
     static <D extends Display> CategoryIdentifier<D> of(String namespace, String path) {
-        return of(new ResourceLocation(namespace, path));
+        return of(namespace + ":" + path);
     }
     
     static <D extends Display> CategoryIdentifier<D> of(ResourceLocation identifier) {
-        return Internals.getCategoryIdentifier(identifier);
+        return of(identifier.toString());
     }
     
     default String getNamespace() {
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java b/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java
index af84774c8..c54a161d0 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIServerPlugin.java
@@ -27,7 +27,7 @@ import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry;
 import org.jetbrains.annotations.ApiStatus;
 
 public interface REIServerPlugin extends REIPlugin<REIServerPlugin> {
-    @ApiStatus.NonExtendable
+    @ApiStatus.OverrideOnly
     default void registerMenuInfo(MenuInfoRegistry registry) {
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/impl/Internals.java b/api/src/main/java/me/shedaniel/rei/impl/Internals.java
index 90e4a03e7..a5912535e 100644
--- a/api/src/main/java/me/shedaniel/rei/impl/Internals.java
+++ b/api/src/main/java/me/shedaniel/rei/impl/Internals.java
@@ -50,7 +50,7 @@ public final class Internals {
     private static Supplier<PluginManager<REIPlugin<?>>> commonPluginManager = Internals::throwNotSetup;
     private static Supplier<PluginManager<REIServerPlugin>> serverPluginManager = Internals::throwNotSetup;
     private static Supplier<NbtHasherProvider> nbtHasherProvider = Internals::throwNotSetup;
-    private static Function<ResourceLocation, CategoryIdentifier<?>> categoryIdentifier = (object) -> throwNotSetup();
+    private static Function<String, CategoryIdentifier<?>> categoryIdentifier = (object) -> throwNotSetup();
     
     private static <T> T throwNotSetup() {
         throw new AssertionError("REI Internals have not been initialized!");
@@ -105,7 +105,7 @@ public final class Internals {
         return nbtHasherProvider.get().provide(ignoredKeys);
     }
     
-    public static <T extends Display> CategoryIdentifier<T> getCategoryIdentifier(ResourceLocation location) {
+    public static <T extends Display> CategoryIdentifier<T> getCategoryIdentifier(String location) {
         return (CategoryIdentifier<T>) categoryIdentifier.apply(location);
     }
     
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
index 2df1550a1..6406429d1 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
@@ -46,13 +46,11 @@ public class DefaultRecipeBookHandler implements TransferHandler {
         if (context.getDisplay() instanceof SimpleGridMenuDisplay && ClientHelper.getInstance().canUseMovePackets())
             return Result.createNotApplicable();
         Display display = context.getDisplay();
-        if (!(context.getMenu() instanceof RecipeBookMenu))
+        if (!(context.getMenu() instanceof RecipeBookMenu<?> container))
             return Result.createNotApplicable();
-        RecipeBookMenu<?> container = (RecipeBookMenu<?>) context.getMenu();
         if (container == null)
             return Result.createNotApplicable();
-        if (display instanceof DefaultCraftingDisplay) {
-            DefaultCraftingDisplay<?> craftingDisplay = (DefaultCraftingDisplay<?>) display;
+        if (display instanceof DefaultCraftingDisplay<?> craftingDisplay) {
             if (craftingDisplay.getOptionalRecipe().isPresent()) {
                 int h = -1, w = -1;
                 if (container instanceof CraftingMenu) {
@@ -77,8 +75,7 @@ public class DefaultRecipeBookHandler implements TransferHandler {
                 context.getMinecraft().gameMode.handlePlaceRecipe(container.containerId, recipe, Screen.hasShiftDown());
                 return Result.createSuccessful();
             }
-        } else if (display instanceof DefaultCookingDisplay) {
-            DefaultCookingDisplay defaultDisplay = (DefaultCookingDisplay) display;
+        } else if (display instanceof DefaultCookingDisplay defaultDisplay) {
             if (defaultDisplay.getOptionalRecipe().isPresent()) {
                 Recipe<?> recipe = (defaultDisplay).getOptionalRecipe().get();
                 if (!context.getMinecraft().player.getRecipeBook().contains(recipe))
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);
     }
     
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
index 55cb3f4d1..6eadc9d81 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
@@ -53,6 +53,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.material.Fluid;
@@ -84,8 +85,9 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
     public void registerFluidSupport(FluidSupportProvider support) {
         support.register(entry -> {
             ItemStack stack = entry.getValue();
-            if (stack.getItem() instanceof BucketItem) {
-                Fluid fluid = ((BucketItem) stack.getItem()).content;
+            Item item = stack.getItem();
+            if (item instanceof BucketItem bucketItem) {
+                Fluid fluid = bucketItem.content;
                 if (fluid != null) {
                     return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid, FluidStackHooks.bucketAmount())));
                 }
@@ -125,13 +127,13 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
     
     @Override
     public void registerMenuInfo(MenuInfoRegistry registry) {
-        registry.register(BuiltinPlugin.CRAFTING, CraftingMenu.class, new RecipeBookGridMenuInfo<CraftingMenu, DefaultCraftingDisplay<?>>() {
+        registry.register(BuiltinPlugin.CRAFTING, CraftingMenu.class, new RecipeBookGridMenuInfo<>() {
             @Override
             public List<List<ItemStack>> getInputs(MenuInfoContext<CraftingMenu, ?, DefaultCraftingDisplay<?>> context) {
                 return context.getDisplay().getOrganisedInputEntries(this, context.getMenu());
             }
         });
-        registry.register(BuiltinPlugin.CRAFTING, InventoryMenu.class, new RecipeBookGridMenuInfo<InventoryMenu, DefaultCraftingDisplay<?>>() {
+        registry.register(BuiltinPlugin.CRAFTING, InventoryMenu.class, new RecipeBookGridMenuInfo<>() {
             @Override
             public List<List<ItemStack>> getInputs(MenuInfoContext<InventoryMenu, ?, DefaultCraftingDisplay<?>> context) {
                 return context.getDisplay().getOrganisedInputEntries(this, context.getMenu());
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 58c77e7b9..cc79a76a1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -464,8 +464,8 @@ public class RoughlyEnoughItemsCore {
         });
         NetworkManager.registerReceiver(NetworkManager.s2c(), RoughlyEnoughItemsNetwork.NOT_ENOUGH_ITEMS_PACKET, (buf, context) -> {
             Screen currentScreen = Minecraft.getInstance().screen;
-            if (currentScreen instanceof CraftingScreen) {
-                RecipeBookComponent recipeBookGui = ((RecipeUpdateListener) currentScreen).getRecipeBookComponent();
+            if (currentScreen instanceof CraftingScreen craftingScreen) {
+                RecipeBookComponent recipeBookGui = craftingScreen.getRecipeBookComponent();
                 GhostRecipe ghostSlots = recipeBookGui.ghostRecipe;
                 ghostSlots.clear();
                 
@@ -481,7 +481,7 @@ public class RoughlyEnoughItemsCore {
                 }
                 
                 ghostSlots.addIngredient(Ingredient.of(Items.STONE), 381203812, 12738291);
-                CraftingMenu container = ((CraftingScreen) currentScreen).getMenu();
+                CraftingMenu container = craftingScreen.getMenu();
                 for (int i = 0; i < input.size(); i++) {
                     List<ItemStack> stacks = input.get(i);
                     if (!stacks.isEmpty()) {
@@ -534,9 +534,9 @@ public class RoughlyEnoughItemsCore {
         ClientGuiEvent.INIT_POST.register((screen, access) -> {
             REIRuntimeImpl.getInstance().setPreviousScreen(screen);
             if (ConfigObject.getInstance().doesDisableRecipeBook() && screen instanceof AbstractContainerScreen) {
-                access.getRenderables().removeIf(widget -> widget instanceof ImageButton && ((ImageButton) widget).resourceLocation.equals(recipeButtonTex));
-                access.getNarratables().removeIf(widget -> widget instanceof ImageButton && ((ImageButton) widget).resourceLocation.equals(recipeButtonTex));
-                screen.children().removeIf(widget -> widget instanceof ImageButton && ((ImageButton) widget).resourceLocation.equals(recipeButtonTex));
+                access.getRenderables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
+                access.getNarratables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
+                screen.children().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
             }
         });
         ClientScreenInputEvent.MOUSE_CLICKED_PRE.register((minecraftClient, screen, mouseX, mouseY, button) -> {
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);<