Use Java 16 features

3 files changed, 5 insertions, 7 deletions

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;