From b5dc18ff7e74deb2b474fdaf073d24d30fa39246 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 10 Aug 2012 16:42:21 -0400 Subject: [PATCH] Fix up modloader and clean up junk method --- .../cpw/mods/fml/common/FMLCommonHandler.java | 5 ----- .../common/modloader/ModLoaderWorldGenerator.java | 14 +++++--------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java index 89bf1dcbe7..49133e840f 100644 --- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -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); diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java index c8dac3824b..6b6de2dd6c 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java @@ -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); } } - }