diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 504f2c520..8fcbcc3fa 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -68,6 +68,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.openBucket); addItem(ModItems.spawnerMover); addItem(ModItems.rainbowRod); + addItem(ModItems.tornadoRod); addBlock(ModBlocks.forestDrum); addBlock(ModBlocks.forestEye); diff --git a/MODSRC/vazkii/botania/common/item/ItemTornadoRod.java b/MODSRC/vazkii/botania/common/item/ItemTornadoRod.java new file mode 100644 index 000000000..f629db146 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemTornadoRod.java @@ -0,0 +1,131 @@ +/** + * 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 @ [Jun 25, 2014, 4:36:13 PM (GMT)] + */ +package vazkii.botania.common.item; + +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibObfuscation; + +public class ItemTornadoRod extends ItemMod { + + private static final int FLY_TIME = 20; + private static final int FALL_MULTIPLIER = 3; + + private static final String TAG_FLYING = "flying"; + + IIcon iconIdle, iconFlying; + + public ItemTornadoRod() { + setMaxDamage(FLY_TIME * FALL_MULTIPLIER); + setUnlocalizedName(LibItemNames.TORNADO_ROD); + setMaxStackSize(1); + } + + @Override + public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + if(par3Entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) par3Entity; + ItemStack itemInUse = ReflectionHelper.getPrivateValue(EntityPlayer.class, player, LibObfuscation.ITEM_IN_USE); + boolean damaged = par1ItemStack.getItemDamage() > 0; + + if(itemInUse != par1ItemStack) { + if(damaged) + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + setFlying(par1ItemStack, false); + } + + if(damaged) + player.fallDistance = 0; + } + } + + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + if(par1ItemStack.getItemDamage() == 0) + setFlying(par1ItemStack, true); + + return par1ItemStack; + } + + @Override + public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { + int max = FALL_MULTIPLIER * FLY_TIME; + if(stack.getItemDamage() >= max) { + setFlying(stack, false); + player.setItemInUse(null, 0); + } else if(isFlying(stack)) { + player.fallDistance = 0F; + player.motionY = 1.25; + stack.setItemDamage(Math.min(max, stack.getItemDamage() + FALL_MULTIPLIER)); + player.worldObj.playSoundAtEntity(player, "mob.blaze.breathe", 0.1F, 0.25F); + for(int i = 0; i < 5; i++) + Botania.proxy.wispFX(player.worldObj, player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + } + } + + @Override + public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + setFlying(par1ItemStack, false); + return par1ItemStack; + } + + @Override + public IIcon getIconIndex(ItemStack par1ItemStack) { + return isFlying(par1ItemStack) ? iconFlying : iconIdle; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return getIconIndex(stack); + } + + @Override + public EnumAction getItemUseAction(ItemStack par1ItemStack) { + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack par1ItemStack) { + return 720000; + } + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + iconIdle = IconHelper.forItem(par1IconRegister, this, 0); + iconFlying = IconHelper.forItem(par1IconRegister, this, 1); + } + + public boolean isFlying(ItemStack stack) { + return ItemNBTHelper.getBoolean(stack, TAG_FLYING, false); + } + + public void setFlying(ItemStack stack, boolean flying) { + ItemNBTHelper.setBoolean(stack, TAG_FLYING, flying); + } + + @Override + public boolean isFull3D() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 5676680a9..1d9103b93 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -126,6 +126,7 @@ public final class ModItems { public static Item pixieRing; public static Item superTravelBelt; public static Item rainbowRod; + public static Item tornadoRod; public static void init() { lexicon = new ItemLexicon(); @@ -194,7 +195,8 @@ public final class ModItems { pixieRing = new ItemPixieRing(); superTravelBelt = new ItemSuperTravelBelt(); rainbowRod = new ItemRainbowRod(); - + tornadoRod = new ItemTornadoRod(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index b4409af92..0d13de961 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -79,6 +79,7 @@ public final class LibItemNames { public static final String PIXIE_RING = "pixieRing"; public static final String SUPER_TRAVEL_BELT = "superTravelBelt"; public static final String RAINBOW_ROD = "rainbowRod"; + public static final String TORNADO_ROD = "tornadoRod"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java index e131b059d..64ed39ce7 100644 --- a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java +++ b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java @@ -41,4 +41,8 @@ public final class LibObfuscation { // EntityAnimal public static final String[] IN_LOVE = new String[] { "inLove", "field_70881_d", "bp" }; + + // EntityPlayer + public static final String[] ITEM_IN_USE = new String[] { "itemInUse", "field_71074_e", "f" }; + } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 8d23e4c2b..eaf9ece47 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -511,6 +511,7 @@ item.botania:spawnerMover.name=Life Aggregator item.botania:pixieRing.name=Great Fairy Ring item.botania:superTravelBelt.name=Globetrotter's Sash item.botania:rainbowRod.name=Rod of Bifrost +item.botania:tornadoRod.name=Rod of the Skies # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition's Index - Pick which category you would like to study: diff --git a/resources/assets/botania/textures/items/tornadoRod0.png b/resources/assets/botania/textures/items/tornadoRod0.png new file mode 100644 index 000000000..240b2f054 Binary files /dev/null and b/resources/assets/botania/textures/items/tornadoRod0.png differ diff --git a/resources/assets/botania/textures/items/tornadoRod1.png b/resources/assets/botania/textures/items/tornadoRod1.png new file mode 100644 index 000000000..eaee96df0 Binary files /dev/null and b/resources/assets/botania/textures/items/tornadoRod1.png differ diff --git a/resources/assets/botania/textures/items/tornadoRod1.png.mcmeta b/resources/assets/botania/textures/items/tornadoRod1.png.mcmeta new file mode 100644 index 000000000..5334ffbca --- /dev/null +++ b/resources/assets/botania/textures/items/tornadoRod1.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": { } +} \ No newline at end of file