Merge pull request #10 from BTW-Community/dev

1.3.2

changelog.txt

@@ -1,6 +1,20 @@
+Version 1.3.2
+[list]
+[*]Added edge variants to rainforest and jungle in new worlds which have slightly less dense vegetation, and which will not spawn melons. This helps provide a transition into the heavy vegetation of these biomes, and makes easy melons harder to obtain by preventing them from spawning at the very edge of these jungle variants.
+[*]Added an edge variant to tropics in new worlds, causing it to be much more likely to spawn as islands instead of connecting to neighboring biomes. When tropics does connect via land, it is likely to do so through sandy beaches.
+[*]Added a BTA version of the vanilla beach, for the same reason as I previously did the same for rivers. This again will not affect anything in your world, but simply allows me to do more with beaches down the line if I wish.
+[*]Added frozen beaches. Snowy woods, frozen springs, siberia, and tundra will now spawn frozen beaches when connecting with oceans. This only affects new worlds.
+[*]Changed how reeds generate in frozen springs slightly to make them a bit more common.
+[*]Changed (increased) the thickness of the border created by all edge variants. This only affects new worlds.
+[*]Changed (increased) the chance of melons spawning in jungle, rainforest, and mangal to offset the large amount of vegetation present (or water in the case of mangal) which could prevent them from spawning.
+[*]Changed (decreased) the chance of melons spawning in tropics given that it is easier to traverse than other jungle variants and has less vegetation.
+[*]Fixed an issue where the game would crash when trying to smooth between climates when no biomes of the transition climate were enabled. The game will now not attempt to smooth climates if no biomes are available for smoothing.
+[*]Fixed an issue where particularly wide rivers could generate with a standard river along the center even if the rest of the river was a different variant. This was most notable as a change in water color but could also show up as missing ice, mismatching riverbed material, or having a random spot of rain in the middle of the river in desert variants.
+[/list]
+
 Version 1.3.1
 [list]
-[*]Fixed an issue causing the game to generate highlands instead of mountains. Any highlands generated in the previous release will be converted to mountains. Worlds created before 1.3.0 will revert to exactly how they were before that 1.3.0. This may cause slight biome color seams in 1.3.0 worlds but given that the two biomes have exactly the same terrain generation will not cause any terrain seams. MCEdit may be used to replace biome id 125 with 145 to make the biomes colors match what they should, or MCEdit can be used to delete any of those chunks and the game will generate them correctly the next time you are in the area.
+[*]Fixed an issue causing the game to generate highlands instead of mountains. Any highlands generated in the previous release will be converted to mountains. Worlds created before 1.3.0 will revert to exactly how they were before 1.3.0. This may cause slight biome color seams in 1.3.0 worlds but given that the two biomes have exactly the same terrain generation will not cause any terrain seams. MCEdit may be used to replace biome id 125 with 145 to make the biomes colors match what they should, or MCEdit can be used to delete any of those chunks and the game will generate them correctly the next time you are in the area.
 [*]Fixed an issue where frozen springs would still generate cherry trees if deco was installed but deco world generation was disabled.
 [/list]
 

src/minecraft/net/minecraft/src/BTABiomeConfiguration.java

@@ -103,9 +103,14 @@ public class BTABiomeConfiguration {
 	public static final BTABiomeGenBase badlandsEdge = new BTABiomeGenBadlands(232, BTAEnumClimate.ARID).setColor(16421912).setBiomeName("Badlands Edge").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.1F, 0.1F);
 	public static final BTABiomeGenBase icyPeaksEdge = new BTABiomeGenIcyPeaks(233, BTAEnumClimate.SNOWY).setColor(16421912).setBiomeName("Icy Peaks Edge").setEnableSnow().setTemperatureRainfall(0.1F, 0.1F).setMinMaxHeight(0.1F, 0.5F);
 	public static final BTABiomeGenBase highlandsEdge = new BTABiomeGenHighlands(234, BTAEnumClimate.TEMPERATE).setColor(14090235).setBiomeName("Highlands Edge").setTemperatureRainfall(0.7F, 0.5F).setMinMaxHeight(0.8F, 2.5F);
