Tweaks to hivegen; still needs more work.

Changing references to "biofuel" to "ethanol"

magicbees_src/magicbees/bees/BeeGenomeManager.java

@@ -519,13 +519,14 @@ public class BeeGenomeManager
 		genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectAggressive");
 		genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
 		genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersEnd");
+		genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
 		
 		return genome;
 	}
 	
 	public static IAllele[] getTemplateOblivion()
 	{
-		IAllele[] genome = getTemplateModBase();
+		IAllele[] genome = getTemplateBaseExtrinsic();
 		
 		genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.OBLIVION;
 		genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityMaximum");
@@ -535,7 +536,7 @@ public class BeeGenomeManager
 	
 	public static IAllele[] getTemplateNameless()
 	{
-		IAllele[] genome = getTemplateModBase();
+		IAllele[] genome = getTemplateBaseExtrinsic();
 		
 		genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.NAMELESS;
 		genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
@@ -546,7 +547,7 @@ public class BeeGenomeManager
 	
 	public static IAllele[] getTemplateAbandoned()
 	{
-		IAllele[] genome = getTemplateModBase();
+		IAllele[] genome = getTemplateBaseExtrinsic();
 		
 		genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ABANDONED;
 		genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
@@ -560,7 +561,7 @@ public class BeeGenomeManager
 	
 	public static IAllele[] getTemplateForlorn()
 	{
-		IAllele[] genome = getTemplateModBase();
+		IAllele[] genome = getTemplateBaseExtrinsic();
 		
 		genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FORLORN;
 		genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
@@ -574,7 +575,7 @@ public class BeeGenomeManager
 	
 	public static IAllele[] getTemplateDraconic()
 	{
-		IAllele[] genome = getTemplateModBase();
+		IAllele[] genome = getTemplateBaseExtrinsic();
 		
 		genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.DRACONIC;
 		genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");

magicbees_src/magicbees/bees/BeeSpecies.java

@@ -400,10 +400,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
 		AWARE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18)
 			.setGenome(BeeGenomeManager.getTemplateAware())
 			.register();
-		SPIRIT.addProduct(Config.combs.getStackForType(CombType.SOUL), 13)
+		SPIRIT.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 22)
+			.addSpecialty(Config.combs.getStackForType(CombType.SOUL), 16)
 			.setGenome(BeeGenomeManager.getTemplateSpirit())
 			.register();
-		SOUL.addProduct(Config.combs.getStackForType(CombType.SOUL), 24)
+		SOUL.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 28)
+			.addSpecialty(Config.combs.getStackForType(CombType.SOUL), 20)
 			.setGenome(BeeGenomeManager.getTemplateSoul())
 			.register();
 		

magicbees_src/magicbees/block/types/HiveType.java

@@ -221,7 +221,7 @@ public enum HiveType
 				}
 				break;
 			case UNUSUAL:
-				for (int i = 0; i < 2; ++i)
+				for (int i = 0; i < 3; ++i)
 				{
 					int coordX = chunkX * 16 + random.nextInt(16);
 					int coordZ = chunkZ * 16 + random.nextInt(16);

magicbees_src/magicbees/item/types/LiquidType.java

@@ -18,7 +18,7 @@ public enum LiquidType
 	
 	// Forestry
 	BIOMASS("biomass"),
-	BIOFUEL("biofuel"),
+	ETHANOL("ethanol"),
 	
 	// Buildcraft
 	OIL("Oil"),

magicbees_src/magicbees/item/types/ResourceType.java

@@ -13,6 +13,7 @@ public enum ResourceType
 	DRAGON_DUST("dragonDust", true),
 	DRAGON_CHUNK("dragonChunk", true),
 	ESSENCE_FALSE_LIFE("essenceFalseLife", true),
+	ESSENCE_SHALLOW_GRAVE("essenceShallowGrave", true),
 	
 	// Dummy items for Thaumanomicon research icons.
 	//   These won't ever actually exist in-game, and so 

magicbees_src/magicbees/world/feature/FeatureHive.java

@@ -18,7 +18,7 @@ public class FeatureHive
 	private static FeatureOreVein glowstoneGen;
 	private static FeatureOreVein endStoneGen;
 	
-	private static boolean logSpawns = true;
+	private static boolean logSpawns = false;
 	
 	public static void initialize()
 	{
@@ -38,12 +38,7 @@ public class FeatureHive
 	
 	public static boolean generateHiveCurious(World world, Random random, int coordX, int coordZ, boolean initialGen)
 	{
-		BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ);
-		int min = (int)(biome.minHeight * 64 + 64);
-		int max = (int)(biome.maxHeight * 64);
-		// sanity
-		max = (max > 1) ? max : 1;
-		int coordY = min + random.nextInt(max + 5);
+		int coordY = getHeight(world, random, coordX, coordZ);
 		boolean doSpawn = false;
 		
 		if (world.isAirBlock(coordX, coordY - 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) &&
@@ -59,12 +54,7 @@ public class FeatureHive
 	
 	public static boolean generateHiveUnusual(World world, Random random, int coordX, int coordZ, boolean initialGen)
 	{
-		BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ);
-		int min = (int)(biome.minHeight * 64 + 64);
-		int max = (int)(biome.maxHeight * 64);
-		// sanity
-		max = (max > 1) ? max : 1;
-		int coordY = min + random.nextInt(max);
+		int coordY = getHeight(world, random, coordX, coordZ);
 		
 		boolean doSpawn = false;
 		if (world.isAirBlock(coordX, coordY + 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) &&
@@ -84,13 +74,7 @@ public class FeatureHive
 	
 	public static boolean generateHiveResonant(World world, Random random, int coordX, int coordZ, boolean initialGen)
 	{
-		BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ);
-		int min = (int)(biome.minHeight * 64 + 62);
-		int max = (int)(biome.maxHeight * 64);
-		// sanity
-		max = (max > 1) ? max : 1;
-		int coordY = min + random.nextInt(max);
-
+		int coordY = getHeight(world, random, coordX, coordZ);
 		boolean doSpawn = false;
 		if (world.isAirBlock(coordX, coordY + 1, coordZ) &&
 				(world.isAirBlock(coordX, coordY, coordZ) || world.getBlockId(coordX, coordY, coordZ) == Block.tallGrass.blockID) &&
@@ -264,6 +248,17 @@ public class FeatureHive
 		return doSpawn;
 	}
 	
+	private static int getHeight(World world, Random random, int coordX, int coordZ)
+	{
+		BiomeGenBase biome = world.getBiomeGenForCoords(coordX, coordZ);
+		int min = (int)(biome.minHeight * 64 + 62);
+		int max = (int)(biome.maxHeight * 64);
+		// sanity
+		min = (min > 1) ? min : 1;
+		max = (max > 5) ? max : 5;
+		return min + random.nextInt(max);
+	}
+	
 	private static int getSurroundCount(World world, int x, int y, int z, Block blockType)
 	{
 		int surroundCount = 0;