Use Java 16 features

5 files changed, 12 insertions, 16 deletions

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());