aboutsummaryrefslogtreecommitdiff
path: root/default-plugin
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-06-02 15:55:21 +0800
committershedaniel <daniel@shedaniel.me>2021-06-02 15:55:21 +0800
commita39d028f5e3c26939c28efdddab281c7c91c3822 (patch)
tree52258abc0f9b35e633798780e6d6e99090ff3309 /default-plugin
parent6cfb14f181892d055e557fae4716749ff508ffbc (diff)
downloadRoughlyEnoughItems-a39d028f5e3c26939c28efdddab281c7c91c3822.tar.gz
RoughlyEnoughItems-a39d028f5e3c26939c28efdddab281c7c91c3822.tar.bz2
RoughlyEnoughItems-a39d028f5e3c26939c28efdddab281c7c91c3822.zip
InteractionResultHolder -> CompoundEventResult
Diffstat (limited to 'default-plugin')
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java6
1 files changed, 3 insertions, 3 deletions
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 48778e497..55cb3f4d1 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
@@ -23,6 +23,7 @@
package me.shedaniel.rei.plugin.common;
+import dev.architectury.event.CompoundEventResult;
import dev.architectury.hooks.fluid.FluidStackHooks;
import dev.architectury.injectables.annotations.ExpectPlatform;
import dev.architectury.injectables.annotations.PlatformOnly;
@@ -50,7 +51,6 @@ import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
-import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.inventory.*;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.ItemStack;
@@ -87,10 +87,10 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
if (stack.getItem() instanceof BucketItem) {
Fluid fluid = ((BucketItem) stack.getItem()).content;
if (fluid != null) {
- return InteractionResultHolder.success(Stream.of(EntryStacks.of(fluid, FluidStackHooks.bucketAmount())));
+ return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid, FluidStackHooks.bucketAmount())));
}
}
- return InteractionResultHolder.pass(null);
+ return CompoundEventResult.pass();
});
if (Platform.isForge()) {
registerForgeFluidSupport(support);