From 6f99b2fd6c4ad126f410d930213af45e05c05c3c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 1 Oct 2016 22:26:20 +0100 Subject: [PATCH] Messenger lens --- .../common/crafting/ModCraftingRecipes.java | 10 +++++++- .../botania/common/item/lens/ItemLens.java | 7 ++++-- .../common/item/lens/LensMessenger.java | 25 +++++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 3 ++- .../botania/common/lib/LibItemNames.java | 3 ++- .../resources/assets/botania/lang/en_US.lang | 4 +++ .../botania/models/item/lensMessenger.json | 7 ++++++ 7 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/lens/LensMessenger.java create mode 100644 src/main/resources/assets/botania/models/item/lensMessenger.json diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 2d515cfa1..6de1148f1 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -170,6 +170,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeLensRedirect; public static IRecipe recipeLensFirework; public static IRecipe recipeLensFlare; + public static IRecipe recipeLensMessenger; public static List recipesMiniIsland; public static IRecipe recipeGaiaPylon; public static IRecipe recipeGatherDrum; @@ -1125,7 +1126,14 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 21), new ItemStack(ModItems.lens), new ItemStack(ModBlocks.elfGlass), LibOreDict.ELEMENTIUM); recipeLensFlare = BotaniaAPI.getLatestAddedRecipe(); - // Mini Island Recipes + // Messenger Lens Recipe + addOreDictRecipe(new ItemStack(ModItems.lens, 1, 22), + " P ", "PLP", " P ", + 'P', new ItemStack(Items.PAPER), + 'L', new ItemStack(ModItems.lens)); + recipeLensMessenger = BotaniaAPI.getLatestAddedRecipe(); + + // Mini Island for(int i = 0; i < 16; i++) GameRegistry.addRecipe(new ItemStack(ModBlocks.floatingFlower, 1, i), "F", "S", "D", diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 1feed3d46..a11903ef1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -45,7 +45,7 @@ import java.util.List; public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { - public static final int SUBTYPES = 22; + public static final int SUBTYPES = 23; public static final int NORMAL = 0, SPEED = 1, @@ -68,7 +68,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens WARP = 18, REDIRECT = 19, FIREWORK = 20, - FLARE = 21; + FLARE = 21, + MESSENGER = 22; public static final int STORM = 5000; @@ -108,6 +109,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens setProps(REDIRECT, PROP_TOUCH | PROP_INTERACTION); setProps(FIREWORK, PROP_TOUCH); setProps(FLARE, PROP_CONTROL); + setProps(MESSENGER, PROP_POWER); setLens(NORMAL, fallbackLens); setLens(SPEED, new LensSpeed()); @@ -131,6 +133,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens setLens(REDIRECT, new LensRedirect()); setLens(FIREWORK, new LensFirework()); setLens(FLARE, new LensFlare()); + setLens(MESSENGER, new LensMessenger()); } private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java b/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java new file mode 100644 index 000000000..4dc94fc3e --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/lens/LensMessenger.java @@ -0,0 +1,25 @@ +/** + * 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 @ [01/10/2016, 20:37:46 (GMT)] + */ +package vazkii.botania.common.item.lens; + +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.BurstProperties; + +public class LensMessenger extends Lens { + + @Override + public void apply(ItemStack stack, BurstProperties props) { + props.maxMana /= 5; + props.ticksBeforeManaLoss *= 3; + props.motionModifier *= 3F; + } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 48bb94cea..8491c9001 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -449,7 +449,8 @@ public final class LexiconData { new PageCraftingRecipe("7", ModCraftingRecipes.recipeLensVelocity), new PageText("8"), new PageCraftingRecipe("9", ModCraftingRecipes.recipeLensPotency), new PageText("10"), new PageCraftingRecipe("11", ModCraftingRecipes.recipeLensResistance), new PageText("12"), - new PageCraftingRecipe("13", ModCraftingRecipes.recipeLensEfficiency), new PageText("14"), + new PageCraftingRecipe("13", ModCraftingRecipes.recipeLensEfficiency), new PageText("38"), + new PageCraftingRecipe("39", ModCraftingRecipes.recipeLensMessenger), new PageText("14"), new PageCraftingRecipe("15", ModCraftingRecipes.recipeLensBounce), new PageText("16"), new PageCraftingRecipe("17", ModCraftingRecipes.recipeLensGravity), new PageText("18"), new PageCraftingRecipe("19", ModCraftingRecipes.recipeLensBore), new PageText("20"), diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 150081047..0e7f5067e 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -183,7 +183,8 @@ public final class LibItemNames { "lensWarp", "lensRedirect", "lensFirework", - "lensFlare" + "lensFlare", + "lensMessenger" }; public static final String[] MANA_RESOURCE_NAMES = new String[] { diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a1a594671..c05ad27e4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1349,6 +1349,8 @@ item.botania:lensFirework.name=Mana Lens: Celebratory item.botania:lensFirework.short=Celebratory item.botania:lensFlare.name=Mana Lens: Flare item.botania:lensFlare.short=Flare +item.botania:lensMessenger.name=Mana Lens: Messenger +item.botania:lensMessenger.short=Messenger item.botania:rune0.name=Rune of Water item.botania:rune1.name=Rune of Fire item.botania:rune2.name=Rune of Earth @@ -2148,6 +2150,8 @@ botania.page.lens12=The &1Efficiency Lens&0 will decrease the amount of time it botania.page.lens13=Efficiency Lens botania.page.lens14=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. botania.page.lens15=Bounce Lens +botania.page.lens38=The &1Messenger Lens&0 massively decreases the amount of &4Mana&0 a &4Mana Burst&0 carries, and also drastically increases the burst's speed and maximum distance.
This can be very useful for interactions with blocks such as the &1Mana Detector&0, &1Drum of the Wild&0, &1Animated Torch&0, among others. +botania.page.lens39=Messenger Lens botania.page.lens16=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus moving in an arc. As compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. botania.page.lens17=Gravity Lens botania.page.lens18=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact with, draining its own mana to do so. diff --git a/src/main/resources/assets/botania/models/item/lensMessenger.json b/src/main/resources/assets/botania/models/item/lensMessenger.json new file mode 100644 index 000000000..9ec14408f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensMessenger.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensInside", + "layer1": "botania:items/lensMessenger" + } +} \ No newline at end of file