From 133f696c668d201360c6e89fad62f4bb461556d6 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 25 Jan 2015 22:21:51 +0000 Subject: [PATCH] Added new brews. --- .../vazkii/botania/common/brew/ModBrews.java | 18 +++---- .../botania/common/brew/ModPotions.java | 47 ++++++++++++++---- .../common/brew/potion/PotionAllure.java | 39 +++++++++++++++ .../common/brew/potion/PotionBloodthirst.java | 47 ++++++++++++++++++ .../common/brew/potion/PotionCleansing.java | 22 -------- .../common/brew/potion/PotionEmptiness.java | 24 +++++++++ .../common/brew/potion/PotionFeatherfeet.java | 12 +++++ .../common/brew/potion/PotionFulfilment.java | 22 -------- .../common/brew/potion/PotionGravitation.java | 22 -------- .../brew/potion/PotionLivingReactor.java | 22 -------- .../common/brew/potion/PotionManashock.java | 22 -------- .../botania/common/brew/potion/PotionMod.java | 9 ++++ .../common/brew/potion/PotionSoulCross.java | 16 ++++++ .../botania/common/lib/LibBrewNames.java | 7 +-- .../botania/common/lib/LibPotionNames.java | 7 +-- .../resources/assets/botania/lang/en_US.lang | 14 ++---- .../assets/botania/textures/gui/potions.png | Bin 6294 -> 5762 bytes 17 files changed, 197 insertions(+), 153 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java create mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java delete mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionCleansing.java delete mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionFulfilment.java delete mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionGravitation.java delete mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionLivingReactor.java delete mode 100644 src/main/java/vazkii/botania/common/brew/potion/PotionManashock.java diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 5de6ca976..73b9eaa49 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -32,15 +32,12 @@ public class ModBrews { public static Brew nightVision; public static Brew absorption; + public static Brew allure; public static Brew soulCross; public static Brew featherfeet; public static Brew emptiness; - public static Brew fulfilment; - public static Brew livingReactor; + public static Brew bloodthirst; public static Brew overload; - public static Brew manashock; - public static Brew gravitation; - public static Brew cleansing; public static Brew warpWard; @@ -59,15 +56,12 @@ public class ModBrews { 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)).setNotBloodPendantInfusable(); - /*soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 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, 2)); + 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));*/ + bloodthirst = new BrewModPotion(LibBrewNames.BLOODTHIRST, 20000, new PotionEffect(ModPotions.bloodthrst.id, 7200, 0)); + allure = new BrewModPotion(LibBrewNames.ALLURE, 2000, new PotionEffect(ModPotions.allure.id, 4800, 0)); } public static void initTC() { diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 9e5c758ee..f0fb5182a 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -11,31 +11,56 @@ */ package vazkii.botania.common.brew; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + import net.minecraft.potion.Potion; +import vazkii.botania.common.brew.potion.PotionAllure; +import vazkii.botania.common.brew.potion.PotionBloodthirst; +import vazkii.botania.common.brew.potion.PotionEmptiness; +import vazkii.botania.common.brew.potion.PotionFeatherfeet; +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 Potion bloodthrst; + public static Potion allure; public static void init() { - /*if(Potion.potionTypes.length < 256) + 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();*/ + bloodthrst = new PotionBloodthirst(); + allure = new PotionAllure(); + } + + private static void extendPotionArray() { + Potion[] potionTypes = null; + + for (Field f : Potion.class.getDeclaredFields()) { + f.setAccessible(true); + try { + if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { + Field modfield = Field.class.getDeclaredField("modifiers"); + modfield.setAccessible(true); + modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); + + potionTypes = (Potion[])f.get(null); + final Potion[] newPotionTypes = new Potion[256]; + System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); + f.set(null, newPotionTypes); + } + } catch (Exception e) { + System.err.println("Severe error, please report this to the mod author:"); + System.err.println(e); + } + } } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java new file mode 100644 index 000000000..ac168d658 --- /dev/null +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -0,0 +1,39 @@ +/** + * 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 cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityFishHook; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionAllure extends PotionMod { + + public PotionAllure() { + super(LibPotionNames.ALLURE, false, 0x0034E4, 5); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onEntityUpdate(LivingUpdateEvent event) { + EntityLivingBase e = event.entityLiving; + if(e instanceof EntityPlayer && hasEffect(e)) { + EntityFishHook hook = ((EntityPlayer) e).fishEntity; + if(hook != null) + hook.onUpdate(); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java new file mode 100644 index 000000000..2202292cb --- /dev/null +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -0,0 +1,47 @@ +/** + * 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 java.util.List; + +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; +import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.lib.LibPotionNames; + +public class PotionBloodthirst extends PotionMod { + + private static final int RANGE = 64; + + public PotionBloodthirst() { + super(LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { + List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); + for(EntityPlayer player : players) + if(hasEffect(player) && !hasEffect(player, ModPotions.emptiness)) { + event.setResult(Result.ALLOW); + return; + } + } + } + +} diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionCleansing.java b/src/main/java/vazkii/botania/common/brew/potion/PotionCleansing.java deleted file mode 100644 index 8aa91545b..000000000 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionCleansing.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 38749285f..447f1d79a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -11,12 +11,36 @@ */ package vazkii.botania.common.brew.potion; +import java.util.List; + +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.lib.LibPotionNames; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class PotionEmptiness extends PotionMod { + private static final int RANGE = 128; + public PotionEmptiness() { super(LibPotionNames.EMPTINESS, false, 0xE7E7E7, 2); + MinecraftForge.EVENT_BUS.register(this); } + @SubscribeEvent + public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if(event.getResult() != Result.ALLOW && event.entityLiving instanceof IMob) { + List players = event.world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(event.x - RANGE, event.y - RANGE, event.z - RANGE, event.x + RANGE, event.y + RANGE, event.z + RANGE)); + for(EntityPlayer player : players) + if(hasEffect(player)) { + event.setResult(Result.DENY); + return; + } + } + } + } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index 9b4bad6dc..d3ab257a1 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -11,12 +11,24 @@ */ package vazkii.botania.common.brew.potion; +import net.minecraft.entity.EntityLivingBase; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import vazkii.botania.common.lib.LibPotionNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onEntityUpdate(LivingUpdateEvent event) { + EntityLivingBase e = event.entityLiving; + if(hasEffect(e)) + e.fallDistance = 0F; } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFulfilment.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFulfilment.java deleted file mode 100644 index 794d42cc2..000000000 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFulfilment.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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/src/main/java/vazkii/botania/common/brew/potion/PotionGravitation.java b/src/main/java/vazkii/botania/common/brew/potion/PotionGravitation.java deleted file mode 100644 index bb2f2a49d..000000000 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionGravitation.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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/src/main/java/vazkii/botania/common/brew/potion/PotionLivingReactor.java b/src/main/java/vazkii/botania/common/brew/potion/PotionLivingReactor.java deleted file mode 100644 index a9cd66dd4..000000000 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionLivingReactor.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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/src/main/java/vazkii/botania/common/brew/potion/PotionManashock.java b/src/main/java/vazkii/botania/common/brew/potion/PotionManashock.java deleted file mode 100644 index aa10878ef..000000000 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionManashock.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 83cae540a..f291545a4 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -12,6 +12,7 @@ package vazkii.botania.common.brew.potion; import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; @@ -43,5 +44,13 @@ public class PotionMod extends Potion { return super.getStatusIconIndex(); } + + public boolean hasEffect(EntityLivingBase entity) { + return hasEffect(entity, this); + } + + public boolean hasEffect(EntityLivingBase entity, Potion potion) { + return entity.getActivePotionEffect(potion) != null; + } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index f1e737838..fbbf24b26 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -11,12 +11,28 @@ */ package vazkii.botania.common.brew.potion; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import vazkii.botania.common.lib.LibPotionNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class PotionSoulCross extends PotionMod { public PotionSoulCross() { super(LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); + MinecraftForge.EVENT_BUS.register(this); } + @SubscribeEvent + public void onEntityKill(LivingDeathEvent event) { + Entity e = event.source.getEntity(); + if(e != null && e instanceof EntityLivingBase) { + EntityLivingBase living = (EntityLivingBase) e; + if(hasEffect(living)) + living.heal(event.entityLiving.getMaxHealth() / 20); + } + } + } diff --git a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java index 0cdf3df2a..74fe33327 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java @@ -30,12 +30,9 @@ public final class LibBrewNames { 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 BLOODTHIRST = "bloodthirst"; 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 ALLURE = "allure"; public static final String WARP_WARD = "warpWard"; diff --git a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java index 6883be343..a16a8a239 100644 --- a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java @@ -16,10 +16,7 @@ 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"; + public static final String BLOODTHIRST = "bloodthirst"; + public static final String ALLURE = "allure"; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4c446617d..1681fcb24 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -828,23 +828,17 @@ 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.bloodthirst=Crimson Shade botania.brew.overload=Overload -botania.brew.livingReactor=Living Reactive -botania.brew.manashock=Manashock -botania.brew.gravitation=Twisted Gravity -botania.brew.cleansing=Cleansing +botania.brew.allure=Marine Allure 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 +botania.potion.bloodthirst=Bloodthirst +botania.potion.allure=Allure # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents diff --git a/src/main/resources/assets/botania/textures/gui/potions.png b/src/main/resources/assets/botania/textures/gui/potions.png index cc5dfc88a163c97c45fd0c6e80d4ffb84900f3d4..15e80491b00b88a65a6f4c6c07b931d03d5316b7 100644 GIT binary patch delta 2486 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 LNkvXXu0mjf0gg7$