2 files changed, 77 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java
index 6a1bb52204..585634bc07 100644
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java
+++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/SystemHD10180.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.galacticraft.system.hd10180;
 
 import gtPlusPlus.xmod.galacticraft.system.BaseSolarSystem;
 import gtPlusPlus.xmod.galacticraft.system.core.dim.BasicChunkProviderGalactic;
+import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.b.blocks.BlockRegistrationHD10180B;
 import gtPlusPlus.xmod.galacticraft.system.hd10180.planets.b.dim.WorldProviderHD10180B;
 import gtPlusPlus.xmod.galacticraft.system.objects.BiomeSettings;
 import gtPlusPlus.xmod.galacticraft.system.objects.DimensionSettings;
@@ -13,28 +14,27 @@ import micdoodle8.mods.galacticraft.api.vector.Vector3;
 
 public class SystemHD10180 extends BaseSolarSystem {
 	
-	public void preInit() {
-		//TCBlocks.initialize();
+	public SystemHD10180() {
+		super("HD10180");
 	}
 
-	public void registrycelestial() {
-
-	}
+	public void preInit() {
+		//Init Blocks
+		BlockRegistrationHD10180B.initialize();
+	}	
 
 	@Override
-	public void initSolarSystem() {
-		
-		SolarSystem aSystemHD10180 = createSolarSystem("HD10180", "hydrus", new Vector3(2.0D, -1.0D, 2.0D));
+	public void initSolarSystem() {		
+		//Lets pick a nice place
+		SolarSystem aSystemHD10180 = createSolarSystem(mSystemName, "hydrus", new Vector3(2.0D, -1.0D, 2.0D));
 		this.registerSolarSystem(aSystemHD10180);
-		
-		Star aMainStar = this.createStar("HD10180-A", -1);
+		//turn the lights on
+		Star aMainStar = this.createStar(mSystemName+"-A", -1);
 		this.setMainStarForSolarSystem(aMainStar);
-
 		//Planet B
-		PlanetGenerator B = this.createPlanet("HD10180-B", new float[] {0.2f, 0.2f, 0.2f}, 3.1415927F, 1f, 2f, 11.861994F, null);
+		PlanetGenerator B = this.createPlanet(mSystemName+"-B", new float[] {0.2f, 0.2f, 0.2f}, 3.1415927F, 1f, 2f, 11.861994F, new BlockRegistrationHD10180B());
 		DimensionSettings Planet_B_Settings = new DimensionSettings(B, BasicChunkProviderGalactic.class, 5, true, 1, false, 240f, 0.1f, 0.2f, false, 48000L);
-		BiomeSettings Planet_B_Biome = new BiomeSettings("HD10180-B", 255, 0.1f, 0.2f);
-		this.registerPlanet(new WorldProviderHD10180B(new WorldProviderSettings(Planet_B_Settings, Planet_B_Biome)).getDim());
-		
+		BiomeSettings Planet_B_Biome = new BiomeSettings(mSystemName+"-B", 255, 0.1f, 0.2f);
+		this.registerPlanet(new WorldProviderHD10180B(new WorldProviderSettings(Planet_B_Settings, Planet_B_Biome)).getDim());		
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/b/blocks/BlockRegistrationHD10180B.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/b/blocks/BlockRegistrationHD10180B.java
new file mode 100644
index 0000000000..d79b5f47ce
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/galacticraft/system/hd10180/planets/b/blocks/BlockRegistrationHD10180B.java
@@ -0,0 +1,62 @@
+package gtPlusPlus.xmod.galacticraft.system.hd10180.planets.b.blocks;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.xmod.galacticraft.system.objects.IPlanetBlockRegister;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+
+public class BlockRegistrationHD10180B implements IPlanetBlockRegister {
+
+	private Map<Integer, Block> mBlocks = new LinkedHashMap<Integer, Block>();
+	private static AutoMap<Block> mBlocksToRegister = new AutoMap<Block>();
+
+	public static void initialize() {
+		//mBlocksToRegister.put(new TCetiEBlocks());
+		//mBlocksToRegister.put(new TCetiEBlockDandelions());
+	}	
+	
+	@Override
+	public Map<Integer, Block> getBlocks() {
+		return mBlocks;
+	}
+
+	@Override
+	public Block getTopLayer() {
+		return mBlocks.get(0);
+	}
+
+	@Override
+	public Block getSoil() {
+		return mBlocks.get(1);
+	}
+
+	@Override
+	public Block getSoil2() {
+		return mBlocks.get(2);
+	}
+
+	@Override
+	public Block getStone() {
+		return mBlocks.get(3);
+	}
+
+	@Override
+	public Block getWaterBlock() {
+		return mBlocks.get(4);
+	}
+
+	@Override
+	public void register() {		
+		//Register Blocks, Add to List
+		mBlocks.put(0, Blocks.grass);
+		mBlocks.put(1, Blocks.dirt);
+		mBlocks.put(2, Blocks.gravel);
+		mBlocks.put(3, Blocks.stone);
+		mBlocks.put(4, Blocks.lava);
+		
+	}
+
+}