Use Java 16 features

16 files changed, 67 insertions, 60 deletions

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);
         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() {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
index 2b9ed42ed..6bbf0954e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/category/CategoryIdentifierImpl.java
@@ -28,14 +28,18 @@ import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.impl.Internals;
 import net.minecraft.resources.ResourceLocation;
 
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
 public class CategoryIdentifierImpl<D extends Display> implements CategoryIdentifier<D> {
     private final ResourceLocation location;
+    private final int hashCode;
     
     public CategoryIdentifierImpl(ResourceLocation location) {
         this.location = Objects.requireNonNull(location);
+        this.hashCode = location.hashCode();
     }
     
     @Override
@@ -45,13 +49,13 @@ public class CategoryIdentifierImpl<D extends Display> implements CategoryIdenti
     
     @Override
     public int hashCode() {
-        return location.hashCode();
+        return hashCode;
     }
     
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof CategoryIdentifier)) return false;
-        return location.equals(((CategoryIdentifier<?>) obj).getIdentifier());
+        if (!(obj instanceof CategoryIdentifier<?> that)) return false;
+        return location.equals(that.getIdentifier());
     }
     
     @Override
@@ -60,6 +64,13 @@ public class CategoryIdentifierImpl<D extends Display> implements CategoryIdenti
     }
     
     public static void attach() {
-        Internals.attachInstance((Function<ResourceLocation, CategoryIdentifier<?>>) CategoryIdentifierImpl::new, "categoryIdentifier");
+        Map<String, CategoryIdentifier<?>> cache = new ConcurrentHashMap<>();
+        Internals.attachInstance((Function<String, CategoryIdentifier<?>>) id -> {
+            CategoryIdentifier<?> identifier = cache.get(id);
+            if (identifier != null) return identifier;
+            identifier = new CategoryIdentifierImpl<>(new ResourceLocation(id));
+            cache.put(id, identifier);
+            return identifier;
+        }, "categoryIdentifier");
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
index db95d6a76..ae09bcd7e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
@@ -171,8 +171,7 @@ public abstract class AbstractEntryStack<A> extends AbstractRenderer implements
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof AbstractEntryStack)) return false;
-        AbstractEntryStack<?> that = (AbstractEntryStack<?>) o;
+        if (!(o instanceof AbstractEntryStack<?> that)) return false;
         return EntryStacks.equalsExact(this, that);
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
index b6a706d9d..1d9214326 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
@@ -58,11 +58,11 @@ public class EntryIngredientImpl {
             @Override
             public EntryIngredient of(Iterable<EntryStack<?>> stacks) {
                 if (stacks instanceof EntryIngredient) return (EntryIngredient) stacks;
-                if (stacks instanceof Collection) {
-                    int size = ((Collection<EntryStack<?>>) stacks).size();
+                if (stacks instanceof Collection<EntryStack<?>> collection) {
+                    int size = collection.size();
                     if (size == 0) return empty();
                     if (size == 1) return of(stacks.iterator().next());
-                    return _of(((Collection<EntryStack<?>>) stacks).toArray(new EntryStack[0]));
+                    return _of(collection.toArray(new EntryStack[0]));
                 }
                 return _of(StreamSupport.stream(stacks.spliterator(), false).toArray(EntryStack[]::new));
             }
@@ -125,8 +125,7 @@ public class EntryIngredientImpl {
         
         @Override
         public EntryIngredient.Builder addAll(Iterable<? extends EntryStack<?>> stacks) {
-            if (stacks instanceof Collection) {
-                Collection<?> collection = (Collection<?>) stacks;
+            if (stacks instanceof Collection<?> collection) {
                 ensureCapacity(size + collection.size());
             }
             for (EntryStack<?> stack : stacks) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java
index e25f754f1..89c2653fb 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java
@@ -74,8 +74,8 @@ public class NbtHasherProviderImpl implements Internals.NbtHasherProvider {
         
         private int hashTag(Tag tag) {
             if (tag == null) return 0;
-            if (tag instanceof ListTag) return hashListTag((ListTag) tag);
-            if (tag instanceof CompoundTag) return hashCompoundTag((CompoundTag) tag);
+            if (tag instanceof ListTag list) return hashListTag(list);
+            if (tag instanceof CompoundTag compound) return hashCompoundTag(compound);
             return tag.hashCode();
         }
         
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java b/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
index 4fa47b9bf..2efe420a9 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java
@@ -56,9 +56,8 @@ import java.util.List;
 public class DefaultCategoryHandler implements TransferHandler {
     @Override
     public Result handle(Context context) {
-        if (!(context.getDisplay() instanceof SimpleGridMenuDisplay))
+        if (!(context.getDisplay() instanceof SimpleGridMenuDisplay display))
             return Result.createNotApplicable();
-        SimpleGridMenuDisplay display = (SimpleGridMenuDisplay) context.getDisplay();
         AbstractContainerScreen<?> containerScreen = context.getContainerScreen();
         if (containerScreen == null) {
             return Result.createNotApplicable();
@@ -87,8 +86,8 @@ public class DefaultCategoryHandler implements TransferHandler {
         }
         
         context.getMinecraft().setScreen(containerScreen);
-        if (containerScreen instanceof RecipeUpdateListener) {
-            ((RecipeUpdateListener) containerScreen).getRecipeBookComponent().ghostRecipe.clear();
+        if (containerScreen instanceof RecipeUpdateListener listener) {
+            listener.getRecipeBookComponent().ghostRecipe.clear();
         }
         FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
         buf.writeResourceLocation(display.getCategoryIdentifier().getIdentifier());
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
index 397fcb04e..c8aa88143 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
@@ -255,8 +255,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
         
         @Override
         public boolean isSame(FavoriteEntry other) {
-            if (!(other instanceof EntryStackFavoriteEntry)) return false;
-            EntryStackFavoriteEntry that = (EntryStackFavoriteEntry) other;
+            if (!(other instanceof EntryStackFavoriteEntry that)) return false;
             return EntryStacks.equalsExact(stack, that.stack);
         }
     }
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
index 26c69543f..121c49c18 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
@@ -116,7 +116,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
     @Override
     public FluidStack normalize(EntryStack<FluidStack> entry, FluidStack value) {
         Fluid fluid = value.getFluid();
-        if (fluid instanceof FlowingFluid) fluid = ((FlowingFluid) fluid).getSource();
+        if (fluid instanceof FlowingFluid flowingFluid) fluid = flowingFluid.getSource();
         FluidStack copy = FluidStack.create(fluid, value.getAmount(), value.getTag());
         copy.setAmount(FluidStack.bucketAmount());
         return copy;