From 335dd553dece5466e90385cd62dbde2fbd7bfe95 Mon Sep 17 00:00:00 2001 From: Cricket Date: Tue, 6 Jan 2015 20:34:41 -0500 Subject: [PATCH] Fixed durability, and removed my stuff --- .../chisel/item/ItemDiamondChisel.java | 22 +++--------------- .../blocks/futura/cricketTest-ctm.png | Bin 3897 -> 0 bytes .../textures/blocks/futura/cricketTest.png | Bin 1005 -> 0 bytes .../blocks/futura/cricketTest.png.mcmeta | 18 -------------- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/cricketTest.png.mcmeta 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 2ff6336d8e467fa2e76cb15db3b94e30f13eb34b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3897 zcmeAS@N?(olHy`uVBq!ia0vp^3JeU48#tJOtp8i58v-fD;vjb?hIQv;UIIBR>5jgR z3=A9lx&I`xGB7YR1o(uw0>#bD%+l+PeSCb3eK*zHZ}P35S${@yrm^vjdgD#LH=e#X zo;-OnP}wLL4T0eo0)dxa-UQ|ohLRw^;Qu2VFa&>RR|Uo}XMsm#F#`kNVGw3Kp1&dm zC@4|l8c`CQpH@rz%|L!#W5tqxp!*!w8gvl zTn-z&Kl%UvyPaECr#y_w2@B6?da`zsLg(*Nul?umPrA3{@&7NcratQX{`+rq{nxS+ z2Y-IExOb}Ohe^QEodyL*nG`txPU<^v!6*76M%U`t!9RNXD$&W+LMFFxW@5z-uow&K1e>G3{YX6;ISA7q= zbMJVC-1;4{Ugga5mb^<6d&^K$$`p{4db9PF>!a^0cPr#ddP%TeHA1f7`R3D5zF={9rR%(EICb5`5JQY_}cwaKn1a z@n&b6Zw{3mw#S(p+`Ob->}a?k z$Z*Qiq2l_SEi;lB#n*1`sFaFt&Y14Y!_VNgMrU`xUXMSPrQ%C;ojD&f{G0Xa@qtjrm^fnw zje~Q32~X%QGgz?r-8NI1ApLcp))pGG7H3PuL+Ra%atw z)vOKAeoRng*3thL|KLu;x;>3orp(*-tv9TJXFIzQpIx@X*Sg$>ha1>$C3Exi?{%)U zu{e^}$c?(l$(OW(=PzkMSPhieg^#$NIl#)#O*zm#e;d75HRv-Z#PeqU7cFHdT$zI%ti(er~OMF8}~W0T7`G_6&6TLw7XYq!;rCLNn;;3hb-fQ zIm|8PXFa<$#R@K3y*@EP`52?-f~G|;%`EqQSRfPPzG=IAY~_HgqLPOKm9*Z*fe^Y6CIsxNBWK^+%QS3j3^P60g9%9XDb~CLQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&g2c?c61}|C5(N`I z13lB!R-;q~2Ie?V7srqY_qo#!=E^$qIA3;qW$++ds^hhXq+XJL-r>?E4JH$cqdGSE zKMascY>aJ^2$-^BrtRPVPrs`DW9|F@qoUF?wV;@F-~0}_5?@IPCI?2ZMAj`Q-EVXL z=6yV2&L@@pH#@i-t{1g6B$rn?%yyI2X)HdvA=Hm^14EX_^6on33oJ_w>^XNW7Il01{fmlOf2?`oczsHvB7?{RkuZnZHCyIxxNpFBQq%v_vA)#| zCA#Sx7G=xXw`5*9C}a`N6a91w1NVZql3g#%8GHk{K2KhdeaeBe;l)y;9WxuFD@0EG z?tA=w{zK2abqw=GZC}hXGGJ+7nsSIMV{-pC;cwE%6fK{6-n&sK+OX~^599H7UmDDM ztsX5co-KjEZx9#>&fD`Eq~hzJ^U&s znU}?|F37fYKCsc+c7g9=zG(+`Cf(3l&Jw|3y5zF!e#VTZpc(U7fWhd+;G#eE;8~tK rhZZ~BE0>v{zdwk|E@q31|Ic(O!lbP0l+XkKSoxdn 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