diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java b/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java index 085515b2..4c4af9d6 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemDiamondChisel.java @@ -3,27 +3,23 @@ package com.cricketcraft.chisel.item; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ChiselMode; import com.cricketcraft.chisel.api.IChiselMode; -import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.Carving; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import java.util.HashSet; import java.util.List; -import java.util.Set; -public class ItemDiamondChisel extends ItemTool implements IChiselMode{ +public class ItemDiamondChisel extends Item implements IChiselMode{ public static Carving carving = Carving.chisel; private static final HashSet toolSet = new HashSet(); public ItemDiamondChisel() { - super(1, ToolMaterial.IRON, CarvableHelper.getChiselBlockSet()); + super(); setMaxStackSize(1); - setMaxDamage(-1); - efficiencyOnProperMaterial = 100F; setUnlocalizedName("diamondChisel"); toolSet.add("chisel"); } @@ -33,21 +29,9 @@ public class ItemDiamondChisel extends ItemTool implements IChiselMode{ if(!entityplayer.isSneaking()) entityplayer.openGui(Chisel.instance, 0, world, 0, 0, 0); - - return itemstack; } - @Override - public Set getToolClasses(ItemStack itemStack){ - return toolSet; - } - - @Override - public boolean onBlockStartBreak(ItemStack itemStack, int x, int y, int z, EntityPlayer player){ - return true; - } - @Override public ChiselMode getChiselMode(ItemStack itemStack){ return ChiselMode.SINGLE; diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png deleted file mode 100644 index 2ff6336d..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png deleted file mode 100644 index bbce0669..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta deleted file mode 100644 index a1eb85fb..00000000 --- a/src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta +++ /dev/null @@ -1,18 +0,0 @@ -{ - "animation": { - "width": 16, - "height": 16, - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - ] - } -} \ No newline at end of file