mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 20:22:28 +00:00
Refactored BiomeManager stronghold add/remove methods to support new
MapGenStronghold dynamic biome changes. Changed InitNoiseGensEvent to pass a NoiseGenerator array instead of NoiseGeneratorOctaves due to new NoiseGeneratorPerlin in ChunkProviderGenerate. Fixed worldgen crash caused by wrong metadata in Chunk patch.
This commit is contained in:
1 parent
e1c0cad8e1
commit
8654623271
8 files changed
+66
-33
No files matched your search
@@ -16,6 +16,9 @@ import com.google.common.collect.Lists;
|
||||
|
||||
public class BiomeManager
|
||||
{
|
||||
public static ArrayList<BiomeGenBase> strongHoldBiomes = new ArrayList<BiomeGenBase>();
|
||||
public static ArrayList<BiomeGenBase> strongHoldBiomesBlackList = new ArrayList<BiomeGenBase>();
|
||||
|
||||
public static void addVillageBiome(BiomeGenBase biome, boolean canSpawn)
|
||||
{
|
||||
if (!MapGenVillage.villageSpawnBiomes.contains(biome))
|
||||
@@ -38,17 +41,17 @@ public class BiomeManager
|
||||
|
||||
public static void addStrongholdBiome(BiomeGenBase biome)
|
||||
{
|
||||
if (!MapGenStronghold.field_151546_e.contains(biome))
|
||||
if (!strongHoldBiomes.contains(biome))
|
||||
{
|
||||
MapGenStronghold.field_151546_e.add(biome);
|
||||
strongHoldBiomes.add(biome);
|
||||
}
|
||||
}
|
||||
|
||||
public static void removeStrongholdBiome(BiomeGenBase biome)
|
||||
{
|
||||
if (MapGenStronghold.field_151546_e.contains(biome))
|
||||
if (!strongHoldBiomesBlackList.contains(biome))
|
||||
{
|
||||
MapGenStronghold.field_151546_e.remove(biome);
|
||||
strongHoldBiomesBlackList.add(biome);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,16 +3,16 @@ package net.minecraftforge.event.terraingen;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.NoiseGeneratorOctaves;
|
||||
import net.minecraft.world.gen.NoiseGenerator;
|
||||
import net.minecraftforge.event.world.*;
|
||||
|
||||
public class InitNoiseGensEvent extends WorldEvent
|
||||
{
|
||||
public final Random rand;
|
||||
public final NoiseGeneratorOctaves[] originalNoiseGens;
|
||||
public NoiseGeneratorOctaves[] newNoiseGens;
|
||||
public final NoiseGenerator[] originalNoiseGens;
|
||||
public NoiseGenerator[] newNoiseGens;
|
||||
|
||||
public InitNoiseGensEvent(World world, Random rand, NoiseGeneratorOctaves[] original)
|
||||
public InitNoiseGensEvent(World world, Random rand, NoiseGenerator[] original)
|
||||
{
|
||||
super(world);
|
||||
this.rand = rand;
|
||||
|
||||
@@ -7,7 +7,7 @@ import cpw.mods.fml.common.eventhandler.Event.*;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.gen.MapGenBase;
|
||||
import net.minecraft.world.gen.NoiseGeneratorOctaves;
|
||||
import net.minecraft.world.gen.NoiseGenerator;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
import net.minecraftforge.common.*;
|
||||
import net.minecraftforge.event.terraingen.DecorateBiomeEvent.*;
|
||||
@@ -17,7 +17,7 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent.*;
|
||||
|
||||
public abstract class TerrainGen
|
||||
{
|
||||
public static NoiseGeneratorOctaves[] getModdedNoiseGenerators(World world, Random rand, NoiseGeneratorOctaves[] original)
|
||||
public static NoiseGenerator[] getModdedNoiseGenerators(World world, Random rand, NoiseGenerator[] original)
|
||||
{
|
||||
InitNoiseGensEvent event = new InitNoiseGensEvent(world, rand, original);
|
||||
MinecraftForge.TERRAIN_GEN_BUS.post(event);
|
||||
|
||||
Reference in new issue
Block a user