From 6d5041d0e63b5c87c324b5cd6c298ceb77585ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 2 Aug 2021 23:31:13 +0200
Subject: [PATCH] Missed some changes for
 944ed7d223fc7a60dd1382467b6d7d71fee784e7.

---
 .../tileentity/DiskDriveTileEntity.java       | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
index a26c76fd..f48705ef 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
@@ -19,6 +19,7 @@ import li.cil.oc2.common.util.ThrottledSoundEmitter;
 import li.cil.sedna.api.device.BlockDevice;
 import li.cil.sedna.device.block.ByteBufferBlockDevice;
 import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
@@ -70,26 +71,36 @@ public final class DiskDriveTileEntity extends AbstractTileEntity {
         return device;
     }
 
-    public ItemStack insert(final ItemStack stack) {
+    public boolean canInsert(final ItemStack stack) {
+        return !stack.isEmpty() && ItemTags.DEVICES_FLOPPY.contains(stack.getItem());
+    }
+
+    public ItemStack insert(final ItemStack stack, @Nullable final PlayerEntity player) {
         if (stack.isEmpty() || !ItemTags.DEVICES_FLOPPY.contains(stack.getItem())) {
             return stack;
         }
 
-        eject();
-
-        if (!stack.isEmpty()) {
-            insertSoundEmitter.play();
-        }
+        eject(player);
 
+        insertSoundEmitter.play();
         return itemHandler.insertItem(0, stack, false);
     }
 
-    public void eject() {
+    public boolean canEject() {
+        return !itemHandler.extractItem(0, 1, true).isEmpty();
+    }
+
+    public void eject(@Nullable final PlayerEntity player) {
         final ItemStack stack = itemHandler.extractItem(0, 1, false);
         if (!stack.isEmpty()) {
             final Direction facing = getBlockState().getValue(DiskDriveBlock.FACING);
-            ItemStackUtils.spawnAsEntity(level, getBlockPos().relative(facing), stack, facing);
             ejectSoundEmitter.play();
+            ItemStackUtils.spawnAsEntity(level, getBlockPos().relative(facing), stack, facing).ifPresent(entity -> {
+                if (player != null) {
+                    entity.setNoPickUpDelay();
+                    entity.setOwner(player.getUUID());
+                }
+            });
         }
     }