keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix up modloader and clean up junk method

This commit is contained in:
Christian 2012-08-10 16:42:21 -04:00
parent 5e7cb9106d
commit b5dc18ff7e
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fml/common/cpw/mods/fml/common/FMLCommonHandler.java
View File

@ -283,11 +283,6 @@ public class FMLCommonHandler
return sidedDelegate;
}
public void handleWorldGeneration(int chunkX, int chunkZ, long worldSeed, Object... data)
{
GameRegistry.generateWorld(chunkX, chunkZ, worldSeed, data);
}
public void onPostServerTick()
{
tickEnd(EnumSet.of(TickType.SERVER), Side.SERVER);

14
fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java
View File

@ -19,19 +19,15 @@ public class ModLoaderWorldGenerator implements IWorldGenerator
}
@Override
public void generate(Random random, int chunkX, int chunkZ, Object... additionalData)
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
{
World w = (World) additionalData[0];
IChunkProvider cp = (IChunkProvider) additionalData[1];
if (cp instanceof ChunkProviderGenerate)
if (chunkGenerator instanceof ChunkProviderGenerate)
{
mod.generateSurface(w, random, chunkX << 4, chunkZ << 4);
mod.generateSurface(world, random, chunkX << 4, chunkZ << 4);
}
else if (cp instanceof ChunkProviderHell)
else if (chunkGenerator instanceof ChunkProviderHell)
{
mod.generateNether(w, random, chunkX << 4, chunkZ << 4);
mod.generateNether(world, random, chunkX << 4, chunkZ << 4);
}
}
}