From 4d172cda28daea0c4aaf99844b8b911901aea677 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 21 Apr 2014 17:56:00 +0100 Subject: [PATCH] Tiny Planet! --- .../vazkii/botania/common/item/ModItems.java | 5 +- .../item/equipment/bauble/ItemTinyPlanet.java | 82 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 3 +- resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/items/tinyPlanet.png | Bin 0 -> 3348 bytes 5 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java create mode 100644 resources/assets/botania/textures/items/tinyPlanet.png diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index a7c5a8e61..930acc001 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -23,6 +23,7 @@ import vazkii.botania.common.item.equipment.armor.ItemTerrasteelBoots; import vazkii.botania.common.item.equipment.armor.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.ItemTerrasteelLegs; +import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.equipment.tool.ItemManasteelAxe; import vazkii.botania.common.item.equipment.tool.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.ItemManasteelShears; @@ -66,6 +67,7 @@ public final class ModItems { public static Item terrasteelLegs; public static Item terrasteelBoots; public static Item terraSword; + public static Item tinyPlanet; public static void init() { lexicon = new ItemLexicon(); @@ -101,7 +103,8 @@ public final class ModItems { terrasteelLegs = new ItemTerrasteelLegs(); terrasteelBoots = new ItemTerrasteelBoots(); terraSword = new ItemTerraSword(); - + tinyPlanet = new ItemTinyPlanet(); + 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/item/equipment/bauble/ItemTinyPlanet.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java new file mode 100644 index 000000000..52dfd080c --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -0,0 +1,82 @@ +/** + * 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 20, 2014, 10:58:00 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovementInput; +import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; + +public class ItemTinyPlanet extends ItemBauble { + + private static final String TAG_ORBIT = "orbit"; + + public ItemTinyPlanet() { + super(LibItemNames.TINY_PLANET); + } + + @Override + public BaubleType getBaubleType(ItemStack itemstack) { + return BaubleType.AMULET; + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + int range = 8; + List entities = player.worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + for(Entity entity : entities) { + IManaBurst burst = (IManaBurst) entity; + int orbitTime = getEntityOrbitTime(entity); + if(orbitTime == 0) + burst.setMinManaLoss(burst.getMinManaLoss() * 4); + + float radius = (float) (Math.max(40, orbitTime) - 40) / 40F + 1F; + int angle = orbitTime % 360; + + float xTarget = (float) ((int) player.posX - 0.5F + Math.cos((angle * 10) * Math.PI / 180F) * radius); + float yTarget = (float) player.posY + 1.2F; + float zTarget = (float) ((int) player.posZ + 0.5F + Math.sin((angle * 10) * Math.PI / 180F) * radius); + if(player.worldObj.isRemote) + yTarget -= 1.62F; + + Vector3 targetVec = new Vector3(xTarget, yTarget, zTarget); + Vector3 currentVec = new Vector3(entity.posX, entity.posY, entity.posZ); + Vector3 moveVector = targetVec.copy().sub(currentVec); + + burst.setMotion(moveVector.x, moveVector.y, moveVector.z); + + incrementOrbitTime(entity); + } + } + + public int getEntityOrbitTime(Entity entity) { + NBTTagCompound cmp = entity.getEntityData(); + if(cmp.hasKey(TAG_ORBIT)) + return cmp.getInteger(TAG_ORBIT); + else return 0; + } + + public void incrementOrbitTime(Entity entity) { + NBTTagCompound cmp = entity.getEntityData(); + int time = getEntityOrbitTime(entity); + cmp.setInteger(TAG_ORBIT, time + 1); + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index a1c5daf6a..5ffb7e396 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -48,7 +48,8 @@ public final class LibItemNames { 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 TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanet"; + public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", LibResources.PREFIX_MOD + "lensSpeed", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index bd8364df0..f0d9d2ce0 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -288,6 +288,7 @@ item.botania:terrasteelChest.name=Terrasteel Chestplate item.botania:terrasteelLegs.name=Terrasteel Leggings item.botania:terrasteelBoots.name=Terrasteel Boots item.botania:terraSword.name=Terra Blade +item.botania:tinyPlanet.name=Tiny Planet # 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/tinyPlanet.png b/resources/assets/botania/textures/items/tinyPlanet.png new file mode 100644 index 0000000000000000000000000000000000000000..84e5b2c2a17ff395c3ff19d4a22230677c3356bb GIT binary patch literal 3348 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 eHo*V%p8){E*}X7DMwWg60000