Use Java 16 features

6 files changed, 25 insertions, 26 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);
     }