103 lines
6.6 KiB
Diff
103 lines
6.6 KiB
Diff
--- ../src-base/minecraft/net/minecraft/world/gen/ChunkGeneratorOverworld.java
|
|
+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkGeneratorOverworld.java
|
|
@@ -61,6 +61,16 @@
|
|
|
|
public ChunkGeneratorOverworld(World p_i46668_1_, long p_i46668_2_, boolean p_i46668_4_, String p_i46668_5_)
|
|
{
|
|
+ {
|
|
+ field_186003_v = net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_186003_v, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE);
|
|
+ field_186004_w = (MapGenStronghold)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_186004_w, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.STRONGHOLD);
|
|
+ field_186005_x = (MapGenVillage)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_186005_x, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE);
|
|
+ field_186006_y = (MapGenMineshaft)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_186006_y, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.MINESHAFT);
|
|
+ field_186007_z = (MapGenScatteredFeature)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_186007_z, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.SCATTERED_FEATURE);
|
|
+ field_185979_A = net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_185979_A, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.RAVINE);
|
|
+ field_185980_B = (StructureOceanMonument)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_185980_B, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.OCEAN_MONUMENT);
|
|
+ field_191060_C = (WoodlandMansion)net.minecraftforge.event.terraingen.TerrainGen.getModdedMapGen(field_191060_C, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.WOODLAND_MANSION);
|
|
+ }
|
|
this.field_185995_n = p_i46668_1_;
|
|
this.field_185996_o = p_i46668_4_;
|
|
this.field_185997_p = p_i46668_1_.func_72912_H().func_76067_t();
|
|
@@ -90,6 +100,17 @@
|
|
this.field_186001_t = this.field_186000_s.field_177778_E ? Blocks.field_150353_l.func_176223_P() : Blocks.field_150355_j.func_176223_P();
|
|
p_i46668_1_.func_181544_b(this.field_186000_s.field_177841_q);
|
|
}
|
|
+
|
|
+ net.minecraftforge.event.terraingen.InitNoiseGensEvent.ContextOverworld ctx =
|
|
+ new net.minecraftforge.event.terraingen.InitNoiseGensEvent.ContextOverworld(field_185991_j, field_185992_k, field_185993_l, field_185994_m, field_185983_b, field_185984_c, field_185985_d);
|
|
+ ctx = net.minecraftforge.event.terraingen.TerrainGen.getModdedNoiseGenerators(p_i46668_1_, this.field_185990_i, ctx);
|
|
+ this.field_185991_j = ctx.getLPerlin1();
|
|
+ this.field_185992_k = ctx.getLPerlin2();
|
|
+ this.field_185993_l = ctx.getPerlin();
|
|
+ this.field_185994_m = ctx.getHeight();
|
|
+ this.field_185983_b = ctx.getScale();
|
|
+ this.field_185984_c = ctx.getDepth();
|
|
+ this.field_185985_d = ctx.getForest();
|
|
}
|
|
|
|
public void func_185976_a(int p_185976_1_, int p_185976_2_, ChunkPrimer p_185976_3_)
|
|
@@ -163,6 +184,7 @@
|
|
|
|
public void func_185977_a(int p_185977_1_, int p_185977_2_, ChunkPrimer p_185977_3_, Biome[] p_185977_4_)
|
|
{
|
|
+ if (!net.minecraftforge.event.ForgeEventFactory.onReplaceBiomeBlocks(this, p_185977_1_, p_185977_2_, p_185977_3_, this.field_185995_n)) return;
|
|
double d0 = 0.03125D;
|
|
this.field_186002_u = this.field_185994_m.func_151599_a(this.field_186002_u, (double)(p_185977_1_ * 16), (double)(p_185977_2_ * 16), 16, 16, 0.0625D, 0.0625D, 1.0D);
|
|
|
|
@@ -370,6 +392,8 @@
|
|
boolean flag = false;
|
|
ChunkPos chunkpos = new ChunkPos(p_185931_1_, p_185931_2_);
|
|
|
|
+ net.minecraftforge.event.ForgeEventFactory.onChunkPopulate(true, this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag);
|
|
+
|
|
if (this.field_185996_o)
|
|
{
|
|
if (this.field_186000_s.field_177829_w)
|
|
@@ -404,6 +428,7 @@
|
|
}
|
|
|
|
if (biome != Biomes.field_76769_d && biome != Biomes.field_76786_s && this.field_186000_s.field_177781_A && !flag && this.field_185990_i.nextInt(this.field_186000_s.field_177782_B) == 0)
|
|
+ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAKE))
|
|
{
|
|
int i1 = this.field_185990_i.nextInt(16) + 8;
|
|
int j1 = this.field_185990_i.nextInt(256);
|
|
@@ -412,6 +437,7 @@
|
|
}
|
|
|
|
if (!flag && this.field_185990_i.nextInt(this.field_186000_s.field_177777_D / 10) == 0 && this.field_186000_s.field_177783_C)
|
|
+ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.LAVA))
|
|
{
|
|
int i2 = this.field_185990_i.nextInt(16) + 8;
|
|
int l2 = this.field_185990_i.nextInt(this.field_185990_i.nextInt(248) + 8);
|
|
@@ -424,6 +450,7 @@
|
|
}
|
|
|
|
if (this.field_186000_s.field_177837_s)
|
|
+ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.DUNGEON))
|
|
{
|
|
for (int j2 = 0; j2 < this.field_186000_s.field_177835_t; ++j2)
|
|
{
|
|
@@ -435,9 +462,12 @@
|
|
}
|
|
|
|
biome.func_180624_a(this.field_185995_n, this.field_185990_i, new BlockPos(i, 0, j));
|
|
+ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ANIMALS))
|
|
WorldEntitySpawner.func_77191_a(this.field_185995_n, biome, i + 8, j + 8, 16, 16, this.field_185990_i);
|
|
blockpos = blockpos.func_177982_a(8, 0, 8);
|
|
|
|
+ if (net.minecraftforge.event.terraingen.TerrainGen.populate(this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag, net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ICE))
|
|
+ {
|
|
for (int k2 = 0; k2 < 16; ++k2)
|
|
{
|
|
for (int j3 = 0; j3 < 16; ++j3)
|
|
@@ -456,7 +486,10 @@
|
|
}
|
|
}
|
|
}
|
|
+ }//Forge: End ICE
|
|
|
|
+ net.minecraftforge.event.ForgeEventFactory.onChunkPopulate(false, this, this.field_185995_n, this.field_185990_i, p_185931_1_, p_185931_2_, flag);
|
|
+
|
|
BlockFalling.field_149832_M = false;
|
|
}
|
|
|