From e3d5fbc091c1e268c429a19ccce4aa82091e3347 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 2 Nov 2014 21:22:06 +0000 Subject: [PATCH] Add all of the basic vanilla potions as brews. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 3 +- .../vazkii/botania/common/brew/ModBrews.java | 24 ++++++++++++-- .../common/crafting/ModBrewRecipes.java | 24 +++++++++++++- .../botania/common/lexicon/LexiconData.java | 7 +++- .../botania/common/lib/LibBrewNames.java | 10 ++++++ resources/assets/botania/lang/en_US.lang | 32 ++++++++++++++++++- 6 files changed, 94 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 75c2d814c..12d4f58a0 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -13,6 +13,7 @@ package vazkii.botania.api; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -58,7 +59,7 @@ public final class BotaniaAPI { public static Map knowledgeTypes = new HashMap(); - public static Map brewMap = new HashMap(); + public static Map brewMap = new LinkedHashMap(); public static List petalRecipes = new ArrayList(); public static List runeAltarRecipes = new ArrayList(); diff --git a/MODSRC/vazkii/botania/common/brew/ModBrews.java b/MODSRC/vazkii/botania/common/brew/ModBrews.java index 6606f6a27..8b0a4a5a9 100644 --- a/MODSRC/vazkii/botania/common/brew/ModBrews.java +++ b/MODSRC/vazkii/botania/common/brew/ModBrews.java @@ -20,10 +20,30 @@ public class ModBrews { public static Brew speed; public static Brew strength; + public static Brew haste; + public static Brew healing; + public static Brew jumpBoost; + public static Brew regen; + public static Brew resistance; + public static Brew fireResistance; + public static Brew waterBreathing; + public static Brew invisibility; + public static Brew nightVision; + public static Brew absorption; public static void init() { - speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 2000, new PotionEffect(Potion.moveSpeed.id, 1800, 1)); - strength = new BrewMod(LibBrewNames.STRENGTH, 0XEE3F3F, 2000, new PotionEffect(Potion.damageBoost.id, 1800, 1)); + speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 4000, new PotionEffect(Potion.moveSpeed.id, 1800, 1)); + strength = new BrewMod(LibBrewNames.STRENGTH, 0xEE3F3F, 4000, new PotionEffect(Potion.damageBoost.id, 1800, 1)); + haste = new BrewMod(LibBrewNames.HASTE, 0xF4A432, 4000, new PotionEffect(Potion.digSpeed.id, 1800, 1)); + healing = new BrewMod(LibBrewNames.HEALING, 0xFF5ECC, 6000, new PotionEffect(Potion.heal.id, 0, 1)); + jumpBoost = new BrewMod(LibBrewNames.JUMP_BOOST, 0x32F46D, 4000, new PotionEffect(Potion.jump.id, 1800, 1)); + regen = new BrewMod(LibBrewNames.REGEN, 0xFD6488, 7000, new PotionEffect(Potion.regeneration.id, 500, 1)); + resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(Potion.resistance.id, 1800, 1)); + fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(Potion.fireResistance.id, 9600, 0)); + waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(Potion.waterBreathing.id, 9600, 0)); + invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 4000, new PotionEffect(Potion.invisibility.id, 9600, 0)); + nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0)); + absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3)); } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java index 4b57bf5e2..c7d3ad5eb 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -11,20 +11,42 @@ */ package vazkii.botania.common.crafting; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.item.ModItems; public class ModBrewRecipes { public static RecipeBrew speedBrew; public static RecipeBrew strengthBrew; - + public static RecipeBrew hasteBrew; + public static RecipeBrew healingBrew; + public static RecipeBrew jumpBoostBrew; + public static RecipeBrew regenerationBrew; + public static RecipeBrew resistanceBrew; + public static RecipeBrew fireResistanceBrew; + public static RecipeBrew waterBreathingBrew; + public static RecipeBrew invisibilityBrew; + public static RecipeBrew nightVisionBrew; + public static RecipeBrew absorptionBrew; + public static void init() { speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, new ItemStack(Items.nether_wart), new ItemStack(Items.sugar), new ItemStack(Items.redstone)); strengthBrew = BotaniaAPI.registerBrewRecipe(ModBrews.strength, new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_powder), new ItemStack(Items.glowstone_dust)); + hasteBrew = BotaniaAPI.registerBrewRecipe(ModBrews.haste, new ItemStack(Items.nether_wart), new ItemStack(Items.sugar), new ItemStack(Items.gold_nugget)); + healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, new ItemStack(Items.nether_wart), new ItemStack(Items.speckled_melon), new ItemStack(Items.potato)); + jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, new ItemStack(Items.nether_wart), new ItemStack(Items.feather), new ItemStack(Items.carrot)); + regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, new ItemStack(Items.nether_wart), new ItemStack(Items.ghast_tear), new ItemStack(Items.glowstone_dust)); + resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.nether_wart), new ItemStack(Items.iron_ingot), new ItemStack(Items.leather)); + fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.nether_wart), new ItemStack(Items.magma_cream), new ItemStack(Blocks.netherrack)); + waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.nether_wart), new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.glowstone_dust)); + invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, new ItemStack(Items.nether_wart), new ItemStack(Items.snowball), new ItemStack(Items.glowstone_dust)); + nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.nether_wart), new ItemStack(Items.spider_eye), new ItemStack(Items.golden_carrot)); + absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.nether_wart), new ItemStack(Items.golden_apple), new ItemStack(Items.potato)); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 70be8e9d2..93a6153d5 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -456,7 +456,12 @@ public final class LexiconData { brewery = new BLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); brewery.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeBrewery), new PageCraftingRecipe("3", ModCrafingRecipes.recipeVial), new PageText("4"), - new PageBrew(ModBrewRecipes.speedBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.strengthBrew, "6a", "6b")); + new PageBrew(ModBrewRecipes.speedBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.strengthBrew, "6a", "6b"), + new PageBrew(ModBrewRecipes.hasteBrew, "7a", "7b"), new PageBrew(ModBrewRecipes.healingBrew, "8a", "8b"), + new PageBrew(ModBrewRecipes.jumpBoostBrew, "9a", "9b"), new PageBrew(ModBrewRecipes.regenerationBrew, "10a", "10b"), + new PageBrew(ModBrewRecipes.resistanceBrew, "11a", "11b"), new PageBrew(ModBrewRecipes.fireResistanceBrew, "12a", "12b"), + new PageBrew(ModBrewRecipes.waterBreathingBrew, "13a", "13b"), new PageBrew(ModBrewRecipes.invisibilityBrew, "14a", "14b"), + new PageBrew(ModBrewRecipes.nightVisionBrew, "15a", "15b"), new PageBrew(ModBrewRecipes.absorptionBrew, "16a", "16b")); flasks = new ALexiconEntry(LibLexicon.DEVICE_FLASKS, categoryDevices); flasks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeFlask)); diff --git a/MODSRC/vazkii/botania/common/lib/LibBrewNames.java b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java index 2b4a51dd0..927a90cdf 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBrewNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java @@ -15,5 +15,15 @@ public final class LibBrewNames { public static final String SPEED = "speed"; public static final String STRENGTH = "strength"; + public static final String HASTE = "haste"; + public static final String HEALING = "healing"; + public static final String JUMP_BOOST = "jumpBoost"; + public static final String REGEN = "regen"; + public static final String RESISTANCE = "resistance"; + public static final String FIRE_RESISTANCE = "fireResistance"; + public static final String WATER_BREATHING = "waterBreathing"; + public static final String INVISIBILITY = "invisibility"; + public static final String NIGHT_VISION = "nightVision"; + public static final String ABSORPTION = "absorption"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index c11c1844a..8bdc4848f 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -776,7 +776,17 @@ item.botania:brewFlask.name=Flask of %s (%s) # BREW NAMES botania.brew.fallback=Fallback botania.brew.speed=Fleetfeet -botania.brew.strength=Fortitude +botania.brew.strength=Vigor +botania.brew.haste=Adrenaline +botania.brew.healing=Mending +botania.brew.jumpBoost=Upsurging +botania.brew.regen=Revitalization +botania.brew.resistance=Fortitude +botania.brew.fireResistance=Magmaskin +botania.brew.waterBreathing=Gills +botania.brew.invisibility=Cloaking +botania.brew.nightVision=Owlsight +botania.brew.absorption=Shielding # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents @@ -1259,6 +1269,26 @@ botania.page.brewery5a=A simple brew, it mimics a &1Potion of Swiftness&0, when botania.page.brewery5b=Gotta go fast botania.page.brewery6a=A simple brew, it mimics a &1Potion of Strength&0, when taken, it has a similar effect, giving the individual a &4Strength II&0 effect. botania.page.brewery6b=Hodor +botania.page.brewery7a=A simple brew, it mimics a &1Potion of Haste&0, when taken, it has a similar effect, giving the individual a &4Haste II&0 effect. +botania.page.brewery7b=Full of C9H13NO3 +botania.page.brewery8a=A simple brew, it mimics a &1Potion of Healing&0, when taken, it has a similar effect, giving the individual an &4Instant Health II&0 effect. +botania.page.brewery8b=He pulled a Truesilver, GG +botania.page.brewery9a=A simple brew, it mimics a &1Potion of Leaping&0, when taken, it has a similar effect, giving the individual a &4Jump Boost II&0 effect. +botania.page.brewery9b=I got jumps, isn't that what the kids say? +botania.page.brewery10a=A simple brew, it mimics a &1Potion of Regeneration&0, when taken, it has a similar effect, giving the individual a &4Regeneration II&0 effect. +botania.page.brewery10b=Good reaction to simochi +botania.page.brewery11a=A simple brew, it mimics a &1Potion of Resistance&0, when taken, it has a similar effect, giving the individual a &4Resistance II&0 effect. +botania.page.brewery11b=Can't touch this +botania.page.brewery12a=A simple brew, it mimics a &1Potion of Fire Resistance&0, when taken, it has a similar effect, giving the individual a &4Fire Resistance&0 effect. +botania.page.brewery12b=He isn't a true dragon, fire can't kill a dragon +botania.page.brewery13a=A simple brew, it mimics a &1Potion of Water Breathing&0, when taken, it has a similar effect, giving the individual a &4Water Breathing&0 effect. +botania.page.brewery13b=Under the sea, under the sea +botania.page.brewery14a=A simple brew, it mimics a &1Potion of Invisibility&0, when taken, it has a similar effect, giving the individual a &4Invisibility&0 effect. +botania.page.brewery14b=Pretend you have Incursio +botania.page.brewery15a=A simple brew, it mimics a &1Potion of Night Vision&0, when taken, it has a similar effect, giving the individual a &4Night Vision&0 effect. +botania.page.brewery15b=Does it come with a silence? +botania.page.brewery16a=A simple brew, it mimics a &1Potion of Absorption&0, when taken, it has a similar effect, giving the individual a &4Absorption IV&0 effect. +botania.page.brewery16b=You're gonna catch a cold # -- BREWING FLASKS botania.entry.flasks=Brewing Flasks