Added new bees. What is wrong with me.

This commit is contained in:
MysteriousAges committed 2015-09-26 19:13:54 -07:00
1 parent bd8fa92266
commit 8569a43f87
9 files changed
+426 -223

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
version_major=2
version_minor=3
version_rev=6
version_rev=7
version_forestry=3.6.3.20
version_bloodmagic=1.3.3-4
+113 -81
View File
@@ -86,13 +86,19 @@ public class Allele implements IAllele {
public static IAlleleEffect effectInvisibility;
public static IAlleleEffect effectDreaming;
public static IAlleleEffect spawnWolf;
public static IAlleleEffect spawnBats;
public static IAlleleEffect spawnCow;
public static IAlleleEffect spawnChicken;
public static IAlleleEffect spawnPig;
public static IAlleleEffect spawnSheep;
public static IAlleleEffect spawnCat;
public static IAlleleEffect spawnHorse;
public static IAlleleEffect spawnGhast;
public static IAlleleEffect spawnSpider;
public static IAlleleEffect spawnBlaze;
public static IAlleleEffect spawnWolf;
public static IAlleleEffect spawnBrainyZombie;
public static IAlleleEffect spawnWisp;
public static IAlleleEffect spawnBats;
public static IAlleleEffect spawnBlizz;
public static IAlleleEffect spawnBlitz;
public static IAlleleEffect spawnBasalz;
@@ -106,85 +112,6 @@ public class Allele implements IAllele {
speedBlinding = new AlleleFloat("speedBlinding", 2f, false);
flowerBookshelf = new AlleleFlower("Bookshelf", new FlowerProviderBookshelf(), true);
if (ThaumcraftHelper.isActive()) {
flowerThaumcraft = new AlleleFlower(FLOWERS_THAUMCRAFT_PLANT, new FlowerProviderThaumcraftFlower(), false);
flowerAuraNode = new AlleleFlower(FLOWERS_AURA_NODE, new FlowerProviderAuraNode(), true);
effectVisRecharge = new AlleleEffectRecharge(EFFECT_VIS_RECHARGE, false);
effectNodeEmpower = new AlleleEffectEmpowering(EFFECT_NODE_EMPOWER, false);
effectNodeRepair = new AlleleEffectNodeRepair(EFFECT_NODE_REPAIR, false);
effectNodeConversionTaint = new AlleleEffectNodeConversion(EFFECT_NODE_TAINTING, NodeType.TAINTED, false, 250);
effectNodeConversionPure = new AlleleEffectNodeConversion(EFFECT_NODE_PURIFYING, NodeType.PURE, false, 250);
effectNodeConversionHungry = new AlleleEffectNodeConversion(EFFECT_NODE_RAVENING, NodeType.HUNGRY, false, 2);
spawnBrainyZombie = new AlleleEffectSpawnMob(EFFECT_BRAINY, false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID)
.setAggrosPlayerOnSpawn()
.setThrottle(800)
.setSpawnsOnPlayerNear(null)
.setMaxMobsInSpawnZone(2);
spawnBats = new AlleleEffectSpawnMob(EFFECT_BATTY, false, ThaumcraftHelper.Entity.FIREBAT.entityID)
.setThrottle(300)
.setSpawnsOnPlayerNear("Bat");
spawnWisp = new AlleleEffectSpawnWisp(EFFECT_WISPY, false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive")
.setThrottle(1800)
.setChanceToSpawn(79);
} else {
flowerThaumcraft = new AlleleFlower(FLOWERS_THAUMCRAFT_PLANT, vanillaFlowers, false);
flowerAuraNode = new AlleleFlower(FLOWERS_AURA_NODE, vanillaFlowers, true);Allele.effectVisRecharge = new AlleleEffectRecharge(EFFECT_VIS_RECHARGE, false);
effectNodeEmpower = new AlleleEffectPlaceholder(EFFECT_NODE_EMPOWER, false);
effectNodeRepair = new AlleleEffectPlaceholder(EFFECT_NODE_REPAIR, false);
effectNodeConversionTaint = new AlleleEffectPlaceholder(EFFECT_NODE_TAINTING, false);
effectNodeConversionPure = new AlleleEffectPlaceholder(EFFECT_NODE_PURIFYING, false);
effectNodeConversionHungry = new AlleleEffectPlaceholder(EFFECT_NODE_RAVENING, false);
spawnBrainyZombie = new AlleleEffectPlaceholder(EFFECT_BRAINY, false);
spawnBats = new AlleleEffectPlaceholder(EFFECT_BATTY, false);
spawnWisp = new AlleleEffectPlaceholder(EFFECT_WISPY, false);
}
if (BotaniaHelper.isActive()) {
flowerBotania = new AlleleFlower(FLOWER_BOTANIA, new FlowerProviderBotania(), true);
effectDreaming = new AlleleEffectTransmuting(EFFECT_DREAMING, false,
new TransmutationEffectController(new TransmutationEffectLBotaniaLiving()), 100);
} else {
flowerBotania = new AlleleFlower(FLOWER_BOTANIA, vanillaFlowers, true);
effectDreaming = new AlleleEffectPlaceholder(EFFECT_DREAMING, false);
}
if (ArsMagicaHelper.isActive()) {
flowerArsMagica = new AlleleFlower(FLOWER_ARS_MAGICA_PLANT, new FlowerProviderArsMagicaFlower(), false);
spawnManaDrainer = new AlleleEffectSpawnMobWeighted(EFFECT_MANA_DRAIN, true, 20,
new String[] { ArsMagicaHelper.Name + ".MobManaCreeper", ArsMagicaHelper.Name + ".ManaVortex" },
new int[] { 60, 2 }
);
spawnWispOrHecate = new AlleleEffectSpawnMobWeighted(EFFECT_AM_WISP, true, 20,
new String[] { ArsMagicaHelper.Name + ".MobWisp", ArsMagicaHelper.Name + ".MobHecate" },
new int[] { 40, 3 }
);
} else {
flowerArsMagica = new AlleleFlower(FLOWER_ARS_MAGICA_PLANT, vanillaFlowers, false);
spawnManaDrainer = new AlleleEffectPlaceholder(EFFECT_MANA_DRAIN, true);
spawnWispOrHecate = new AlleleEffectPlaceholder(EFFECT_AM_WISP, true);
}
if (ThermalModsHelper.isActive()) {
spawnBlizz = new AlleleEffectSpawnMob(EFFECT_TE_BLIZZY, true, ThermalModsHelper.Entity.BLIZZ.entityID)
.setThrottle(100)
.setChanceToSpawn(80);
spawnBlitz = new AlleleEffectSpawnMob(EFFECT_TE_BLITZ, true, ThermalModsHelper.Entity.BLIZZ.entityID)
.setThrottle(100)
.setChanceToSpawn(80);
spawnBasalz = new AlleleEffectSpawnMob(EFFECT_TE_BASALZ, true, ThermalModsHelper.Entity.BLIZZ.entityID)
.setThrottle(100)
.setChanceToSpawn(80);
} else {
spawnBlizz = new AlleleEffectPlaceholder(EFFECT_TE_BLIZZY, true);
spawnBlitz = new AlleleEffectPlaceholder(EFFECT_TE_BLITZ, true);
spawnBasalz = new AlleleEffectPlaceholder(EFFECT_TE_BASALZ, true);
}
effectCleansing = new AlleleEffectCure("Curative", false);
effectDigSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false);
effectMoveSpeed = new AlleleEffectPotion("MoveSpeed", Potion.moveSpeed, 10, false);
@@ -217,6 +144,111 @@ public class Allele implements IAllele {
.setThrottle(650)
.setChanceToSpawn(40)
.setMaxMobsInSpawnZone(2);
spawnPig = new AlleleEffectSpawnMob("Porcine", true, "Pig", "mob.pig.say")
.setThrottle(350)
.setMaxMobsInSpawnZone(4);
spawnCow = new AlleleEffectSpawnMob("Bovine", true, "Cow", "mob.cow.say")
.setThrottle(640)
.setMaxMobsInSpawnZone(3);
spawnChicken = new AlleleEffectSpawnMob("Chicken", true, "Chicken", "mob.chicken.hurt")
.setThrottle(20)
.setMaxMobsInSpawnZone(20);
spawnSheep = new AlleleEffectSpawnMob("Sheep", false, "Sheep", "mob.sheep.say")
.setThrottle(450)
.setMaxMobsInSpawnZone(5);
spawnCat = new AlleleEffectSpawnMob("Catty", false, "Ozelot", "mob.cat.meow")
.setThrottle(702)
.setChanceToSpawn(60)
.setMaxMobsInSpawnZone(2);
spawnHorse = new AlleleEffectSpawnMob("Horse", false, "EntityHorse", "mob.horse.idle")
.setThrottle(450)
.setChanceToSpawn(59)
.setMaxMobsInSpawnZone(2);
if (ThaumcraftHelper.isActive()) {
flowerThaumcraft = new AlleleFlower(FLOWERS_THAUMCRAFT_PLANT, new FlowerProviderThaumcraftFlower(), false);
flowerAuraNode = new AlleleFlower(FLOWERS_AURA_NODE, new FlowerProviderAuraNode(), true);
effectVisRecharge = new AlleleEffectRecharge(EFFECT_VIS_RECHARGE, false);
effectNodeEmpower = new AlleleEffectEmpowering(EFFECT_NODE_EMPOWER, false);
effectNodeRepair = new AlleleEffectNodeRepair(EFFECT_NODE_REPAIR, false);
effectNodeConversionTaint = new AlleleEffectNodeConversion(EFFECT_NODE_TAINTING, NodeType.TAINTED, false, 250);
effectNodeConversionPure = new AlleleEffectNodeConversion(EFFECT_NODE_PURIFYING, NodeType.PURE, false, 250);
effectNodeConversionHungry = new AlleleEffectNodeConversion(EFFECT_NODE_RAVENING, NodeType.HUNGRY, false, 2);
spawnBrainyZombie = new AlleleEffectSpawnMob(EFFECT_BRAINY, false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID)
.setAggrosPlayerOnSpawn()
.setThrottle(800)
.setSpawnsOnPlayerNear(null)
.setMaxMobsInSpawnZone(2);
spawnBats = new AlleleEffectSpawnMob(EFFECT_BATTY, false, ThaumcraftHelper.Entity.FIREBAT.entityID)
.setThrottle(300)
.setSpawnsOnPlayerNear("Bat");
spawnWisp = new AlleleEffectSpawnWisp(EFFECT_WISPY, false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive")
.setThrottle(1800)
.setChanceToSpawn(79);
}
else {
spawnBats = new AlleleEffectSpawnMob(EFFECT_BATTY, false, "Bat")
.setThrottle(150);
flowerThaumcraft = new AlleleFlower(FLOWERS_THAUMCRAFT_PLANT, vanillaFlowers, false);
flowerAuraNode = new AlleleFlower(FLOWERS_AURA_NODE, vanillaFlowers, true);Allele.effectVisRecharge = new AlleleEffectRecharge(EFFECT_VIS_RECHARGE, false);
effectNodeEmpower = new AlleleEffectPlaceholder(EFFECT_NODE_EMPOWER, false);
effectNodeRepair = new AlleleEffectPlaceholder(EFFECT_NODE_REPAIR, false);
effectNodeConversionTaint = new AlleleEffectPlaceholder(EFFECT_NODE_TAINTING, false);
effectNodeConversionPure = new AlleleEffectPlaceholder(EFFECT_NODE_PURIFYING, false);
effectNodeConversionHungry = new AlleleEffectPlaceholder(EFFECT_NODE_RAVENING, false);
spawnBrainyZombie = new AlleleEffectPlaceholder(EFFECT_BRAINY, false);
spawnWisp = new AlleleEffectPlaceholder(EFFECT_WISPY, false);
}
if (BotaniaHelper.isActive()) {
flowerBotania = new AlleleFlower(FLOWER_BOTANIA, new FlowerProviderBotania(), true);
effectDreaming = new AlleleEffectTransmuting(EFFECT_DREAMING, false,
new TransmutationEffectController(new TransmutationEffectLBotaniaLiving()), 100);
}
else {
flowerBotania = new AlleleFlower(FLOWER_BOTANIA, vanillaFlowers, true);
effectDreaming = new AlleleEffectPlaceholder(EFFECT_DREAMING, false);
}
if (ArsMagicaHelper.isActive()) {
flowerArsMagica = new AlleleFlower(FLOWER_ARS_MAGICA_PLANT, new FlowerProviderArsMagicaFlower(), false);
spawnManaDrainer = new AlleleEffectSpawnMobWeighted(EFFECT_MANA_DRAIN, true, 20,
new String[] { ArsMagicaHelper.Name + ".MobManaCreeper", ArsMagicaHelper.Name + ".ManaVortex" },
new int[] { 60, 2 }
);
spawnWispOrHecate = new AlleleEffectSpawnMobWeighted(EFFECT_AM_WISP, true, 20,
new String[] { ArsMagicaHelper.Name + ".MobWisp", ArsMagicaHelper.Name + ".MobHecate" },
new int[] { 40, 3 }
);
}
else {
flowerArsMagica = new AlleleFlower(FLOWER_ARS_MAGICA_PLANT, vanillaFlowers, false);
spawnManaDrainer = new AlleleEffectPlaceholder(EFFECT_MANA_DRAIN, true);
spawnWispOrHecate = new AlleleEffectPlaceholder(EFFECT_AM_WISP, true);
}
if (ThermalModsHelper.isActive()) {
spawnBlizz = new AlleleEffectSpawnMob(EFFECT_TE_BLIZZY, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName)
.setThrottle(100)
.setChanceToSpawn(80);
spawnBlitz = new AlleleEffectSpawnMob(EFFECT_TE_BLITZ, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName)
.setThrottle(100)
.setChanceToSpawn(80);
spawnBasalz = new AlleleEffectSpawnMob(EFFECT_TE_BASALZ, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName)
.setThrottle(100)
.setChanceToSpawn(80);
}
else {
spawnBlizz = new AlleleEffectPlaceholder(EFFECT_TE_BLIZZY, true);
spawnBlitz = new AlleleEffectPlaceholder(EFFECT_TE_BLITZ, true);
spawnBasalz = new AlleleEffectPlaceholder(EFFECT_TE_BASALZ, true);
}
}
public static void registerDeprecatedAlleleReplacements() {
@@ -325,6 +325,44 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateBatty() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BATTY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBats;
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
return genome;
}
public static IAllele[] getTemplateChicken() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.CHICKEN;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnChicken;
return genome;
}
public static IAllele[] getTemplateBeef() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BEEF;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnCow;
return genome;
}
public static IAllele[] getTemplatePork() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PORK;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnPig;
return genome;
}
public static IAllele[] getTemplateBigbad() {
IAllele[] genome = getTemplateBaseMalevolent();
@@ -335,6 +373,38 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateSheepish() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SHEEPISH;
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnSheep;
return genome;
}
public static IAllele[] getTemplateHorse() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.HORSE;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFastest");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnHorse;
return genome;
}
public static IAllele[] getTemplateCatty() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.CATTY;
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth3");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnCat;
return genome;
}
public static IAllele[] getTemplateGhastly() {
IAllele[] genome = getTemplateBaseMalevolent();
@@ -362,6 +432,16 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateBrainy() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BRAINY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBrainyZombie;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateSmouldering() {
IAllele[] genome = getTemplateBaseMalevolent();
@@ -917,18 +997,7 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateTCBrainy() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BRAINY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBrainyZombie;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateTCWispy() {
IAllele[] genome = getTemplateBaseMalevolent();
@@ -941,40 +1010,6 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateTCBatty() {
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BATTY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBats;
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
return genome;
}
public static IAllele[] getTemplateTCChicken() {
IAllele[] genome = getTemplateBaseMetallic();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_CHICKEN;
return genome;
}
public static IAllele[] getTemplateTCBeef() {
IAllele[] genome = getTemplateBaseMetallic();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BEEF;
return genome;
}
public static IAllele[] getTemplateTCPork() {
IAllele[] genome = getTemplateBaseMetallic();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_PORK;
return genome;
}
public static IAllele[] getTemplaceTCVoid() {
IAllele[] genome = getTemplateBaseMetallic();
@@ -1253,23 +1288,6 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateTEDante() {
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_DANTE;
return genome;
}
public static IAllele[] getTemplateTEPyro() {
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_PYRO;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
return genome;
}
public static IAllele[] getTemplateTEDestabilized() {
IAllele[] genome = getTemplateTEBase();
@@ -1302,6 +1320,22 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateTEDante() {
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_DANTE;
return genome;
}
public static IAllele[] getTemplateTEPyro() {
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_PYRO;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
return genome;
}
public static IAllele[] getTemplateTEBlizzy() {
IAllele[] genome = getTemplateTEEnd();
@@ -1322,6 +1356,46 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateTEShocking() {
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_SHOCKING;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
return genome;
}
public static IAllele[] getTemplateTEAmped() {
IAllele[] genome = getTemplateTEShocking();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_AMPED;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBlitz;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedBlinding;
return genome;
}
public static IAllele[] getTemplateTEGrounded() {
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_GROUNDED;
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
return genome;
}
public static IAllele[] getTemplateTERocking() {
IAllele[] genome = getTemplateTEGrounded();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_ROCKING;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFaster");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBasalz;
return genome;
}
public static IAllele[] getTemplateTECoal() {
IAllele[] genome = getTemplateTEBase();
+41 -19
View File
@@ -104,11 +104,30 @@ public class BeeMutation implements IBeeMutation {
new BeeMutation(Allele.getBaseSpecies("Modest"), BeeSpecies.ELDRITCH, BeeSpecies.SKULKING, 12);
new BeeMutation(Allele.getBaseSpecies("Tropical"), BeeSpecies.SKULKING, BeeSpecies.SPIDERY, 10);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, 9);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.HATEFUL, BeeSpecies.SMOULDERING, 7)
new BeeMutation(BeeSpecies.BATTY, BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, 9);
new BeeMutation(BeeSpecies.GHASTLY, BeeSpecies.HATEFUL, BeeSpecies.SMOULDERING, 7)
.setBiomeRequired(BiomeDictionary.Type.NETHER);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.MYSTERIOUS, BeeSpecies.BIGBAD, 7)
.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.FULL);
.setMoonPhaseRestricted(MoonPhase.FULL);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.CHICKEN, 12)
.setBiomeRequired(Type.FOREST);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.BEEF, 12)
.setBiomeRequired(Type.PLAINS);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.PORK, 12)
.setBiomeRequired(Type.MOUNTAIN);
new BeeMutation(BeeSpecies.PORK, BeeSpecies.SKULKING, BeeSpecies.SHEEPISH, 13)
.setBiomeRequired(Type.PLAINS);
new BeeMutation(BeeSpecies.BEEF, BeeSpecies.SHEEPISH, BeeSpecies.HORSE, 12)
.setBiomeRequired(Type.PLAINS);
new BeeMutation(BeeSpecies.CHICKEN, BeeSpecies.SPIDERY, BeeSpecies.CATTY, 15)
.setBiomeRequired(Type.JUNGLE);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.WINDY, BeeSpecies.BATTY, 9);
if (ThaumcraftHelper.isActive()) {
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.PUPIL, BeeSpecies.BRAINY, 9);
}
else {
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.MUTABLE, BeeSpecies.BRAINY, 14);
}
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.OBLIVION, BeeSpecies.NAMELESS, 10);
new BeeMutation(BeeSpecies.OBLIVION, BeeSpecies.NAMELESS, BeeSpecies.ABANDONED, 8);
@@ -251,23 +270,16 @@ public class BeeMutation implements IBeeMutation {
.setBiomeRequired(Type.MAGICAL)
.setBlockAndMetaRequired(ThaumcraftHelper.airy, ThaumcraftHelper.AiryBlockType.NODE.ordinal());
new BeeMutation(BeeSpecies.TRANSMUTING, BeeSpecies.TC_EMPOWERING, BeeSpecies.TC_TAINT, 11);
new BeeMutation(BeeSpecies.TRANSMUTING, BeeSpecies.TC_EMPOWERING, BeeSpecies.TC_TAINT, 11)
.setMoonPhaseRestricted(MoonPhase.NEW);
new BeeMutation(BeeSpecies.TRANSMUTING, BeeSpecies.TC_REJUVENATING, BeeSpecies.TC_PURE, 8)
.setBiomeRequired(Type.MAGICAL);
.setBiomeRequired(Type.MAGICAL)
.setMoonPhaseRestricted(MoonPhase.NEW);
new BeeMutation(BeeSpecies.BIGBAD, BeeSpecies.TC_VIS, BeeSpecies.TC_HUNGRY, 20);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.WINDY, BeeSpecies.TC_BATTY, 9);
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.PUPIL, BeeSpecies.TC_BRAINY, 9);
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, BeeSpecies.TC_WISPY, 9)
.setMoonPhaseRestricted(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.TC_CHICKEN, 12)
.setBiomeRequired(Type.FOREST);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.TC_BEEF, 12)
.setBiomeRequired(Type.PLAINS);
new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.TC_PORK, 12)
.setBiomeRequired(Type.MOUNTAIN);
new BeeMutation(BeeSpecies.IRON, BeeSpecies.TC_TAINT, BeeSpecies.TC_VOID, 5)
.setBiomeRequired(Type.MAGICAL)
.setRequiresNight();
@@ -296,12 +308,11 @@ public class BeeMutation implements IBeeMutation {
}
if (BloodMagicHelper.isActive()) {
new BeeMutation(BeeSpecies.ELDRITCH, BeeSpecies.EARTHY, BeeSpecies.BM_BLOODY, 8)
.setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 8)
new BeeMutation(BeeSpecies.ELDRITCH, BeeSpecies.EARTHY, BeeSpecies.BM_BLOODY, 13)
.setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 0.85f)
.setBlockRequired(BloodMagicHelper.bloodStoneBrick);
new BeeMutation(BeeSpecies.BM_BLOODY, BeeSpecies.ARCANE, BeeSpecies.BM_BOUND, 8)
.setBlockRequired(BloodMagicHelper.masterRitualStone);
new BeeMutation(BeeSpecies.BM_BLOODY, BeeSpecies.ARCANE, BeeSpecies.BM_BOUND, 8);
}
if (RedstoneArsenalHelper.isActive()) {
@@ -344,8 +355,13 @@ public class BeeMutation implements IBeeMutation {
.setBiomeRequired(BiomeDictionary.Type.NETHER);
new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Wintry"), BeeSpecies.TE_BLIZZY, 12);
new BeeMutation(BeeSpecies.TE_BLIZZY, Allele.getBaseSpecies("Icy"), BeeSpecies.TE_GELID, 8);
new BeeMutation(BeeSpecies.SMOULDERING, BeeSpecies.WINDY, BeeSpecies.TE_SHOCKING, 13);
new BeeMutation(BeeSpecies.TE_SHOCKING, BeeSpecies.WINDY, BeeSpecies.TE_AMPED, 8);
new BeeMutation(BeeSpecies.SMOULDERING, BeeSpecies.EARTHY, BeeSpecies.TE_GROUNDED, 12);
new BeeMutation(BeeSpecies.TE_GROUNDED, BeeSpecies.EARTHY, BeeSpecies.TE_ROCKING, 9);
new BeeMutation(BeeSpecies.TE_PLATINUM, BeeSpecies.OBLIVION, BeeSpecies.TE_WINSOME, 12);
@@ -374,6 +390,7 @@ public class BeeMutation implements IBeeMutation {
}
}
private IAllele parent1;
private IAllele parent2;
private IAllele mutationTemplate[];
@@ -632,6 +649,11 @@ public class BeeMutation implements IBeeMutation {
return this;
}
public BeeMutation setMoonPhaseRestricted(MoonPhase phase) {
setMoonPhaseRestricted(phase, phase);
return this;
}
public BeeMutation setMoonPhaseRestricted(MoonPhase begin, MoonPhase end) {
this.isMoonRestricted = true;
this.moonPhaseStart = begin;
@@ -70,10 +70,29 @@ public class BeeProductHelper {
SMOULDERING.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 0.10f)
.addSpecialty(new ItemStack(Items.blaze_rod), 0.05f);
BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addProduct(new ItemStack(Items.rotten_flesh), 0.6f);
BIGBAD.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.18f)
.addProduct(new ItemStack(Items.beef), 0.12f)
.addProduct(new ItemStack(Items.chicken), 0.12f)
.addSpecialty(new ItemStack(Items.melon), 0.20f);
BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addSpecialty(new ItemStack(Items.string), 0.00001f);
CHICKEN.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.23f)
.addSpecialty(new ItemStack(Items.feather), 0.08f)
.addSpecialty(new ItemStack(Items.egg), 0.08f);
BEEF.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f)
.addSpecialty(new ItemStack(Items.leather), 0.165f);
PORK.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addSpecialty(new ItemStack(Items.carrot), 0.165f);
SHEEPISH.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f)
.addSpecialty(new ItemStack(Blocks.wool), 0.16f)
.addSpecialty(new ItemStack(Items.wheat), 0.24f);
HORSE.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f)
.addSpecialty(new ItemStack(Items.leather), 0.24f)
.addSpecialty(new ItemStack(Items.apple), 0.38f);
CATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.25f)
.addSpecialty(new ItemStack(Items.fish), 0.24f);
TIMELY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 0.16f);
LORDLY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 0.19f);
@@ -259,16 +278,8 @@ public class BeeProductHelper {
TC_PURE.addSpecialty(Config.combs.getStackForType(CombType.SOUL), 0.19f);
TC_HUNGRY.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.28f);
TC_HUNGRY.addSpecialty(Config.combs.getStackForType(CombType.TEMPORAL), 0.195f);
TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addProduct(new ItemStack(Items.rotten_flesh), 0.6f);
TC_BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f)
.addSpecialty(new ItemStack(Items.gunpowder), 0.4f);
TC_WISPY.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.22f)
.addSpecialty(new ItemStack(ForestryHelper.craftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 0.4f);
TC_CHICKEN.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
TC_BEEF.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
TC_PORK.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
TC_VOID.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (ThaumcraftHelper.isActive()) {
@@ -282,10 +293,11 @@ public class BeeProductHelper {
TC_ORDER.addSpecialty(Config.propolis.getStackForType(PropolisType.ORDER), 0.18f);
TC_CHAOS.addSpecialty(Config.propolis.getStackForType(PropolisType.CHAOS), 0.18f);
TC_BRAINY.addSpecialty(new ItemStack(ThaumcraftHelper.miscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 0.2f);
TC_CHICKEN.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetChicken, 1), 0.9f);
TC_BEEF.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetBeef, 1), 0.9f);
TC_PORK.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetPork, 1), 0.9f);
BATTY.addSpecialty(new ItemStack(Items.gunpowder), 0.4f);
BRAINY.addSpecialty(new ItemStack(ThaumcraftHelper.miscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 0.2f);
CHICKEN.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetChicken, 1), 0.9f);
BEEF.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetBeef, 1), 0.9f);
PORK.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetPork, 1), 0.9f);
TC_VOID.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetMetal, 1, ThaumcraftHelper.NuggetType.VOID_METAL.ordinal()), 0.155f);
}
}
@@ -351,6 +363,10 @@ public class BeeProductHelper {
.addSpecialty(new ItemStack(Items.coal), 0.5f);
TE_BLIZZY.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f);
TE_GELID.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f);
TE_SHOCKING.addProduct(Config.combs.getStackForType(CombType.AIRY), 0.16f);
TE_AMPED.addProduct(Config.combs.getStackForType(CombType.AIRY), 0.29f);
TE_GROUNDED.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.16f);
TE_ROCKING.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.29f);
if (ThermalModsHelper.isActive()) {
LogHelper.info("Thermal Expansion bees active");
@@ -358,6 +374,10 @@ public class BeeProductHelper {
TE_GELID.addSpecialty(ThermalModsHelper.dustCryotheum, 0.9f);
TE_DANTE.addSpecialty(ThermalModsHelper.dustSulfur, 0.9f);
TE_PYRO.addSpecialty(ThermalModsHelper.dustPyrotheum, 0.9f);
TE_SHOCKING.addSpecialty(ThermalModsHelper.dustBlitz, 0.9f);
TE_AMPED.addSpecialty(ThermalModsHelper.dustAerotheum, 0.9f);
TE_GROUNDED.addSpecialty(ThermalModsHelper.dustBasalz, 0.9f);
TE_ROCKING.addSpecialty(ThermalModsHelper.dustPetrotheum, 0.9f);
TE_WINSOME.addSpecialty(ThermalModsHelper.dustPlatinum, 0.9f);
TE_ENDEARING.addSpecialty(ThermalModsHelper.enderiumNugget, 0.9f);
}
+48 -25
View File
@@ -108,8 +108,24 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
SMOULDERING("Smouldering", "flagrantia", BeeClassification.SKULKING,
0xFFC747, 0xEA8344, EnumTemperature.HELLISH, EnumHumidity.NORMAL, false, false),
BRAINY("TCBrainy", "cerebrum", BeeClassification.SKULKING,
0x83FF70, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BIGBAD("BigBad", "magnumalum", BeeClassification.SKULKING,
0xA9344B, 0x453536, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true),
CHICKEN("TCChicken", "pullus", BeeClassification.FLESHY,
0xFF0000, 0xD3D3D3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BEEF("TCBeef", "bubulae", BeeClassification.FLESHY,
0xB7B7B7, 0x3F3024, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
PORK("TCPork", "porcina", BeeClassification.FLESHY,
0xF1AEAC, 0xDF847B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BATTY("TCBatty", "chiroptera", BeeClassification.FLESHY,
0x5B482B, 0x271B0F, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
SHEEPISH("Sheepish", "balans", BeeClassification.FLESHY,
0xF7F7F7, 0xCACACA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
HORSE("Horse", "equus", BeeClassification.FLESHY,
0x906330, 0x7B4E1B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
CATTY("Catty", "feline", BeeClassification.FLESHY,
0xECE684, 0x563C24, EnumTemperature.HOT, EnumHumidity.NORMAL, false, true),
TIMELY("Timely", "gallifreis", BeeClassification.TIME,
0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
@@ -213,19 +229,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_HUNGRY("TCHungry", "omnique", BeeClassification.THAUMIC,
0xDCA5E2, BodyColours.THAUMCRAFT_NODE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_BRAINY("TCBrainy", "cerebrum", BeeClassification.THAUMIC,
0x83FF70, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_WISPY("TCWispy", "umbrabilis", BeeClassification.THAUMIC,
0x9cb8d5, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_BATTY("TCBatty", "chiroptera", BeeClassification.THAUMIC,
0x27350d, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_CHICKEN("TCChicken", "pullus", BeeClassification.FLESHY,
0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_BEEF("TCBeef", "bubulae", BeeClassification.FLESHY,
0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_PORK("TCPork", "porcina", BeeClassification.FLESHY,
0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_VOID("TCVoid", "obscurus", BeeClassification.METALLIC,
0x180A29, 0x4B2A74, EnumTemperature.ICY, EnumHumidity.NORMAL, false, false),
@@ -268,8 +273,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true),
TE_DANTE("TEDante", "inferno", BeeClassification.ABOMINABLE,
0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false),
TE_PYRO("TEPyro", "pyromaniac", BeeClassification.ABOMINABLE,
TE_PYRO("TEPyro", "pyromania", BeeClassification.ABOMINABLE,
0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, true, true),
TE_SHOCKING("TEShocking", "horrendum", BeeClassification.ABOMINABLE,
0xC5FF26, 0xF8EE00, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_AMPED("TEAmped", "concitatus", BeeClassification.ABOMINABLE,
0x8AFFFF, 0xECE670, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
TE_GROUNDED("TEGrounded", "tellus", BeeClassification.ABOMINABLE,
0xCEC1C1, 0x826767, EnumTemperature.HOT, EnumHumidity.ARID, false, true),
TE_ROCKING("TERocking", "saxsous", BeeClassification.ABOMINABLE,
0x980000, 0xAB9D9B, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
TE_ELECTRUM("TEElectrum", "electrum", BeeClassification.THERMAL,
0xEAF79E, EnumTemperature.HOT,EnumHumidity.ARID, false, false),
@@ -371,7 +384,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
GHASTLY.registerGenomeTemplate(BeeGenomeManager.getTemplateGhastly());
SPIDERY.registerGenomeTemplate(BeeGenomeManager.getTemplateSpidery());
SMOULDERING.registerGenomeTemplate(BeeGenomeManager.getTemplateSmouldering());
BIGBAD.registerGenomeTemplate(BeeGenomeManager.getTemplateBigbad());
BIGBAD.registerGenomeTemplate(BeeGenomeManager.getTemplateBigbad());
CHICKEN.registerGenomeTemplate(BeeGenomeManager.getTemplateChicken());
BEEF.registerGenomeTemplate(BeeGenomeManager.getTemplateBeef());
PORK.registerGenomeTemplate(BeeGenomeManager.getTemplatePork());
SHEEPISH.registerGenomeTemplate(BeeGenomeManager.getTemplateSheepish());
HORSE.registerGenomeTemplate(BeeGenomeManager.getTemplateHorse());
CATTY.registerGenomeTemplate(BeeGenomeManager.getTemplateCatty());
TIMELY.registerGenomeTemplate(BeeGenomeManager.getTemplateTimely());
LORDLY.registerGenomeTemplate(BeeGenomeManager.getTemplateLordly());
DOCTORAL.registerGenomeTemplate(BeeGenomeManager.getTemplateDoctoral());
@@ -418,12 +437,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_TAINT.registerGenomeTemplate(BeeGenomeManager.getTemplateTCTaint());
TC_PURE.registerGenomeTemplate(BeeGenomeManager.getTemplateTCPure());
TC_HUNGRY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCHungry());
TC_BRAINY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBrainy());
BRAINY.registerGenomeTemplate(BeeGenomeManager.getTemplateBrainy());
TC_WISPY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCWispy());
TC_BATTY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBatty());
TC_CHICKEN.registerGenomeTemplate(BeeGenomeManager.getTemplateTCChicken());
TC_BEEF.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBeef());
TC_PORK.registerGenomeTemplate(BeeGenomeManager.getTemplateTCPork());
BATTY.registerGenomeTemplate(BeeGenomeManager.getTemplateBatty());
TC_VOID.registerGenomeTemplate(BeeGenomeManager.getTemplaceTCVoid());
EE_MINIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateEEMinium());
AM_ESSENCE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMEssence());
@@ -442,6 +458,10 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TE_GELID.registerGenomeTemplate(BeeGenomeManager.getTemplateTEGelid());
TE_DANTE.registerGenomeTemplate(BeeGenomeManager.getTemplateTEDante());
TE_PYRO.registerGenomeTemplate(BeeGenomeManager.getTemplateTEPyro());
TE_SHOCKING.registerGenomeTemplate(BeeGenomeManager.getTemplateTEShocking());
TE_AMPED.registerGenomeTemplate(BeeGenomeManager.getTemplateTEAmped());
TE_GROUNDED.registerGenomeTemplate(BeeGenomeManager.getTemplateTEGrounded());
TE_ROCKING.registerGenomeTemplate(BeeGenomeManager.getTemplateTERocking());
TE_ELECTRUM.registerGenomeTemplate(BeeGenomeManager.getTemplateTEElectrum());
TE_PLATINUM.registerGenomeTemplate(BeeGenomeManager.getTemplateTEPlatinum());
TE_NICKEL.registerGenomeTemplate(BeeGenomeManager.getTemplateTENickel());
@@ -482,11 +502,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
TC_PURE.setInactive();
TC_HUNGRY.setInactive();
TC_BRAINY.setInactive();
TC_BATTY.setInactive();
TC_CHICKEN.setInactive();
TC_BEEF.setInactive();
TC_PORK.setInactive();
BRAINY.setInactive();
TC_WISPY.setInactive();
TC_VOID.setInactive();
@@ -939,15 +955,22 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
case SPIDERY:
case SMOULDERING:
case BIGBAD:
case TC_BRAINY:
case BATTY:
case SHEEPISH:
case HORSE:
case CATTY:
case BRAINY:
case TC_WISPY:
case TC_BATTY:
case AM_VORTEX:
case AM_WIGHT:
case TE_BLIZZY:
case TE_GELID:
case TE_DANTE:
case TE_PYRO:
case TE_SHOCKING:
case TE_AMPED:
case TE_GROUNDED:
case TE_ROCKING:
value = CommonProxy.DOMAIN + ":bees/skulking/";
break;
+2 -2
View File
@@ -91,7 +91,7 @@ public class Config
public static boolean extraBeesActive;
public static boolean redstoneArsenalActive;
public static boolean thaumcraftActive;
public static boolean thermalExpansionActive;
public static boolean thermalFoundationActive;
public static boolean botaniaActive;
public static boolean ae2Active;
@@ -262,7 +262,7 @@ public class Config
thaumcraftActive = p.getBoolean();
p = configuration.get(CATEGORY_MODULES, "ThermalExpansion", true);
thermalExpansionActive = p.getBoolean();
thermalFoundationActive = p.getBoolean();
p = configuration.get(CATEGORY_MODULES, "Botania", true);
botaniaActive = p.getBoolean();
@@ -32,16 +32,18 @@ public class ThermalModsHelper implements IModHelper {
}
public enum Entity {
BLIZZ("Blizz"),
BLITZ("Blitz"),
BASALZ("Basalz"),
BLIZZ("Blizz", "ThermalFoundation:mobBlizzBreathe0"),
BLITZ("Blitz", "ThermalFoundation:mobBlitzBreathe1"),
BASALZ("Basalz", "ThermalFoundation:mobBasalzBreathe0"),
;
public final String entityID;
public final String soundName;
private Entity(String s)
private Entity(String id, String sound)
{
this.entityID = s;
this.entityID = id;
soundName = sound;
}
}
@@ -71,16 +73,16 @@ public class ThermalModsHelper implements IModHelper {
public static FluidStack fluidRedstone;
public static FluidStack fluidEnder;
public static final String Name = "ThermalExpansion";
private static boolean isThermalExpansionPresent = false;
public static final String Name = "ThermalFoundation";
private static boolean isThermalFoundationPresent = false;
public static boolean isActive() {
return isThermalExpansionPresent;
return isThermalFoundationPresent;
}
public void preInit() {
if (Loader.isModLoaded(Name) && Config.thermalExpansionActive) {
isThermalExpansionPresent = true;
if (Loader.isModLoaded(Name) && Config.thermalFoundationActive) {
isThermalFoundationPresent = true;
}
}
@@ -285,6 +285,22 @@ magicbees.speciesSmouldering=Smouldering
magicbees.speciesSmouldering.description=The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon
magicbees.speciesBigBad=Big Bad
magicbees.speciesBigBad.description="Who is afraid of the Big Bad Chris?"|Pahimar, last words
magicbees.speciesTCBrainy=Brainy
magicbees.speciesTCBrainy.description=Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon
magicbees.speciesTCBatty=Batty
magicbees.speciesTCBatty.description=They tend to attract bats to their hives through means unknown.|Apinomicon
magicbees.speciesTCChicken=Poultry
magicbees.speciesTCChicken.description="Cluck. Cluck cluck! ... You heard me."|Confused bee
magicbees.speciesTCBeef=Beefy
magicbees.speciesTCBeef.description="Moo, moo, moo. Wait, what?"|Confused bee
magicbees.speciesTCPork=Porcine
magicbees.speciesTCPork.description="Oink, oink. Er.... bzzz?"|Confused bee
magicbees.speciesSheepish=Sheepish
magicbees.speciesSheepish.description="Baa baaaazzzzz bzzz"|Confused bee
magicbees.speciesCatty=Catty
magicbees.speciesCatty.description="Purr purr meowwwzzzzz"|Confused bee
magicbees.speciesHorse=Neighsayer
magicbees.speciesHorse.description="Nay! I mean Neigh."|Confused bee
magicbees.speciesTimely=Timely
magicbees.speciesTimely.description="An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist
@@ -388,18 +404,8 @@ magicbees.speciesTCHungry.description=It is unknown how the bees take raw essenc
magicbees.speciesTCVoid=Void
# Description is gibberish; don't bother translating. <3
magicbees.speciesTCVoid.description=§kNeque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit|?????
magicbees.speciesTCBrainy=Brainy
magicbees.speciesTCBrainy.description=Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon
magicbees.speciesTCWispy=Wispy
magicbees.speciesTCWispy.description=Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon
magicbees.speciesTCBatty=Batty
magicbees.speciesTCBatty.description=They tend to attract bats to their hives through means unknown.|Apinomicon
magicbees.speciesTCChicken=Poultry
magicbees.speciesTCChicken.description="Cluck. Cluck cluck! ... You heard me."|Confused bee
magicbees.speciesTCBeef=Beefy
magicbees.speciesTCBeef.description="Moo, moo, moo. Wait, what?"|Confused bee
magicbees.speciesTCPork=Porcine
magicbees.speciesTCPork.description="Oink, oink. Er.... bzzz?"|Confused bee
magicbees.speciesEEMinium=Minium
magicbees.speciesEEMinium.description=It may be possible to exploit their mercurial and changeable nature.|Apinomicon
magicbees.speciesAMEssence=Essence
@@ -436,6 +442,14 @@ magicbees.speciesTEDante=Dante
magicbees.speciesTEDante.description=Mixing bees in an inferno produces surprising results.|Apinomicon
magicbees.speciesTEPyro=Pyro
magicbees.speciesTEPyro.description=You Monster.|Everyone, to you.
magicbees.speciesTEShocking=Shocking
magicbees.speciesTEShocking.description=Their hives attract static charge through an unknown mechanism. Use caution when collecting combs.|Apinomicon
magicbees.speciesTEAmped=Amped
magicbees.speciesTEAmped.description="They're really excited. Like, CRAZY excited. You'd have to measure it in terms of electric current, that's how excited they are."|Marquis Muskrat
magicbees.speciesTEGrounded=Grounded
magicbees.speciesTEGrounded.description=They have an affinity for music, especially of the variety with electric guitars and screamed vocals.|Apinomiconl
magicbees.speciesTERocking=Rockin'
magicbees.speciesTERocking.description=[guitar solo]
magicbees.speciesTEElectrum=Electrum
magicbees.speciesTEElectrum.description=The best of both precious metals, but somehow greater than both.|Apinomicon
magicbees.speciesTEPlatinum=Platinum
@@ -499,7 +513,7 @@ magicbees.effectTransmuting=Transmuting
binniecore.allele.magicbees.effectTransmuting.desc=Transforms materials depending on many factors
magicbees.effectCrumbling=Crumbling
binniecore.allele.magicbees.effectCrumbling.desc=Causes hard materials to become softer ones
magicbees.effectInvisiblility=Invisibility
magicbees.effectInvisibility=Invsbl.
binniecore.allele.magicbees.effectInvisiblility.desc=Turns players invisible
magicbees.effectVisRecharge=Recharging
binniecore.allele.magicbees.effectVisRecharge.desc=Recharges nearby Aura Nodes
@@ -533,8 +547,24 @@ magicbees.effectAMWisp=Spiritual
binniecore.allele.magicbees.effectAMWisp.desc=Randomly spawns spirits
magicbees.effectTEBlizzy=Blizzy
binniecore.allele.magicbees.effectTEBlizzy.desc=Randomly spawns Blizzes
magicbees.effectTEBlitz=Blitzy
binniecore.allele.magicbees.effectTEBlitz.desc=Randomly spawns Blitzes
magicbees.effectTEBasalz=Basalzy
binniecore.allele.magicbees.effectTEBasalz.desc=Randomly spawns Basalzes
magicbees.effectDreaming=Dreaming
binniecore.allele.magicbees.effectDreaming.desc=Transforms mundane materials into Botannical ones
magicbees.effectPorcine=Porcine
binniecore.allele.magicbees.effectPorcine.desc=Causes pigs to appear.
magicbees.effectBovine=Bovine
binniecore.allele.magicbees.effectBovine.desc=Attracts cows.
magicbees.effectChicken=Plucky
binniecore.allele.magicbees.effectChicken.desc=Attracts chickens.
magicbees.effectSheep=Wooly
binniecore.allele.magicbees.effectSheep.desc=Manufactures wool farms.
magicbees.effectCatty=Catty
binniecore.allele.magicbees.effectCatty.desc=Causes cats to gather.
magicbees.effectHorse=Neighsayer
binniecore.allele.magicbees.effectHorse.desc=Causes horses to appear.
flowerProvider.book=Books
flowerProvider.magic=Thaumic Flowers