From 7b2b53d370c670a9d67ecb052b1653b6723fdcc5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 20 May 2014 23:15:53 +0100 Subject: [PATCH] Some work on the Terra Shatterer, mode enabling and disabled now works. --- .../item/equipment/tool/ItemTerraPick.java | 29 ++++++++++++++++-- resources/assets/botania/lang/en_US.lang | 2 +- .../botania/textures/items/terraPick1.png | Bin 2913 -> 3214 bytes 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java index da12f41ee..541680e0b 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -11,21 +11,37 @@ */ package vazkii.botania.common.item.equipment.tool; +import java.awt.Color; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; public class ItemTerraPick extends ItemManasteelPick { + private static final String TAG_ENABLED = "enabled"; + IIcon iconTool, iconOverlay; public ItemTerraPick() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_PICK); } + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + ItemNBTHelper.setBoolean(par1ItemStack, TAG_ENABLED, !isEnabled(par1ItemStack)); + return par1ItemStack; + } + @Override public void registerIcons(IIconRegister par1IconRegister) { iconTool = IconHelper.forItem(par1IconRegister, this, 0); @@ -39,11 +55,20 @@ public class ItemTerraPick extends ItemManasteelPick { @Override public IIcon getIcon(ItemStack stack, int pass) { - return pass == 2 && isEnabled(stack) ? iconOverlay : iconTool; + return pass == 1 && isEnabled(stack) ? iconOverlay : iconTool; } + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { + if(par2 == 0 || !isEnabled(par1ItemStack)) + return 0xFFFFFF; + + return Color.HSBtoRGB(0.375F, (float) Math.min(1F, (Math.sin((double) System.currentTimeMillis() / 200D) * 0.5 + 1F)), 1F); + } + boolean isEnabled(ItemStack stack) { - return false; // TODO + return ItemNBTHelper.getBoolean(stack, TAG_ENABLED, false); } } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 910c2be9f..74ae8ef7a 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -326,7 +326,7 @@ item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization item.botania:waterRing.name=Ring of Chordata item.botania:miningRing.name=Ring of the Mantle -item.botania:terraPick.name=Terra Breaker +item.botania:terraPick.name=Terra Shatterer # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/terraPick1.png b/resources/assets/botania/textures/items/terraPick1.png index d126753f90d22ef4c1d3e9f5b438db92337de808..f3b52bb06a6da9c6e24dcf44514c24521a9beb49 100644 GIT binary patch delta 474 zcmV<00VV$77LFOPzY2c=xk*GpRCwB?lgn<~Fcd@&RlQ6jn|w;Q?J{5O1h!!(KmtTw z^*54iEQypzP8X7#*RCaS!3#cyGjn;3Bmj=bqpY>W7;(-ai4X$U*Vhcg!1;XU_sxx| zB)s=zSw>M5Ac_0?d&ycNpe(}!G6vN(swz}f1Yp14OH6l`KoWlm*zI=e0OdIY(9IF% zwFGFr=5#vAeE^w~y2b&wx3^MJTsFP;c<<@^o^c!}Rz<<#a8N&kObk*&S%#{LrfGC{ zcPAP1iK_R0%8j7~o}Qlc&R~wPXfI1Pn~g?b9LM*|ORU#CKR-(n8Gv(+7$ZLgtLJ{cMrjjlI<2YVE&PT8W$XYa;mf+&Y!XRhX36N64drwgmgb>Ij$TC>3 zY1ZJ`8DmoZG>v}NwK2|Nt^ID|Fbt%W zaL!%iEVHa7EcIWlKAZT_z+o7^Rb*){6$M(Yczk?Rm>)MwH~#C$_|Nfo0GrO+LVs&29vjDI(C6&ObR~eVbUY