Scary Meteorite Re-write.

hooks/MeteoriteWorldGen.java

@@ -1,18 +1,19 @@
 package appeng.hooks;
 
+import java.util.Collection;
 import java.util.Random;
-import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
 
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import appeng.api.features.IWorldGen.WorldGenType;
-import appeng.api.util.DimensionalCoord;
 import appeng.core.AEConfig;
-import appeng.core.AELog;
 import appeng.core.WorldSettings;
 import appeng.core.features.registries.WorldGenRegistry;
 import appeng.helpers.MeteoritePlacer;
 import appeng.services.helpers.ICompassCallback;
+import appeng.util.Platform;
 import cpw.mods.fml.common.IWorldGenerator;
 
 final public class MeteoriteWorldGen implements IWorldGenerator
@@ -37,41 +38,105 @@ final public class MeteoriteWorldGen implements IWorldGenerator
 	@Override
 	public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
 	{
-		if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Metorites, w ) && r.nextFloat() > 0.9 )
+		if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Metorites, w ) )
 		{
-			int x = r.nextInt( 16 ) + (chunkX << 4);
-			int z = r.nextInt( 16 ) + (chunkZ << 4);
-
-			myGen obj = new myGen();
-			Future<?> future = WorldSettings.getInstance().getCompass().getCompassDirection( new DimensionalCoord( w, x, 128, z ), 70, obj );
-
-			try
+			// add new metorites?
+			if ( r.nextFloat() > 0.7 )
 			{
-				future.get();
-
-				if ( obj.distance > AEConfig.instance.minMeteoriteDistanceSq )
-				{
-					int depth = 180 + r.nextInt( 20 );
-					for (int trys = 0; trys < 20; trys++)
-					{
-						MeteoritePlacer mp = new MeteoritePlacer();
-
-						if ( mp.spawnMeteorite( w, x, depth, z ) )
-							return;
-
-						depth -= 15;
-						if ( depth < 40 )
-							return;
-
-					}
-				}
+				int x = r.nextInt( 16 ) + (chunkX << 4);
+				int z = r.nextInt( 16 ) + (chunkZ << 4);
 
+				int depth = 180 + r.nextInt( 20 );
+				TickHandler.instance.addCallable( w, new MetoriteSpawn( x, depth, z, w ) );
 			}
-			catch (Throwable e)
-			{
-				AELog.error( e );
-			}
-
+			else
+				TickHandler.instance.addCallable( w, new MetoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) );
 		}
 	}
+
+	class MetoriteSpawn implements Callable
+	{
+
+		final int x;
+		final int z;
+		final World w;
+		int depth;
+
+		public MetoriteSpawn(int x, int depth, int z, World w) {
+			this.x = x;
+			this.z = z;
+			this.w = w;
+			this.depth = depth;
+		}
+
+		@Override
+		public Object call() throws Exception
+		{
+			int chunkX = x >> 4;
+			int chunkZ = z >> 4;
+
+			double minSqDist = Double.MAX_VALUE;
+
+			// near by meteorites!
+			for (NBTTagCompound data : getNearByMetetorites( w, chunkX, chunkZ ))
+			{
+				MeteoritePlacer mp = new MeteoritePlacer();
+				mp.spawnMeteorite( new MeteoritePlacer.ChunkOnly( w, chunkX, chunkZ ), data );
+
+				minSqDist = Math.min( minSqDist, mp.getSqDistance( x, z ) );
+			}
+
+			boolean isCluster = (minSqDist < 30 * 30) && Platform.getRandomFloat() > 0.8;
+
+			if ( minSqDist > AEConfig.instance.minMeteoriteDistanceSq || isCluster )
+				tryMetroite( w, depth, x, z );
+
+			WorldSettings.getInstance().setGenerated( w.provider.dimensionId, chunkX, chunkZ );
+			return null;
+		}
+	}
+
+	private boolean tryMetroite(World w, int depth, int x, int z)
+	{
+		for (int trys = 0; trys < 20; trys++)
+		{
+			MeteoritePlacer mp = new MeteoritePlacer();
+
+			if ( mp.spawnMeteorite( new MeteoritePlacer.ChunkOnly( w, x >> 4, z >> 4 ), x, depth, z ) )
+			{
+				int px = x >> 4;
+				int pz = z >> 4;
+
+				for (int cx = px - 6; cx < px + 6; cx++)
+					for (int cz = pz - 6; cz < pz + 6; cz++)
+					{
+						if ( w.getChunkProvider().chunkExists( cx, cz ) )
+						{
+							if ( px == cx && pz == cz )
+								continue;
+
+							if ( WorldSettings.getInstance().hasGenerated( w.provider.dimensionId, cx, cz ) )
+							{
+								MeteoritePlacer mp2 = new MeteoritePlacer();
+								mp2.spawnMeteorite( new MeteoritePlacer.ChunkOnly( w, cx, cz ), mp.getSettings() );
+							}
+						}
+					}
+
+				return true;
+			}
+
+			depth -= 15;
+			if ( depth < 40 )
+				return false;
+		}
+
+		return false;
+	}
+
+	private Collection<NBTTagCompound> getNearByMetetorites(World w, int chunkX, int chunkZ)
+	{
+		return WorldSettings.getInstance().getNearByMetetorites( w.provider.dimensionId, chunkX, chunkZ );
+	}
+
 }