diff --git a/MODSRC/vazkii/botania/common/block/BlockNaturaCharge.java b/MODSRC/vazkii/botania/common/block/BlockNaturaCharge.java new file mode 100644 index 000000000..697bd8feb --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockNaturaCharge.java @@ -0,0 +1,22 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 3, 2014, 9:20:49 PM (GMT)] + */ +package vazkii.botania.common.block; + +import net.minecraft.block.material.Material; + +public class BlockNaturaCharge extends BlockMod { + + public BlockNaturaCharge() { + super(Material.tnt); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemManaGun.java b/MODSRC/vazkii/botania/common/item/ItemManaGun.java index 256b6eb02..898920b70 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaGun.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaGun.java @@ -11,18 +11,24 @@ */ package vazkii.botania.common.item; +import java.awt.Color; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; @@ -34,6 +40,8 @@ public class ItemManaGun extends ItemMod { private static final String TAG_LENS = "lens"; private static final int COOLDOWN = 30; + IIcon[] icons; + public ItemManaGun() { super(); setMaxDamage(COOLDOWN); @@ -48,7 +56,7 @@ public class ItemManaGun extends ItemMod { public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if(!par3EntityPlayer.isSneaking()) { if(par1ItemStack.getItemDamage() == 0) { - EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack); + EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true); if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) { if(!par2World.isRemote) { par2World.playSoundAtEntity(par3EntityPlayer, "random.explode", 0.9F, 3F); @@ -70,8 +78,34 @@ public class ItemManaGun extends ItemMod { return par1ItemStack; } + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + icons = new IIcon[2]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forItem(par1IconRegister, this, i); + } + + @Override + public boolean requiresMultipleRenderPasses() { + return true; + } - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return icons[Math.min(1, pass)]; + } + + @Override + public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { + if(par2 == 0) + return 0xFFFFFF; + + EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false); + return burst == null ? 0x20FF20 : burst.getColor(); + } + + public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) { EntityManaBurst burst = new EntityManaBurst(player); int maxMana = 120; @@ -88,7 +122,7 @@ public class ItemManaGun extends ItemMod { burst.setSourceLens(lens); - if(ManaItemHandler.requestManaExact(stack, player, props.maxMana, false)) { + if(!request || ManaItemHandler.requestManaExact(stack, player, props.maxMana, false)) { burst.setColor(props.color); burst.setMana(props.maxMana); burst.setStartingMana(props.maxMana); diff --git a/resources/assets/botania/textures/blocks/naturaCharge.png b/resources/assets/botania/textures/blocks/naturaCharge.png new file mode 100644 index 000000000..e6dd43da4 Binary files /dev/null and b/resources/assets/botania/textures/blocks/naturaCharge.png differ diff --git a/resources/assets/botania/textures/items/manaGun.png b/resources/assets/botania/textures/items/manaGun0.png similarity index 92% rename from resources/assets/botania/textures/items/manaGun.png rename to resources/assets/botania/textures/items/manaGun0.png index 35e044906..a171631a2 100644 Binary files a/resources/assets/botania/textures/items/manaGun.png and b/resources/assets/botania/textures/items/manaGun0.png differ diff --git a/resources/assets/botania/textures/items/manaGun1.png b/resources/assets/botania/textures/items/manaGun1.png new file mode 100644 index 000000000..b7409d572 Binary files /dev/null and b/resources/assets/botania/textures/items/manaGun1.png differ