From 645c54d0611b8f44a6851b06c2cc74c78d824331 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 1 Jun 2021 02:28:36 +0800 Subject: cast().getValue() -> castValue() --- api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java | 4 ++++ .../java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java | 4 +++- api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java | 2 +- .../java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java | 2 +- .../rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java | 5 +++-- .../shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java | 2 +- .../me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java | 2 +- 7 files changed, 14 insertions(+), 7 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 extends TextRepresentable, Renderer { T getValue(); + default R castValue() { + return (R) getValue(); + } + EntryStack setting(Settings settings, R value); EntryStack removeSetting(Settings 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 ex default List> getInputs(MenuInfoContext 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.cast().getValue())); + CollectionUtils., 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 leftType = left.getType(); EntryType rightType = right.getType(); if (leftType == rightType) { - return left.getDefinition().equals(left.getValue(), right.cast().getValue(), context); + return left.getDefinition().equals(left.getValue(), right.castValue(), context); } for (EntryTypeBridge bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) { InteractionResultHolder>> holder = bridge.bridge(left); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index 94534142c..4a229a3c2 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -228,7 +228,7 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin } EntryIngredient arrowStack = EntryIngredient.of(EntryStacks.of(Items.ARROW)); ReferenceSet registeredPotions = new ReferenceOpenHashSet<>(); - EntryRegistry.getInstance().getEntryStacks().filter(entry -> entry.getValueType() == ItemStack.class && entry.cast().getValue().getItem() == Items.LINGERING_POTION).forEach(entry -> { + EntryRegistry.getInstance().getEntryStacks().filter(entry -> entry.getValueType() == ItemStack.class && entry.castValue().getItem() == Items.LINGERING_POTION).forEach(entry -> { ItemStack itemStack = (ItemStack) entry.getValue(); Potion potion = PotionUtils.getPotion(itemStack); if (registeredPotions.add(potion)) { diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java index ea442b696..10516c2b5 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java @@ -27,6 +27,7 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; +import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import me.shedaniel.rei.api.common.transfer.info.simple.SimpleGridMenuInfo; import me.shedaniel.rei.api.common.util.CollectionUtils; @@ -69,8 +70,8 @@ public abstract class DefaultCraftingDisplay> extends BasicD list.add(Collections.emptyList()); } for (int i = 0; i < getInputEntries().size(); i++) { - List stacks = CollectionUtils.filterAndMap(getInputEntries().get(i), stack -> stack.getType() == VanillaEntryTypes.ITEM, - stack -> stack.cast().getValue()); + List stacks = CollectionUtils., ItemStack>filterAndMap(getInputEntries().get(i), stack -> stack.getType() == VanillaEntryTypes.ITEM, + EntryStack::castValue); list.set(getSlotWithSize(this, i, menuInfo.getCraftingWidth(container)), stacks); } return list; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java index c44622f1a..143d93662 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryListEntryWidget.java @@ -85,7 +85,7 @@ public abstract class EntryListEntryWidget extends EntryWidget { } } if (entry.getValueType() == ItemStack.class) - entry.cast().getValue().setCount(button != 1 && !Screen.hasShiftDown() ? 1 : ((ItemStack) entry.getValue()).getMaxStackSize()); + entry.castValue().setCount(button != 1 && !Screen.hasShiftDown() ? 1 : entry.castValue().getMaxStackSize()); return ClientHelper.getInstance().tryCheatingEntry(entry); } 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 b645040a1..ee03470e0 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 @@ -231,7 +231,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin { } } if (entry.getType() == VanillaEntryTypes.ITEM) - entry.cast().getValue().setCount(button != 1 && !Screen.hasShiftDown() ? 1 : ((ItemStack) entry.getValue()).getMaxStackSize()); + entry.castValue().setCount(button != 1 && !Screen.hasShiftDown() ? 1 : entry.castValue().getMaxStackSize()); return ClientHelper.getInstance().tryCheatingEntry(entry); } -- cgit