Start on Botania integration.

This commit is contained in:
MysteriousAges committed 2015-04-19 15:26:40 -07:00
1 parent d8cd023876
commit b16524e919
5 files changed
+233 -266

No files matched your search

@@ -35,7 +35,10 @@ public enum BeeClassification implements IClassification
THERMAL("Thermal", "Thermametallic"),
ADORABLE("Adorable", "Amabilis"),
BLOODY("Bloody", "Sanguis");
BLOODY("Bloody", "Sanguis"),
BOTANICAL("Botanical", "Botanica"),
;
private String uID;
private String latin;
File diff suppressed because it is too large. Load diff
+28 -8
View File
@@ -17,6 +17,7 @@ import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.LogHelper;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.BloodMagicHelper;
import magicbees.main.utils.compat.BotaniaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
@@ -294,6 +295,19 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
BM_BOUND("BMBound", "obligatus",
BeeClassification.BLOODY, 0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
//----------------------Botania Bees---------------------------------------
BOT_BOTANIC("BotBotanic", "botanica",
BeeClassification.BOTANICAL, 0xffffff, 0x6666ff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BOT_BLOSSOM("BotBlossom", "viridis",
BeeClassification.BOTANICAL, 0x00ffff, 0x6666ff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
BOT_FLORAL("BotFloral", "florens",
BeeClassification.BOTANICAL, 0x0000ff, 0x6666ff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BOT_VAZBEE("BotVazbee", "vazbii",
BeeClassification.BOTANICAL, 0x00ff00, 0x6666ff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
;
public static void setupBeeSpecies()
@@ -421,13 +435,27 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
if (BloodMagicHelper.isActive())
{
BloodMagicHelper.addAltarRecipeBee(MYSTICAL, BM_BLOODY, 1, 1000, 100, 100);
BloodMagicHelper.addBindingRecipeBee(BM_BLOODY, BM_BOUND);
}
else
{
BM_BLOODY.setInactive();
}
if (BotaniaHelper.isActive())
{
}
else
{
BOT_BLOSSOM.setInactive();
BOT_BOTANIC.setInactive();
BOT_FLORAL.setInactive();
BOT_VAZBEE.setInactive();
}
AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBlitz", AM_LIGHTNING);
@@ -970,14 +998,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.setGenome(BeeGenomeManager.getTemplateBMBound())
.register();
if (BloodMagicHelper.isActive())
{
BloodMagicHelper.addAltarRecipeBee(MYSTICAL, BM_BLOODY, 1, 1000, 100, 100);
BloodMagicHelper.addBindingRecipeBee(BM_BLOODY, BM_BOUND);
}
}
+4
View File
@@ -216,6 +216,10 @@ public class Config
public static ItemStack bmAquasalus;
public static ItemStack bmTennebrae;
public static Block botLivingRock;
public static Block botLivingWood;
public static Item botManaResource;
//----- Config State info ----------------------------------
public static Configuration configuration;
@@ -2,18 +2,41 @@ package magicbees.main.utils.compat;
import magicbees.main.Config;
import magicbees.main.utils.BlockInterface;
import magicbees.main.utils.ItemInterface;
import cpw.mods.fml.common.Loader;
public class BotaniaHelper {
public enum ManaResource {
MANASTEEL,
MANAPEARL,
MANADIAMOND,
LIVINGWOOD_TWIG,
TERRASTEEL,
LIFE_ESSENCE,
REDSTONE_ROOT,
ELEMENTIUM,
PIXIE_DUST,
DRAGONSTONE,
PRISMARINE_SHARD,
PLACEHOLDER,
RED_STRING,
DREAMWOOD_TWIG,
GAIA_INGOT,
ENDER_AIR_BOTTLE,
MANA_STRING,
;
}
private static boolean isBotaniaActive = false;
public static final String Name = "AWWayofTime";
public static final String Name = "Botania";
public static boolean isActive() {
return isBotaniaActive;
}
public static void preInit() {
if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
if (Loader.isModLoaded(Name) && Config.botaniaActive) {
isBotaniaActive = true;
}
}
@@ -29,9 +52,11 @@ public class BotaniaHelper {
}
public static void getBlocks() {
Config.bmBloodStoneBrick = BlockInterface.getBlock(Name, "bloodStoneBrick");
Config.botLivingRock = BlockInterface.getBlock(Name, "livingrock");
Config.botLivingWood = BlockInterface.getBlock(Name, "livingwood");
}
public static void getItems() {
Config.botManaResource = ItemInterface.getItem(Name, "manaResource");
}
}