diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b583891e9..ba6f4d9dc 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -59,6 +59,7 @@ public final class LibResources { public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craftCrate.png"; public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png"; public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png"; + public static final String ENTRY_BANNERS = PREFIX_ENTRIES + "banners.png"; public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_ALTAR_META = PREFIX_MODEL + "altarMeta%d.png"; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 34344da5a..89442032a 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -39,6 +39,7 @@ public class Botania { public static boolean bcTriggersLoaded = false; public static boolean bloodMagicLoaded = false; public static boolean coloredLightsLoaded = false; + public static boolean etFuturumLoaded = false; public static ILightHelper lightHelper; @@ -56,6 +57,7 @@ public class Botania { bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); bloodMagicLoaded = Loader.isModLoaded("AWWayofTime"); // Psh, noob coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); + etFuturumLoaded = Loader.isModLoaded("etfuturum"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index abdda9ab5..f440a6e0c 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -61,6 +61,7 @@ import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; +import vazkii.botania.common.integration.etfuturum.ModBanners; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; @@ -98,7 +99,10 @@ public class CommonProxy { ModBrewRecipes.init(); ModAchievements.init(); ModMultiblocks.init(); - + + if(Botania.etFuturumLoaded) + ModBanners.init(); + ChestGenHandler.init(); LexiconData.init(); diff --git a/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java b/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java new file mode 100644 index 000000000..ad3e464ca --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/etfuturum/ModBanners.java @@ -0,0 +1,51 @@ +/** + * 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 @ [Aug 25, 2015, 7:11:35 PM (GMT)] + */ +package vazkii.botania.common.integration.etfuturum; + +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.EnumHelper; + +public final class ModBanners { + + public static void init() { + try { + Class> clazz = (Class>) Class.forName("ganymedes01.etfuturum.tileentities.TileEntityBanner$EnumBannerPattern"); + addPattern(clazz, "flower", "flr", new ItemStack(ModItems.manaResource, 1, 3)); + addPattern(clazz, "lexicon", "lex", new ItemStack(ModItems.lexicon)); + addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.manaResource, 1, 4)); + addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.manaResource, 1, 13)); + addPattern(clazz, "tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato)); + + addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgrade, 1, 0)); + addPattern(clazz, "spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgrade, 1, 1)); + addPattern(clazz, "spark_isolated", "sis", new ItemStack(ModItems.sparkUpgrade, 1, 2)); + addPattern(clazz, "spark_recessive", "src", new ItemStack(ModItems.sparkUpgrade, 1, 3)); + + addPattern(clazz, "fish", "fis", new ItemStack(Items.fish)); + addPattern(clazz, "axe", "axe", new ItemStack(Items.iron_axe)); + addPattern(clazz, "hoe", "hoe", new ItemStack(Items.iron_hoe)); + addPattern(clazz, "pickaxe", "pik", new ItemStack(Items.iron_pickaxe)); + addPattern(clazz, "shovel", "shv", new ItemStack(Items.iron_shovel)); + addPattern(clazz, "sword", "srd", new ItemStack(Items.iron_sword)); + } catch (ClassNotFoundException e) { + // Looks like we don't have EtFuturum around, let's not do any of this nonsense then + } + } + + public static void addPattern(Class> clazz, String name, String id, ItemStack craftingItem) { + name = "botania_" + name; + id = "bt_" + id; + EnumHelper.addEnum(clazz, name.toUpperCase(), new Class[] { String.class, String.class, ItemStack.class }, new Object[] { name, id, craftingItem }); + } +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 3e6947358..5b28767ee 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -13,8 +13,10 @@ package vazkii.botania.common.lexicon; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; @@ -275,6 +277,7 @@ public final class LexiconData { public static LexiconEntry cacophonium; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; + public static LexiconEntry banners; public static void init() { BotaniaAPI.addCategory(BotaniaAPI.categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS, 9)); @@ -1026,6 +1029,11 @@ public final class LexiconData { tcIntegration = new CLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc, "Thaumcraft"); tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")).setIcon(new ItemStack(ModItems.manaInkwell)); } + + if(Botania.etFuturumLoaded) { + banners = new CLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc, "EtFuturum"); + banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)).setIcon(new ItemStack(ModItems.lexicon)); + } } } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 320a4553e..cf3263377 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -244,6 +244,7 @@ public final class LibLexicon { public static final String MISC_CACOPHONIUM = "cacophonium"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; + public static final String MISC_BANNERS = "banners"; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index bcf60d3bc..9dee1b6a8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1482,6 +1482,262 @@ botania.gui.lexicon.wip=(This entry is a Work In Progress. It's not even its fin item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence +# BANNER NAMES +item.banner.botania_flower.black=Black Mystical Flower +item.banner.botania_flower.red=Red Mystical Flower +item.banner.botania_flower.green=Green Mystical Flower +item.banner.botania_flower.brown=Brown Mystical Flower +item.banner.botania_flower.blue=Blue Mystical Flower +item.banner.botania_flower.purple=Purple Mystical Flower +item.banner.botania_flower.cyan=Cyan Mystical Flower +item.banner.botania_flower.silver=Light Gray Mystical Flower +item.banner.botania_flower.gray=Gray Mystical Flower +item.banner.botania_flower.pink=Pink Mystical Flower +item.banner.botania_flower.lime=Lime Mystical Flower +item.banner.botania_flower.yellow=Yellow Mystical Flower +item.banner.botania_flower.lightBlue=Light Blue Mystical Flower +item.banner.botania_flower.magenta=Magenta Mystical Flower +item.banner.botania_flower.orange=Orange Mystical Flower +item.banner.botania_flower.white=White Mystical Flower + +item.banner.botania_lexicon.black=Black Lexicon +item.banner.botania_lexicon.red=Red Lexicon +item.banner.botania_lexicon.green=Green Lexicon +item.banner.botania_lexicon.brown=Brown Lexicon +item.banner.botania_lexicon.blue=Blue Lexicon +item.banner.botania_lexicon.purple=Purple Lexicon +item.banner.botania_lexicon.cyan=Cyan Lexicon +item.banner.botania_lexicon.silver=Light Gray Lexicon +item.banner.botania_lexicon.gray=Gray Lexicon +item.banner.botania_lexicon.pink=Pink Lexicon +item.banner.botania_lexicon.lime=Lime Lexicon +item.banner.botania_lexicon.yellow=Yellow Lexicon +item.banner.botania_lexicon.lightBlue=Light Blue Lexicon +item.banner.botania_lexicon.magenta=Magenta Lexicon +item.banner.botania_lexicon.orange=Orange Lexicon +item.banner.botania_lexicon.white=White Lexicon + +item.banner.botania_logo.black=Black Botania +item.banner.botania_logo.red=Red Botania +item.banner.botania_logo.green=Green Botania +item.banner.botania_logo.brown=Brown Botania +item.banner.botania_logo.blue=Blue Botania +item.banner.botania_logo.purple=Purple Botania +item.banner.botania_logo.cyan=Cyan Botania +item.banner.botania_logo.silver=Light Gray Botania +item.banner.botania_logo.gray=Gray Botania +item.banner.botania_logo.pink=Pink Botania +item.banner.botania_logo.lime=Lime Botania +item.banner.botania_logo.yellow=Yellow Botania +item.banner.botania_logo.lightBlue=Light Blue Botania +item.banner.botania_logo.magenta=Magenta Botania +item.banner.botania_logo.orange=Orange Botania +item.banner.botania_logo.white=White Botania + +item.banner.botania_sapling.black=Black Tree +item.banner.botania_sapling.red=Red Tree +item.banner.botania_sapling.green=Green Tree +item.banner.botania_sapling.brown=Brown Tree +item.banner.botania_sapling.blue=Blue Tree +item.banner.botania_sapling.purple=Purple Tree +item.banner.botania_sapling.cyan=Cyan Tree +item.banner.botania_sapling.silver=Light Gray Tree +item.banner.botania_sapling.gray=Gray Tree +item.banner.botania_sapling.pink=Pink Tree +item.banner.botania_sapling.lime=Lime Tree +item.banner.botania_sapling.yellow=Yellow Tree +item.banner.botania_sapling.lightBlue=Light Blue Tree +item.banner.botania_sapling.magenta=Magenta Tree +item.banner.botania_sapling.orange=Orange Tree +item.banner.botania_sapling.white=White Tree + +item.banner.botania_tiny_potato.black=Black Potato Face +item.banner.botania_tiny_potato.red=Red Potato Face +item.banner.botania_tiny_potato.green=Green Potato Face +item.banner.botania_tiny_potato.brown=Brown Potato Face +item.banner.botania_tiny_potato.blue=Blue Potato Face +item.banner.botania_tiny_potato.purple=Purple Potato Face +item.banner.botania_tiny_potato.cyan=Cyan Potato Face +item.banner.botania_tiny_potato.silver=Light Gray Potato Face +item.banner.botania_tiny_potato.gray=Gray Potato Face +item.banner.botania_tiny_potato.pink=Pink Potato Face +item.banner.botania_tiny_potato.lime=Lime Potato Face +item.banner.botania_tiny_potato.yellow=Yellow Potato Face +item.banner.botania_tiny_potato.lightBlue=Light Blue Potato Face +item.banner.botania_tiny_potato.magenta=Magenta Potato Face +item.banner.botania_tiny_potato.orange=Orange Potato Face +item.banner.botania_tiny_potato.white=White Potato Face + +item.banner.botania_spark_dispersive.black=Black Dispersive Symbol +item.banner.botania_spark_dispersive.red=Red Dispersive Symbol +item.banner.botania_spark_dispersive.green=Green Dispersive Symbol +item.banner.botania_spark_dispersive.brown=Brown Dispersive Symbol +item.banner.botania_spark_dispersive.blue=Blue Dispersive Symbol +item.banner.botania_spark_dispersive.purple=Purple Dispersive Symbol +item.banner.botania_spark_dispersive.cyan=Cyan Dispersive Symbol +item.banner.botania_spark_dispersive.silver=Light Gray Dispersive Symbol +item.banner.botania_spark_dispersive.gray=Gray Dispersive Symbol +item.banner.botania_spark_dispersive.pink=Pink Dispersive Symbol +item.banner.botania_spark_dispersive.lime=Lime Dispersive Symbol +item.banner.botania_spark_dispersive.yellow=Yellow Dispersive Symbol +item.banner.botania_spark_dispersive.lightBlue=Light Blue Dispersive Symbol +item.banner.botania_spark_dispersive.magenta=Magenta Dispersive Symbol +item.banner.botania_spark_dispersive.orange=Orange Dispersive Symbol +item.banner.botania_spark_dispersive.white=White Dispersive Symbol + +item.banner.botania_spark_dominant.black=Black Dominant Symbol +item.banner.botania_spark_dominant.red=Red Dominant Symbol +item.banner.botania_spark_dominant.green=Green Dominant Symbol +item.banner.botania_spark_dominant.brown=Brown Dominant Symbol +item.banner.botania_spark_dominant.blue=Blue Dominant Symbol +item.banner.botania_spark_dominant.purple=Purple Dominant Symbol +item.banner.botania_spark_dominant.cyan=Cyan Dominant Symbol +item.banner.botania_spark_dominant.silver=Light Gray Dominant Symbol +item.banner.botania_spark_dominant.gray=Gray Dominant Symbol +item.banner.botania_spark_dominant.pink=Pink Dominant Symbol +item.banner.botania_spark_dominant.lime=Lime Dominant Symbol +item.banner.botania_spark_dominant.yellow=Yellow Dominant Symbol +item.banner.botania_spark_dominant.lightBlue=Light Blue Dominant Symbol +item.banner.botania_spark_dominant.magenta=Magenta Dominant Symbol +item.banner.botania_spark_dominant.orange=Orange Dominant Symbol +item.banner.botania_spark_dominant.white=White Dominant Symbol + +item.banner.botania_spark_isolated.black=Black Isolated Symbol +item.banner.botania_spark_isolated.red=Red Isolated Symbol +item.banner.botania_spark_isolated.green=Green Isolated Symbol +item.banner.botania_spark_isolated.brown=Brown Isolated Symbol +item.banner.botania_spark_isolated.blue=Blue Isolated Symbol +item.banner.botania_spark_isolated.purple=Purple Isolated Symbol +item.banner.botania_spark_isolated.cyan=Cyan Isolated Symbol +item.banner.botania_spark_isolated.silver=Light Gray Isolated Symbol +item.banner.botania_spark_isolated.gray=Gray Isolated Symbol +item.banner.botania_spark_isolated.pink=Pink Isolated Symbol +item.banner.botania_spark_isolated.lime=Lime Isolated Symbol +item.banner.botania_spark_isolated.yellow=Yellow Isolated Symbol +item.banner.botania_spark_isolated.lightBlue=Light Blue Isolated Symbol +item.banner.botania_spark_isolated.magenta=Magenta Isolated Symbol +item.banner.botania_spark_isolated.orange=Orange Isolated Symbol +item.banner.botania_spark_isolated.white=White Isolated Symbol + +item.banner.botania_spark_recessive.black=Black Recessive Symbol +item.banner.botania_spark_recessive.red=Red Recessive Symbol +item.banner.botania_spark_recessive.green=Green Recessive Symbol +item.banner.botania_spark_recessive.brown=Brown Recessive Symbol +item.banner.botania_spark_recessive.blue=Blue Recessive Symbol +item.banner.botania_spark_recessive.purple=Purple Recessive Symbol +item.banner.botania_spark_recessive.cyan=Cyan Recessive Symbol +item.banner.botania_spark_recessive.silver=Light Gray Recessive Symbol +item.banner.botania_spark_recessive.gray=Gray Recessive Symbol +item.banner.botania_spark_recessive.pink=Pink Recessive Symbol +item.banner.botania_spark_recessive.lime=Lime Recessive Symbol +item.banner.botania_spark_recessive.yellow=Yellow Recessive Symbol +item.banner.botania_spark_recessive.lightBlue=Light Blue Recessive Symbol +item.banner.botania_spark_recessive.magenta=Magenta Recessive Symbol +item.banner.botania_spark_recessive.orange=Orange Recessive Symbol +item.banner.botania_spark_recessive.white=White Recessive Symbol + +item.banner.botania_fish.black=Black Fish +item.banner.botania_fish.red=Red Fish +item.banner.botania_fish.green=Green Fish +item.banner.botania_fish.brown=Brown Fish +item.banner.botania_fish.blue=Blue Fish +item.banner.botania_fish.purple=Purple Fish +item.banner.botania_fish.cyan=Cyan Fish +item.banner.botania_fish.silver=Light Gray Fish +item.banner.botania_fish.gray=Gray Fish +item.banner.botania_fish.pink=Pink Fish +item.banner.botania_fish.lime=Lime Fish +item.banner.botania_fish.yellow=Yellow Fish +item.banner.botania_fish.lightBlue=Light Blue Fish +item.banner.botania_fish.magenta=Magenta Fish +item.banner.botania_fish.orange=Orange Fish +item.banner.botania_fish.white=White Fish + +item.banner.botania_axe.black=Black Axe +item.banner.botania_axe.red=Red Axe +item.banner.botania_axe.green=Green Axe +item.banner.botania_axe.brown=Brown Axe +item.banner.botania_axe.blue=Blue Axe +item.banner.botania_axe.purple=Purple Axe +item.banner.botania_axe.cyan=Cyan Axe +item.banner.botania_axe.silver=Light Gray Axe +item.banner.botania_axe.gray=Gray Axe +item.banner.botania_axe.pink=Pink Axe +item.banner.botania_axe.lime=Lime Axe +item.banner.botania_axe.yellow=Yellow Axe +item.banner.botania_axe.lightBlue=Light Blue Axe +item.banner.botania_axe.magenta=Magenta Axe +item.banner.botania_axe.orange=Orange Axe +item.banner.botania_axe.white=White Axe + +item.banner.botania_hoe.black=Black Hoe +item.banner.botania_hoe.red=Red Hoe +item.banner.botania_hoe.green=Green Hoe +item.banner.botania_hoe.brown=Brown Hoe +item.banner.botania_hoe.blue=Blue Hoe +item.banner.botania_hoe.purple=Purple Hoe +item.banner.botania_hoe.cyan=Cyan Hoe +item.banner.botania_hoe.silver=Light Gray Hoe +item.banner.botania_hoe.gray=Gray Hoe +item.banner.botania_hoe.pink=Pink Hoe +item.banner.botania_hoe.lime=Lime Hoe +item.banner.botania_hoe.yellow=Yellow Hoe +item.banner.botania_hoe.lightBlue=Light Blue Hoe +item.banner.botania_hoe.magenta=Magenta Hoe +item.banner.botania_hoe.orange=Orange Hoe +item.banner.botania_hoe.white=White Hoe + +item.banner.botania_pickaxe.black=Black Pickaxe +item.banner.botania_pickaxe.red=Red Pickaxe +item.banner.botania_pickaxe.green=Green Pickaxe +item.banner.botania_pickaxe.brown=Brown Pickaxe +item.banner.botania_pickaxe.blue=Blue Pickaxe +item.banner.botania_pickaxe.purple=Purple Pickaxe +item.banner.botania_pickaxe.cyan=Cyan Pickaxe +item.banner.botania_pickaxe.silver=Light Gray Pickaxe +item.banner.botania_pickaxe.gray=Gray Pickaxe +item.banner.botania_pickaxe.pink=Pink Pickaxe +item.banner.botania_pickaxe.lime=Lime Pickaxe +item.banner.botania_pickaxe.yellow=Yellow Pickaxe +item.banner.botania_pickaxe.lightBlue=Light Blue Pickaxe +item.banner.botania_pickaxe.magenta=Magenta Pickaxe +item.banner.botania_pickaxe.orange=Orange Pickaxe +item.banner.botania_pickaxe.white=White Pickaxe + +item.banner.botania_shovel.black=Black Shovel +item.banner.botania_shovel.red=Red Shovel +item.banner.botania_shovel.green=Green Shovel +item.banner.botania_shovel.brown=Brown Shovel +item.banner.botania_shovel.blue=Blue Shovel +item.banner.botania_shovel.purple=Purple Shovel +item.banner.botania_shovel.cyan=Cyan Shovel +item.banner.botania_shovel.silver=Light Gray Shovel +item.banner.botania_shovel.gray=Gray Shovel +item.banner.botania_shovel.pink=Pink Shovel +item.banner.botania_shovel.lime=Lime Shovel +item.banner.botania_shovel.yellow=Yellow Shovel +item.banner.botania_shovel.lightBlue=Light Blue Shovel +item.banner.botania_shovel.magenta=Magenta Shovel +item.banner.botania_shovel.orange=Orange Shovel +item.banner.botania_shovel.white=White Shovel + +item.banner.botania_sword.black=Black Sword +item.banner.botania_sword.red=Red Sword +item.banner.botania_sword.green=Green Sword +item.banner.botania_sword.brown=Brown Sword +item.banner.botania_sword.blue=Blue Sword +item.banner.botania_sword.purple=Purple Sword +item.banner.botania_sword.cyan=Cyan Sword +item.banner.botania_sword.silver=Light Gray Sword +item.banner.botania_sword.gray=Gray Sword +item.banner.botania_sword.pink=Pink Sword +item.banner.botania_sword.lime=Lime Sword +item.banner.botania_sword.yellow=Yellow Sword +item.banner.botania_sword.lightBlue=Light Blue Sword +item.banner.botania_sword.magenta=Magenta Sword +item.banner.botania_sword.orange=Orange Sword +item.banner.botania_sword.white=White Sword + # LEXICON CATEGORIES botania.category.basics=Basics and Mechanics botania.category.mana=Mana Manipulation @@ -3029,3 +3285,8 @@ botania.page.tcIntegration6b=The official frowny face # -- BUILDCRAFT INTEGRATION botania.entry.bcIntegration=Buildcraft Integration botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them. A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana.
&1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block. In addition, they can also sense when a &1Runic Altar&0 is ready to create runes. + +# -- BANNER ADDITIONS +botania.entry.banners=Banner Additions +botania.page.banners0=In the presence of the &1Banners&0 from the future, &1Botania&0 adds &415&0 new icons to them, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. +botania.page.banners1=Showcase of the various banners diff --git a/src/main/resources/assets/botania/textures/gui/entries/banners.png b/src/main/resources/assets/botania/textures/gui/entries/banners.png new file mode 100644 index 000000000..734b13007 Binary files /dev/null and b/src/main/resources/assets/botania/textures/gui/entries/banners.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png new file mode 100644 index 000000000..7e732b971 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_axe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png new file mode 100644 index 000000000..f3ca142d8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_fish.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png new file mode 100644 index 000000000..b0f1367df Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_flower.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png new file mode 100644 index 000000000..201dfa15a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_hoe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png new file mode 100644 index 000000000..50d27b318 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_lexicon.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png new file mode 100644 index 000000000..731af471a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_logo.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png new file mode 100644 index 000000000..04e593eb4 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_pickaxe.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png new file mode 100644 index 000000000..7600ce575 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sapling.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png new file mode 100644 index 000000000..873dac8c8 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_shovel.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png new file mode 100644 index 000000000..a14acbb54 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dispersive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png new file mode 100644 index 000000000..3e6c06383 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_dominant.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png new file mode 100644 index 000000000..2dd3d374f Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_isolated.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png new file mode 100644 index 000000000..04707fbcb Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_spark_recessive.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png new file mode 100644 index 000000000..af1da9888 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_sword.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png b/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png new file mode 100644 index 000000000..dbc603612 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/entity/banner/botania_tiny_potato.png differ