From 7582889149956462e3cec0ea33bd79c90850ff65 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 14 Apr 2014 20:38:22 +0100 Subject: [PATCH] Added the Terra Blade. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 2 +- .../common/core/BotaniaCreativeTab.java | 1 + .../vazkii/botania/common/item/ModItems.java | 3 + .../common/item/tool/ItemManasteelSword.java | 10 +- .../common/item/tool/ItemTerraSword.java | 100 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/items/terraSword.png | Bin 0 -> 3220 bytes 8 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java create mode 100644 resources/assets/botania/textures/items/terraSword.png diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 25922bef1..8774bdd8d 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -52,7 +52,7 @@ public final class BotaniaAPI { public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); - public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 1800, 8.6F, 3F, 26); + public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 3, 1800, 9F, 3F, 26); static { registerSubTile("", DummySubTile.class); diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index b4e52ad01..d9e86234b 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -82,6 +82,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manasteelChest); addItem(ModItems.manasteelLegs); addItem(ModItems.manasteelBoots); + addItem(ModItems.terraSword); addItem(ModItems.terrasteelHelm); addItem(ModItems.terrasteelChest); addItem(ModItems.terrasteelLegs); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 59d339a1e..94164abf5 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -20,6 +20,7 @@ import vazkii.botania.common.item.tool.ItemManasteelPick; import vazkii.botania.common.item.tool.ItemManasteelShears; import vazkii.botania.common.item.tool.ItemManasteelShovel; import vazkii.botania.common.item.tool.ItemManasteelSword; +import vazkii.botania.common.item.tool.ItemTerraSword; import vazkii.botania.common.item.tool.armor.ItemManasteelBoots; import vazkii.botania.common.item.tool.armor.ItemManasteelChest; import vazkii.botania.common.item.tool.armor.ItemManasteelHelm; @@ -64,6 +65,7 @@ public final class ModItems { public static Item terrasteelChest; public static Item terrasteelLegs; public static Item terrasteelBoots; + public static Item terraSword; public static void init() { lexicon = new ItemLexicon(); @@ -98,6 +100,7 @@ public final class ModItems { terrasteelChest = new ItemTerrasteelChest(); terrasteelLegs = new ItemTerrasteelLegs(); terrasteelBoots = new ItemTerrasteelBoots(); + terraSword = new ItemTerraSword(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java index 29b97246c..cd7ad505c 100644 --- a/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java +++ b/MODSRC/vazkii/botania/common/item/tool/ItemManasteelSword.java @@ -29,14 +29,18 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword { - private static final int MANA_PER_DAMAGE = 50; + static final int MANA_PER_DAMAGE = 51; IIcon elucidatorIcon; public ItemManasteelSword() { - super(BotaniaAPI.manasteelToolMaterial); + this(BotaniaAPI.manasteelToolMaterial, LibItemNames.MANASTEEL_SWORD); + } + + public ItemManasteelSword(ToolMaterial mat, String name) { + super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); - setUnlocalizedName(LibItemNames.MANASTEEL_SWORD); + setUnlocalizedName(name); } @Override diff --git a/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java b/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java new file mode 100644 index 000000000..b5d777e5f --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/tool/ItemTerraSword.java @@ -0,0 +1,100 @@ +/** + * 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 @ [Apr 14, 2014, 7:34:56 PM (GMT)] + */ +package vazkii.botania.common.item.tool; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.api.mana.BurstProperties; +import vazkii.botania.api.mana.ILens; +import vazkii.botania.api.mana.ILensEffect; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { + + public ItemTerraSword() { + super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_SWORD); + } + + @Override + public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + if(par3Entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) par3Entity; + if(player.swingProgress == 0.16666667F && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { + EntityManaBurst burst = getBurst(player, par1ItemStack); + par2World.spawnEntityInWorld(burst); + ManasteelToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); + par2World.playSoundAtEntity(player, "random.levelup", 1F, 1.4F); + } + } + } + + public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { + EntityManaBurst burst = new EntityManaBurst(player); + + float motionModifier = 5F; + + burst.setColor(0x20FF20); + burst.setMana(MANA_PER_DAMAGE); + burst.setStartingMana(MANA_PER_DAMAGE); + burst.setMinManaLoss(40); + burst.setManaLossPerTick(4F); + burst.setGravity(0F); + burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); + + burst.setSourceLens(stack); + return burst; + } + + @Override + public void apply(ItemStack stack, BurstProperties props) { + // NO-OP + } + + @Override + public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { + Entity entity = (Entity) burst; + if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && !(pos.entityHit instanceof EntityPlayer)) { + EntityLivingBase living = (EntityLivingBase) pos.entityHit; + if(living.hurtTime == 0) { + int cost = MANA_PER_DAMAGE / 3; + int mana = burst.getMana(); + if(mana >= cost) { + burst.setMana(mana - cost); + float damage = 4F + BotaniaAPI.terrasteelToolMaterial.getDamageVsEntity(); + if(!burst.isFake() && !entity.worldObj.isRemote) + living.attackEntityFrom(DamageSource.magic, damage); + } + } + } + return dead; + } + + @Override + public void updateBurst(IManaBurst burst, ItemStack stack) { + // NO-OP + } + + @Override + public boolean doParticles(IManaBurst burst, ItemStack stack) { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 479f680bb..b07b0e549 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -47,6 +47,7 @@ public final class LibItemNames { public static final String TERRASTEEL_CHEST = LibResources.PREFIX_MOD + "terrasteelChest"; public static final String TERRASTEEL_LEGS = LibResources.PREFIX_MOD + "terrasteelLegs"; public static final String TERRASTEEL_BOOTS = LibResources.PREFIX_MOD + "terrasteelBoots"; + public static final String TERRA_SWORD = LibResources.PREFIX_MOD + "terraSword"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index df3d7e47a..751a13482 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -275,6 +275,7 @@ item.botania:terrasteelHelm.name=Terrasteel Helmet item.botania:terrasteelChest.name=Terrasteel Chestplate item.botania:terrasteelLegs.name=Terrasteel Leggings item.botania:terrasteelBoots.name=Terrasteel Boots +item.botania:terraSword.name=Terra Blade # 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/terraSword.png b/resources/assets/botania/textures/items/terraSword.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4420da1230e83d60ec172f4d74d5571a3062ef GIT binary patch literal 3220 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