From ff1425f773180f542f6ad828f676abb71209615c Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 4 Feb 2016 17:43:29 -0800 Subject: [PATCH] Alchemy Array no longer has missing particles for break animation Also provides Arcane Ashes on pick block. --- .../bloodmagic/block/BlockAlchemyArray.java | 12 ++++++++---- .../bloodmagic/blockstates/BlockAlchemyArray.json | 2 +- .../bloodmagic/models/block/BlockAlchemyArray.json | 6 ++++++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockAlchemyArray.json diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 639f1c96..6e54fde3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block; import java.util.List; import java.util.Random; +import WayofTime.bloodmagic.registry.ModItems; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -10,10 +11,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -89,6 +87,12 @@ public class BlockAlchemyArray extends BlockContainer return true; } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) + { + return new ItemStack(ModItems.arcaneAshes); + } + @Override public int quantityDropped(Random random) { diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockAlchemyArray.json b/src/main/resources/assets/bloodmagic/blockstates/BlockAlchemyArray.json index 6e051692..bb6a9c7a 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockAlchemyArray.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockAlchemyArray.json @@ -3,7 +3,7 @@ "normal": { "model": "bloodmagic:BlockAlchemyArray", "textures": { - "all": "bloodmagic:blocks/BlockBloodLight" + "all": "bloodmagic:models/AlchemyArrays/AirSigil" } } } diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockAlchemyArray.json b/src/main/resources/assets/bloodmagic/models/block/BlockAlchemyArray.json new file mode 100644 index 00000000..907873ee --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockAlchemyArray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:models/AlchemyArrays/AirSigil" + } +}