+    public static final BTABiomeGenBase jungleEdge = new BTABiomeGenJungleEdge(235, BTAEnumClimate.TROPICAL).setColor(5470985).setBiomeName("Better Jungle Edge").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.0F, 0.4F);
+	public static final BTABiomeGenBase rainforestEdge = new BTABiomeGenRainforestEdge(236, BTAEnumClimate.TROPICAL).setColor(9286496).setBiomeName("Rainforest Edge").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 1.5F);
+	public static final BTABiomeGenBase tropicsEdge = new BTABiomeGenTropics(237, BTAEnumClimate.TROPICAL).setColor(16711935).setBiomeName("Tropics Edge").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(-0.3F, 0.1F);
 
 	//Beach variants
     public static final BTABiomeGenBase beachOutback = new BTABiomeGenBeachOutback(240, BTAEnumClimate.ARID).setColor(16440917).setBiomeName("Red Sand Beach").setDisableRain().setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.0F, 0.1F);
+    public static final BTABiomeGenBase beach = new BTABiomeGenBeach(241, BTAEnumClimate.TEMPERATE).setColor(16440917).setBiomeName("Better Beach").setTemperatureRainfall(0.8F, 0.4F).setMinMaxHeight(0.0F, 0.1F);
+    public static final BTABiomeGenBase beachFrozen = new BTABiomeGenBeach(241, BTAEnumClimate.SNOWY).setColor(16440917).setBiomeName("Frozen Beach").setTemperatureRainfall(0.0F, 0.4F).setMinMaxHeight(0.0F, 0.1F);
 
     //Various biome lists
 	public static ArrayList<BTABiomeGenBase> biomeList = new ArrayList();
