cast().getValue() -> castValue()

3 files changed, 8 insertions, 2 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
index 926ce3265..c9810211d 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java
@@ -133,6 +133,10 @@ public interface EntryStack<T> extends TextRepresentable, Renderer {
     
     T getValue();
     
+    default <R> R castValue() {
+        return (R) getValue();
+    }
+    
     <R> EntryStack<T> setting(Settings<R> settings, R value);
     
     <R> EntryStack<T> removeSetting(Settings<R> settings);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java
index 283a2078f..bf7927c2e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.api.common.transfer.info;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry;
+import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
 import me.shedaniel.rei.api.common.transfer.RecipeFinder;
 import me.shedaniel.rei.api.common.transfer.RecipeFinderPopulator;
@@ -120,7 +121,8 @@ public interface MenuInfo<T extends AbstractContainerMenu, D extends Display> ex
     default List<List<ItemStack>> getInputs(MenuInfoContext<T, ?, D> context) {
         if (context.getDisplay() == null) return Collections.emptyList();
         return CollectionUtils.map(context.getDisplay().getInputEntries(), inputEntry ->
-                CollectionUtils.filterAndMap(inputEntry, stack -> stack.getType() == VanillaEntryTypes.ITEM, stack -> stack.<ItemStack>cast().getValue()));
+                CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(inputEntry, 
+                        stack -> stack.getType() == VanillaEntryTypes.ITEM, EntryStack::castValue));
     }
     
     /**
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
index b100bcba7..02459b8e8 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
@@ -81,7 +81,7 @@ public final class EntryStacks {
         EntryType<A> leftType = left.getType();
         EntryType<B> rightType = right.getType();
         if (leftType == rightType) {
-            return left.getDefinition().equals(left.getValue(), right.<A>cast().getValue(), context);
+            return left.getDefinition().equals(left.getValue(), right.<A>castValue(), context);
         }
         for (EntryTypeBridge<A, B> bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) {
             InteractionResultHolder<Stream<EntryStack<B>>> holder = bridge.bridge(left);