mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
Change world generation to expose a mod interface
This commit is contained in:
1 parent
749cb7bcd6
commit
320503340b
6 files changed
+26
-62
No files matched your search
@@ -312,18 +312,7 @@ public class FMLClientHandler implements IFMLSidedHandler
|
||||
*/
|
||||
public void onChunkPopulate(IChunkProvider chunkProvider, int chunkX, int chunkZ, World world, IChunkProvider generator)
|
||||
{
|
||||
Random fmlRandom = new Random(world.func_22138_q());
|
||||
long xSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
long zSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
fmlRandom.setSeed((xSeed * chunkX + zSeed * chunkZ) ^ world.func_22138_q());
|
||||
|
||||
for (ModContainer mod : Loader.getModList())
|
||||
{
|
||||
if (mod.generatesWorld())
|
||||
{
|
||||
mod.getWorldGenerator().generate(fmlRandom, chunkX, chunkZ, world, generator, chunkProvider);
|
||||
}
|
||||
}
|
||||
FMLCommonHandler.instance().handleWorldGeneration(chunkX, chunkZ, world.func_22138_q(), world, generator, chunkProvider);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -27,6 +27,7 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.regex.Matcher;
|
||||
@@ -81,7 +82,9 @@ public class FMLCommonHandler
|
||||
|
||||
private Map<String,Properties> modLanguageData=new HashMap<String,Properties>();
|
||||
|
||||
private Set<ITickHandler>tickHandlers = new HashSet<ITickHandler>();
|
||||
private Set<ITickHandler> tickHandlers = new HashSet<ITickHandler>();
|
||||
|
||||
private Set<IWorldGenerator> worldGenerators = new HashSet<IWorldGenerator>();
|
||||
/**
|
||||
* We register our delegate here
|
||||
* @param handler
|
||||
@@ -531,8 +534,26 @@ public class FMLCommonHandler
|
||||
}
|
||||
}
|
||||
|
||||
public void handleWorldGeneration(int chunkX, int chunkZ, long worldSeed, Object... data)
|
||||
{
|
||||
Random fmlRandom = new Random(worldSeed);
|
||||
long xSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
long zSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
fmlRandom.setSeed((xSeed * chunkX + zSeed * chunkZ) ^ worldSeed);
|
||||
|
||||
for (IWorldGenerator generator : worldGenerators)
|
||||
{
|
||||
generator.generate(fmlRandom, chunkX, chunkZ, data);
|
||||
}
|
||||
}
|
||||
|
||||
public void registerTickHandler(ITickHandler handler)
|
||||
{
|
||||
tickHandlers.add(handler);
|
||||
}
|
||||
|
||||
public void registerWorldGenerator(IWorldGenerator generator)
|
||||
{
|
||||
worldGenerators.add(generator);
|
||||
}
|
||||
}
|
||||
@@ -132,21 +132,7 @@ public class FMLModContainer implements ModContainer
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean generatesWorld()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWorldGenerator getWorldGenerator()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int lookupFuelValue(int itemId, int itemDamage)
|
||||
{
|
||||
|
||||
@@ -103,16 +103,6 @@ public interface ModContainer
|
||||
* @return
|
||||
*/
|
||||
Object getMod();
|
||||
/**
|
||||
* Does this mod want to generate world data.
|
||||
* @return
|
||||
*/
|
||||
boolean generatesWorld();
|
||||
/**
|
||||
* The world generator for this mod.
|
||||
* @return
|
||||
*/
|
||||
IWorldGenerator getWorldGenerator();
|
||||
/**
|
||||
* Lookup the fuel value for the supplied item/damage with this mod.
|
||||
* @param itemId
|
||||
|
||||
@@ -106,6 +106,7 @@ public class ModLoaderModContainer implements ModContainer
|
||||
mod = modClazz.newInstance();
|
||||
this.tickHandler.setMod(mod);
|
||||
FMLCommonHandler.instance().registerTickHandler(this.tickHandler);
|
||||
FMLCommonHandler.instance().registerWorldGenerator(this.mod);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -394,18 +395,6 @@ public class ModLoaderModContainer implements ModContainer
|
||||
return mod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean generatesWorld()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWorldGenerator getWorldGenerator()
|
||||
{
|
||||
return mod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int lookupFuelValue(int itemId, int itemDamage)
|
||||
{
|
||||
|
||||
@@ -208,18 +208,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
||||
*/
|
||||
public void onChunkPopulate(IChunkProvider chunkProvider, int chunkX, int chunkZ, World world, IChunkProvider generator)
|
||||
{
|
||||
Random fmlRandom = new Random(world.func_22079_j());
|
||||
long xSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
long zSeed = fmlRandom.nextLong() >> 2 + 1L;
|
||||
fmlRandom.setSeed((xSeed * chunkX + zSeed * chunkZ) ^ world.func_22079_j());
|
||||
|
||||
for (ModContainer mod : Loader.getModList())
|
||||
{
|
||||
if (mod.generatesWorld())
|
||||
{
|
||||
mod.getWorldGenerator().generate(fmlRandom, chunkX, chunkZ, world, generator, chunkProvider);
|
||||
}
|
||||
}
|
||||
FMLCommonHandler.instance().handleWorldGeneration(chunkX, chunkZ, world.func_22079_j(), world, generator, chunkProvider);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user