mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-16 18:45:11 +00:00
Some refactoring; work on some initial hive blocks.
This commit is contained in:
1 parent
66c1a89c32
commit
7aba3f5f53
19 files changed
+322
-468
No files matched your search
@@ -5,12 +5,15 @@ import thaumicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IAlleleFlowers;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleEffect;
|
||||
|
||||
public class Allele implements IAllele
|
||||
{
|
||||
public static IBeeRoot beeRoot;
|
||||
|
||||
public static AlleleInteger fertilityHighDominant;
|
||||
public static AlleleFloat speedBlinding;
|
||||
|
||||
@@ -43,6 +46,8 @@ public class Allele implements IAllele
|
||||
|
||||
public static void setupAdditionalAlleles()
|
||||
{
|
||||
beeRoot = (IBeeRoot)AlleleManager.alleleRegistry.getSpeciesRoot("rootBees");
|
||||
|
||||
Allele.fertilityHighDominant = new AlleleInteger("fertilityHighDominant", 3, true);
|
||||
Allele.speedBlinding = new AlleleFloat("speedBlinding", 2f, false);
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
|
||||
area[2] = Math.max((int)(area[2] * mod), 1);
|
||||
|
||||
ThaumicBees.proxy.drawBeeEffects(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(),
|
||||
genome.getPrimaryAsBee().getIconColour(0), area[0], area[1], area[2]);
|
||||
genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
|
||||
return storedData;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import forestry.api.genetics.IClassification;
|
||||
|
||||
public enum BeeClassification implements IClassification
|
||||
{
|
||||
VEILED("Veiled", "velata"),
|
||||
ARCANE("Arcane", "Arcanus"),
|
||||
SUPERNATURAL("Supernatural", "Occultus"),
|
||||
SCHOLARLY("Scholarly", "Docto"),
|
||||
@@ -19,11 +20,15 @@ public enum BeeClassification implements IClassification
|
||||
MAGICAL("Magic", "Magica"),
|
||||
TIME("Time", "Tempestivus"),
|
||||
SOUL("Soul", "Animus"),
|
||||
|
||||
METALLIC("Metallic", "Metallicis"),
|
||||
GEM("Gem", "Lapidi"),
|
||||
|
||||
THAUMIC("Thaumic", "Thaumis"),
|
||||
FLESHY("Fleshy", "Carnosa"),
|
||||
|
||||
ALCHEMICAL("Alchemical", "Alchimia"),
|
||||
|
||||
ESSENTIAL("Essential", "Essentia"),
|
||||
;
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.STARK;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_STARK;
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityNormal");
|
||||
|
||||
return genome;
|
||||
@@ -194,7 +194,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AIR;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_AIR;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFastest");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened");
|
||||
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLargest");
|
||||
@@ -209,7 +209,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FIRE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FIRE;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFaster");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown3");
|
||||
@@ -224,7 +224,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WATER;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WATER;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLong");
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
|
||||
@@ -239,7 +239,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EARTH;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_EARTH;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1");
|
||||
@@ -255,7 +255,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseElemental();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.INFUSED;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_INFUSED;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
|
||||
|
||||
@@ -287,7 +287,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.VIS;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_VIS;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlower");
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
|
||||
@@ -299,7 +299,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PURE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_PURE;
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringAverage");
|
||||
@@ -313,7 +313,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FLUX;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FLUX;
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
|
||||
@@ -326,7 +326,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.NODE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_NODE;
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlowest");
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeAttract;
|
||||
@@ -338,7 +338,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.REJUVENATING;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_REJUVENATING;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge;
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
@@ -373,7 +373,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMalevolent();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BRAINY;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BRAINY;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBrainyZombie;
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
|
||||
|
||||
@@ -384,7 +384,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMalevolent();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.GOSSAMER;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_GOSSAMER;
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerThaumcraft;
|
||||
|
||||
@@ -395,7 +395,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMalevolent();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WISPY;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WISPY;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnWisp;
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
|
||||
@@ -408,7 +408,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMalevolent();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BATTY;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BATTY;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBats;
|
||||
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
|
||||
|
||||
@@ -508,7 +508,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseAlchemical();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MINIUM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EE_MINIUM;
|
||||
|
||||
return genome;
|
||||
}
|
||||
@@ -642,7 +642,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMetallic();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.CHICKEN;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_CHICKEN;
|
||||
|
||||
return genome;
|
||||
}
|
||||
@@ -651,7 +651,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMetallic();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BEEF;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BEEF;
|
||||
|
||||
return genome;
|
||||
}
|
||||
@@ -660,7 +660,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMetallic();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PORK;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_PORK;
|
||||
|
||||
return genome;
|
||||
}
|
||||
@@ -678,7 +678,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ESSENCE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ESSENCE;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
|
||||
@@ -691,7 +691,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateEssence();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.QUINTESSENCE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_QUINTESSENCE;
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated");
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringAverage");
|
||||
@@ -704,7 +704,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EARTH_AM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_EARTH;
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFaster");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLongest");
|
||||
@@ -717,7 +717,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AIR_AM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_AIR;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
|
||||
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum");
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -730,7 +730,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FIRE_AM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_FIRE;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -744,7 +744,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WATER_AM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_WATER;
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -757,7 +757,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.LIGHTNING;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_LIGHTNING;
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortest");
|
||||
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum");
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedBlinding;
|
||||
@@ -775,7 +775,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PLANT;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_PLANT;
|
||||
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFastest");
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -788,7 +788,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ICE;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ICE;
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp2");
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -803,7 +803,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MAGMA;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_MAGMA;
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
|
||||
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
@@ -817,7 +817,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ARCANE_AM;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ARCANE;
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
|
||||
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
|
||||
@@ -830,7 +830,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.VORTEX;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_VORTEX;
|
||||
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
|
||||
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
|
||||
@@ -844,7 +844,7 @@ public class BeeGenomeManager
|
||||
{
|
||||
IAllele[] genome = getTemplateBaseMagica();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WIGHT;
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_WIGHT;
|
||||
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
|
||||
|
||||
@@ -25,273 +25,9 @@ import thaumicbees.main.utils.compat.ForestryHelper;
|
||||
import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
|
||||
public class BeeMutation implements IBeeMutation
|
||||
{
|
||||
private static BeeMutation Esoteric;
|
||||
private static BeeMutation Esoteric1;
|
||||
private static BeeMutation Mysterious;
|
||||
private static BeeMutation Mysterious2;
|
||||
private static BeeMutation Mysterious1;
|
||||
private static BeeMutation Arcane;
|
||||
private static BeeMutation Charmed;
|
||||
private static BeeMutation Charmed1;
|
||||
private static BeeMutation Enchanted;
|
||||
private static BeeMutation Enchanted1;
|
||||
private static BeeMutation Supernatural;
|
||||
private static BeeMutation Stark;
|
||||
private static BeeMutation Fire;
|
||||
private static BeeMutation Water;
|
||||
private static BeeMutation Pupil;
|
||||
private static BeeMutation Scholarly;
|
||||
private static BeeMutation Savant;
|
||||
private static BeeMutation Aware;
|
||||
private static BeeMutation Skulking;
|
||||
private static BeeMutation Ghastly;
|
||||
private static BeeMutation Spidery;
|
||||
private static BeeMutation Timely;
|
||||
private static BeeMutation Lordly;
|
||||
private static BeeMutation Doctoral;
|
||||
private static BeeMutation Spirit;
|
||||
private static BeeMutation Spirit1;
|
||||
private static BeeMutation Soul;
|
||||
private static BeeMutation Iron;
|
||||
private static BeeMutation Gold;
|
||||
private static BeeMutation Copper;
|
||||
private static BeeMutation Tin;
|
||||
private static BeeMutation Silver;
|
||||
private static BeeMutation Lead;
|
||||
private static BeeMutation Diamond;
|
||||
private static BeeMutation Emerald;
|
||||
private static BeeMutation Apatite;
|
||||
|
||||
private static BeeMutation Vis;
|
||||
private static BeeMutation Vis1;
|
||||
private static BeeMutation Pure;
|
||||
private static BeeMutation Flux;
|
||||
private static BeeMutation Node;
|
||||
private static BeeMutation Node1;
|
||||
private static BeeMutation Rejuvination;
|
||||
private static BeeMutation Rejuvination1;
|
||||
private static BeeMutation Brainy;
|
||||
private static BeeMutation Gossamer;
|
||||
private static BeeMutation Wispy;
|
||||
private static BeeMutation Batty;
|
||||
private static BeeMutation Beef;
|
||||
private static BeeMutation Chicken;
|
||||
private static BeeMutation Pork;
|
||||
|
||||
private static BeeMutation Minium;
|
||||
|
||||
private static BeeMutation Essence;
|
||||
private static BeeMutation Quintessence;
|
||||
private static BeeMutation EarthAM;
|
||||
private static BeeMutation AirAM;
|
||||
private static BeeMutation FireAM;
|
||||
private static BeeMutation WaterAM;
|
||||
private static BeeMutation Lightning;
|
||||
private static BeeMutation Ice;
|
||||
private static BeeMutation Plant;
|
||||
private static BeeMutation Magma;
|
||||
private static BeeMutation ArcaneAM;
|
||||
private static BeeMutation Vortex;
|
||||
private static BeeMutation Wight;
|
||||
|
||||
{
|
||||
public static void setupMutations()
|
||||
{
|
||||
IAlleleBeeSpecies baseA, baseB;
|
||||
|
||||
BeeMutation.Esoteric = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 10);
|
||||
BeeMutation.Esoteric1 = new BeeMutation(Allele.getBaseSpecies("Heroic"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 25);
|
||||
BeeMutation.Mysterious = new BeeMutation(Allele.getBaseSpecies("Ended"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 8);
|
||||
BeeMutation.Mysterious1 = new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 11);
|
||||
BeeMutation.Mysterious2 = new BeeMutation(Allele.getBaseSpecies("Monastic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 9);
|
||||
BeeMutation.Arcane = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, BeeSpecies.ARCANE, 8)
|
||||
.setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 1.5f);
|
||||
|
||||
BeeMutation.Charmed = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Valiant"), BeeSpecies.CHARMED, 12);
|
||||
BeeMutation.Charmed1 = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Monastic"), BeeSpecies.CHARMED, 18);
|
||||
BeeMutation.Enchanted = new BeeMutation(BeeSpecies.CHARMED, Allele.getBaseSpecies("Valiant"), BeeSpecies.ENCHANTED, 8);
|
||||
BeeMutation.Enchanted1 = new BeeMutation(BeeSpecies.CHARMED, Allele.getBaseSpecies("Monastic"), BeeSpecies.ENCHANTED, 8);
|
||||
BeeMutation.Supernatural = new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 6)
|
||||
.setMoonPhaseBonus(MoonPhase.WAXING_GIBBOUS, MoonPhase.WANING_GIBBOUS, 1.5f);
|
||||
|
||||
BeeMutation.Pupil = new BeeMutation(Allele.getBaseSpecies("Hermitic"), BeeSpecies.ENCHANTED, BeeSpecies.PUPIL, 10);
|
||||
|
||||
BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SOUL, BeeSpecies.GHASTLY, 13);
|
||||
BeeMutation.Stark = new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.STARK, 8);
|
||||
|
||||
BeeMutation.Spidery = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Tropical"), BeeSpecies.SPIDERY, 10);
|
||||
|
||||
BeeMutation.Aware = new BeeMutation(Allele.getBaseSpecies("Demonic"), Allele.getBaseSpecies("Edenic"), BeeSpecies.AWARE, 12);
|
||||
|
||||
BeeMutation.Timely = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.ENCHANTED, BeeSpecies.TIMELY, 10);
|
||||
BeeMutation.Lordly = new BeeMutation(BeeSpecies.TIMELY, Allele.getBaseSpecies("Imperial"), BeeSpecies.LORDLY, 9);
|
||||
BeeMutation.Doctoral = new BeeMutation(BeeSpecies.TIMELY, BeeSpecies.LORDLY, BeeSpecies.DOCTORAL, 7);
|
||||
|
||||
BeeMutation.Spirit = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.ENCHANTED, BeeSpecies.SPIRIT, 8);
|
||||
BeeMutation.Spirit1 = new BeeMutation(Allele.getBaseSpecies("Fiendish"), Allele.getBaseSpecies("Ended"), BeeSpecies.SPIRIT, 13);
|
||||
BeeMutation.Soul = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.SPIRIT, BeeSpecies.SOUL, 11);
|
||||
|
||||
BeeMutation.Iron = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Common"), BeeSpecies.IRON, 8)
|
||||
.setBlockRequired(Block.blockIron);
|
||||
|
||||
baseA = (BeeSpecies.MINIUM.isActive()) ? BeeSpecies.MINIUM : Allele.getBaseSpecies("Imperial");
|
||||
baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON;
|
||||
BeeMutation.Gold = new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 5)
|
||||
.setBlockRequired(Block.blockGold);
|
||||
|
||||
if (BeeSpecies.COPPER.isActive())
|
||||
{
|
||||
BeeMutation.Copper = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Meadows"), BeeSpecies.COPPER, 10);
|
||||
if (OreDictionary.getOres("blockCopper").size() > 0)
|
||||
{
|
||||
Copper.setBlockRequired("blockCopper");
|
||||
}
|
||||
}
|
||||
if (BeeSpecies.TIN.isActive())
|
||||
{
|
||||
BeeMutation.Tin = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Forest"), BeeSpecies.TIN, 9);
|
||||
if (OreDictionary.getOres("blockTin").size() > 0)
|
||||
{
|
||||
Tin.setBlockRequired("blockTin");
|
||||
}
|
||||
}
|
||||
if (BeeSpecies.SILVER.isActive())
|
||||
{
|
||||
BeeMutation.Silver = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Modest"), BeeSpecies.SILVER, 8);
|
||||
if (OreDictionary.getOres("blockSilver").size() > 0)
|
||||
{
|
||||
Silver.setBlockRequired("blockSilver");
|
||||
}
|
||||
}
|
||||
if (BeeSpecies.LEAD.isActive())
|
||||
{
|
||||
if (BeeSpecies.TIN.isActive())
|
||||
{
|
||||
baseA = BeeSpecies.TIN;
|
||||
}
|
||||
else if (BeeSpecies.COPPER.isActive())
|
||||
{
|
||||
baseA = BeeSpecies.COPPER;
|
||||
}
|
||||
else
|
||||
{
|
||||
baseA = BeeSpecies.IRON;
|
||||
}
|
||||
BeeMutation.Lead = new BeeMutation(baseA, Allele.getBaseSpecies("Common"), BeeSpecies.LEAD, 8);
|
||||
|
||||
if (OreDictionary.getOres("blockLead").size() > 0)
|
||||
{
|
||||
Lead.setBlockRequired("blockLead");
|
||||
}
|
||||
}
|
||||
|
||||
BeeMutation.Diamond = new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 4)
|
||||
.setBlockRequired(Block.blockDiamond);
|
||||
|
||||
baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial");
|
||||
BeeMutation.Emerald = new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 4)
|
||||
.setBlockRequired(Block.blockEmerald);
|
||||
|
||||
BeeMutation.Apatite = new BeeMutation(BeeSpecies.EARTH, Allele.getBaseSpecies("Rural"), BeeSpecies.APATITE, 6)
|
||||
.setBlockAndMetaRequired(BlockInterface.getBlock("resources").itemID, ForestryHelper.BlockResource.APATITE.ordinal());
|
||||
|
||||
baseA = (ExtraBeesHelper.isActive()) ? Allele.getExtraSpecies("desolate") : Allele.getBaseSpecies("Modest");
|
||||
BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, baseA, BeeSpecies.SKULKING, 10);
|
||||
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
BeeMutation.Scholarly = new BeeMutation(BeeSpecies.PUPIL, Allele.getBaseSpecies("Hermitic"), BeeSpecies.SCHOLARLY, 8);
|
||||
BeeMutation.Savant = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.SCHOLARLY, BeeSpecies.SAVANT, 6);
|
||||
|
||||
BeeMutation.Vis = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.ARCANE, BeeSpecies.VIS, 9)
|
||||
.setAuraNodeRequired(40);
|
||||
BeeMutation.Vis1 = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.STARK, BeeSpecies.VIS, 12)
|
||||
.setAuraNodeRequired(80);
|
||||
BeeMutation.Pure = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.PURE, 7)
|
||||
.setAuraNodeTypeRequired(5, EnumNodeType.PURE).setMoonPhaseBonus(MoonPhase.NEW, MoonPhase.NEW, 1.6f);
|
||||
BeeMutation.Flux = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.FLUX, 7)
|
||||
.setAuraNodeTypeRequired(30, EnumNodeType.UNSTABLE).setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 1.6f);
|
||||
|
||||
BeeMutation.Node = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Hermitic"), BeeSpecies.NODE, 2)
|
||||
.setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF);
|
||||
BeeMutation.Node1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Hermitic"), BeeSpecies.NODE, 2)
|
||||
.setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF);
|
||||
|
||||
BeeMutation.Beef = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.BEEF, 10);
|
||||
BeeMutation.Chicken = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.CHICKEN, 10);
|
||||
BeeMutation.Pork = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.PORK, 10);
|
||||
|
||||
if (ExtraBeesHelper.isActive())
|
||||
{
|
||||
BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rotten"), BeeSpecies.BRAINY, 12);
|
||||
BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("ancient"), BeeSpecies.GOSSAMER, 10);
|
||||
BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rock"), BeeSpecies.BATTY, 14);
|
||||
BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3);
|
||||
BeeMutation.Rejuvination1 = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Sinister"), BeeSpecies.BRAINY, 10);
|
||||
BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SUPERNATURAL, BeeSpecies.GOSSAMER, 10);
|
||||
BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Frugal"), BeeSpecies.BATTY, 11);
|
||||
BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3);
|
||||
BeeMutation.Rejuvination1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3);
|
||||
}
|
||||
|
||||
BeeMutation.Gossamer.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_CRESCENT);
|
||||
BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, BeeSpecies.SOUL, BeeSpecies.WISPY, 8);
|
||||
BeeMutation.Rejuvination.setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF)
|
||||
.setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6);
|
||||
BeeMutation.Rejuvination1.setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF)
|
||||
.setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6);
|
||||
}
|
||||
else
|
||||
{
|
||||
BeeMutation.Fire = new BeeMutation(BeeSpecies.STARK, Allele.getBaseSpecies("Fiendish"), BeeSpecies.FIRE, 10);
|
||||
if (ExtraBeesHelper.isActive())
|
||||
{
|
||||
BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getExtraSpecies("ocean"), BeeSpecies.WATER, 12);
|
||||
BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getExtraSpecies("river"), BeeSpecies.WATER, 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
BeeMutation.Water = new BeeMutation(BeeSpecies.STARK, Allele.getBaseSpecies("Marshy"), BeeSpecies.WATER, 10);
|
||||
}
|
||||
}
|
||||
|
||||
if (EquivalentExchangeHelper.isActive())
|
||||
{
|
||||
BeeMutation.Minium = new BeeMutation(Allele.getBaseSpecies("Frugal"), BeeSpecies.PUPIL, BeeSpecies.MINIUM, 10);
|
||||
}
|
||||
|
||||
if (ArsMagicaHelper.isActive())
|
||||
{
|
||||
BeeMutation.Essence = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.CHARMED, BeeSpecies.ESSENCE, 15);
|
||||
BeeMutation.Quintessence = new BeeMutation(BeeSpecies.ESSENCE, Allele.getBaseSpecies("Austere"), BeeSpecies.QUINTESSENCE, 7);
|
||||
|
||||
BeeMutation.EarthAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.EARTH, BeeSpecies.EARTH_AM, 12);
|
||||
BeeMutation.AirAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.AIR, BeeSpecies.AIR_AM, 12);
|
||||
BeeMutation.FireAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.FIRE, BeeSpecies.FIRE_AM, 12);
|
||||
BeeMutation.WaterAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.WATER, BeeSpecies.WATER_AM, 12);
|
||||
|
||||
BeeMutation.Lightning = new BeeMutation(BeeSpecies.AIR_AM, BeeSpecies.FIRE_AM, BeeSpecies.LIGHTNING, 8);
|
||||
BeeMutation.Ice = new BeeMutation(BeeSpecies.WATER_AM, Allele.getBaseSpecies("Icy"), BeeSpecies.ICE, 8);
|
||||
BeeMutation.Plant = new BeeMutation(BeeSpecies.EARTH_AM, BeeSpecies.WATER_AM, BeeSpecies.PLANT, 8);
|
||||
BeeMutation.Magma = new BeeMutation(BeeSpecies.FIRE_AM, BeeSpecies.EARTH_AM, BeeSpecies.MAGMA, 8);
|
||||
|
||||
BeeMutation.ArcaneAM = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getBaseSpecies("Hermitic"), BeeSpecies.ARCANE_AM, 6);
|
||||
|
||||
BeeMutation.Wight = new BeeMutation(BeeSpecies.SOUL, BeeSpecies.SKULKING, BeeSpecies.WIGHT, 10);
|
||||
|
||||
if (ExtraBeesHelper.isActive())
|
||||
{
|
||||
BeeMutation.Vortex = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getExtraSpecies("creeper"), BeeSpecies.VORTEX, 12);
|
||||
}
|
||||
else
|
||||
{
|
||||
BeeMutation.Vortex = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getBaseSpecies("Austere"), BeeSpecies.VORTEX, 12);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private IAllele parent1;
|
||||
@@ -325,7 +61,7 @@ public class BeeMutation implements IBeeMutation
|
||||
this.requiredBlockMeta = OreDictionary.WILDCARD_VALUE;
|
||||
this.requiredBlockOreDictEntry = null;
|
||||
|
||||
BeeManager.breedingManager.registerBeeMutation(this);
|
||||
Allele.beeRoot.registerMutation(this);
|
||||
}
|
||||
|
||||
public float getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1)
|
||||
@@ -404,7 +140,7 @@ public class BeeMutation implements IBeeMutation
|
||||
finalChance = Math.round(chance
|
||||
* housing.getMutationModifier((IBeeGenome) genome0,
|
||||
(IBeeGenome) genome1, chance)
|
||||
* BeeManager.breedingManager.getBeekeepingMode(housing.getWorld())
|
||||
* Allele.beeRoot.getBeekeepingMode(housing.getWorld())
|
||||
.getMutationModifier((IBeeGenome) genome0,
|
||||
(IBeeGenome) genome1, chance));
|
||||
}
|
||||
|
||||
@@ -34,51 +34,76 @@ import forestry.api.core.IIconProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
|
||||
public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
{
|
||||
MYSTICAL("Mystical", "mysticum",
|
||||
BeeClassification.VEILED, 0xAFFFB7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true),
|
||||
SORCEROUS("Sorcerous", "fascinatio",
|
||||
BeeClassification.VEILED, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true),
|
||||
UNUSUAL("Unusual", "inusitatus",
|
||||
BeeClassification.VEILED, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true),
|
||||
ATTUNED("Attuned", "similis",
|
||||
BeeClassification.VEILED, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true),
|
||||
|
||||
ELDRITCH("Eldritch", "prodigiosus",
|
||||
BeeClassification.VEILED, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
ESOTERIC("Esoteric", "secretiore",
|
||||
BeeClassification.ARCANE, 0x001099, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
MYSTERIOUS("Mysterious", "mysticus",
|
||||
BeeClassification.ARCANE, 0x762bc2, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
ARCANE("Arcane", "arcanus",
|
||||
BeeClassification.ARCANE, 0xd242df, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
|
||||
CHARMED("Charmed", "larvatus",
|
||||
BeeClassification.SUPERNATURAL, 0x48EEEC, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
ENCHANTED("Enchanted", "cantatus",
|
||||
BeeClassification.SUPERNATURAL, 0x18e726, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
SUPERNATURAL("Supernatural", "coeleste",
|
||||
BeeClassification.SUPERNATURAL, 0x005614, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
|
||||
ETHEREAL("Ethereal", "diaphanum",
|
||||
BeeClassification.MAGICAL, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
WATERY("Watery", "aquatilis",
|
||||
BeeClassification.MAGICAL, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true),
|
||||
EARTHY("Earthen", "fictili",
|
||||
BeeClassification.MAGICAL, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true),
|
||||
FIREY("Firey", "ardens",
|
||||
BeeClassification.MAGICAL, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true),
|
||||
WINDY("Windy", "ventosum",
|
||||
BeeClassification.MAGICAL, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false ,true),
|
||||
|
||||
PUPIL("Pupil", "disciplina",
|
||||
BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true),
|
||||
STARK("Stark", "torridae",
|
||||
BeeClassification.MAGICAL, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
AIR("Aura", "ventosa",
|
||||
BeeClassification.MAGICAL, 0xD9D636, 0xA19E10, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
FIRE("Ignis", "praefervidus",
|
||||
BeeClassification.MAGICAL, 0xE50B0B, 0x95132F, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
|
||||
WATER("Aqua", "umidus",
|
||||
BeeClassification.MAGICAL, 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true),
|
||||
EARTH("Solum", "sordida",
|
||||
BeeClassification.MAGICAL, 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
SCHOLARLY("Scholarly", "studiosis",
|
||||
BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false),
|
||||
SAVANT("Savant", "philologus",
|
||||
BeeClassification.SCHOLARLY, 0x6E1C6D, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false),
|
||||
|
||||
AWARE("Aware", "sensibilis",
|
||||
BeeClassification.MAGICAL, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
BeeClassification.MAGICAL, 0x0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
SPIRIT("Spirit", "larva",
|
||||
BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true),
|
||||
SOUL("Soul", "anima",
|
||||
BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false),
|
||||
|
||||
SKULKING("Skulking", "malevolens",
|
||||
BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
GHASTLY("Ghastly", "pallens",
|
||||
BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
SPIDERY("Spidery", "araneolus",
|
||||
BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
TIMELY("Timely", "gallifreis",
|
||||
BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
LORDLY("Lordly", "rassilonis",
|
||||
BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
DOCTORAL("Doctoral", "medicus qui",
|
||||
BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
SPIRIT("Spirit", "larva",
|
||||
BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true),
|
||||
SOUL("Soul", "anima",
|
||||
BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false),
|
||||
|
||||
IRON("Iron", "ferrus",
|
||||
BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
GOLD("Gold", "aurum",
|
||||
@@ -91,6 +116,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
LEAD("Lead", "plumbeus",
|
||||
BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
DIAMOND("Diamond", "diamond",
|
||||
BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
EMERALD("Emerald", "prasinus",
|
||||
@@ -99,67 +125,81 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
|
||||
// --------- Thaumcraft Bees ---------------------------------------------------------------------------------------
|
||||
SCHOLARLY("Scholarly", "studiosis",
|
||||
BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false),
|
||||
SAVANT("Savant", "philologus",
|
||||
BeeClassification.SCHOLARLY, 0x6E1C6D, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false),
|
||||
INFUSED("Praecantatio", "azanorius",
|
||||
TC_STARK("Stark", "torridae",
|
||||
BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
TC_AIR("Aura", "aether",
|
||||
BeeClassification.THAUMIC, 0xD9D636, 0xA19E10, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
TC_FIRE("Ignis", "praefervidus",
|
||||
BeeClassification.THAUMIC, 0xE50B0B, 0x95132F, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
|
||||
TC_WATER("Aqua", "umidus",
|
||||
BeeClassification.THAUMIC, 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true),
|
||||
TC_EARTH("Solum", "sordida",
|
||||
BeeClassification.THAUMIC, 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
TC_INFUSED("Praecantatio", "azanorius",
|
||||
BeeClassification.THAUMIC, 0xaa32fc, 0x7A489E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
VIS("Vis", "arcanus saecula",
|
||||
|
||||
TC_VIS("Vis", "arcanus saecula",
|
||||
BeeClassification.THAUMIC, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
PURE("Pure", "arcanus puritatem",
|
||||
TC_PURE("Pure", "arcanus puritatem",
|
||||
BeeClassification.THAUMIC, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
FLUX("Flux", "arcanus labe",
|
||||
TC_FLUX("Flux", "arcanus labe",
|
||||
BeeClassification.THAUMIC, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
NODE("Node", "conficiens",
|
||||
BeeClassification.THAUMIC, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
REJUVENATING("Rejuvenating", "arcanus vitae",
|
||||
TC_REJUVENATING("Rejuvenating", "arcanus vitae",
|
||||
BeeClassification.THAUMIC, 0x91D0D9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
BRAINY("Brainy", "cerebrum",
|
||||
|
||||
TC_BRAINY("Brainy", "cerebrum",
|
||||
BeeClassification.THAUMIC, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
GOSSAMER("Gossamer", "perlucidus",
|
||||
BeeClassification.THAUMIC, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
WISPY("Wispy", "umbrabilis",
|
||||
TC_WISPY("Wispy", "umbrabilis",
|
||||
BeeClassification.THAUMIC, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
BATTY("Batty", "chiroptera",
|
||||
TC_BATTY("Batty", "chiroptera",
|
||||
BeeClassification.THAUMIC, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
CHICKEN("Chicken", "pullus",
|
||||
|
||||
TC_CHICKEN("Chicken", "pullus",
|
||||
BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
BEEF("Beef", "bubulae",
|
||||
TC_BEEF("Beef", "bubulae",
|
||||
BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
PORK("Pork", "porcina",
|
||||
TC_PORK("Pork", "porcina",
|
||||
BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
@Deprecated
|
||||
TC_NODE("Node", "conficiens",
|
||||
BeeClassification.THAUMIC, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
@Deprecated
|
||||
TC_GOSSAMER("Gossamer", "perlucidus",
|
||||
BeeClassification.THAUMIC, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
// --------- Equivalent Exchange Bees -----------------------------------------------------------------------------
|
||||
MINIUM("Minium", "mutabilis",
|
||||
EE_MINIUM("Minium", "mutabilis",
|
||||
BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
|
||||
// --------- Ars Magica Bees --------------------------------------------------------------------------------------
|
||||
ESSENCE("Essence", "essentia",
|
||||
AM_ESSENCE("Essence", "essentia",
|
||||
BeeClassification.ESSENTIAL, 0x86BBC5, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
QUINTESSENCE("Quintessence", "cor essentia",
|
||||
AM_QUINTESSENCE("Quintessence", "cor essentia",
|
||||
BeeClassification.ESSENTIAL, 0xE3A45B, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
|
||||
EARTH_AM("Erde", "magica terra",
|
||||
|
||||
AM_EARTH("Erde", "magica terra",
|
||||
BeeClassification.ESSENTIAL, 0xAA875E, 0xE3A55B, EnumTemperature.WARM, EnumHumidity.ARID, false, false),
|
||||
AIR_AM("Luft", "magica aer",
|
||||
AM_AIR("Luft", "magica aer",
|
||||
BeeClassification.ESSENTIAL, 0xD5EB9D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
FIRE_AM("Feuer", "magica ignis",
|
||||
AM_FIRE("Feuer", "magica ignis",
|
||||
BeeClassification.ESSENTIAL, 0x93451E, 0xE3A55B, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
|
||||
WATER_AM("Wasser", "magica aqua",
|
||||
AM_WATER("Wasser", "magica aqua",
|
||||
BeeClassification.ESSENTIAL, 0x3B7D8C, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false),
|
||||
LIGHTNING("Blitz", "magica fulgur",
|
||||
AM_LIGHTNING("Blitz", "magica fulgur",
|
||||
BeeClassification.ESSENTIAL, 0xEBEFA1, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
PLANT("Staude", "magica herba",
|
||||
AM_PLANT("Staude", "magica herba",
|
||||
BeeClassification.ESSENTIAL, 0x49B549, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
ICE("Eis", "magica glacium",
|
||||
AM_ICE("Eis", "magica glacium",
|
||||
BeeClassification.ESSENTIAL, 0x86BAC6, 0xE3A55B, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false),
|
||||
MAGMA("Magma", "magica torrens igneus",
|
||||
AM_MAGMA("Magma", "magica torrens igneus",
|
||||
BeeClassification.ESSENTIAL, 0x932B1E, 0xE3A55B, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false),
|
||||
ARCANE_AM("Arkanen", "magica arcanum",
|
||||
AM_ARCANE("Arkanen", "magica arcanum",
|
||||
BeeClassification.ESSENTIAL, 0x76184D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
|
||||
VORTEX("Vortex", "gurges",
|
||||
|
||||
AM_VORTEX("Vortex", "gurges",
|
||||
BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
|
||||
WIGHT("Wight", "vectem",
|
||||
AM_WIGHT("Wight", "vectem",
|
||||
BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
|
||||
;
|
||||
|
||||
@@ -168,71 +208,70 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
// Species must be set inactive prior to registration.
|
||||
if (ThaumcraftHelper.isActive())
|
||||
{
|
||||
AIR.addSpecialty(new ItemStack(Config.tcNuggets, 1, ThaumcraftHelper.NuggetType.QUICKSILVER.ordinal()), 8);
|
||||
EARTH.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), 6);
|
||||
BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2);
|
||||
CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 9);
|
||||
BEEF.addSpecialty(new ItemStack(Config.tcNuggetBeef, 1), 9);
|
||||
PORK.addSpecialty(new ItemStack(Config.tcNuggetPork, 1), 9);
|
||||
TC_AIR.addSpecialty(new ItemStack(Config.tcNuggets, 1, ThaumcraftHelper.NuggetType.QUICKSILVER.ordinal()), 8);
|
||||
TC_EARTH.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), 6);
|
||||
TC_BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2);
|
||||
TC_CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 9);
|
||||
TC_BEEF.addSpecialty(new ItemStack(Config.tcNuggetBeef, 1), 9);
|
||||
TC_PORK.addSpecialty(new ItemStack(Config.tcNuggetPork, 1), 9);
|
||||
}
|
||||
else
|
||||
{
|
||||
SCHOLARLY.setInactive();
|
||||
SAVANT.setInactive();
|
||||
INFUSED.setInactive();
|
||||
VIS.setInactive();
|
||||
PURE.setInactive();
|
||||
FLUX.setInactive();
|
||||
NODE.setInactive();
|
||||
REJUVENATING.setInactive();
|
||||
BRAINY.setInactive();
|
||||
GOSSAMER.setInactive();
|
||||
WISPY.setInactive();
|
||||
BATTY.setInactive();
|
||||
CHICKEN.setInactive();
|
||||
BEEF.setInactive();
|
||||
PORK.setInactive();
|
||||
TC_INFUSED.setInactive();
|
||||
TC_VIS.setInactive();
|
||||
TC_PURE.setInactive();
|
||||
TC_FLUX.setInactive();
|
||||
TC_REJUVENATING.setInactive();
|
||||
TC_BRAINY.setInactive();
|
||||
TC_GOSSAMER.setInactive();
|
||||
TC_WISPY.setInactive();
|
||||
TC_BATTY.setInactive();
|
||||
TC_CHICKEN.setInactive();
|
||||
TC_BEEF.setInactive();
|
||||
TC_PORK.setInactive();
|
||||
}
|
||||
// Node bee is getting phased out.
|
||||
TC_NODE.setInactive();
|
||||
|
||||
if (EquivalentExchangeHelper.isActive())
|
||||
{
|
||||
MINIUM.addSpecialty(new ItemStack(Config.eeMinuimShard), 6);
|
||||
EE_MINIUM.addSpecialty(new ItemStack(Config.eeMinuimShard), 6);
|
||||
}
|
||||
else
|
||||
{
|
||||
MINIUM.setInactive();
|
||||
EE_MINIUM.setInactive();
|
||||
}
|
||||
|
||||
if (ArsMagicaHelper.isActive())
|
||||
{
|
||||
QUINTESSENCE.addSpecialty(new ItemStack(Config.amArcaneCompound), 5);
|
||||
EARTH_AM.addSpecialty(new ItemStack(Config.amEssenceEarth), 7);
|
||||
AIR_AM.addSpecialty(new ItemStack(Config.amEssenceAir), 7);
|
||||
FIRE_AM.addSpecialty(new ItemStack(Config.amEssenceFire), 7);
|
||||
WATER_AM.addSpecialty(new ItemStack(Config.amEssenceWater), 7);
|
||||
LIGHTNING.addSpecialty(new ItemStack(Config.amEssenceLightning), 7);
|
||||
PLANT.addSpecialty(new ItemStack(Config.amEssencePlant), 7);
|
||||
ICE.addSpecialty(new ItemStack(Config.amEssenceIce), 7);
|
||||
MAGMA.addSpecialty(new ItemStack(Config.amEssenceMagma), 7);
|
||||
ARCANE_AM.addSpecialty(new ItemStack(Config.amEssenceArcane), 11);
|
||||
VORTEX.addSpecialty(new ItemStack(Config.amArcaneCompound), 15);
|
||||
WIGHT.addSpecialty(new ItemStack(Item.enderPearl), 11);
|
||||
AM_QUINTESSENCE.addSpecialty(new ItemStack(Config.amArcaneCompound), 5);
|
||||
AM_EARTH.addSpecialty(new ItemStack(Config.amEssenceEarth), 7);
|
||||
AM_AIR.addSpecialty(new ItemStack(Config.amEssenceAir), 7);
|
||||
AM_FIRE.addSpecialty(new ItemStack(Config.amEssenceFire), 7);
|
||||
AM_WATER.addSpecialty(new ItemStack(Config.amEssenceWater), 7);
|
||||
AM_LIGHTNING.addSpecialty(new ItemStack(Config.amEssenceLightning), 7);
|
||||
AM_PLANT.addSpecialty(new ItemStack(Config.amEssencePlant), 7);
|
||||
AM_ICE.addSpecialty(new ItemStack(Config.amEssenceIce), 7);
|
||||
AM_MAGMA.addSpecialty(new ItemStack(Config.amEssenceMagma), 7);
|
||||
AM_ARCANE.addSpecialty(new ItemStack(Config.amEssenceArcane), 11);
|
||||
AM_VORTEX.addSpecialty(new ItemStack(Config.amArcaneCompound), 15);
|
||||
AM_WIGHT.addSpecialty(new ItemStack(Item.enderPearl), 11);
|
||||
}
|
||||
else
|
||||
{
|
||||
ESSENCE.setInactive();
|
||||
QUINTESSENCE.setInactive();
|
||||
EARTH_AM.setInactive();
|
||||
AIR_AM.setInactive();
|
||||
FIRE_AM.setInactive();
|
||||
WATER_AM.setInactive();
|
||||
LIGHTNING.setInactive();
|
||||
PLANT.setInactive();
|
||||
ICE.setInactive();
|
||||
MAGMA.setInactive();
|
||||
ARCANE_AM.setInactive();
|
||||
VORTEX.setInactive();
|
||||
WIGHT.setInactive();
|
||||
AM_ESSENCE.setInactive();
|
||||
AM_QUINTESSENCE.setInactive();
|
||||
AM_EARTH.setInactive();
|
||||
AM_AIR.setInactive();
|
||||
AM_FIRE.setInactive();
|
||||
AM_WATER.setInactive();
|
||||
AM_LIGHTNING.setInactive();
|
||||
AM_PLANT.setInactive();
|
||||
AM_ICE.setInactive();
|
||||
AM_MAGMA.setInactive();
|
||||
AM_ARCANE.setInactive();
|
||||
AM_VORTEX.setInactive();
|
||||
AM_WIGHT.setInactive();
|
||||
}
|
||||
|
||||
// Oredict bees
|
||||
@@ -284,21 +323,21 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 5)
|
||||
.setGenome(BeeGenomeManager.getTemplateSavant())
|
||||
.register();
|
||||
STARK.addProduct(Config.combs.getStackForType(CombType.STARK), 10)
|
||||
TC_STARK.addProduct(Config.combs.getStackForType(CombType.STARK), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateStark())
|
||||
.register();
|
||||
AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 9)
|
||||
TC_AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 9)
|
||||
.addSpecialty(new ItemStack(Item.feather), 4)
|
||||
.setGenome(BeeGenomeManager.getTemplateAir())
|
||||
.register();
|
||||
FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 15)
|
||||
TC_FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 15)
|
||||
.addSpecialty(new ItemStack(Item.blazePowder), 4).setGenome(BeeGenomeManager.getTemplateFire())
|
||||
.register();
|
||||
WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20)
|
||||
TC_WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20)
|
||||
.addSpecialty(new ItemStack(Block.ice), 1)
|
||||
.setGenome(BeeGenomeManager.getTemplateWater())
|
||||
.register();
|
||||
EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 30)
|
||||
TC_EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 30)
|
||||
.addSpecialty(new ItemStack(Block.obsidian), 4)
|
||||
.setGenome(BeeGenomeManager.getTemplateEarth())
|
||||
.register();
|
||||
@@ -375,90 +414,90 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
.setGenome(BeeGenomeManager.getTemplateApatite())
|
||||
.register();
|
||||
|
||||
INFUSED.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20)
|
||||
TC_INFUSED.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20)
|
||||
.setGenome(BeeGenomeManager.getTemplateInfused())
|
||||
.register();
|
||||
VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25)
|
||||
TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25)
|
||||
.setGenome(BeeGenomeManager.getTemplateVis())
|
||||
.register();
|
||||
PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
.setGenome(BeeGenomeManager.getTemplatePure())
|
||||
.register();
|
||||
FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
TC_FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
.setGenome(BeeGenomeManager.getTemplateFlux())
|
||||
.register();
|
||||
NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
TC_NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
.setGenome(BeeGenomeManager.getTemplateNode())
|
||||
.register();
|
||||
REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
|
||||
.setGenome(BeeGenomeManager.getTemplateRejuvinating())
|
||||
.register();
|
||||
BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
|
||||
TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
|
||||
.addProduct(new ItemStack(Item.rottenFlesh), 6)
|
||||
.setGenome(BeeGenomeManager.getTemplateBrainy())
|
||||
.register();
|
||||
BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
|
||||
TC_BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
|
||||
.addSpecialty(new ItemStack(Item.gunpowder), 4)
|
||||
.setGenome(BeeGenomeManager.getTemplateBatty())
|
||||
.register();
|
||||
GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15)
|
||||
TC_GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15)
|
||||
.setGenome(BeeGenomeManager.getTemplateGossamer())
|
||||
.register();
|
||||
WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 22)
|
||||
TC_WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 22)
|
||||
.addSpecialty(new ItemStack(Config.fCraftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 4)
|
||||
.setGenome(BeeGenomeManager.getTemplateWispy())
|
||||
.register();
|
||||
CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
TC_CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateChicken())
|
||||
.register();
|
||||
BEEF.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
TC_BEEF.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateBeef())
|
||||
.register();
|
||||
PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
TC_PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplatePork())
|
||||
.register();
|
||||
|
||||
MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16)
|
||||
EE_MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16)
|
||||
.setGenome(BeeGenomeManager.getTemplateMinium())
|
||||
.register();
|
||||
|
||||
ESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 12)
|
||||
AM_ESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateEssence())
|
||||
.register();
|
||||
QUINTESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 23)
|
||||
AM_QUINTESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 23)
|
||||
.setGenome(BeeGenomeManager.getTemplateQuintessence())
|
||||
.register();
|
||||
EARTH_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_EARTH.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateEarthAM())
|
||||
.register();
|
||||
AIR_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_AIR.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateAirAM())
|
||||
.register();
|
||||
FIRE_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_FIRE.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateFireAM())
|
||||
.register();
|
||||
WATER_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_WATER.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateWaterAM())
|
||||
.register();
|
||||
LIGHTNING.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_LIGHTNING.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateLightning())
|
||||
.register();
|
||||
PLANT.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_PLANT.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplatePlant())
|
||||
.register();
|
||||
ICE.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_ICE.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateIce())
|
||||
.register();
|
||||
MAGMA.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
AM_MAGMA.addProduct(Config.combs.getStackForType(CombType.POTENT), 12)
|
||||
.setGenome(BeeGenomeManager.getTemplateMagma())
|
||||
.register();
|
||||
ARCANE_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 19)
|
||||
AM_ARCANE.addProduct(Config.combs.getStackForType(CombType.POTENT), 19)
|
||||
.setGenome(BeeGenomeManager.getTemplateArcaneAM())
|
||||
.register();
|
||||
VORTEX.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 10)
|
||||
AM_VORTEX.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateVortex())
|
||||
.register();
|
||||
WIGHT.addProduct(Config.combs.getStackForType(CombType.SOUL), 30)
|
||||
AM_WIGHT.addProduct(Config.combs.getStackForType(CombType.SOUL), 30)
|
||||
.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
|
||||
.setGenome(BeeGenomeManager.getTemplateWight())
|
||||
.register();
|
||||
@@ -486,10 +525,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
private Icon[][] icons;
|
||||
|
||||
private final static boolean defaultSecretSetting = true;
|
||||
private final static int defaultBodyColour = 0xFF6E0D;
|
||||
|
||||
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
|
||||
{
|
||||
this(speciesName, genusName, classification, 0, firstColour, 0xFF6E0D, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant);
|
||||
this(speciesName, genusName, classification, 0, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant);
|
||||
}
|
||||
|
||||
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
|
||||
@@ -497,6 +537,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant);
|
||||
}
|
||||
|
||||
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant)
|
||||
{
|
||||
this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant);
|
||||
}
|
||||
|
||||
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant)
|
||||
{
|
||||
this(speciesName, genusName, classification, 0, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant);
|
||||
}
|
||||
|
||||
private BeeSpecies(String speciesName, String genusName, IClassification classification, int body, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant)
|
||||
{
|
||||
this.uid = "thaumicbees.species" + speciesName;
|
||||
@@ -544,7 +594,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
public ItemStack getBeeItem(EnumBeeType beeType)
|
||||
{
|
||||
return BeeManager.beeInterface.getBeeStack(BeeManager.beeInterface.getBee(null, BeeManager.beeInterface.templateAsGenome(genomeTemplate)), beeType);
|
||||
return Allele.beeRoot.getMemberStack(Allele.beeRoot.getBee(null, Allele.beeRoot.templateAsGenome(genomeTemplate)), beeType.ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -650,7 +700,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
private BeeSpecies register()
|
||||
{
|
||||
BeeManager.breedingManager.registerBeeTemplate(this.getGenome());
|
||||
Allele.beeRoot.registerTemplate(this.getGenome());
|
||||
if (!this.isActive)
|
||||
{
|
||||
AlleleManager.alleleRegistry.blacklistAllele(this.getUID());
|
||||
@@ -685,7 +735,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
return icons[type.ordinal()][Math.min(renderPass, 2)];
|
||||
}
|
||||
|
||||
private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, BRAINY, GOSSAMER, WISPY, BATTY, VORTEX, WISPY };
|
||||
private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, TC_BRAINY, TC_GOSSAMER, TC_WISPY, TC_BATTY, AM_VORTEX, TC_WISPY };
|
||||
|
||||
public void registerItemIcons(IconRegister itemMap)
|
||||
{
|
||||
@@ -713,8 +763,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
switch (this)
|
||||
{
|
||||
case SKULKING: case GHASTLY: case SPIDERY:
|
||||
case BRAINY: case GOSSAMER: case WISPY: case BATTY:
|
||||
case VORTEX: case WIGHT:
|
||||
case TC_BRAINY: case TC_GOSSAMER: case TC_WISPY: case TC_BATTY:
|
||||
case AM_VORTEX: case AM_WIGHT:
|
||||
value = VersionInfo.ModName.toLowerCase() + ":bees/skulking/";
|
||||
break;
|
||||
|
||||
@@ -726,6 +776,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ISpeciesRoot getRoot()
|
||||
{
|
||||
return Allele.beeRoot;
|
||||
}
|
||||
|
||||
/// --------- Unused Functions ---------------------------------------------
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package thaumicbees.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import forestry.api.core.BlockInterface;
|
||||
|
||||
public class BlockHive extends Block
|
||||
{
|
||||
public BlockHive(int id)
|
||||
{
|
||||
super(id, new MaterialHive());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.main.ThaumicBees;
|
||||
import thaumicbees.main.utils.VersionInfo;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.main.Config;
|
||||
import thaumicbees.main.ThaumicBees;
|
||||
import thaumicbees.main.utils.VersionInfo;
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package thaumicbees.block;
|
||||
|
||||
import net.minecraft.block.material.MapColor;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
||||
public class MaterialHive extends Material
|
||||
{
|
||||
|
||||
public MaterialHive()
|
||||
{
|
||||
super(MapColor.stoneColor);
|
||||
this.setImmovableMobility();
|
||||
this.setRequiresTool();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package thaumicbees.block.types;
|
||||
|
||||
public enum HiveType
|
||||
{
|
||||
MYSTICAL,
|
||||
UNUSUAL,
|
||||
SORCEROUS,
|
||||
ATTUNED,
|
||||
;
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package thaumicbees.item.types;
|
||||
package thaumicbees.block.types;
|
||||
|
||||
public enum PlankType
|
||||
{
|
||||
@@ -7,9 +7,9 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.item.types.CapsuleType;
|
||||
import thaumicbees.item.types.LiquidType;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.main.CommonProxy;
|
||||
import thaumicbees.main.ThaumicBees;
|
||||
import thaumicbees.main.utils.TabThaumicBees;
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumicbees.block.BlockEffectJar;
|
||||
import thaumicbees.block.BlockPlanks;
|
||||
import thaumicbees.block.BlockWoodSlab;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.item.ItemCapsule;
|
||||
import thaumicbees.item.ItemComb;
|
||||
import thaumicbees.item.ItemCrystalAspect;
|
||||
@@ -36,7 +37,6 @@ import thaumicbees.item.ItemWax;
|
||||
import thaumicbees.item.types.CapsuleType;
|
||||
import thaumicbees.item.types.HiveFrameType;
|
||||
import thaumicbees.item.types.NuggetType;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.item.types.ResourceType;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import thaumicbees.main.utils.compat.ArsMagicaHelper;
|
||||
|
||||
@@ -12,12 +12,12 @@ import thaumcraft.api.research.ResearchItem;
|
||||
import thaumcraft.api.research.ResearchList;
|
||||
import thaumicbees.bees.Allele;
|
||||
import thaumicbees.bees.BeeGenomeManager;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.item.ItemComb;
|
||||
import thaumicbees.item.ItemMiscResources;
|
||||
import thaumicbees.item.types.CombType;
|
||||
import thaumicbees.item.types.DropType;
|
||||
import thaumicbees.item.types.LiquidType;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.item.types.PollenType;
|
||||
import thaumicbees.item.types.PropolisType;
|
||||
import thaumicbees.item.types.ResourceType;
|
||||
|
||||
@@ -8,6 +8,7 @@ import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumicbees.bees.Allele;
|
||||
import thaumicbees.bees.BeeGenomeManager;
|
||||
import thaumicbees.bees.BeeSpecies;
|
||||
import thaumicbees.block.types.PlankType;
|
||||
import thaumicbees.item.ItemCapsule;
|
||||
import thaumicbees.item.ItemWax;
|
||||
import thaumicbees.item.types.CombType;
|
||||
@@ -15,7 +16,6 @@ import thaumicbees.item.types.DropType;
|
||||
import thaumicbees.item.types.HiveFrameType;
|
||||
import thaumicbees.item.types.LiquidType;
|
||||
import thaumicbees.item.types.NuggetType;
|
||||
import thaumicbees.item.types.PlankType;
|
||||
import thaumicbees.item.types.PollenType;
|
||||
import thaumicbees.item.types.PropolisType;
|
||||
import thaumicbees.item.types.ResourceType;
|
||||
|
||||
@@ -728,50 +728,50 @@ public class ThaumcraftHelper
|
||||
'T', Item.ingotIron
|
||||
});
|
||||
|
||||
ItemStack drone = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.DRONE);
|
||||
ItemStack princess = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.PRINCESS);
|
||||
ItemStack drone = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.TC_STARK, EnumBeeType.DRONE);
|
||||
ItemStack princess = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.TC_STARK, EnumBeeType.PRINCESS);
|
||||
|
||||
String researchKey = "BEEINFUSION";
|
||||
|
||||
tags = (new ObjectTags()).add(EnumTag.WIND, 40).add(EnumTag.MOTION, 24);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION1", BeeSpecies.AIR.getBeeItem(EnumBeeType.DRONE),
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION1", BeeSpecies.TC_AIR.getBeeItem(EnumBeeType.DRONE),
|
||||
new ItemStack[] { drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())},
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION2", BeeSpecies.AIR.getBeeItem(EnumBeeType.PRINCESS),
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION2", BeeSpecies.TC_AIR.getBeeItem(EnumBeeType.PRINCESS),
|
||||
new ItemStack[] { princess , new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
|
||||
tags = (new ObjectTags()).add(EnumTag.FIRE, 40).add( EnumTag.POWER, 24);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION3", BeeSpecies.FIRE.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION3", BeeSpecies.TC_FIRE.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
{ drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION4", BeeSpecies.FIRE.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION4", BeeSpecies.TC_FIRE.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
{ princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
|
||||
tags = (new ObjectTags()).add(EnumTag.WATER, 40).add( EnumTag.COLD, 24);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION5", BeeSpecies.WATER.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION5", BeeSpecies.TC_WATER.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
{ drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION6", BeeSpecies.WATER.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION6", BeeSpecies.TC_WATER.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
{ princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
|
||||
tags = (new ObjectTags()).add(EnumTag.EARTH, 40).add( EnumTag.ROCK, 24);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION7", BeeSpecies.EARTH.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION7", BeeSpecies.TC_EARTH.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
{ drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION8", BeeSpecies.EARTH.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION8", BeeSpecies.TC_EARTH.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
{ princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
|
||||
tags = new ObjectTags().add(EnumTag.MAGIC, 40).add(EnumTag.FLUX, 24);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.TC_INFUSED.getBeeItem(EnumBeeType.DRONE), new Object[]
|
||||
{ drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.INFUSED.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.TC_INFUSED.getBeeItem(EnumBeeType.PRINCESS), new Object[]
|
||||
{ princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) },
|
||||
100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES);
|
||||
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
|
||||
}
|
||||
|
||||
public static void doFluxEffect(HiveFrameType frameType, World w, int x, int y, int z)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package thaumicbees.tileentity;
|
||||
|
||||
import thaumicbees.bees.Allele;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
@@ -8,6 +9,7 @@ import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -146,7 +148,7 @@ public class EffectJarHousing implements IBeeHousing
|
||||
ItemStack stack = this.jarEntity.getStackInSlot(TileEntityEffectJar.QUEEN_SLOT);
|
||||
if (stack != null)
|
||||
{
|
||||
IBee queen = BeeManager.beeInterface.getBee(stack);
|
||||
IBee queen = Allele.beeRoot.getMember(stack);
|
||||
temp = queen.getGenome().getPrimary().getTemperature();
|
||||
}
|
||||
return temp;
|
||||
@@ -159,7 +161,7 @@ public class EffectJarHousing implements IBeeHousing
|
||||
ItemStack stack = this.jarEntity.getStackInSlot(TileEntityEffectJar.QUEEN_SLOT);
|
||||
if (stack != null)
|
||||
{
|
||||
IBee queen = BeeManager.beeInterface.getBee(stack);
|
||||
IBee queen = Allele.beeRoot.getMember(stack);
|
||||
humid = queen.getGenome().getPrimary().getHumidity();
|
||||
}
|
||||
return humid;
|
||||
@@ -198,4 +200,10 @@ public class EffectJarHousing implements IBeeHousing
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package thaumicbees.tileentity;
|
||||
|
||||
import thaumicbees.bees.Allele;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -67,7 +68,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
{
|
||||
if (this.beeSlots[QUEEN_SLOT] != null)
|
||||
{
|
||||
IBee queen = BeeManager.beeInterface.getBee(this.beeSlots[QUEEN_SLOT]);
|
||||
IBee queen = Allele.beeRoot.getMember(this.beeSlots[QUEEN_SLOT]);
|
||||
|
||||
currentBeeHealth = (queen.getHealth() * 100) / queen.getMaxHealth();
|
||||
currentBeeColour = ((IAlleleBeeSpecies)queen.getGenome().getPrimary()).getIconColour(0);
|
||||
@@ -106,9 +107,9 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
{
|
||||
// make a queen
|
||||
ItemStack droneStack = this.beeSlots[DRONE_SLOT];
|
||||
if (BeeManager.beeInterface.isDrone(droneStack))
|
||||
if (Allele.beeRoot.isDrone(droneStack))
|
||||
{
|
||||
IBee bee = BeeManager.beeInterface.getBee(droneStack);
|
||||
IBee bee = Allele.beeRoot.getMember(droneStack);
|
||||
if (droneStack.stackSize == 1)
|
||||
{
|
||||
this.beeSlots[DRONE_SLOT] = null;
|
||||
|
||||
Reference in new issue
Block a user