PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the bucket tag for filling jars instead of just the vanilla bucket

Browse source
This commit is contained in:
Sollace 2024-10-08 15:02:26 +01:00
parent e9ee61d8da
commit 9c3e2184db
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/block/jar/FluidOnlyJarContents.java
View file

@ -6,11 +6,11 @@ import com.minelittlepony.unicopia.block.ItemJarBlock.TileData;
import com.minelittlepony.unicopia.util.FluidHelper; import com.minelittlepony.unicopia.util.FluidHelper;
import com.minelittlepony.unicopia.util.serialization.NbtSerialisable; import com.minelittlepony.unicopia.util.serialization.NbtSerialisable;
import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.RegistryWrapper.WrapperLookup;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
@ -29,7 +29,7 @@ public record FluidOnlyJarContents (
@Override @Override
public TypedActionResult<JarContents> interact(PlayerEntity player, Hand hand) { public TypedActionResult<JarContents> interact(PlayerEntity player, Hand hand) {
ItemStack stack = player.getStackInHand(hand); ItemStack stack = player.getStackInHand(hand);
if (stack.isOf(Items.BUCKET)) { if (stack.isIn(ConventionalItemTags.EMPTY_BUCKETS)) {
long remainder = FluidHelper.deposit(stack, player, hand, fluid, amount); long remainder = FluidHelper.deposit(stack, player, hand, fluid, amount);
tile.markDirty(); tile.markDirty();
fluid.getFluid().getBucketFillSound().ifPresent(sound -> player.playSound(sound, 1, 1)); fluid.getFluid().getBucketFillSound().ifPresent(sound -> player.playSound(sound, 1, 1));