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

Fixed InitMapGenEvent's fire order so values are used. And added OCEAN_MONUMENT type. Closes #1681

Browse source
This commit is contained in:
Lex Manos 2015-02-04 12:11:34 -08:00
parent 9cb7cc557a
commit 48c24246a5
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.java.patch
View file

@ -12,22 +12,22 @@
public class ChunkProviderGenerate implements IChunkProvider
{
@@ -57,6 +62,15 @@
double[] field_147426_g;
private static final String __OBFID = "CL_00000396";
+ {
+ field_73226_t = TerrainGen.getModdedMapGen(field_73226_t, CAVE);
+ field_73225_u = (MapGenStronghold) TerrainGen.getModdedMapGen(field_73225_u, STRONGHOLD);
+ field_73224_v = (MapGenVillage) TerrainGen.getModdedMapGen(field_73224_v, VILLAGE);
+ field_73223_w = (MapGenMineshaft) TerrainGen.getModdedMapGen(field_73223_w, MINESHAFT);
+ field_73233_x = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(field_73233_x, SCATTERED_FEATURE);
+ field_73232_y = TerrainGen.getModdedMapGen(field_73232_y, RAVINE);
+ }
+
public ChunkProviderGenerate(World p_i45636_1_, long p_i45636_2_, boolean p_i45636_4_, String p_i45636_5_)
{
this.field_177476_s = Blocks.field_150355_j;
@@ -68,6 +73,15 @@
this.field_73233_x = new MapGenScatteredFeature();
this.field_73232_y = new MapGenRavine();
this.field_177474_A = new StructureOceanMonument();
+ {
+ field_73226_t = TerrainGen.getModdedMapGen(field_73226_t, CAVE);
+ field_73225_u = (MapGenStronghold)TerrainGen.getModdedMapGen(field_73225_u, STRONGHOLD);
+ field_73224_v = (MapGenVillage)TerrainGen.getModdedMapGen(field_73224_v, VILLAGE);
+ field_73223_w = (MapGenMineshaft)TerrainGen.getModdedMapGen(field_73223_w, MINESHAFT);
+ field_73233_x = (MapGenScatteredFeature)TerrainGen.getModdedMapGen(field_73233_x, SCATTERED_FEATURE);
+ field_73232_y = TerrainGen.getModdedMapGen(field_73232_y, RAVINE);
+ field_177474_A = (StructureOceanMonument)TerrainGen.getModdedMapGen(field_177474_A, OCEAN_MONUMENT);
+ }
this.field_73230_p = p_i45636_1_;
this.field_73229_q = p_i45636_4_;
this.field_177475_o = p_i45636_1_.func_72912_H().func_76067_t();
@@ -96,6 +110,16 @@
this.field_177477_r = ChunkProviderSettings.Factory.func_177865_a(p_i45636_5_).func_177864_b();
this.field_177476_s = this.field_177477_r.field_177778_E ? Blocks.field_150353_l : Blocks.field_150355_j;

6
src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java
View file

@ -7,12 +7,12 @@ public class InitMapGenEvent extends Event
{
/** Use CUSTOM to filter custom event types
*/
public static enum EventType { CAVE, MINESHAFT, NETHER_BRIDGE, NETHER_CAVE, RAVINE, SCATTERED_FEATURE, STRONGHOLD, VILLAGE, CUSTOM }
public static enum EventType { CAVE, MINESHAFT, NETHER_BRIDGE, NETHER_CAVE, RAVINE, SCATTERED_FEATURE, STRONGHOLD, VILLAGE, OCEAN_MONUMENT, CUSTOM }
public final EventType type;
public final MapGenBase originalGen;
public MapGenBase newGen;
InitMapGenEvent(EventType type, MapGenBase original)
{
this.type = type;