From a7db6e4139c180386f871ef7771f1a5db0a1b408 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 15 May 2015 22:40:55 +0100 Subject: [PATCH] Added the Terra Truncator (Terrasteel Axe). Also changed some mana cost values around. --- .../handler/TerraPickRankDisplayHandler.java | 2 +- .../common/core/BotaniaCreativeTab.java | 1 + .../recipe/TerraPickTippingRecipe.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 7 +- .../item/equipment/tool/ToolCommons.java | 7 +- .../tool/elementium/ItemElementiumPick.java | 2 +- .../tool/manasteel/ItemManasteelAxe.java | 10 +- .../tool/manasteel/ItemManasteelSword.java | 12 +- .../tool/terrasteel/ItemTerraAxe.java | 189 ++++++++++++++++++ .../tool/{ => terrasteel}/ItemTerraPick.java | 9 +- .../tool/{ => terrasteel}/ItemTerraSword.java | 12 +- .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + .../items/{terraAxe.png => terraAxe0.png} | Bin .../botania/textures/items/terraAxe1.png | Bin 0 -> 15381 bytes 15 files changed, 239 insertions(+), 16 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java rename src/main/java/vazkii/botania/common/item/equipment/tool/{ => terrasteel}/ItemTerraPick.java (97%) rename src/main/java/vazkii/botania/common/item/equipment/tool/{ => terrasteel}/ItemTerraSword.java (95%) rename src/main/resources/assets/botania/textures/items/{terraAxe.png => terraAxe0.png} (100%) create mode 100644 src/main/resources/assets/botania/textures/items/terraAxe1.png diff --git a/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java index c33336d9a..0f12e74d5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TerraPickRankDisplayHandler.java @@ -26,7 +26,7 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import vazkii.botania.common.item.equipment.tool.ItemTerraPick; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibObfuscation; import cpw.mods.fml.relauncher.ReflectionHelper; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 9c8a9bb49..150f82949 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -168,6 +168,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terraSword); addItem(ModItems.thornChakram); addItem(ModItems.terraPick); + addItem(ModItems.terraAxe); addItem(ModItems.temperanceStone); addItem(ModItems.terrasteelHelm); if(Botania.thaumcraftLoaded) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index 619d68d34..733367684 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.tool.ItemTerraPick; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; public class TerraPickTippingRecipe implements IRecipe { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index bf2c18208..6d6dc0218 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -59,8 +59,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; -import vazkii.botania.common.item.equipment.tool.ItemTerraPick; -import vazkii.botania.common.item.equipment.tool.ItemTerraSword; import vazkii.botania.common.item.equipment.tool.bow.ItemCrystalBow; import vazkii.botania.common.item.equipment.tool.bow.ItemLivingwoodBow; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumAxe; @@ -73,6 +71,9 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraAxe; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; import vazkii.botania.common.item.interaction.thaumcraft.ItemElementiumHelmRevealing; import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell; import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing; @@ -241,6 +242,7 @@ public final class ModItems { public static Item recordGaia2; public static Item temperanceStone; public static Item incenseStick; + public static Item terraAxe; public static void init() { lexicon = new ItemLexicon(); @@ -373,6 +375,7 @@ public final class ModItems { recordGaia2 = new ItemRecordGaia2(); temperanceStone = new ItemTemperanceStone(); incenseStick = new ItemIncenseStick(); + terraAxe = new ItemTerraAxe(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 69a78e54e..06d3afe0b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -30,6 +30,7 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; public final class ToolCommons { @@ -63,6 +64,10 @@ public final class ToolCommons { } public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int bx, int by, int bz, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose) { + removeBlockWithDrops(player, stack, world, x, y, z, bx, by, bz, block, materialsListing, silk, fortune, blockHardness, dispose, true); + } + + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int bx, int by, int bz, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose, boolean particles) { if(!world.blockExists(x, y, z)) return; @@ -91,7 +96,7 @@ public final class ToolCommons { damageItem(stack, 1, player, 80); } else world.setBlockToAir(x, y, z); - if(ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool && !world.isRemote) + if(particles && !world.isRemote && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blk) + (meta << 12)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 4c561bbe2..4ef76bb2a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -10,8 +10,8 @@ import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.tool.ItemTerraPick; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 57e9b0ea8..c4d34535f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -72,17 +72,21 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); + ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { if (block.getBlockHardness(world, x, y, z) != 0F) - ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; } + + public int getManaPerDamage() { + return MANA_PER_DAMAGE; + } @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { @@ -104,7 +108,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index c240bedac..572864ff0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -35,7 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { - public static final int MANA_PER_DAMAGE = 51; + public static final int MANA_PER_DAMAGE = 60; IIcon elucidatorIcon; @@ -70,7 +70,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { if(usesMana(par1ItemStack)) - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); + ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); return true; } @@ -87,16 +87,20 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { @Override public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entity) { if(usesMana(stack) && block.getBlockHardness(world, x, y, z) != 0F) - ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); return true; } @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } + + public int getManaPerDamage() { + return MANA_PER_DAMAGE; + } @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java new file mode 100644 index 000000000..36ac4685f --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -0,0 +1,189 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [May 15, 2015, 6:55:34 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.tool.terrasteel; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.item.ISequentialBreaker; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.item.equipment.tool.ToolCommons; +import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; +import vazkii.botania.common.item.relic.ItemLokiRing; +import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { + + private static final int MANA_PER_DAMAGE = 100; + private static Map> blockSwappers = new HashMap(); + + IIcon iconOn, iconOff; + + public ItemTerraAxe() { + super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); + FMLCommonHandler.instance().bus().register(this); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister par1IconRegister) { + iconOn = IconHelper.forItem(par1IconRegister, this, 0); + iconOff = IconHelper.forItem(par1IconRegister, this, 1); + } + + @Override + public IIcon getIconFromDamage(int p_77617_1_) { + return iconOn; + } + + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return player.isSneaking() ? iconOff : iconOn; + } + + + @Override + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) { + MovingObjectPosition raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); + if(raycast != null) { + breakOtherBlock(player, stack, x, y, z, x, y, z, raycast.sideHit); + ItemLokiRing.breakOnAllCursors(player, this, stack, x, y, z, raycast.sideHit); + } + + return false; + } + + @Override + public int getManaPerDamage() { + return MANA_PER_DAMAGE; + } + + @Override + public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { + if(!player.isSneaking()) { + ChunkCoordinates coords = new ChunkCoordinates(x, y, z); + addBlockSwapper(player.worldObj, player, stack, coords, coords, 32, false, true, new ArrayList()); + } + } + + @Override + public boolean disposeOfTrashBlocks(ItemStack stack) { + return false; + } + + @SubscribeEvent + public void onTickEnd(TickEvent.WorldTickEvent event) { + if(event.phase == Phase.END) { + int dim = event.world.provider.dimensionId; + if(blockSwappers.containsKey(dim)) { + List swappers = blockSwappers.get(dim); + List swappersSafe = new ArrayList(swappers); + swappers.clear(); + + for(BlockSwapper s : swappersSafe) + if(s != null) + s.tick(); + } + } + } + + private static BlockSwapper addBlockSwapper(World world, EntityPlayer player, ItemStack stack, ChunkCoordinates origCoords, ChunkCoordinates coords, int steps, boolean leaves, boolean force, List posChecked) { + BlockSwapper swapper = new BlockSwapper(world, player, stack, origCoords, coords, steps, leaves, force, posChecked); + + int dim = world.provider.dimensionId; + if(!blockSwappers.containsKey(dim)) + blockSwappers.put(dim, new ArrayList()); + blockSwappers.get(dim).add(swapper); + + return swapper; + } + + private static class BlockSwapper { + + final World world; + final EntityPlayer player; + final ItemStack stack; + final ChunkCoordinates origCoords; + final int steps; + final ChunkCoordinates coords; + final boolean leaves; + final boolean force; + final List posChecked; + int ticks = 2; + + BlockSwapper(World world, EntityPlayer player, ItemStack stack, ChunkCoordinates origCoords, ChunkCoordinates coords, int steps, boolean leaves, boolean force, List posChecked) { + this.world = world; + this.player = player; + this.stack = stack; + this.origCoords = origCoords; + this.coords = coords; + this.steps = steps; + this.leaves = leaves; + this.force = force; + this.posChecked = posChecked; + } + + void tick() { + Block blockat = world.getBlock(coords.posX, coords.posY, coords.posZ); + if(!force && blockat.isAir(world, coords.posX, coords.posY, coords.posZ)) + return; + + ToolCommons.removeBlockWithDrops(player, stack, world, coords.posX, coords.posY, coords.posZ, origCoords.posX, origCoords.posY, origCoords.posZ, null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack), 0F, false, !leaves); + + if(steps == 0) + return; + + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + int x = coords.posX + dir.offsetX; + int y = coords.posY + dir.offsetY; + int z = coords.posZ + dir.offsetZ; + String pstr = posStr(x, y, z); + if(posChecked.contains(pstr)) + continue; + + Block block = world.getBlock(x, y, z); + boolean log = block.isWood(world, x, y, z); + boolean leaf = block.isLeaves(world, x, y, z); + if(log || leaf) { + int steps = this.steps - 1; + steps = leaf ? this.leaves ? steps : 3 : steps; + addBlockSwapper(world, player, stack, origCoords, new ChunkCoordinates(x, y, z), steps, leaf, false, posChecked); + posChecked.add(pstr); + } + } + } + + String posStr(int x, int y, int z) { + return x + ":" + y + ":" + z; + } + } + +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java similarity index 97% rename from src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java rename to src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 660ac5abb..530b09a83 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -8,7 +8,7 @@ * * File Created @ [May 20, 2014, 10:56:14 PM (GMT)] */ -package vazkii.botania.common.item.equipment.tool; +package vazkii.botania.common.item.equipment.tool.terrasteel; import java.awt.Color; import java.util.List; @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; +import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; @@ -57,6 +58,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ private static final String TAG_TIPPED = "tipped"; private static final int MAX_MANA = Integer.MAX_VALUE; + private static final int MANA_PER_DAMAGE = 100; private static final Material[] MATERIALS = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; @@ -138,6 +140,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return false; } + @Override + public int getManaPerDmg() { + return MANA_PER_DAMAGE; + } + @Override public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { if(!isEnabled(stack)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java similarity index 95% rename from src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java rename to src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 6637bee38..1b4cdd7a2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -8,7 +8,7 @@ * * File Created @ [Apr 14, 2014, 7:34:56 PM (GMT)] */ -package vazkii.botania.common.item.equipment.tool; +package vazkii.botania.common.item.equipment.tool.terrasteel; import java.util.List; @@ -35,13 +35,16 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, ICraftAchievement { private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; - + + private static final int MANA_PER_DAMAGE = 100; + public ItemTerraSword() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_SWORD); } @@ -62,6 +65,11 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } } } + + @Override + public int getManaPerDamage() { + return MANA_PER_DAMAGE; + } public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { EntityManaBurst burst = new EntityManaBurst(player); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index b5ba92bb4..ebaf5af39 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -143,6 +143,7 @@ public final class LibItemNames { public static final String RECORD_GAIA2 = "recordGaia2"; public static final String TEMPERANCE_STONE = "temperanceStone"; public static final String INCENSE_STICK = "incenseStick"; + public static final String TERRA_AXE = "terraAxe"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c761f876f..7623a8269 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1326,6 +1326,7 @@ item.botania:recordGaia1.name=Scathed Music Disc item.botania:recordGaia2.name=Scathed Music Disc item.botania:temperanceStone.name=Stone of Temperance item.botania:incenseStick.name=Incense Stick +item.botania:terraAxe.name=Terra Truncator # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/items/terraAxe.png b/src/main/resources/assets/botania/textures/items/terraAxe0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraAxe.png rename to src/main/resources/assets/botania/textures/items/terraAxe0.png diff --git a/src/main/resources/assets/botania/textures/items/terraAxe1.png b/src/main/resources/assets/botania/textures/items/terraAxe1.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce941c126e486c912049603440607c6c8b4f93a GIT binary patch literal 15381 zcmeI3Ym5_B6vt1r z&prP$^Sk$)&X-vXFj^1mQX))zxeD{_!lYL@b=31Vl?R5(Tpf!aXt><@o8MMh3(NN%ok|f4;*+N`lAq zl*3Q^qZMLEs%(sjwT%<%_{QnHOE8V}7Q2%y5QvBxMZBGXf} z=^oQ4Jt0}|pGa0HF_Cmw9A=(o>|~kC!Z;XvIWwHJ(u|FwZ4_fOGgg*%v5bSveoWqC zaORE)LAJ&>Hk%Gu9#cruqAW!v5(!JfW>I1d6ytKaDB4O{t!6O8tj>}(E@_t4ff21wD-z8mlGQ9bK#@vvQHrt9RG}b&&&5RJv2gm* z1fCMZVnmcR6~r+GIc)w)?x zk*X0@B_89&F*Cuf3@mi_niR}0P6s93)8(~`NvVr4-IEDRZ-vYXxxu}%6)}<1lvtgj zguR(vHnANcSy4d_eM*uAC7}*;Q}FEkQs;$4AE$|4uoWF<+F@oKb&Q>LxL7;=2+goG zZ4k-Kgf#q$AO&Z^8dfU{WNc2OhG8bG0ZK>UH138}jB^b-0?!7OScKEOQiN*|si@rG zrt*V^nYj(cRw!X51};nV+T2v3VMA1Uld)B@s&O(eR{6YOz#>Tk%L_ulN^_uuxpJ4e zT(CRLE~niND%u|81-sKF*n~7hzuy?%N!q9IalKHo(gKjCT{Kr#CI-w*u)NG%X180- z0h$k(twAQhIh{e9-5F??HiUPQu8v8d$#G%B9R2G5ZHfXiol;dwD%hH{3|kg#+;khO z6=!rDZFhvFbUTW2F;&!y&0}h>wp{F6>y6CI>$M;Pz#T^Omz9gmhDn_l z@Wv=-^bO%%=SYM^8C6gjsr0O_MN}oICAgS4ssZeYe<<^eV8;kp*-hy^KP>$RYoKy7 zZ*B!{tb}f21>kn{zpOxh@A4r|ZV&}8)xK@p2X1W9GE3R9p4!_$=lXN&|356KU9gY1 zbj>hss?%6Lb7p?MUW4IydcMm^gAc{%zu8cu8xEa}4mG;r(0t?*vZQ&f*=*3TAxi&~ z%(U@Z@H{7aoeqc1;ilkWIAWrd6vOpC3G`c4?;?yd8v{EE22SoO(BQ}hW|qqEJ9aiRG@UW^L@f;KTOG#|)|aX~=P zCdP&419>qn2ngE5xX^qcFUAD{L7NyCnh)f~xF8^C6XQbjfxH+O1O#njTxdR!7vq9} zpiPVm%?I*gTo4eniE*L%KwgXs0)jR%E;Jv=i*Z3f&?d%(<^y>#E(i$P#JJFWATP!R z0YRG>7n%>`#ke3KXcOZ?^MSk=7X$=tB5@Vx-_jIi@M>lPyo0&%Xt(R&{Y{dutnm{> z<6wfAGoK*-XamOY zy!X^gsX6v%$?c)>bZT$Y+6@D^P@reG8AD$FdcAY_wH~EE4_fka`4*af<+ciT1sk~9 zll^srRJCVZ>WcjKlO?U?WcA}ymz+$VyMFMG?dOlb=UXtP(lV^*`v;z1*EfFo+GuLS zG$r&g?Z$9A9h`2)3^ zM(kZyL_8dSsb<&UFQ#8TwX=I_&qH*!cjz*%wP23pvG$p zgC8}0^H}O!Vkq(1mE(P$JN!h;rU6@zHE@dZ*8b(czi`A;dhUE{b1z~@@Pl#RZ1d0l zW#BU3w^vGjKh<3A`j{SiXLHG=+3_W{j4Q1h@kzm