From fa239f36866d03ad214a4998c2a46ce288d1342c Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 17 Aug 2015 18:19:48 +0100 Subject: [PATCH] Starcaller recipe/docs. --- .../vazkii/botania/common/core/BotaniaCreativeTab.java | 1 + .../botania/common/crafting/ModCraftingRecipes.java | 10 ++++++++++ .../botania/common/entity/EntityFallingStar.java | 4 ++-- .../vazkii/botania/common/lexicon/LexiconData.java | 4 ++++ .../java/vazkii/botania/common/lib/LibLexicon.java | 1 + src/main/resources/assets/botania/lang/en_US.lang | 5 +++++ 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index fd8dc3eed..fe9deb88e 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -169,6 +169,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.elementiumAxe); addItem(ModItems.elementiumShears); addItem(ModItems.elementiumSword); + addItem(ModItems.starSword); addItem(ModItems.crystalBow); addItem(ModItems.elementiumHelm); if(Botania.thaumcraftLoaded) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c78f94dfe..0b6cbf31e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -276,6 +276,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeManaBomb; public static IRecipe recipeCobweb; public static IRecipe recipeSlimeBottle; + public static IRecipe recipeStarSword; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1876,6 +1877,15 @@ public final class ModCraftingRecipes { 'S', new ItemStack(Items.slime_ball)); recipeSlimeBottle = BotaniaAPI.getLatestAddedRecipe(); + // Starcaller Recipe + addOreDictRecipe(new ItemStack(ModItems.starSword), + " I", "AD ", "TA ", + 'I', LibOreDict.ELEMENTIUM, + 'D', LibOreDict.DRAGONSTONE, + 'A', LibOreDict.ENDER_AIR_BOTTLE, + 'T', new ItemStack(ModItems.terraSword)); + recipeStarSword = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block/Nugget Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 80314a49a..b413fb470 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -70,8 +70,8 @@ public class EntityFallingStar extends EntityThrowableCopy { 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); + pos.entityHit.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) thrower), 10); + else pos.entityHit.attackEntityFrom(DamageSource.generic, 10); } Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index f9961573e..4b82d9d1f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -214,6 +214,7 @@ public final class LexiconData { public static LexiconEntry blackHoleTalisman; public static LexiconEntry corporeaCrystalCube; public static LexiconEntry luminizerTransport; + public static LexiconEntry starSword; public static LexiconEntry baublesIntro; public static LexiconEntry cosmeticBaubles; @@ -814,6 +815,9 @@ public final class LexiconData { luminizerTransport = new ALexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); luminizerTransport.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLuminizer), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeDetectorLuminizer), new PageText("5"), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLuminizerLauncher)); + starSword = new ALexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder); + starSword.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeStarSword)); + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index cb9131130..b76f6c580 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -183,6 +183,7 @@ public final class LibLexicon { public static final String ENDER_BLACK_HOLE_TALISMAN = "blackHoleTalisman"; 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 BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_COSMETIC = "cosmeticBaubles"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index b1b7c921a..295955489 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2598,6 +2598,11 @@ botania.page.luminizerTransport4=Are you ready to draw? botania.page.luminizerTransport5=While players can just right click the &1Luminizers&0, in order to get animals or other beings into the trails, a &1Luminizer Launcher&0 is required.
This block needs to be placed down adjacent to &1Luminizers&0, and when it receives a &4redstone pulse&0, it'll randomly distribute all living beings on top of it into all of the adjacent &1Luminizers&0, causing them to go on their merry way. botania.page.luminizerTransport6=Let's believe it, open the flag +# -- STARCALLER +botania.entry.starSword=Starcaller +botania.page.starSword0=The &1Starcaller&0 is a blade with the power to call upon the wrath of the stars, when swung, there's a chance for the blade to summon a falling star heading towards where the wielder is looking, this star will deal damage upon impact with any entities. Creating this sword proves to be no easy task, as it requires &1Ender Air&0 and a &1Terra Blade&0. Keep in mind that the process does wipe the enchantments on the sword used. +botania.page.starSword1=Caller, fury, whatever... + # - BAUBLES AND ACCESSORIES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles