more entity events and entity item api

This commit is contained in:
gnembon committed 2019-09-03 09:16:18 -03:00
1 parent 25b37913f2
commit 06b3f7c532
9 files changed
+121 -21

No files matched your search

@@ -2,7 +2,7 @@ package carpet.mixins;
import carpet.settings.CarpetSettings;
import carpet.helpers.InventoryHelper;
import carpet.utils.IItemEntity;
import carpet.fakes.ItemEntityInterface;
import net.minecraft.block.ShulkerBoxBlock;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
@@ -18,7 +18,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ItemEntity.class)
public abstract class ItemEntityMixin extends Entity implements IItemEntity {
public abstract class ItemEntityMixin extends Entity implements ItemEntityInterface
{
private static final int SHULKERBOX_MAX_STACK_AMOUNT = 64;
@Shadow private int age;
@@ -89,8 +90,8 @@ public abstract class ItemEntityMixin extends Entity implements IItemEntity {
selfStack.increment(amount);
self.setStack(selfStack);
this.pickupDelay = Math.max(((IItemEntity)other).getPickupDelay(), this.pickupDelay);
this.age = Math.min(((IItemEntity)other).getAge(), this.age);
this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelay(), this.pickupDelay);
this.age = Math.min(((ItemEntityInterface)other).getAge(), this.age);
otherStack.decrement(amount);
if (otherStack.isEmpty())