mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 12:42:50 +00:00
Did someone say [Thunderfury, Blessed Blade of the Windseeker]?
This commit is contained in:
1 parent
b04ba666ec
commit
b0967c5609
9 files changed
+126
-3
No files matched your search
@@ -171,6 +171,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addItem(ModItems.elementiumShears);
|
||||
addItem(ModItems.elementiumSword);
|
||||
addItem(ModItems.starSword);
|
||||
addItem(ModItems.thunderSword);
|
||||
addItem(ModItems.crystalBow);
|
||||
addItem(ModItems.elementiumHelm);
|
||||
if(Botania.thaumcraftLoaded)
|
||||
|
||||
@@ -280,7 +280,8 @@ public final class ModCraftingRecipes {
|
||||
public static IRecipe recipeExchangeRod;
|
||||
public static IRecipe recipeGreaterMagnetRing;
|
||||
public static IRecipe recipeFireChakram;
|
||||
|
||||
public static IRecipe recipeThunderSword;
|
||||
|
||||
// Garden of Glass
|
||||
public static IRecipe recipeRootToSapling;
|
||||
public static IRecipe recipeRootToFertilizer;
|
||||
@@ -1915,6 +1916,15 @@ public final class ModCraftingRecipes {
|
||||
'C', new ItemStack(ModItems.thornChakram));
|
||||
recipeFireChakram = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Thundercaller Recipe
|
||||
addOreDictRecipe(new ItemStack(ModItems.thunderSword),
|
||||
" I", "AD ", "TA ",
|
||||
'I', LibOreDict.ELEMENTIUM,
|
||||
'D', LibOreDict.MANA_DIAMOND,
|
||||
'A', LibOreDict.ENDER_AIR_BOTTLE,
|
||||
'T', new ItemStack(ModItems.terraSword));
|
||||
recipeThunderSword = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Storage Block/Nugget Recipes
|
||||
|
||||
@@ -61,6 +61,7 @@ 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.ItemThunderSword;
|
||||
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;
|
||||
@@ -253,7 +254,8 @@ public final class ModItems {
|
||||
public static Item starSword;
|
||||
public static Item exchangeRod;
|
||||
public static Item magnetRingGreater;
|
||||
|
||||
public static Item thunderSword;
|
||||
|
||||
public static void init() {
|
||||
lexicon = new ItemLexicon();
|
||||
petal = new ItemPetal();
|
||||
@@ -393,7 +395,8 @@ public final class ModItems {
|
||||
starSword = new ItemStarSword();
|
||||
exchangeRod = new ItemExchangeRod();
|
||||
magnetRingGreater = new ItemGreaterMagnetRing();
|
||||
|
||||
thunderSword = new ItemThunderSword();
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
|
||||
for(int i = 0; i < 16; i++) {
|
||||
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i));
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. 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 27, 2015, 10:38:50 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.tool;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.command.IEntitySelector;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.monster.IMob;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.common.Botania;
|
||||
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.item.equipment.tool.manasteel.ItemManasteelSword;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
|
||||
public class ItemThunderSword extends ItemManasteelSword implements ICraftAchievement {
|
||||
|
||||
private static final int MANA_PER_DAMAGE = 150;
|
||||
|
||||
private static final String TAG_LIGHTNING_SEED = "lightningSeed";
|
||||
|
||||
public ItemThunderSword() {
|
||||
super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.THUNDER_SWORD);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) {
|
||||
if(!(entity instanceof EntityPlayer) && entity != null) {
|
||||
double range = 8;
|
||||
final List<EntityLivingBase> alreadyTargetedEntities = new ArrayList();
|
||||
int dmg = 5;
|
||||
long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0);
|
||||
|
||||
IEntitySelector selector = new IEntitySelector() {
|
||||
|
||||
@Override
|
||||
public boolean isEntityApplicable(Entity e) {
|
||||
return e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
Random rand = new Random(lightningSeed);
|
||||
EntityLivingBase lightningSource = entity;
|
||||
for(int i = 0; i < 4; i++) {
|
||||
List<EntityLivingBase> entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector);
|
||||
if(entities.isEmpty())
|
||||
break;
|
||||
|
||||
EntityLivingBase target = entities.get(rand.nextInt(entities.size()));
|
||||
if(attacker instanceof EntityPlayer)
|
||||
target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg);
|
||||
else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg);
|
||||
|
||||
Botania.proxy.lightningFX(entity.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF);
|
||||
|
||||
alreadyTargetedEntities.add(target);
|
||||
lightningSource = target;
|
||||
dmg--;
|
||||
}
|
||||
|
||||
if(!entity.worldObj.isRemote)
|
||||
ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, entity.worldObj.rand.nextLong());
|
||||
}
|
||||
|
||||
|
||||
return super.hitEntity(stack, entity, attacker);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) {
|
||||
return ModAchievements.terrasteelWeaponCraft;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -217,6 +217,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry corporeaCrystalCube;
|
||||
public static LexiconEntry luminizerTransport;
|
||||
public static LexiconEntry starSword;
|
||||
public static LexiconEntry thunderSword;
|
||||
|
||||
public static LexiconEntry baublesIntro;
|
||||
public static LexiconEntry cosmeticBaubles;
|
||||
@@ -830,6 +831,9 @@ public final class LexiconData {
|
||||
starSword = new ALexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder);
|
||||
starSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarSword));
|
||||
|
||||
thunderSword = new ALexiconEntry(LibLexicon.ENDER_THUNDER_SWORD, categoryEnder);
|
||||
thunderSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeThunderSword));
|
||||
|
||||
// BAUBLES ENTRIES
|
||||
baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
|
||||
baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));
|
||||
|
||||
@@ -151,6 +151,7 @@ public final class LibItemNames {
|
||||
public static final String STAR_SWORD = "starSword";
|
||||
public static final String EXCHANGE_ROD = "exchangeRod";
|
||||
public static final String MAGNET_RING_GREATER = "magnetRingGreater";
|
||||
public static final String THUNDER_SWORD = "thunderSword";
|
||||
|
||||
public static final String[] LENS_NAMES = new String[] {
|
||||
"lensNormal",
|
||||
|
||||
@@ -186,6 +186,7 @@ public final class LibLexicon {
|
||||
public static final String ENDER_CORPOREA_CRYSTAL_CUBE = "corporeaCrystalCube";
|
||||
public static final String ENDER_LUMINIZER_TRANSPORT = "luminizerTransport";
|
||||
public static final String ENDER_STAR_SWORD = "starSword";
|
||||
public static final String ENDER_THUNDER_SWORD = "thunderSword";
|
||||
|
||||
public static final String BAUBLE_INTRO = "bIntro";
|
||||
public static final String BAUBLE_COSMETIC = "cosmeticBaubles";
|
||||
|
||||
Reference in new issue
Block a user