From b31df2d72db5e7039c1f6f991cf21f483a2c4dbb Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Jun 2014 19:21:43 +0100 Subject: [PATCH] Added the Rod of the Skies. --- .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/item/ItemTornadoRod.java | 131 ++++++++++++++++++ .../vazkii/botania/common/item/ModItems.java | 4 +- .../botania/common/lib/LibItemNames.java | 1 + .../botania/common/lib/LibObfuscation.java | 4 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/items/tornadoRod0.png | Bin 0 -> 3153 bytes .../botania/textures/items/tornadoRod1.png | Bin 0 -> 3456 bytes .../textures/items/tornadoRod1.png.mcmeta | 3 + 9 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 MODSRC/vazkii/botania/common/item/ItemTornadoRod.java create mode 100644 resources/assets/botania/textures/items/tornadoRod0.png create mode 100644 resources/assets/botania/textures/items/tornadoRod1.png create mode 100644 resources/assets/botania/textures/items/tornadoRod1.png.mcmeta 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 0000000000000000000000000000000000000000..240b2f054c4f56bf814d11ca0f03cd4503b7ef5d GIT binary patch literal 3153 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 literal 0 HcmV?d00001 diff --git a/resources/assets/botania/textures/items/tornadoRod1.png b/resources/assets/botania/textures/items/tornadoRod1.png new file mode 100644 index 0000000000000000000000000000000000000000..eaee96df0942ff8dccfc65195e31874403ad9a71 GIT binary patch literal 3456 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