diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 10cfb241c..13caacc86 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -215,6 +215,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeDirtPath; public static IRecipe recipeDreamwoodTwig; public static IRecipe recipeMonocle; + public static IRecipe recipeClip; public static void init() { // Lexicon Recipe @@ -1402,6 +1403,12 @@ public final class ModCraftingRecipes { 'N', new ItemStack(Items.gold_nugget)); recipeMonocle = BotaniaAPI.getLatestAddedRecipe(); + // Lens Clip Recipe + addOreDictRecipe(new ItemStack(ModItems.clip), + " D ", "D D", "DD ", + 'D', LibOreDict.DREAM_WOOD); + recipeClip = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 86a8360b9..2fabe395d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -76,7 +76,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(par3EntityPlayer.isSneaking()) { + if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) { rotatePos(par1ItemStack); par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); if(par2World.isRemote) diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 8a63020a5..85330fc4a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -152,6 +152,7 @@ public final class LexiconData { public static LexiconEntry regenIvy; public static LexiconEntry missileRod; public static LexiconEntry craftingHalo; + public static LexiconEntry clip; public static LexiconEntry baublesIntro; public static LexiconEntry tinyPlanet; @@ -583,6 +584,9 @@ public final class LexiconData { craftingHalo = new BLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCraftingHalo)); + clip = new ALexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); + clip.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeClip)); + // 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 1604979b9..5148ffefc 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -133,6 +133,7 @@ public final class LibLexicon { public static final String TOOL_REGEN_IVY = "regenIvy"; public static final String TOOL_MISSILE_ROD = "missileRod"; public static final String TOOL_CRAFTING_HALO = "craftingHalo"; + public static final String TOOL_CLIP = "clip"; public static final String BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2fe36263d..d55d06b31 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1643,6 +1643,12 @@ botania.page.craftingHalo0=Carrying a &1Crafting Table&0 around generally can be botania.page.craftingHalo1=As long as the item is present in the inventory the last crafting recipe done will be stored in it.
Right clicking an empty slot of the halo will set the last recipe on it. Right clicking a slot with a recipe will try to do it using items from the inventory. Removing a recipe can be done through shift-left click. botania.page.craftingHalo2=It has no taste if you cook it from the menu +# -- LENS CLIP +botania.entry.clip=Lens Clip +botania.page.clip0=While a formidable and versatile tool, the &1Mana Blaster&0's greatest downfall is the lack of an ability to store more than one &1Lens&0 at once. Not any more. The &1Lens Clip&0 will attach to a &1Mana Blaster&0 in a crafting grid and allow it to store up to 6 lenses rather than just one.
As they say, Russian Roulette is not the same without a gun... +botania.page.clip1=Adding and removing &1Lenses&0 works just as it did previously, with one detail. The lens will be added or removed in the slot that the clip is currently on.
To change this slot, simply shift-right click the &1Mana Blaster&0 in the air. This will also change which lens is selected, case there is one in that slot. +botania.page.clip2=Since we're dubbed by 4Kids we must make do without one + # - BAUBLES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles