Fix BiomeMode: OldGenerator being broken by 0ee3a23

Author: rutgerkok

common/src/main/java/com/khorn/terraincontrol/LocalWorld.java

@@ -89,9 +89,6 @@ public interface LocalWorld
      */
     public LocalBiome getBiome(int x, int z) throws BiomeNotFoundException;
 
-    // temperature*rain
-    public double getBiomeFactorForOldBM(int index);
-
     // Default generators
     public void prepareDefaultStructures(int chunkX, int chunkZ, boolean dry);
 

common/src/main/java/com/khorn/terraincontrol/generator/ChunkProviderTC.java

@@ -4,13 +4,12 @@
 import static com.khorn.terraincontrol.util.ChunkCoordinate.CHUNK_Y_SIZE;
 import static com.khorn.terraincontrol.util.ChunkCoordinate.CHUNK_Z_SIZE;
 
-import com.khorn.terraincontrol.generator.biome.BiomeGenerator;
-
 import com.khorn.terraincontrol.LocalWorld;
-import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.configuration.WorldSettings;
+import com.khorn.terraincontrol.generator.biome.BiomeGenerator;
+import com.khorn.terraincontrol.generator.biome.OldBiomeGenerator;
 import com.khorn.terraincontrol.generator.biome.OutputType;
 import com.khorn.terraincontrol.generator.noise.NoiseGeneratorNewOctaves;
 import com.khorn.terraincontrol.generator.noise.NoiseGeneratorPerlinOctaves;
@@ -541,10 +540,13 @@ private void generateTerrainNoise(int xOffset, int yOffset, int zOffset, int max
 
     private void oldBiomeFactor(int x, int z, int i4, int ySections, double noiseHeight)
     {
-        if (this.worldSettings.worldConfig.biomeMode == TerrainControl.getBiomeModeManager().OLD_GENERATOR)
+        BiomeGenerator unwrapped = localWorld.getBiomeGenerator().unwrap();
+        if (unwrapped instanceof OldBiomeGenerator)
         {
-            this.volatilityFactor = (1.0D - this.localWorld.getBiomeFactorForOldBM(z * 48 + 17 + x * 3));
-
+            OldBiomeGenerator oldBiomeGenerator = (OldBiomeGenerator) unwrapped;
+            int index = z * 48 + 17 + x * 3;
+            double product = oldBiomeGenerator.oldTemperature1[index] * oldBiomeGenerator.oldWetness[index];
+            this.volatilityFactor = 1.0 - product;
         } else
         {
             final BiomeConfig biomeConfig = toBiomeConfig(this.biomeArray[(x + this.maxSmoothRadius + (z + this.maxSmoothRadius)

common/src/main/java/com/khorn/terraincontrol/generator/biome/BiomeGenerator.java

@@ -105,4 +105,15 @@ public boolean isCached()
         return false;
     }
 
+    /**
+     * Biome generators can be wrapped, for example to cache another biome
+     * generator. This method returns the unwrapped biome generator. If this
+     * biome generator doesn't wrap another biome generator, it returns itself.
+     * @return The unwrapped biome generator.
+     */
+    public BiomeGenerator unwrap()
+    {
+        return this;
+    }
+
 }

common/src/main/java/com/khorn/terraincontrol/generator/biome/CachedBiomeGenerator.java

@@ -179,4 +179,10 @@ public boolean isCached()
     {
         return true;
     }
+
+    @Override
+    public BiomeGenerator unwrap()
+    {
+        return generator.unwrap();
+    }
 }

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitWorld.java

@@ -14,7 +14,6 @@
 import com.khorn.terraincontrol.customobjects.CustomObjectStructureCache;
 import com.khorn.terraincontrol.exception.BiomeNotFoundException;
 import com.khorn.terraincontrol.generator.biome.BiomeGenerator;
-import com.khorn.terraincontrol.generator.biome.OldBiomeGenerator;
 import com.khorn.terraincontrol.logging.LogMarker;
 import com.khorn.terraincontrol.util.ChunkCoordinate;
 import com.khorn.terraincontrol.util.NamedBinaryTag;
@@ -160,13 +159,6 @@ public int getCalculatedBiomeId(int x, int z)
         return this.biomeGenerator.getBiome(x, z);
     }
 
-    @Override
-    public double getBiomeFactorForOldBM(int index)
-    {
-        OldBiomeGenerator oldBiomeGenerator = (OldBiomeGenerator) this.biomeGenerator;
-        return oldBiomeGenerator.oldTemperature1[index] * oldBiomeGenerator.oldWetness[index];
-    }
-
     @Override
     public void prepareDefaultStructures(int chunkX, int chunkZ, boolean dry)
     {

platforms/forge/src/main/java/com/khorn/terraincontrol/forge/ForgeWorld.java

@@ -10,7 +10,6 @@
 import com.khorn.terraincontrol.forge.generator.structure.*;
 import com.khorn.terraincontrol.forge.util.NBTHelper;
 import com.khorn.terraincontrol.generator.biome.BiomeGenerator;
-import com.khorn.terraincontrol.generator.biome.OldBiomeGenerator;
 import com.khorn.terraincontrol.logging.LogMarker;
 import com.khorn.terraincontrol.util.ChunkCoordinate;
 import com.khorn.terraincontrol.util.NamedBinaryTag;
@@ -182,13 +181,6 @@ public int getCalculatedBiomeId(int x, int z)
         return this.biomeManager.getBiome(x, z);
     }
 
-    @Override
-    public double getBiomeFactorForOldBM(int index)
-    {
-        OldBiomeGenerator oldBiomeGenerator = (OldBiomeGenerator) this.biomeManager;
-        return oldBiomeGenerator.oldTemperature1[index] * oldBiomeGenerator.oldWetness[index];
-    }
-
     @Override
     public void prepareDefaultStructures(int chunkX, int chunkZ, boolean dry)
     {