Added support for the 1.8 Banners backported by Et Futurum by adding 15 new banner icons.

This commit is contained in:
Vasco Lavos committed 2015-08-25 21:47:41 +01:00
1 parent e4f349ca0c
commit fd3776af2f
23 files changed
+329 -1

No files matched your search

@@ -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";
@@ -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();
@@ -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();
@@ -0,0 +1,51 @@
/**
* This class was created by <Vazkii>. 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<Enum<?>> clazz = (Class<Enum<?>>) 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<Enum<?>> 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 });
}
}
@@ -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));
}
}
}
@@ -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";
}