diff --git a/MODSRC/vazkii/botania/common/brew/ModBrews.java b/MODSRC/vazkii/botania/common/brew/ModBrews.java index 6cdb5b3d7..6a2ae143d 100644 --- a/MODSRC/vazkii/botania/common/brew/ModBrews.java +++ b/MODSRC/vazkii/botania/common/brew/ModBrews.java @@ -32,7 +32,17 @@ public class ModBrews { public static Brew absorption; public static Brew soulCross; + public static Brew featherfeet; + public static Brew emptiness; + public static Brew fulfilment; + public static Brew livingReactor; + public static Brew overload; + public static Brew manashock; + public static Brew gravitation; + public static Brew cleansing; + public static Brew warpWard; + public static void init() { 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)); @@ -48,6 +58,15 @@ public class ModBrews { absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3)); soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0)); + featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet.id, 1800, 0)); + emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness.id, 7200, 0)); + fulfilment = new BrewModPotion(LibBrewNames.FULFILMENT, 20000, new PotionEffect(ModPotions.fulfilment.id, 7200, 0)); + livingReactor = new BrewModPotion(LibBrewNames.LIVING_REACTOR, 9000, new PotionEffect(ModPotions.livingReactor.id, 200, 0)); + overload = new BrewMod(LibBrewNames.OVERLOAD, 0x232323, 12000, new PotionEffect(Potion.damageBoost.id, 1800, 3), new PotionEffect(Potion.moveSpeed.id, 1800, 2), new PotionEffect(Potion.weakness.id, 1800, 2), new PotionEffect(Potion.hunger.id, 200, 0)); + manashock = new BrewModPotion(LibBrewNames.MANASHOCK, 15000, new PotionEffect(ModPotions.manashock.id, 200, 0)); + gravitation = new BrewModPotion(LibBrewNames.MANASHOCK, 12000, new PotionEffect(ModPotions.gravitation.id, 1800, 0)); + cleansing = new BrewModPotion(LibBrewNames.CLEANSING, 16000, new PotionEffect(ModPotions.cleansing.id, 1200, 0)); + + // TODO Warp Ward if TC is loaded } - } diff --git a/MODSRC/vazkii/botania/common/brew/ModPotions.java b/MODSRC/vazkii/botania/common/brew/ModPotions.java index 7fcda5b81..c3314d182 100644 --- a/MODSRC/vazkii/botania/common/brew/ModPotions.java +++ b/MODSRC/vazkii/botania/common/brew/ModPotions.java @@ -15,17 +15,38 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import net.minecraft.potion.Potion; +import vazkii.botania.common.brew.potion.PotionCleansing; +import vazkii.botania.common.brew.potion.PotionEmptiness; +import vazkii.botania.common.brew.potion.PotionFeatherfeet; +import vazkii.botania.common.brew.potion.PotionFulfilment; +import vazkii.botania.common.brew.potion.PotionGravitation; +import vazkii.botania.common.brew.potion.PotionLivingReactor; +import vazkii.botania.common.brew.potion.PotionManashock; import vazkii.botania.common.brew.potion.PotionSoulCross; public class ModPotions { public static Potion soulCross; - + public static Potion featherfeet; + public static Potion emptiness; + public static Potion fulfilment; + public static Potion livingReactor; + public static Potion manashock; + public static Potion gravitation; + public static Potion cleansing; + public static void init() { if(Potion.potionTypes.length < 256) extendPotionArray(); soulCross = new PotionSoulCross(); + featherfeet = new PotionFeatherfeet(); + emptiness = new PotionEmptiness(); + fulfilment = new PotionFulfilment(); + livingReactor = new PotionLivingReactor(); + manashock = new PotionManashock(); + gravitation = new PotionGravitation(); + cleansing = new PotionCleansing(); } // This is the method that everyone and their mom uses right? diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionCleansing.java b/MODSRC/vazkii/botania/common/brew/potion/PotionCleansing.java new file mode 100644 index 000000000..8aa91545b --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionCleansing.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:17:08 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionCleansing extends PotionMod { + + public PotionCleansing() { + super(LibPotionNames.CLEANSING, false, 0xFF2B94, 7); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionEmptiness.java b/MODSRC/vazkii/botania/common/brew/potion/PotionEmptiness.java new file mode 100644 index 000000000..38749285f --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:12:36 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionEmptiness extends PotionMod { + + public PotionEmptiness() { + super(LibPotionNames.EMPTINESS, false, 0xE7E7E7, 2); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/MODSRC/vazkii/botania/common/brew/potion/PotionFeatherfeet.java new file mode 100644 index 000000000..9b4bad6dc --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:12:04 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionFeatherfeet extends PotionMod { + + public PotionFeatherfeet() { + super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionFulfilment.java b/MODSRC/vazkii/botania/common/brew/potion/PotionFulfilment.java new file mode 100644 index 000000000..794d42cc2 --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionFulfilment.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:13:09 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionFulfilment extends PotionMod { + + public PotionFulfilment() { + super(LibPotionNames.FULFILMENT, false, 0xF4C4AE, 3); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionGravitation.java b/MODSRC/vazkii/botania/common/brew/potion/PotionGravitation.java new file mode 100644 index 000000000..bb2f2a49d --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionGravitation.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:16:43 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionGravitation extends PotionMod { + + public PotionGravitation() { + super(LibPotionNames.GRAVITATION, false, 0x6000FF, 6); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionLivingReactor.java b/MODSRC/vazkii/botania/common/brew/potion/PotionLivingReactor.java new file mode 100644 index 000000000..a9cd66dd4 --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionLivingReactor.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:14:00 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionLivingReactor extends PotionMod { + + public PotionLivingReactor() { + super(LibPotionNames.LIVING_REACTOR, false, 0x0FB662, 4); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionManashock.java b/MODSRC/vazkii/botania/common/brew/potion/PotionManashock.java new file mode 100644 index 000000000..aa10878ef --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionManashock.java @@ -0,0 +1,22 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 3, 2014, 12:15:09 AM (GMT)] + */ +package vazkii.botania.common.brew.potion; + +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionManashock extends PotionMod { + + public PotionManashock() { + super(LibPotionNames.MANASHOCK, false, 0x0034E4, 5); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/potion/PotionMod.java b/MODSRC/vazkii/botania/common/brew/potion/PotionMod.java index de00cc5b4..49339b816 100644 --- a/MODSRC/vazkii/botania/common/brew/potion/PotionMod.java +++ b/MODSRC/vazkii/botania/common/brew/potion/PotionMod.java @@ -25,7 +25,7 @@ public class PotionMod extends Potion { public PotionMod(String name, boolean badEffect, int color, int iconIndex) { super(findFreeID(), badEffect, color); setPotionName("botania.potion." + name); - setIconIndex(iconIndex % 8 * 8, iconIndex / 8); + setIconIndex(iconIndex % 8, iconIndex / 8); } static int findFreeID() { diff --git a/MODSRC/vazkii/botania/common/lib/LibBrewNames.java b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java index 05fdc0e6e..b5f4d269b 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBrewNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java @@ -27,5 +27,15 @@ public final class LibBrewNames { public static final String ABSORPTION = "absorption"; public static final String SOUL_CROSS = "soulCross"; + public static final String FEATHER_FEET = "featherFeet"; + public static final String EMPTINESS = "emptiness"; + public static final String FULFILMENT = "fulfilment"; + public static final String LIVING_REACTOR = "livingReactor"; + public static final String OVERLOAD = "overload"; + public static final String MANASHOCK = "manashock"; + public static final String GRAVITATION = "gravitation"; + public static final String CLEANSING = "cleansing"; + public static final String WARP_WARD = "warpWard"; + } diff --git a/MODSRC/vazkii/botania/common/lib/LibPotionNames.java b/MODSRC/vazkii/botania/common/lib/LibPotionNames.java index a24b978a7..6da4406d7 100644 --- a/MODSRC/vazkii/botania/common/lib/LibPotionNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibPotionNames.java @@ -14,5 +14,12 @@ package vazkii.botania.common.lib; public final class LibPotionNames { public static final String SOUL_CROSS = "soulCross"; + public static final String FEATHER_FEET = "featherFeet"; + public static final String EMPTINESS = "emptiness"; + public static final String FULFILMENT = "fulfilment"; + public static final String LIVING_REACTOR = "livingReactor"; + public static final String MANASHOCK = "manashock"; + public static final String GRAVITATION = "gravitation"; + public static final String CLEANSING = "cleansing"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index b3ac5b023..018480f96 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -63,7 +63,7 @@ botaniamisc.dropTip1=CTRL-%key% will drop a full stack botaniamisc.wandMode.bind=Bind Mode botaniamisc.wandMode.function=Function Mode botaniamisc.playVideo=Play Video -botaniamisc.brewOf=Brew of %s +botaniamisc.brewOf=%s Brew # NEI INTEGRATION botania.nei.elvenTrade=Elven Trade @@ -788,9 +788,25 @@ botania.brew.invisibility=Cloaking botania.brew.nightVision=Owlsight botania.brew.absorption=Shielding botania.brew.soulCross=Crossed Souls +botania.brew.featherFeet=Feather Feet +botania.brew.emptiness=Vanity's Emptiness +botania.brew.fulfilment=Vanity's Fulfilment +botania.brew.overload=Overload +botania.brew.livingReactor=Living Reactive +botania.brew.manashock=Manashock +botania.brew.gravitation=Twisted Gravity +botania.brew.cleansing=Cleansing +botania.brew.warpWard=Sane Thoughts # POTION NAMES botania.potion.soulCross=Soul Cross +botania.potion.featherFeet=Feather Feet +botania.potion.emptiness=Emptiness +botania.potion.fulfilment=Fulfilment +botania.potion.livingReactor=Living Reactor +botania.potion.manashock=Manashock +botania.potion.gravitation=Gravitation +botania.potion.cleansing=Cleansing # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents diff --git a/resources/assets/botania/textures/gui/potions.png b/resources/assets/botania/textures/gui/potions.png index b922862c2..cc5dfc88a 100644 Binary files a/resources/assets/botania/textures/gui/potions.png and b/resources/assets/botania/textures/gui/potions.png differ