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 000000000..84e5b2c2a Binary files /dev/null and b/resources/assets/botania/textures/items/tinyPlanet.png differ