mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-17 02:55:19 +00:00
Started work on Bloodmagic Bees
Implemented BloodMagicHelper to interface with bloodmagic
This commit is contained in:
1 parent
44ecbbdc45
commit
f5a6ca61ba
9 files changed
+168
-5
No files matched your search
@@ -38,6 +38,8 @@ public enum BeeClassification implements IClassification
|
||||
|
||||
THERMAL ("Thermal", "Thermametallic"),
|
||||
ADORABLE ("Adorable", "Amabilis"),
|
||||
|
||||
BLOODY ("Bloody", "Sanguis")
|
||||
;
|
||||
|
||||
private String uID;
|
||||
|
||||
@@ -4,6 +4,7 @@ package magicbees.bees;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.apiculture.genetics.Bee;
|
||||
import magicbees.main.utils.ItemInterface;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import magicbees.main.utils.compat.ExtraBeesHelper;
|
||||
@@ -1370,7 +1371,41 @@ 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;
|
||||
|
||||
return genome;
|
||||
}
|
||||
|
||||
public static IAllele[] getTemplateBMBound()
|
||||
{
|
||||
IAllele[] genome = getTemplateBMBase();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BM_BOUND;
|
||||
|
||||
return genome;
|
||||
}
|
||||
|
||||
/*--------------------- Other Stuff ---------------------------------- */
|
||||
|
||||
public static ItemStack getBeeNBTForSpecies(BeeSpecies species, EnumBeeType beeType)
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.util.Collection;
|
||||
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.LogHelper;
|
||||
import magicbees.main.utils.MoonPhase;
|
||||
import magicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import magicbees.main.utils.compat.EquivalentExchangeHelper;
|
||||
@@ -51,11 +52,11 @@ public class BeeMutation implements IBeeMutation
|
||||
{
|
||||
for (String str : binnieMundane)
|
||||
{
|
||||
FMLLog.info("Registering %s", str);
|
||||
LogHelper.info("Registering %s" + str);
|
||||
try {
|
||||
new BeeMutation(species, Allele.getExtraSpecies(str), ForestryHelper.getTemplateForestryForSpecies("Common"), 15);
|
||||
} catch (Exception e) {
|
||||
FMLLog.info("Unable to register! This mutation will not be available.");
|
||||
LogHelper.info("Unable to register! This mutation will not be available.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package magicbees.bees;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -12,6 +13,7 @@ import magicbees.item.types.*;
|
||||
import magicbees.main.CommonProxy;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.LogHelper;
|
||||
import magicbees.main.utils.compat.*;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -960,6 +962,27 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
return new ItemStack[0];
|
||||
}
|
||||
},
|
||||
|
||||
//----------------------Bloodmagic Bees---------------------------------
|
||||
BM_BLOODY("BMBloody", "sanguis",
|
||||
BeeClassification.BLOODY, 0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false )
|
||||
{
|
||||
@Override
|
||||
public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i)
|
||||
{
|
||||
return new ItemStack[0];
|
||||
}
|
||||
},
|
||||
|
||||
BM_BOUND("BMBound", "obligatus",
|
||||
BeeClassification.BLOODY, 0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false )
|
||||
{
|
||||
@Override
|
||||
public ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual iIndividual, int i)
|
||||
{
|
||||
return new ItemStack[0];
|
||||
}
|
||||
},
|
||||
|
||||
;
|
||||
|
||||
@@ -1082,7 +1105,17 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
{
|
||||
RSA_FLUXED.setInactive();
|
||||
}
|
||||
|
||||
|
||||
// Bloodmagic Bees
|
||||
|
||||
if (BloodMagicHelper.isActive())
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
BM_BLOODY.setInactive();
|
||||
}
|
||||
|
||||
|
||||
AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBlitz", AM_LIGHTNING);
|
||||
@@ -1615,6 +1648,24 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
TE_GELID.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateTEGelid())
|
||||
.register();
|
||||
|
||||
BM_BLOODY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateBMBloody())
|
||||
.register();
|
||||
|
||||
BM_BOUND.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateBMBound())
|
||||
.register();
|
||||
|
||||
|
||||
|
||||
if (BloodMagicHelper.isActive())
|
||||
{
|
||||
BloodMagicHelper.addAltarRecipeBee(MYSTICAL, BM_BLOODY, 1, 1000, 100, 100);
|
||||
|
||||
BloodMagicHelper.addBindingRecipeBee(BM_BLOODY, BM_BOUND);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user