From b2d7bc2794d5bfa972cad50a4d681d84995fd4c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 25 Jun 2016 16:09:46 -0500 Subject: [PATCH] Pick block for entities --- .../vazkii/botania/common/entity/EntityCorporeaSpark.java | 7 +++++++ .../vazkii/botania/common/entity/EntityPoolMinecart.java | 7 +++++++ .../java/vazkii/botania/common/entity/EntitySpark.java | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 420497254..20ac2dd47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -25,6 +25,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; @@ -71,6 +72,12 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { dataManager.register(DISPLAY_STACK, Optional.absent()); } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return isMaster() ? new ItemStack(ModItems.corporeaSpark, 1, 1) : new ItemStack(ModItems.corporeaSpark); + } + @Override public boolean canBeCollidedWith() { return true; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 50c3f069d..de95a2998 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -24,6 +24,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; @@ -80,6 +81,12 @@ public class EntityPoolMinecart extends EntityMinecart { return false; } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return new ItemStack(ModItems.poolMinecart); + } + @Override public void killMinecart(DamageSource source) { super.killMinecart(source); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 795c14410..c4a7e28c2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; @@ -72,6 +73,12 @@ public class EntitySpark extends Entity implements ISparkEntity { dataManager.register(UPGRADE, 0); } + @Nonnull + @Override + public ItemStack getPickedResult(RayTraceResult target) { + return new ItemStack(ModItems.spark); + } + @Override public void onUpdate() { super.onUpdate();