From f84b6aeea94e7da3c1b6579c8b4d3675a6378b67 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 1 Nov 2014 20:38:43 +0000 Subject: [PATCH] Basic Brew system implementation, still quite a fair bit of work to be done, but this part is working, at least. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 12 ++ .../client/core/proxy/ClientProxy.java | 15 ++ .../vazkii/botania/common/brew/BrewMod.java | 30 ++++ .../vazkii/botania/common/brew/ModBrews.java | 29 ++++ .../ItemBrew.java => brew/ModPotions.java} | 10 +- .../common/core/BotaniaCreativeTab.java | 2 + .../common/core/proxy/CommonProxy.java | 5 +- .../vazkii/botania/common/item/ModItems.java | 9 +- .../common/item/brew/ItemBrewBase.java | 129 ++++++++++++++++++ .../common/item/brew/ItemBrewFlask.java | 24 ++++ .../common/item/brew/ItemBrewVial.java | 24 ++++ .../common/item/{ => brew}/ItemVial.java | 18 ++- .../botania/common/lib/LibBrewNames.java | 19 +++ .../botania/common/lib/LibItemNames.java | 6 +- resources/assets/botania/lang/en_US.lang | 18 +++ 15 files changed, 338 insertions(+), 12 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/brew/BrewMod.java create mode 100644 MODSRC/vazkii/botania/common/brew/ModBrews.java rename MODSRC/vazkii/botania/common/{item/ItemBrew.java => brew/ModPotions.java} (70%) create mode 100644 MODSRC/vazkii/botania/common/item/brew/ItemBrewBase.java create mode 100644 MODSRC/vazkii/botania/common/item/brew/ItemBrewFlask.java create mode 100644 MODSRC/vazkii/botania/common/item/brew/ItemBrewVial.java rename MODSRC/vazkii/botania/common/item/{ => brew}/ItemVial.java (75%) create mode 100644 MODSRC/vazkii/botania/common/lib/LibBrewNames.java diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 4aae1b790..32cdf1e5a 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -83,6 +83,8 @@ public final class BotaniaAPI { public static KnowledgeType basicKnowledge, elvenKnowledge; + public static Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); + static { registerSubTile("", DummySubTile.class); @@ -195,6 +197,16 @@ public final class BotaniaAPI { return brew; } + /** + * Gets a brew from the key passed in, returns the fallback if + * it's not in the map. + */ + public static Brew getBrewFromKey(String key) { + if(brewMap.containsKey(key)) + return brewMap.get(key); + return fallbackBrew; + } + /** * Registers a Petal Recipe. * @param output The ItemStack to craft. diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 03e809de1..dbb7c7594 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -23,6 +23,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; +import net.minecraft.util.StringTranslate; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; @@ -101,6 +103,9 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { @@ -124,6 +129,15 @@ public class ClientProxy extends CommonProxy { initRenderers(); } + @Override + public void postInit(FMLPostInitializationEvent event) { + for(int i = 0; i <= 30; i++) { // Fix Enchant and Potion values up to 30 + String loc = StatCollector.translateToLocal("botania.roman" + i); + LanguageRegistry.instance().addStringLocalization("enchantment.level." + i , "en_US", loc); + LanguageRegistry.instance().addStringLocalization("potion.potency." + i, "en_US", loc); + } + } + private void initRenderers() { LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); @@ -287,3 +301,4 @@ public class ClientProxy extends CommonProxy { LightningHandler.spawnLightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); } } + diff --git a/MODSRC/vazkii/botania/common/brew/BrewMod.java b/MODSRC/vazkii/botania/common/brew/BrewMod.java new file mode 100644 index 000000000..0f567dbfa --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/BrewMod.java @@ -0,0 +1,30 @@ +/** + * 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 1, 2014, 7:02:29 PM (GMT)] + */ +package vazkii.botania.common.brew; + +import net.minecraft.potion.PotionEffect; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.Brew; + +public class BrewMod extends Brew { + + public BrewMod(String key, int color, int cost, PotionEffect... effects) { + super(key, key, color, cost, effects); + BotaniaAPI.registerBrew(this); + } + + @Override + public String getUnlocalizedName() { + return "botania.brew." + super.getUnlocalizedName(); + } + +} diff --git a/MODSRC/vazkii/botania/common/brew/ModBrews.java b/MODSRC/vazkii/botania/common/brew/ModBrews.java new file mode 100644 index 000000000..fc33bc51e --- /dev/null +++ b/MODSRC/vazkii/botania/common/brew/ModBrews.java @@ -0,0 +1,29 @@ +/** + * 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 1, 2014, 7:00:33 PM (GMT)] + */ +package vazkii.botania.common.brew; + +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import vazkii.botania.api.brew.Brew; +import vazkii.botania.common.lib.LibBrewNames; + +public class ModBrews { + + public static Brew speed; + public static Brew strength; + + public static void init() { + speed = new BrewMod(LibBrewNames.SPEED, 0x59B7FF, 2000, new PotionEffect(Potion.moveSpeed.id, 1200, 1)); + strength = new BrewMod(LibBrewNames.STRENGTH, 0XEE3F3F, 2000, new PotionEffect(Potion.damageBoost.id, 1200, 1)); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemBrew.java b/MODSRC/vazkii/botania/common/brew/ModPotions.java similarity index 70% rename from MODSRC/vazkii/botania/common/item/ItemBrew.java rename to MODSRC/vazkii/botania/common/brew/ModPotions.java index 6f5d786ba..2d6a9e964 100644 --- a/MODSRC/vazkii/botania/common/item/ItemBrew.java +++ b/MODSRC/vazkii/botania/common/brew/ModPotions.java @@ -7,10 +7,14 @@ * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) * - * File Created @ [Nov 1, 2014, 5:45:58 PM (GMT)] + * File Created @ [Nov 1, 2014, 7:00:29 PM (GMT)] */ -package vazkii.botania.common.item; +package vazkii.botania.common.brew; -public class ItemBrew { +public class ModPotions { + public static void init() { + + } + } diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index bd70861c0..11ee27bb6 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -104,6 +104,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.runeAltar); addBlock(ModBlocks.brewery); addItem(ModItems.vial); + addItem(ModItems.brewVial); + addItem(ModItems.brewFlask); addBlock(ModBlocks.pylon); addBlock(ModBlocks.pistonRelay); addBlock(ModBlocks.shinyFlower); diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index ec05d2454..03ba2771d 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -22,6 +22,8 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.command.CommandDownloadLatest; import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; @@ -49,7 +51,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -67,6 +68,8 @@ public class CommonProxy { ModBlocks.init(); ModItems.init(); ModEntities.init(); + ModPotions.init(); + ModBrews.init(); ModCrafingRecipes.init(); ModPetalRecipes.init(); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 227235690..250170fc8 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -14,6 +14,9 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.common.item.brew.ItemBrewFlask; +import vazkii.botania.common.item.brew.ItemBrewVial; +import vazkii.botania.common.item.brew.ItemVial; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumBoots; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumChest; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; @@ -157,6 +160,8 @@ public final class ModItems { public static Item regenIvy; public static Item manaInkwell; public static Item vial; + public static Item brewVial; + public static Item brewFlask; public static void init() { lexicon = new ItemLexicon(); @@ -248,7 +253,9 @@ public final class ModItems { regenIvy = new ItemRegenIvy(); manaInkwell = new ItemManaInkwell(); vial = new ItemVial(); - + brewVial = new ItemBrewVial(); + brewFlask = new ItemBrewFlask(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/item/brew/ItemBrewBase.java b/MODSRC/vazkii/botania/common/item/brew/ItemBrewBase.java new file mode 100644 index 000000000..13433a7b8 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -0,0 +1,129 @@ +/** + * 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 1, 2014, 5:45:58 PM (GMT)] + */ +package vazkii.botania.common.item.brew; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttribute; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.Brew; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.ItemMod; + +public abstract class ItemBrewBase extends ItemMod { + + private static final String TAG_BREW_KEY = "brewKey"; + private static final String TAG_SWIGS_LEFT = "swigsLeft"; + + String name; + String texName; + int swigs; + int drinkSpeed; + ItemStack baseItem; + + IIcon[] icons; + + public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { + this.name = name; + this.texName = texName; + this.swigs = swigs; + this.drinkSpeed = drinkSpeed; + this.baseItem = baseItem; + setMaxDamage(swigs); + setUnlocalizedName(name); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for(String s : BotaniaAPI.brewMap.keySet()) { + ItemStack stack = new ItemStack(item); + setBrew(stack, s); + list.add(stack); + } + } + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + itemIcon = IconHelper.forName(par1IconRegister, texName + "0"); + + icons = new IIcon[swigs]; + for(int i = 0; i < swigs; i++) + icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i); + } + + @Override + public boolean requiresMultipleRenderPasses() { + return true; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return pass == 0 ? itemIcon : icons[Math.max(0, swigs - getSwigsLeft(stack))]; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int pass) { + return pass == 0 ? 0xFFFFFF : getBrew(stack).getColor(stack); + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + return String.format(StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name"), StatCollector.translateToLocal(getBrew(stack).getUnlocalizedName(stack)), EnumChatFormatting.BOLD + "" + getSwigsLeft(stack) + EnumChatFormatting.RESET); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + Brew brew = getBrew(stack); + for(PotionEffect effect : brew.getPotionEffects(stack)) { + Potion potion = Potion.potionTypes[effect.getPotionID()]; + EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; + list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + " " + StatCollector.translateToLocal("potion.potency." + effect.getAmplifier()) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : (" (" + Potion.getDurationString(effect) + ")"))); + } + } + + public static Brew getBrew(ItemStack stack) { + String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); + return BotaniaAPI.getBrewFromKey(key); + } + + public static void setBrew(ItemStack stack, Brew brew) { + setBrew(stack, brew.getKey()); + } + + public static void setBrew(ItemStack stack, String brew) { + ItemNBTHelper.setString(stack, TAG_BREW_KEY, brew); + } + + public int getSwigsLeft(ItemStack stack) { + return ItemNBTHelper.getInt(stack, TAG_SWIGS_LEFT, swigs); + } + + public void setSwigsLeft(ItemStack stack, int swigs) { + ItemNBTHelper.setInt(stack, TAG_SWIGS_LEFT, drinkSpeed); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/brew/ItemBrewFlask.java b/MODSRC/vazkii/botania/common/item/brew/ItemBrewFlask.java new file mode 100644 index 000000000..149c00c8d --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/brew/ItemBrewFlask.java @@ -0,0 +1,24 @@ +/** + * 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 1, 2014, 7:34:30 PM (GMT)] + */ +package vazkii.botania.common.item.brew; + +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; +import net.minecraft.item.ItemStack; + +public class ItemBrewFlask extends ItemBrewBase { + + public ItemBrewFlask() { + super(LibItemNames.BREW_FLASK, LibItemNames.FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1)); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/brew/ItemBrewVial.java b/MODSRC/vazkii/botania/common/item/brew/ItemBrewVial.java new file mode 100644 index 000000000..5d3eccc59 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/brew/ItemBrewVial.java @@ -0,0 +1,24 @@ +/** + * 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 1, 2014, 7:33:24 PM (GMT)] + */ +package vazkii.botania.common.item.brew; + +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; +import net.minecraft.item.ItemStack; + +public class ItemBrewVial extends ItemBrewBase { + + public ItemBrewVial() { + super(LibItemNames.BREW_VIAL, LibItemNames.VIAL, 4, 32, new ItemStack(ModItems.vial)); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemVial.java b/MODSRC/vazkii/botania/common/item/brew/ItemVial.java similarity index 75% rename from MODSRC/vazkii/botania/common/item/ItemVial.java rename to MODSRC/vazkii/botania/common/item/brew/ItemVial.java index 83382396a..50b448f71 100644 --- a/MODSRC/vazkii/botania/common/item/ItemVial.java +++ b/MODSRC/vazkii/botania/common/item/brew/ItemVial.java @@ -9,7 +9,7 @@ * * File Created @ [Nov 1, 2014, 5:45:50 PM (GMT)] */ -package vazkii.botania.common.item; +package vazkii.botania.common.item.brew; import java.util.List; @@ -21,6 +21,8 @@ import net.minecraft.util.IIcon; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; public class ItemVial extends ItemMod implements IBrewContainer { @@ -28,14 +30,18 @@ public class ItemVial extends ItemMod implements IBrewContainer { public static IIcon flaskIcon, vialIcon; public ItemVial() { + this(LibItemNames.VIAL); + } + + public ItemVial(String name) { setHasSubtypes(true); - setUnlocalizedName(LibItemNames.VIAL); + setUnlocalizedName(name); } @Override public void registerIcons(IIconRegister par1IconRegister) { - vialIcon = IconHelper.forName(par1IconRegister, "vial0"); - flaskIcon = IconHelper.forName(par1IconRegister, "flask0"); + vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0"); + flaskIcon = IconHelper.forName(par1IconRegister, LibItemNames.FLASK + "0"); } @Override @@ -56,7 +62,9 @@ public class ItemVial extends ItemMod implements IBrewContainer { @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { - return null; + ItemStack brewStack = new ItemStack(stack.getItemDamage() == 1 ? ModItems.brewFlask : ModItems.brewVial); + ItemBrewBase.setBrew(brewStack, brew); + return brewStack; } @Override diff --git a/MODSRC/vazkii/botania/common/lib/LibBrewNames.java b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java new file mode 100644 index 000000000..2b4a51dd0 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lib/LibBrewNames.java @@ -0,0 +1,19 @@ +/** + * 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 1, 2014, 7:03:57 PM (GMT)] + */ +package vazkii.botania.common.lib; + +public final class LibBrewNames { + + public static final String SPEED = "speed"; + public static final String STRENGTH = "strength"; + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 48acb60b8..b5f012da9 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -102,8 +102,10 @@ public final class LibItemNames { public static final String REGEN_IVY = "regenIvy"; public static final String MANA_INKWELL = "manaInkwell"; public static final String VIAL = "vial"; - public static final String BOTANICAL_POTION = "botanicalPotion"; - + public static final String FLASK = "flask"; + public static final String BREW_VIAL = "brewVial"; + public static final String BREW_FLASK = "brewFlask"; + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 38edb9cb1..851bdf293 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -116,6 +116,7 @@ botania.wings6=Wings: Lord of the Pit botania.wings7=Wings: Sylph # ROMAN NUMERALS +botania.roman0= botania.roman1=I botania.roman2=II botania.roman3=III @@ -136,6 +137,16 @@ botania.roman17=XVII botania.roman18=XVIII botania.roman19=XIX botania.roman20=XX +botania.roman21=XXI +botania.roman22=XXII +botania.roman23=XXIII +botania.roman24=XXIV +botania.roman25=XXV +botania.roman26=XXVI +botania.roman27=XXVII +botania.roman28=XXVIII +botania.roman29=XXIX +botania.roman30=XXX # KNOWLEDGE botania.knowledge.minecraft=Minecraftian Knowledge @@ -758,6 +769,13 @@ item.botania:regenIvy.name=Timeless Ivy item.botania:manaInkwell.name=Botanurgist's Inkwell item.botania:vial0.name=Managlass Vial item.botania:vial1.name=Alfglass Flask +item.botania:brewVial.name=Vial of %s (%s) +item.botania:brewFlask.name=Flask of %s (%s) + +# BREW NAMES +botania.brew.fallback=Fallback +botania.brew.speed=Fleetfeet +botania.brew.strength=Fortitude # GUI TEXT botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents