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();