From fb8e92677dc94098b258168bb274f6c6335a43e7 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 17 Aug 2015 17:38:06 +0100 Subject: [PATCH] Added the Starcaller. --- .../common/entity/EntityBabylonWeapon.java | 2 +- .../common/entity/EntityFallingStar.java | 85 +++++++++++++++ .../botania/common/entity/ModEntities.java | 1 + .../vazkii/botania/common/item/ModItems.java | 3 + .../item/equipment/tool/ItemStarSword.java | 98 ++++++++++++++++++ .../botania/common/lib/LibEntityNames.java | 1 + .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + src/main/resources/assets/botania/sounds.json | 1 + .../assets/botania/sounds/starcaller.ogg | Bin 0 -> 10649 bytes .../textures/items/{unused => }/starSword.png | Bin 11 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vazkii/botania/common/entity/EntityFallingStar.java create mode 100644 src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java create mode 100644 src/main/resources/assets/botania/sounds/starcaller.ogg rename src/main/resources/assets/botania/textures/items/{unused => }/starSword.png (100%) diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 76138e195..285de7cac 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -124,7 +124,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { - if(living != thrower) + if(living == thrower) continue; if(living.hurtTime == 0) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java new file mode 100644 index 000000000..80314a49a --- /dev/null +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -0,0 +1,85 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 17, 2015, 4:19:52 PM (GMT)] + */ +package vazkii.botania.common.entity; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; + +public class EntityFallingStar extends EntityThrowableCopy { + + public EntityFallingStar(World world) { + super(world); + setSize(0F, 0F); + } + + public EntityFallingStar(World world, EntityLivingBase e) { + super(world, e); + setSize(0F, 0F); + } + + @Override + public void onUpdate() { + super.onUpdate(); + + float dist = 1.5F; + for(int i = 0; i < 10; i++) { + float xs = (float) (Math.random() - 0.5) * dist; + float ys = (float) (Math.random() - 0.5) * dist; + float zs = (float) (Math.random() - 0.5) * dist; + Botania.proxy.sparkleFX(worldObj, posX + xs, posY + ys, posZ + zs, 1F, 0.4F, 1F, 2F, 6); + } + + EntityLivingBase thrower = getThrower(); + if(!worldObj.isRemote && thrower != null) { + AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + for(EntityLivingBase living : entities) { + if(living == thrower) + continue; + + if(living.hurtTime == 0) { + onImpact(new MovingObjectPosition(living)); + return; + } + } + } + + if(ticksExisted > 200) + setDead(); + } + + @Override + protected void onImpact(MovingObjectPosition pos) { + EntityLivingBase thrower = getThrower(); + if(pos.entityHit != null && thrower != null && pos.entityHit != thrower && !pos.entityHit.isDead) { + if(thrower instanceof EntityPlayer) + pos.entityHit.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) thrower), 7); + else pos.entityHit.attackEntityFrom(DamageSource.generic, 7); + } + + Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); + if(ConfigHandler.blockBreakParticles && !block.isAir(worldObj, pos.blockX, pos.blockY, pos.blockZ)) + worldObj.playAuxSFX(2001, pos.blockX, pos.blockY, pos.blockZ, Block.getIdFromBlock(block) + (worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) << 12)); + + setDead(); + } + +} + diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index d0fd9d196..f9722ef7a 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -38,6 +38,7 @@ public final class ModEntities { EntityRegistry.registerModEntity(EntityPlayerMover.class, LibEntityNames.PLAYER_MOVER, id++, Botania.instance, 40, 3, true); EntityRegistry.registerModEntity(EntityManaStorm.class, LibEntityNames.MANA_STORM, id++, Botania.instance, 64, 10, false); EntityRegistry.registerModEntity(EntityBabylonWeapon.class, LibEntityNames.BABYLON_WEAPON, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(EntityFallingStar.class, LibEntityNames.FALLING_STAR, id++, Botania.instance, 64, 10, true); } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 4ccd8dc37..321c476ed 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -59,6 +59,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; +import vazkii.botania.common.item.equipment.tool.ItemStarSword; import vazkii.botania.common.item.equipment.tool.bow.ItemCrystalBow; import vazkii.botania.common.item.equipment.tool.bow.ItemLivingwoodBow; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumAxe; @@ -247,6 +248,7 @@ public final class ModItems { public static Item obedienceStick; public static Item cacophonium; public static Item slimeBottle; + public static Item starSword; public static void init() { lexicon = new ItemLexicon(); @@ -384,6 +386,7 @@ public final class ModItems { obedienceStick = new ItemObedienceStick(); cacophonium = new ItemCacophonium(); slimeBottle = new ItemSlimeBottle(); + starSword = new ItemStarSword(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java new file mode 100644 index 000000000..43a47a223 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -0,0 +1,98 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 17, 2015, 3:55:52 PM (GMT)] + */ +package vazkii.botania.common.item.equipment.tool; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.stats.Achievement; +import net.minecraft.util.AxisAlignedBB; +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.common.achievement.ICraftAchievement; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.entity.EntityFallingStar; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemStarSword extends ItemManasteelSword implements ICraftAchievement { + + private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; + + private static final int MANA_PER_DAMAGE = 120; + + public ItemStarSword() { + super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.STAR_SWORD); + } + + @Override + public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); + if(par3Entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) par3Entity; + PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); + float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; + + if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { + MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); + if(pos != null) { + Vector3 posVec = new Vector3(pos.blockX, pos.blockY, pos.blockZ); + Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); + posVec.add(motVec); + motVec.normalize().negate().multiply(1.5); + + EntityFallingStar star = new EntityFallingStar(par2World, player); + star.setPosition(posVec.x, posVec.y, posVec.z); + star.motionX = motVec.x; + star.motionY = motVec.y; + star.motionZ = motVec.z; + par2World.spawnEntityInWorld(star); + + ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); + par2World.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F); + } + } + } + } + + @Override + public int getManaPerDamage() { + return MANA_PER_DAMAGE; + } + + @Override + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + } + + @Override + public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { + return ModAchievements.terrasteelWeaponCraft; + } + + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index 609891bde..e36c7aa78 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -32,5 +32,6 @@ public final class LibEntityNames { public static final String PLAYER_MOVER = LibResources.PREFIX_MOD + "playerMover"; public static final String MANA_STORM = LibResources.PREFIX_MOD + "manaStorm"; public static final String BABYLON_WEAPON = LibResources.PREFIX_MOD + "babylonWeapon"; + public static final String FALLING_STAR = LibResources.PREFIX_MOD + "fallingStar"; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index f874b16e4..355aca40a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -148,6 +148,7 @@ public final class LibItemNames { public static final String OBEDIENCE_STICK = "obedienceStick"; public static final String CACOPHONIUM = "cacophonium"; public static final String SLIME_BOTTLE = "slimeBottle"; + public static final String STAR_SWORD = "starSword"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1b2e96c58..b1b7c921a 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1424,6 +1424,7 @@ item.botania:waterBowl.name=Bowl of Water item.botania:obedienceStick.name=Floral Obedience Stick item.botania:cacophonium.name=Cacophonium item.botania:slimeBottle.name=Slime in a Bottle +item.botania:starSword.name=Starcaller # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index b237c12a2..f870ca126 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -29,6 +29,7 @@ "runeAltarCraft": { "category": "block", "sounds":["runeAltarCraft"] }, "runeAltarStart": { "category": "block", "sounds":["runeAltarStart"] }, "spreaderFire": { "category": "block", "sounds":["spreaderFire"] }, + "starcaller": { "category": "player", "sounds":["starcaller"] }, "terraBlade": { "category": "player", "sounds":["terraBlade"] }, "terraformRod": { "category": "player", "sounds":["terraformRod"] }, "terraPickMode": { "category": "player", "sounds":["terraPickMode"] }, diff --git a/src/main/resources/assets/botania/sounds/starcaller.ogg b/src/main/resources/assets/botania/sounds/starcaller.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cea96c31dcf898c8e2532e8f770bb2d4838aaef3 GIT binary patch literal 10649 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/unused/starSword.png b/src/main/resources/assets/botania/textures/items/starSword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/starSword.png rename to src/main/resources/assets/botania/textures/items/starSword.png