From 0e3cb6fd1a59b4f6f095e34d0b0ed08fed723bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Sun, 3 Jul 2016 17:56:49 +0200
Subject: [PATCH] Moving stuff around

---
 TODO.txt                          |  6 +++---
 src/java/mmm/proxy/PCommon.java   |  3 +--
 src/java/mmm/world/World.java     | 17 +++++++++++++++++
 src/java/mmm/world/gen/WGOre.java | 14 +-------------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 800255e..49b6ed8 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -50,8 +50,8 @@ materials.ore	No		Lead (galena)
 materials.ore	No		Cinnabar
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Alloy furnace
-							-> fix item pickup in creative mode
-							-> don't drop the item in creative mode unless it's been named
+							-> fix item pickup in creative mode                                         BF
+							-> don't drop the item in creative mode unless it's been named              BF
 tech.base		No		Coke oven
 tech.base		No		Metal recycler
 -------------------------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ tech.tools
 -------------------------------------------------------------------------------------------------------
 animals			???		Goats
 -------------------------------------------------------------------------------------------------------
-world			???		Limestone hills / mountains
+world			???		Improved system to handle neighbouring biomes                                   BF
 -------------------------------------------------------------------------------------------------------
 ???				???		Sub-blocks
 ???				Yes		Improved pistons
diff --git a/src/java/mmm/proxy/PCommon.java b/src/java/mmm/proxy/PCommon.java
index 7ef1742..4cb9caf 100644
--- a/src/java/mmm/proxy/PCommon.java
+++ b/src/java/mmm/proxy/PCommon.java
@@ -10,7 +10,6 @@ import mmm.utils.UAccessors;
 import mmm.utils.URegistry;
 import mmm.utils.USeat;
 import mmm.world.World;
-import mmm.world.gen.WGOre;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
@@ -36,6 +35,6 @@ public abstract class PCommon
 	public void init( final FMLInitializationEvent event )
 	{
 		USeat.register( Mmm.get( ) );
-		WGOre.init( );
+		World.init( );
 	}
 }
\ No newline at end of file
diff --git a/src/java/mmm/world/World.java b/src/java/mmm/world/World.java
index 4abd689..15b1a0b 100644
--- a/src/java/mmm/world/World.java
+++ b/src/java/mmm/world/World.java
@@ -1,10 +1,17 @@
 package mmm.world;
 
 
+import java.util.ArrayList;
+
+import mmm.utils.I_UOreGenerationRegistrar;
+import mmm.utils.URegistry;
 import mmm.world.biome.WBLimestoneMountains;
 import mmm.world.biome.WBLimestonePlateau;
+import mmm.world.gen.WGOre;
+import mmm.world.gen.WGOreCondition;
 import net.minecraftforge.common.BiomeManager.BiomeType;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
 
@@ -64,4 +71,14 @@ public class World
 		// EMPTY
 	}
 
+
+	public static void init( )
+	{
+		final ArrayList< WGOreCondition > conditions = new ArrayList<>( );
+		for ( final I_UOreGenerationRegistrar registrar : URegistry.getOreGenerationRegistrars( ) ) {
+			registrar.addConditions( conditions );
+		}
+		GameRegistry.registerWorldGenerator( new WGOre( conditions ) , 0 );
+	}
+
 }
diff --git a/src/java/mmm/world/gen/WGOre.java b/src/java/mmm/world/gen/WGOre.java
index 64d587e..9fc2a49 100644
--- a/src/java/mmm/world/gen/WGOre.java
+++ b/src/java/mmm/world/gen/WGOre.java
@@ -4,13 +4,10 @@ package mmm.world.gen;
 import java.util.ArrayList;
 import java.util.Random;
 
-import mmm.utils.I_UOreGenerationRegistrar;
-import mmm.utils.URegistry;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.fml.common.IWorldGenerator;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
 
@@ -18,19 +15,10 @@ public class WGOre
 		implements IWorldGenerator
 {
 
-	public static void init( )
-	{
-		final ArrayList< WGOreCondition > conditions = new ArrayList<>( );
-		for ( final I_UOreGenerationRegistrar registrar : URegistry.getOreGenerationRegistrars( ) ) {
-			registrar.addConditions( conditions );
-		}
-		GameRegistry.registerWorldGenerator( new WGOre( conditions ) , 0 );
-	}
-
 	private final ArrayList< WGOreCondition > conditions;
 
 
-	private WGOre( final ArrayList< WGOreCondition > conditions )
+	public WGOre( final ArrayList< WGOreCondition > conditions )
 	{
 		this.conditions = conditions;
 	}