From a39d028f5e3c26939c28efdddab281c7c91c3822 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 2 Jun 2021 15:55:21 +0800 Subject: InteractionResultHolder -> CompoundEventResult --- .../display/visibility/DisplayVisibilityPredicate.java | 3 ++- .../api/client/registry/screen/FocusedStackProvider.java | 4 ++-- .../rei/api/common/entry/type/EntryTypeBridge.java | 4 ++-- .../rei/api/common/fluid/FluidSupportProvider.java | 5 ++--- .../me/shedaniel/rei/api/common/util/EntryStacks.java | 15 +++++++-------- 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'api/src/main/java/me') diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/visibility/DisplayVisibilityPredicate.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/visibility/DisplayVisibilityPredicate.java index 16a13c04c..e9368fb75 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/visibility/DisplayVisibilityPredicate.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/visibility/DisplayVisibilityPredicate.java @@ -23,6 +23,7 @@ package me.shedaniel.rei.api.client.registry.display.visibility; +import dev.architectury.event.EventResult; import me.shedaniel.rei.api.client.registry.display.DisplayCategory; import me.shedaniel.rei.api.common.display.Display; import net.fabricmc.api.EnvType; @@ -50,7 +51,7 @@ public interface DisplayVisibilityPredicate extends Comparable category, Display display); + EventResult handleDisplay(DisplayCategory category, Display display); @Override default int compareTo(DisplayVisibilityPredicate o) { diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/FocusedStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/FocusedStackProvider.java index 9c115593e..7eb47bfeb 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/FocusedStackProvider.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/screen/FocusedStackProvider.java @@ -23,12 +23,12 @@ package me.shedaniel.rei.api.client.registry.screen; +import dev.architectury.event.CompoundEventResult; import me.shedaniel.math.Point; import me.shedaniel.rei.api.common.entry.EntryStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.world.InteractionResultHolder; @FunctionalInterface @Environment(EnvType.CLIENT) @@ -40,7 +40,7 @@ public interface FocusedStackProvider extends Comparable { return 0d; } - InteractionResultHolder> provide(Screen screen, Point mouse); + CompoundEventResult> provide(Screen screen, Point mouse); @Override default int compareTo(FocusedStackProvider o) { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeBridge.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeBridge.java index 7f81fc181..fcbf6e3db 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeBridge.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeBridge.java @@ -23,8 +23,8 @@ package me.shedaniel.rei.api.common.entry.type; +import dev.architectury.event.CompoundEventResult; import me.shedaniel.rei.api.common.entry.EntryStack; -import net.minecraft.world.InteractionResultHolder; import java.util.stream.Stream; @@ -37,5 +37,5 @@ import java.util.stream.Stream; */ @FunctionalInterface public interface EntryTypeBridge { - InteractionResultHolder>> bridge(EntryStack object); + CompoundEventResult>> bridge(EntryStack object); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/fluid/FluidSupportProvider.java b/api/src/main/java/me/shedaniel/rei/api/common/fluid/FluidSupportProvider.java index 0cea4cc0d..bc9ca90d8 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/fluid/FluidSupportProvider.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/fluid/FluidSupportProvider.java @@ -23,14 +23,13 @@ package me.shedaniel.rei.api.common.fluid; +import dev.architectury.event.CompoundEventResult; import dev.architectury.fluid.FluidStack; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.api.common.plugins.REIPlugin; import me.shedaniel.rei.api.common.registry.Reloadable; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.item.ItemStack; -import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; @@ -50,6 +49,6 @@ public interface FluidSupportProvider extends Reloadable>, List>> itemToFluid(EntryStack stack); + CompoundEventResult>> itemToFluid(EntryStack stack); } } 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 02459b8e8..8b421e151 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 @@ -23,6 +23,7 @@ package me.shedaniel.rei.api.common.util; +import dev.architectury.event.CompoundEventResult; import dev.architectury.fluid.FluidStack; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.comparison.ComparisonContext; @@ -30,8 +31,6 @@ import me.shedaniel.rei.api.common.entry.type.EntryType; import me.shedaniel.rei.api.common.entry.type.EntryTypeBridge; import me.shedaniel.rei.api.common.entry.type.EntryTypeRegistry; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.material.Fluid; @@ -84,9 +83,9 @@ public final class EntryStacks { return left.getDefinition().equals(left.getValue(), right.castValue(), context); } for (EntryTypeBridge bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) { - InteractionResultHolder>> holder = bridge.bridge(left); - if (holder.getResult() == InteractionResult.SUCCESS) { - Iterator> iterator = holder.getObject().iterator(); + CompoundEventResult>> holder = bridge.bridge(left); + if (holder.isTrue()) { + Iterator> iterator = holder.object().iterator(); while (iterator.hasNext()) { EntryStack next = iterator.next(); if (next.getDefinition().equals(next.getValue(), right.getValue(), context)) { @@ -96,9 +95,9 @@ public final class EntryStacks { } } for (EntryTypeBridge bridge : EntryTypeRegistry.getInstance().getBridgesFor(rightType, leftType)) { - InteractionResultHolder>> holder = bridge.bridge(right); - if (holder.getResult() == InteractionResult.SUCCESS) { - Iterator> iterator = holder.getObject().iterator(); + CompoundEventResult>> holder = bridge.bridge(right); + if (holder.isTrue()) { + Iterator> iterator = holder.object().iterator(); while (iterator.hasNext()) { EntryStack next = iterator.next(); if (next.getDefinition().equals(next.getValue(), left.getValue(), context)) { -- cgit