Removing Blood Magic hooks

This commit is contained in:
MysteriousAges committed 2016-01-23 17:40:37 -06:00
1 parent 8952663d40
commit 1e082e087f
16 files changed
+36 -202

No files matched your search

+2
View File
@@ -262,6 +262,8 @@ public class Allele implements IAllele {
registry.registerDeprecatedAlleleReplacement("magicbees.effectNodeFlux", effectNodeConversionTaint);
registry.registerDeprecatedAlleleReplacement("magicbees.effectNodeCharge", effectNodeEmpower);
registry.registerDeprecatedAlleleReplacement("magicbees.speciesTCAttractive", BeeSpecies.TC_EMPOWERING.getSpecies());
registry.registerDeprecatedAlleleReplacement("magicbees.speciesBMBloodyBMBloody", BeeSpecies.EARTHY.getSpecies());
registry.registerDeprecatedAlleleReplacement("magicbees.speciesBMBloodyBMBound", BeeSpecies.ARCANE.getSpecies());
}
public static IAlleleBeeSpecies getBaseSpecies(String name) {
@@ -1403,37 +1403,6 @@ public class BeeGenomeManager {
return genome;
}
private static IAllele[] getTemplateBMBase() {
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersVanilla");
return genome;
}
public static IAllele[] getTemplateBMBloody() {
IAllele[] genome = getTemplateBMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BM_BLOODY.getSpecies();
return genome;
}
public static IAllele[] getTemplateBMBound() {
IAllele[] genome = getTemplateBMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BM_BOUND.getSpecies();
return genome;
}
public static IAllele[] getTemplateBotaniaBase() {
IAllele[] genome = getTemplateModBase();
@@ -4,7 +4,6 @@ import magicbees.main.utils.LogHelper;
import magicbees.main.utils.MoonPhase;
import magicbees.main.utils.compat.AppliedEnergisticsHelper;
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.ExtraBeesHelper;
@@ -12,9 +11,7 @@ import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import net.minecraftforge.oredict.OreDictionary;
@@ -300,14 +297,6 @@ public class BeeMutation {
beeMutationFactory.createMutation(Allele.getBaseSpecies("Frugal"), BeeSpecies.MUTABLE.getSpecies(), BeeSpecies.EE_MINIUM.getGenome(), 8);
}
if (BloodMagicHelper.isActive()) {
beeMutationFactory.createMutation(BeeSpecies.ELDRITCH.getSpecies(), BeeSpecies.EARTHY.getSpecies(), BeeSpecies.BM_BLOODY.getGenome(), 13)
.addMutationCondition(new MoonPhaseMutationBonus(MoonPhase.WANING_CRESCENT, 0.85f))
.requireResource(BloodMagicHelper.bloodStoneBrick, 0);
beeMutationFactory.createMutation(BeeSpecies.BM_BLOODY.getSpecies(), BeeSpecies.ARCANE.getSpecies(), BeeSpecies.BM_BOUND.getGenome(), 8);
}
if (RedstoneArsenalHelper.isActive()) {
beeMutationFactory.createMutation(BeeSpecies.TE_ELECTRUM.getSpecies(), BeeSpecies.TE_DESTABILIZED.getSpecies(), BeeSpecies.RSA_FLUXED.getGenome(), 10)
.requireResource("blockElectrumFlux");
@@ -391,13 +391,6 @@ public class BeeProductHelper {
}
}
public static void initBloodMagicProducts() {
BM_BLOODY.addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.12f)
.addSpecialty(Config.combs.getStackForType(CombType.BM_SANGUINE), 0.8f);
BM_BOUND.addProduct(Config.combs.getStackForType(CombType.BM_SANGUINE), 0.8f)
.addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.16f);
}
public static void initBotaniaProducts() {
BOT_ROOTED.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.10f);
BOT_BOTANIC.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.10f)
+7 -25
View File
@@ -1,7 +1,13 @@
package magicbees.bees;
import magicbees.main.utils.compat.AppliedEnergisticsHelper;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.BotaniaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.item.ItemStack;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
@@ -17,15 +23,6 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IClassification;
import magicbees.main.utils.compat.AppliedEnergisticsHelper;
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.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
public enum BeeSpecies
{
MYSTICAL("Mystical", "mysticum", BeeClassification.VEILED,
@@ -289,13 +286,6 @@ public enum BeeSpecies
RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", BeeClassification.THERMAL,
0x9E060D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
// ----------------------Bloodmagic Bees---------------------------------
BM_BLOODY("BMBloody", "sanguis", BeeClassification.BLOODY,
0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
BM_BOUND("BMBound", "obligatus", BeeClassification.BLOODY,
0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
// ----------------------Botania Bees---------------------------------------
BOT_ROOTED("BotRooted", "truncus", BeeClassification.BOTANICAL,
0x00A800, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
@@ -453,8 +443,6 @@ public enum BeeSpecies
TE_WINSOME.registerGenomeTemplate(BeeGenomeManager.getTemplateTEWinsome());
TE_ENDEARING.registerGenomeTemplate(BeeGenomeManager.getTemplateTEEndearing());
RSA_FLUXED.registerGenomeTemplate(BeeGenomeManager.getTemplateRSAFluxed());
BM_BLOODY.registerGenomeTemplate(BeeGenomeManager.getTemplateBMBloody());
BM_BOUND.registerGenomeTemplate(BeeGenomeManager.getTemplateBMBound());
BOT_ROOTED.registerGenomeTemplate(BeeGenomeManager.getTemplateBotRooted());
BOT_BOTANIC.registerGenomeTemplate(BeeGenomeManager.getTemplateBotBotanic());
BOT_BLOSSOM.registerGenomeTemplate(BeeGenomeManager.getTemplateBotBlossom());
@@ -531,12 +519,6 @@ public enum BeeSpecies
RSA_FLUXED.setInactive();
}
BeeProductHelper.initBloodMagicProducts();
if (!BloodMagicHelper.isActive()) {
BM_BLOODY.setInactive();
BM_BOUND.setInactive();
}
BeeProductHelper.initBotaniaProducts();
if (!BotaniaHelper.isActive()) {
BOT_ROOTED.setInactive();
+13 -4
View File
@@ -2,9 +2,6 @@ package magicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.item.types.CombType;
import magicbees.main.Config;
import magicbees.main.utils.compat.ForestryHelper;
@@ -13,10 +10,13 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemComb extends Item
{
{
public ItemComb()
{
super();
@@ -100,4 +100,13 @@ public class ItemComb extends Item
return CombType.values()[stack.getItemDamage()].getName();
}
@Override
public int getDamage(ItemStack stack) {
if (CombType.values().length < super.getDamage(stack)) {
stack.setItemDamage(0);
}
return super.getDamage(stack);
}
}
@@ -38,8 +38,6 @@ public enum CombType {
TE_CARBON("TEcarbon", false),
TE_LUX("TElux", false),
TE_ENDEARING("TEendearing", false),
BM_SANGUINE("BMSanguine", false),
;
private static int[][] colours = new int[][] {
@@ -75,8 +73,6 @@ public enum CombType {
{ 0x454545, 0x0F0F0F },
{ 0xF5F3A4, 0xC9C87D },
{ 0x12E3D9, 0x069E97 },
{ 0x7F3228, 0xBE1900 },
};
private CombType(String pName, boolean show) {
@@ -14,7 +14,6 @@ import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.main.Config;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.BloodMagicHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
@@ -574,13 +573,6 @@ public class CraftingManager {
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT), output);
}
if (BloodMagicHelper.isActive()) {
output = newMap();
output.put(Config.wax.getStackForType(WaxType.SOUL), 0.9f);
output.put(BloodMagicHelper.bloodShard, 0.08f);
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.BM_SANGUINE), output);
}
if (ThermalModsHelper.isActive()) {
output = newMap();
output.put(Config.wax.getStackForType(WaxType.MAGIC), 0.55f);
@@ -25,7 +25,7 @@ public class VersionInfo
public static final String Logo = "/gfx/magicbees/logo.png";
public static final String Depends = "required-after:Forestry@[4.2.1,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";
public static final String Depends = "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";
boolean criticalUpdate;
boolean newVersion;
@@ -1,96 +0,0 @@
package magicbees.main.utils.compat;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry;
import cpw.mods.fml.common.Loader;
import magicbees.bees.BeeSpecies;
import magicbees.main.Config;
import magicbees.main.utils.BlockInterface;
import magicbees.main.utils.ItemInterface;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import forestry.api.apiculture.EnumBeeType;
public class BloodMagicHelper implements IModHelper {
//--- Blood Magic Blocks ---
public static Block bloodStoneBrick;
public static Block masterRitualStone;
//--- Blood Magic Items ---
public static ItemStack bloodShard;
public static ItemStack incendium;
public static ItemStack magicales;
public static ItemStack sanctus;
public static ItemStack aether;
public static ItemStack crepitous;
public static ItemStack crystallos;
public static ItemStack terrae;
public static ItemStack aquasalus;
public static ItemStack tennebrae;
private static boolean isBloodMagicActive = false;
public static final String Name = "AWWayofTime";
public static boolean isActive() {
return isBloodMagicActive;
}
public void preInit() {
if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
isBloodMagicActive = true;
}
}
public void init() {
if (isActive()) {
getBlocks();
getItems();
}
}
public void postInit() {
if (isActive()) {
// Disabled for now until we can figure out a better way to match these.
/*BloodMagicHelper.addAltarRecipeBee(BeeSpecies.MYSTICAL, BeeSpecies.BM_BLOODY, 1, 1000, 100, 100);
BloodMagicHelper.addBindingRecipeBee(BeeSpecies.BM_BLOODY, BeeSpecies.BM_BOUND);*/
}
}
public static void getBlocks() {
bloodStoneBrick = BlockInterface.getBlock(Name, "bloodStoneBrick");
masterRitualStone = BlockInterface.getBlock(Name, "masterStone");
}
public static void getItems() {
bloodShard = ItemInterface.getItemStack(Name, "weakBloodShard");
incendium = ItemInterface.getItemStack(Name, "incendium");
magicales = ItemInterface.getItemStack(Name, "magicales");
sanctus = ItemInterface.getItemStack(Name, "sanctus");
aether = ItemInterface.getItemStack(Name, "aether");
crepitous = ItemInterface.getItemStack(Name, "crepitous");
crystallos = ItemInterface.getItemStack(Name, "crystallos");
terrae = ItemInterface.getItemStack(Name, "terrae");
aquasalus = ItemInterface.getItemStack(Name, "aquasalus");
tennebrae = ItemInterface.getItemStack(Name, "tennebrae");
}
public static void addAltarRecipe(ItemStack requiredItem, ItemStack result, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled) {
AltarRecipeRegistry.registerAltarRecipe(result, requiredItem, minTier, liquidRequired, consumptionRate, drainRate, canBeFilled);
}
public static void addAltarRecipeBee(BeeSpecies inputBee, BeeSpecies outputBee, int minTier, int liquidRequired, int consumptionRate, int drainRate) {
addAltarRecipe(inputBee.getBeeItem(EnumBeeType.DRONE), outputBee.getBeeItem(EnumBeeType.DRONE), minTier, liquidRequired, consumptionRate, drainRate, false);
addAltarRecipe(inputBee.getBeeItem(EnumBeeType.PRINCESS), outputBee.getBeeItem(EnumBeeType.PRINCESS), minTier, liquidRequired, consumptionRate, drainRate, false);
addAltarRecipe(inputBee.getBeeItem(EnumBeeType.QUEEN), outputBee.getBeeItem(EnumBeeType.QUEEN), minTier, liquidRequired, consumptionRate, drainRate, false);
}
public static void addBindingRecipe(ItemStack input, ItemStack output) {
BindingRegistry.registerRecipe(output, input);
}
public static void addBindingRecipeBee(BeeSpecies inputBee, BeeSpecies outputBee) {
addBindingRecipe(inputBee.getBeeItem(EnumBeeType.DRONE), outputBee.getBeeItem(EnumBeeType.DRONE));
addBindingRecipe(inputBee.getBeeItem(EnumBeeType.PRINCESS), outputBee.getBeeItem(EnumBeeType.PRINCESS));
addBindingRecipe(inputBee.getBeeItem(EnumBeeType.QUEEN), outputBee.getBeeItem(EnumBeeType.QUEEN));
}
}
@@ -37,7 +37,6 @@ public class ModHelperManager {
helpers.add(new ArsMagicaHelper());
helpers.add(new ThermalModsHelper());
helpers.add(new RedstoneArsenalHelper());
helpers.add(new BloodMagicHelper());
helpers.add(new BotaniaHelper());
helpers.add(new AppliedEnergisticsHelper());
}
@@ -31,21 +31,27 @@ public class RedstoneArsenalHelper implements IModHelper {
}
public void init() {
// if (isActive()) { }
}
public void postInit() {
if (isActive()) {
if (isActive()) {
getBlocks();
getItems();
}
}
public void postInit() {
//if (isActive()) { }
}
private static void getBlocks() {
fluxBlock = ItemInterface.getItemStack(Name, "blockElectrumFlux");
fluxBlock = ItemInterface.getItemStack(Name.toLowerCase(), "blockElectrumFlux");
if (fluxNugget == null) {
throw new RuntimeException("Can't find " + Name + ".blockElectrumFlux");
}
}
private static void getItems() {
fluxNugget = ItemInterface.getItemStack(Name, "nuggetElectrumFlux");
fluxNugget = ItemInterface.getItemStack(Name.toLowerCase(), "nuggetElectrumFlux");
if (fluxNugget == null) {
throw new RuntimeException("Can't find " + Name + ".nuggetElectrumFlux");
}
}
}