@@ -123,9 +128,11 @@ public class BTABiomeConfiguration {
 	public static Map<Integer, BTABiomeInfo> biomeInfoMap = new HashMap();
 
 	private static ArrayList<BiomeGenBase> beachlessBiomes = new ArrayList();
+	private static ArrayList<BiomeGenBase> beachlessBiomes132 = new ArrayList();
 
 	private static ArrayList<BiomeGenBase> edgeBiomes = new ArrayList();
 	private static ArrayList<BiomeGenBase> noEdgeBiomes = new ArrayList();
+	private static ArrayList<BiomeGenBase> noEdgeBiomes132 = new ArrayList();
 	private static ArrayList<BiomeGenBase> noPerlinBeachBiomes = new ArrayList();
 
 	private static ArrayList<BiomeGenBase> pumpkinBiomes = new ArrayList();
@@ -308,6 +315,12 @@ public static void filterBeachBiomes() {
 		beachlessBiomes.add(frozenSprings);
 		beachlessBiomes.add(mangroveForest);
 		beachlessBiomes.add(mangroveForestIsland);
+
+		beachlessBiomes132.addAll(beachlessBiomes);
+		beachlessBiomes132.remove(snowyWoods);
+		beachlessBiomes132.remove(tundra);
+		beachlessBiomes132.remove(siberia);
+		beachlessBiomes132.remove(frozenSprings);
 	}
 
 	public static void filterPerlinBeachBiomes() {
@@ -337,6 +350,7 @@ public static void addBiomesToStructureGenerators() {
 		reedBiomes.add(plains);
 		reedBiomes.add(mangroveForest);
 		reedBiomes.add(temperateForest);
+		reedBiomes.add(frozenSprings);
 
 		villageBiomes.add(savanna);
 		villageBiomes.add(desert);
@@ -401,6 +415,13 @@ public static void addBiomesToStructureGenerators() {
 		witchHutBiomes.add(wetlandsHills);
 		witchHutBiomes.add(willowHills);
 
+		//Edges
+		reedBiomes.add(jungleEdge);
+		reedBiomes.add(rainforestEdge);
+
+		jungleTempleBiomes.add(jungleEdge);
+		jungleTempleBiomes.add(rainforestEdge);
+
 		//Rivers
 		reedBiomes.add(riverRainforest);
 		reedBiomes.add(riverTropics);
@@ -512,13 +533,16 @@ else if (baseBiome == willowGrove.biomeID) {
 	public static int getRiverVariantForBiomes(int baseBiome) {
 		int riverBiome = -1;
 
-		if (baseBiome == desert.biomeID || baseBiome == desertHills.biomeID || baseBiome == dunes.biomeID) {
+		if (BiomeGenBase.biomeList[baseBiome] instanceof BTABiomeGenRiver) {
+			riverBiome = baseBiome;
+		}
+		else if (baseBiome == desert.biomeID || baseBiome == desertHills.biomeID || baseBiome == dunes.biomeID) {
 			riverBiome = riverDesert.biomeID;
 		}
 		else if (baseBiome == mysticForest.biomeID) {
 			riverBiome = riverMystic.biomeID;
 		}
-		else if (baseBiome == rainforest.biomeID) {
+		else if (baseBiome == rainforest.biomeID || baseBiome == rainforestEdge.biomeID) {
 			riverBiome = riverRainforest.biomeID;
 		}
 		else if (baseBiome == outback.biomeID) {
@@ -527,13 +551,13 @@ else if (baseBiome == outback.biomeID) {
 		else if (baseBiome == badlands.biomeID || baseBiome == badlandsPlateau.biomeID || baseBiome == badlandsEdge.biomeID) {
 			riverBiome = riverBadlands.biomeID;
 		}
-		else if (baseBiome == tropics.biomeID) {
+		else if (baseBiome == tropics.biomeID || baseBiome == tropicsEdge.biomeID) {
 			riverBiome = riverTropics.biomeID;
 		}
 		else if (baseBiome == orchard.biomeID) {
 			riverBiome = riverOrchard.biomeID;
 		}
-		else if (baseBiome == jungle.biomeID || baseBiome == jungleHills.biomeID) {
+		else if (baseBiome == jungle.biomeID || baseBiome == jungleHills.biomeID || baseBiome == jungleEdge.biomeID) {
 			riverBiome = riverJungle.biomeID;
 		}
 		else if (baseBiome == wetlands.biomeID || baseBiome == wetlandsHills.biomeID) {
@@ -555,17 +579,23 @@ else if (BiomeGenBase.biomeList[baseBiome].getEnableSnow()) {
 		return riverBiome;
 	}
 
-	public static int getBeachVariantForBiomes(int baseBiome) {
+	public static int getBeachVariantForBiomes(int baseBiome, BTAWorldConfigurationInfo generatorInfo) {
 		int beachBiome = -1;
 
 		if (baseBiome == outback.biomeID || baseBiome == badlands.biomeID) {
 			beachBiome = beachOutback.biomeID;
 		}
+		else if ((baseBiome == snowyWoods.biomeID || baseBiome == tundra.biomeID || baseBiome == siberia.biomeID || baseBiome == frozenSprings.biomeID) && generatorInfo.getCompatMode().isVersionAtLeast(BTAEnumVersionCompat.V1_3_2)) {
+			beachBiome = beachFrozen.biomeID;
+		}
+		else if (shouldBiomeSpawnBeach(baseBiome, generatorInfo)) {
+			beachBiome = beach.biomeID;
+		}
 
 		return beachBiome;
 	}
 
-	public static int getEdgeVariantForBiome(int baseBiome) {
+	public static int getEdgeVariantForBiome(int baseBiome, BTAWorldConfigurationInfo generatorInfo) {
 		int edgeBiome = -1;
 
 		if (baseBiome == alpine.biomeID) {
@@ -589,6 +619,15 @@ else if (baseBiome == icyPeaks.biomeID) {
 		else if (baseBiome == highlands.biomeID) {
 			edgeBiome = highlandsEdge.biomeID;
 		}
+		else if (baseBiome == jungle.biomeID && generatorInfo.getCompatMode().isVersionAtLeast(BTAEnumVersionCompat.V1_3_2)) {
+			edgeBiome = jungleEdge.biomeID;
+		}
+		else if (baseBiome == rainforest.biomeID && generatorInfo.getCompatMode().isVersionAtLeast(BTAEnumVersionCompat.V1_3_2)) {
+			edgeBiome = rainforestEdge.biomeID;
+		}
+		else if (baseBiome == tropics.biomeID && generatorInfo.getCompatMode().isVersionAtLeast(BTAEnumVersionCompat.V1_3_2)) {
+			edgeBiome = tropicsEdge.biomeID;
+		}
 
 		return edgeBiome;
 	}
@@ -646,23 +685,30 @@ public static void addBiomesWithEdge() {
 		edgeBiomes.add(dunes);
 		edgeBiomes.add(badlands);
 		edgeBiomes.add(icyPeaks);
-		edgeBiomes.add(highlandsEdge);
+		edgeBiomes.add(highlands);
 	}
 
 	public static void filterEdgeBiomes() {
 		noEdgeBiomes.addAll(edgeBiomes);
 		noEdgeBiomes.add(mysticForest);
-		noEdgeBiomes.add(rainforest);
 		noEdgeBiomes.add(temperateForest);
 		noEdgeBiomes.add(coniferousForest);
 		noEdgeBiomes.add(coniferousForestSnow);
 		noEdgeBiomes.add(patagoniaMountains);
 		noEdgeBiomes.add(badlandsPlateau);
 		noEdgeBiomes.remove(badlands);
+
+		noEdgeBiomes132.addAll(noEdgeBiomes);
+		noEdgeBiomes132.add(jungleHills);
 	}
 
-	public static boolean shouldBiomeConnectWithEdge(int biome) {
-		return !noEdgeBiomes.contains(BiomeGenBase.biomeList[biome]);
+	public static boolean shouldBiomeConnectWithEdge(int biome, BTAWorldConfigurationInfo generatorInfo) {
+		if (generatorInfo.getCompatMode().isVersionAtOrBelow(BTAEnumVersionCompat.V1_3_1)) {
+			return !noEdgeBiomes.contains(BiomeGenBase.biomeList[biome]);
+		}
+		else {
+			return !noEdgeBiomes132.contains(BiomeGenBase.biomeList[biome]);
+		}
 	}
 
 	public static boolean doesBiomeIgnoreEdgeRestrictions(int currentBiome, int biome1, int biome2, int biome3, int biome4) {
@@ -673,9 +719,13 @@ public static boolean doesBiomeIgnoreEdgeRestrictions(int currentBiome, int biom
 				biome4 != badlandsPlateau.biomeID);
 	}
 
-	public static boolean shouldBiomeSpawnBeach(int biomeID) {
-		BiomeGenBase biome = BiomeGenBase.biomeList[biomeID];
-		return !beachlessBiomes.contains(biome);
+	public static boolean shouldBiomeSpawnBeach(int biome, BTAWorldConfigurationInfo generatorInfo) {
+		if (generatorInfo.getCompatMode().isVersionAtOrBelow(BTAEnumVersionCompat.V1_3_1)) {
+			return !beachlessBiomes.contains(BiomeGenBase.biomeList[biome]);
+		}
+		else {
+			return !beachlessBiomes132.contains(BiomeGenBase.biomeList[biome]);
+		}
 	}
 
 	public static boolean shouldBiomeSpawnPerlinBeach(int biomeID) {
@@ -727,7 +777,7 @@ public static ArrayList<BiomeGenBase> getVillageBiomes() {
 		return villageBiomes;
 	}
 
-	public static ArrayList<BiomeGenBase> getEdgeBiomes() {
+	public static ArrayList<BiomeGenBase> getEdgeBiomes(BTAWorldConfigurationInfo generatorInfo) {
 		return edgeBiomes;
 	}
 

src/minecraft/net/minecraft/src/BTABiomeDecorator.java

@@ -156,7 +156,8 @@ public class BTABiomeDecorator
 	public boolean generateStoneInGrass2;
 	public boolean generateOutback;
 
-	public int fractionalTreeChance;
+	protected int fractionalTreeChance;
+	protected int melonChancePerChunk;
 
 	private BTAWorldConfigurationInfo generatorInfo;
 
@@ -219,6 +220,7 @@ public BTABiomeDecorator(BiomeGenBase par1BiomeGenBase)
 		lavaLakesPerChunk = 20;
 		bigRedMushroomsPerChunk = 0;
 		fractionalTreeChance = 10;
+		melonChancePerChunk = 24;
 	}
 
 	/**
@@ -473,7 +475,7 @@ protected void decorate()
 			this.pumpkinGen.generate(this.currentWorld, this.randomGenerator, var2, var3, var4);
 		}
 
-		if (this.randomGenerator.nextInt(32) == 0)
+		if (this.randomGenerator.nextInt(melonChancePerChunk) == 0)
 		{
 			var2 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
 			var3 = this.randomGenerator.nextInt(128);

src/minecraft/net/minecraft/src/BTABiomeGenJungleEdge.java

@@ -0,0 +1,61 @@
+package net.minecraft.src;
+
+import java.util.Random;
+
+public class BTABiomeGenJungleEdge extends BTABiomeGenBase
+{
+    public BTABiomeGenJungleEdge(int par1, BTAEnumClimate climate)
+    {
+        super(par1, climate);
+        this.btaBiomeDecorator.treesPerChunk = 5;
+        this.btaBiomeDecorator.grassPerChunk = 25;
+        this.btaBiomeDecorator.flowersPerChunk = 4;
+		this.btaBiomeDecorator.sandPerChunk = 100;
+		this.btaBiomeDecorator.sandPerChunk2 = 100;
+        this.btaBiomeDecorator.waterlilyPerChunk = 4;
+        this.spawnableCreatureList.clear();
+        this.spawnableCreatureList.add(new SpawnListEntry(FCEntityChicken.class, 10, 4, 4));
+        this.spawnableCreatureList.add(new SpawnListEntry(FCEntityPig.class, 10, 4, 4));
+        this.spawnableCreatureList.add(new SpawnListEntry(FCEntityChicken.class, 10, 4, 4));
+        this.spawnableMonsterList.clear();
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntityJungleSpider.class, 2, 1, 1));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySpider.class, 10, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntityZombie.class, 10, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySkeleton.class, 10, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntityCreeper.class, 10, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySlime.class, 10, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntityEnderman.class, 1, 1, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(FCEntityOcelot.class, 2, 1, 1));
+        this.waterColorMultiplier = 10083127;
+    }
+
+    /**
+     * Gets a WorldGen appropriate for this biome.
+     */
+    public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
+    {
+        return (WorldGenerator)(par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(3, 0) : (par1Random.nextInt(3) == 0 ? new WorldGenHugeTrees(false, 10 + par1Random.nextInt(20), 3, 3) : new WorldGenTrees(false, 4 + par1Random.nextInt(7), 3, 3, true))));
+    }
+
+    /**
+     * Gets a WorldGen appropriate for this biome.
+     */
+    public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
+    {
+        return par1Random.nextInt(4) == 0 ? new BTAWorldGenTallGrass(Block.tallGrass.blockID, 2) : new BTAWorldGenTallGrass(Block.tallGrass.blockID, 1);
+    }
+
+    public void decorate(World par1World, Random par2Random, int par3, int par4, BTAWorldConfigurationInfo generatorOptions)
+    {
+        super.decorate(par1World, par2Random, par3, par4, generatorOptions);
+        WorldGenVines var5 = new WorldGenVines();
+
+        for (int var6 = 0; var6 < 50; ++var6)
+        {
+            int var7 = par3 + par2Random.nextInt(16) + 8;
+            byte var8 = 64;
+            int var9 = par4 + par2Random.nextInt(16) + 8;
+            var5.generate(par1World, par2Random, var7, var8, var9);
+        }
+    }
+}

src/minecraft/net/minecraft/src/BTABiomeGenRainforestEdge.java

@@ -0,0 +1,66 @@
+package net.minecraft.src;
+
+import java.util.Random;
+
+public class BTABiomeGenRainforestEdge extends BTABiomeGenBase {
+
+	public BTABiomeGenRainforestEdge(int id, BTAEnumClimate climate) {
+		super(id, climate);
+		this.btaBiomeDecorator.treesPerChunk = 5;
+		this.btaBiomeDecorator.grassPerChunk = 7;
+		this.btaBiomeDecorator.reedsPerChunk = 10;
+        this.btaBiomeDecorator.waterlilyPerChunk = 4;
+		this.waterColorMultiplier = 6160128;
+		this.spawnableCreatureList.clear();
+		this.spawnableCreatureList.add(new SpawnListEntry(FCEntityChicken.class, 10, 4, 4));
+		this.spawnableCreatureList.add(new SpawnListEntry(FCEntityPig.class, 10, 4, 4));
+		this.spawnableCreatureList.add(new SpawnListEntry(FCEntityChicken.class, 10, 4, 4));
+		this.spawnableMonsterList.clear();
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntityJungleSpider.class, 2, 1, 1));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySpider.class, 10, 4, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntityZombie.class, 10, 4, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySkeleton.class, 10, 4, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntityCreeper.class, 10, 4, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntitySlime.class, 10, 4, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntityEnderman.class, 1, 1, 4));
+		this.spawnableMonsterList.add(new SpawnListEntry(FCEntityOcelot.class, 2, 1, 1));
+	}
+
+	/**
+	 * Gets a WorldGen appropriate for this biome.
+	 */
+	@Override
+	public WorldGenerator getRandomWorldGenForTrees(Random rand)
+	{
+    	WorldGenerator gen;
+
+    	if (rand.nextInt(10) == 0) {
+    		gen = new BTAWorldGenRainforest2();
+    	}
+    	else if (rand.nextInt(5) == 0) {
+    		gen = new WorldGenTrees(false, 4 + rand.nextInt(7), 3, 3, true);
+    	}
+    	else if (rand.nextInt(2) == 0) {
+    		gen = new BTAWorldGenRainforest1(true);
+    	}
+    	else {
+    		gen = new WorldGenShrub(3, 3);
+    	}
+
+    	return gen;
+	}
+
+    public void decorate(World par1World, Random par2Random, int par3, int par4, BTAWorldConfigurationInfo generatorOptions)
+    {
+        super.decorate(par1World, par2Random, par3, par4, generatorOptions);
+        WorldGenVines var5 = new WorldGenVines();
+
+        for (int var6 = 0; var6 < 50; ++var6)
+        {
+            int var7 = par3 + par2Random.nextInt(16) + 8;
+            byte var8 = 64;
+            int var9 = par4 + par2Random.nextInt(16) + 8;
+            var5.generate(par1World, par2Random, var7, var8, var9);
+        }
+    }
+}

src/minecraft/net/minecraft/src/BTABiomeGenRiverDesert.java

@@ -1,6 +1,6 @@
 package net.minecraft.src;
 
-public class BTABiomeGenRiverDesert extends BTABiomeGenBase {
+public class BTABiomeGenRiverDesert extends BTABiomeGenRiver {
 	public BTABiomeGenRiverDesert(int par1)
     {
         super(par1, BTABiomeConfiguration.desert.climate);