- Removed Unused GC planetary system code. (For now)

- Removed Heat Pipes. (For now)

24 files changed, 15 insertions, 2534 deletions

diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
index f58bd06cab..d5c7a7e4e5 100644
--- a/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
+++ b/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
@@ -1,15 +1,10 @@
 package gtPlusPlus.xmod.galacticraft;
 
-import java.util.HashMap;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.galacticraft.system.core.space.BaseSolarSystem;
-import gtPlusPlus.xmod.galacticraft.system.hd10180.SystemHD10180;
 
 public class HANDLER_GalactiCraft {
 	
-	private static final HashMap<String, BaseSolarSystem> mSystemsCache = new HashMap<String, BaseSolarSystem>();
+	//private static final HashMap<String, BaseSolarSystem> mSystemsCache = new HashMap<String, BaseSolarSystem>();
 	
 	public static void preInit(){
 		if (LoadedMods.GalacticraftCore){
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BaseWorldProviderGalactic.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BaseWorldProviderGalactic.java
deleted file mode 100644
index 6b15b388cd..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BaseWorldProviderGalactic.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.dim;
-
-import java.util.Random;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.xmod.galacticraft.system.core.space.BaseGalacticDimension;
-import gtPlusPlus.xmod.galacticraft.system.core.world.gen.GalacticBiomeGenBase;
-import gtPlusPlus.xmod.galacticraft.system.objects.BiomeSettings;
-import gtPlusPlus.xmod.galacticraft.system.objects.DimensionSettings;
-import gtPlusPlus.xmod.galacticraft.system.objects.PlanetGenerator;
-import gtPlusPlus.xmod.galacticraft.system.objects.WorldProviderSettings;
-import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeDecorator;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.BiomeDictionary.Type;
-import net.minecraftforge.event.terraingen.TerrainGen;
-import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post;
-import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Pre;
-import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType;
-
-public class BaseWorldProviderGalactic {
-	
-	private final PlanetGenerator mThisPlanet;
-	private final BaseGalacticDimension mDim;
-	public final BiomeGenBase mBiome;
-	
-	//new DimensionSettings(b, aCP, 5, true, 1, false, 240f, 0.1f, 0.2f, false, 48000L)
-	
-	public BaseWorldProviderGalactic(WorldProviderSettings b) {		
-		this(b.getPlanet(), b.getDimSettings(), b.getBiomeSettings());
-	}
-	
-	private BaseWorldProviderGalactic(PlanetGenerator b, DimensionSettings aDimSettings, BiomeSettings aBiomeSettings) {
-		mThisPlanet = b;
-		mBiome = tryCreateBiome(aBiomeSettings);
-		if (mBiome != null) {
-			Logger.SPACE("Created Biome for "+b.getPlanet().getLocalizedName()+".");
-			mDim = new BaseGalacticDimension(b, mBiome, aDimSettings.getChunkProvider(), aDimSettings);
-		}
-		else {
-			Logger.SPACE("Failed to Create Biome for "+b.getPlanet().getLocalizedName()+", Using Deep Ocean as fallback.");
-			mDim = new BaseGalacticDimension(b, BiomeGenBase.deepOcean, aDimSettings.getChunkProvider(), aDimSettings);
-		}
-	}
-
-	public synchronized final BaseGalacticDimension getDim() {
-		return mDim;
-	}
-	
-	public BiomeGenBase tryCreateBiome(BiomeSettings aSettings) {		
-		BiomeGenBase x = (new BiomeGenMain(aSettings.getID())).setBiomeName(aSettings.getName()).setHeight(aSettings.getHeight());		
-		return x;
-	}
-		
-	public class BiomeGenBasePlanetSurface extends GalacticBiomeGenBase {
-		public BiomeGenBase aBiome;
-
-		public BiomeGenBasePlanetSurface(int id) {
-			super(id);
-			this.enableRain = true;
-			this.enableSnow = true;
-			this.topBlock = Blocks.stone;
-			this.fillerBlock = Blocks.stone;
-		}
-
-		public BiomeDecorator createBiomeDecorator() {
-			return new BiomeDecoratorGalactic();
-		}
-
-		protected BiomeDecoratorGalactic getBiomeDecorator() {
-			return (BiomeDecoratorGalactic) this.theBiomeDecorator;
-		}
-
-	}
-	
-	public class BiomeGenMain extends BiomeGenBasePlanetSurface {
-		public BiomeGenMain(int aID) {
-			super(aID);
-			this.enableRain = false;
-			this.enableSnow = false;
-			this.topBlock = mThisPlanet.getTask().getTopLayer();
-			this.topMeta = 0;
-			this.fillerBlock = mThisPlanet.getTask().getSoil();
-			this.fillerMeta = 0;
-			this.stoneBlock = mThisPlanet.getTask().getStone();
-			this.stoneMeta = 0;
-			this.spawnableCaveCreatureList.clear();
-			this.spawnableCreatureList.clear();
-			this.spawnableMonsterList.clear();
-			this.spawnableWaterCreatureList.clear();
-			if (!ConfigManagerCore.disableBiomeTypeRegistrations) {
-				BiomeDictionary.registerBiomeType(this, new Type[]{Type.COLD, Type.DRY, Type.DEAD, Type.SPOOKY});
-			}
-
-		}
-	}
-	
-	public class BiomeDecoratorGalactic extends BiomeDecorator {
-		
-		public void decorateChunk(World world, Random rand, BiomeGenBase biome, int x, int z) {
-			if (this.currentWorld != null) {
-				throw new RuntimeException("Already decorating!!");
-			} else {
-				this.currentWorld = world;
-				this.randomGenerator = new XSTR(rand.nextLong());
-				this.chunk_X = x;
-				this.chunk_Z = z;
-				this.genDecorations(biome);
-				this.currentWorld = null;
-				this.randomGenerator = null;
-			}
-		}
-
-		protected void genDecorations(BiomeGenBase biome) {
-			MinecraftForge.EVENT_BUS.post(new Pre(this.currentWorld, this.randomGenerator, this.chunk_X, this.chunk_Z));
-			MinecraftForge.EVENT_BUS.post(new Post(this.currentWorld, this.randomGenerator, this.chunk_X, this.chunk_Z));
-		}
-
-		protected boolean getGen(EventType event) {
-			return TerrainGen.decorate(this.currentWorld, this.randomGenerator, this.chunk_X, this.chunk_Z, event);
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BasicChunkProviderGalactic.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BasicChunkProviderGalactic.java
deleted file mode 100644
index 9a912fdfc0..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/dim/BasicChunkProviderGalactic.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.dim;
-
-import gtPlusPlus.xmod.galacticraft.system.core.world.gen.ChunkProviderGalactic;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace;
-import net.minecraft.world.World;
-
-public class BasicChunkProviderGalactic extends ChunkProviderGalactic {
-
-	public BasicChunkProviderGalactic(World par1World, long seed, boolean mapFeaturesEnabled) {
-		super(par1World, seed, mapFeaturesEnabled);
-	}
-
-	@Override
-	public BiomeDecoratorSpace getBiomeGenerator() {
-		return null;
-	}
-	
-}
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseGalacticDimension.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseGalacticDimension.java
deleted file mode 100644
index c0283604e8..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseGalacticDimension.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.space;
-
-import java.util.Random;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.xmod.galacticraft.system.objects.DimensionSettings;
-import gtPlusPlus.xmod.galacticraft.system.objects.PlanetGenerator;
-import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldChunkManagerSpace;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace;
-import micdoodle8.mods.galacticraft.api.vector.Vector3;
-import micdoodle8.mods.galacticraft.api.world.IExitHeight;
-import micdoodle8.mods.galacticraft.api.world.ISolarLevel;
-import micdoodle8.mods.galacticraft.api.world.ITeleportType;
-import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
-import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
-import micdoodle8.mods.galacticraft.planets.mars.entities.EntityLandingBalloons;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.IChunkProvider;
-
-public class BaseGalacticDimension {
-
-	private final WorldChunkManagerGalactic mGlobalChunkManager;
-	private final WorldProviderGalactic mWorldProvider;
-	private final Class<? extends IChunkProvider> mChunkProvider;
-	private final PlanetGenerator mPlanet;
-
-	public BaseGalacticDimension(PlanetGenerator aPlanet, BiomeGenBase aBiomeForDim, Class<? extends IChunkProvider> aChunkProvider, DimensionSettings aSettings) {
-		mPlanet = aPlanet;
-		mGlobalChunkManager = new WorldChunkManagerGalactic(aBiomeForDim);
-		mChunkProvider = aChunkProvider;
-		mWorldProvider = new WorldProviderGalactic(aSettings);
-	}
-
-	public class WorldChunkManagerGalactic extends WorldChunkManagerSpace {
-		private final BiomeGenBase mBiome;
-
-		public WorldChunkManagerGalactic(BiomeGenBase aDimBiome) {
-			mBiome = aDimBiome;
-		}
-
-		public BiomeGenBase getBiome() {
-			return mBiome;
-		}
-	}
-
-	public class WorldProviderGalactic extends WorldProviderSpace implements IExitHeight, ISolarLevel, ITeleportType {
-
-		private final int mTierRequirement;
-		private final PlanetGenerator mPlanet;
-		private final boolean mAtmosphere;
-		private final int mPressure;
-		private final boolean mSolarRadiation;
-		private final float mCloudHeight;
-		private final float mGravity;
-		private final float mMeteorFreq;
-		private final boolean mCanRainOrSnow;
-		private final long mDayLength;
-		private final Class<? extends IChunkProvider> mChunkProvider;
-		
-		public WorldProviderGalactic(DimensionSettings aSettings) {
-			mPlanet = aSettings.getPlanet();
-			mTierRequirement = aSettings.getTierRequirement();
-			mAtmosphere = aSettings.hasAtmosphere();
-			mPressure = aSettings.getPressure();
-			mSolarRadiation = aSettings.hasSolarRadiation();
-			mCloudHeight = aSettings.getCloudHeight();
-			mGravity = aSettings.getGravity();
-			mMeteorFreq = aSettings.getMeteorFreq();
-			mCanRainOrSnow = aSettings.hasRainOrSnow();
-			mDayLength = aSettings.getDayLength();
-			mChunkProvider = aSettings.getChunkProvider();
-		}
-
-		public WorldProviderGalactic(PlanetGenerator aPlanet, Class<? extends IChunkProvider> aChunkProvider, int aTierRequirement, boolean aHasBreathableAtmo,
-				int aPressure, boolean aSolarRadiation, float aCloudHeight, float aGravity, float aMeteorFreq, boolean aCanRainOrSnow, long aDayLength) {
-			mPlanet = aPlanet;
-			mTierRequirement = aTierRequirement;
-			mAtmosphere = aHasBreathableAtmo;
-			mPressure = aPressure;
-			mSolarRadiation = aSolarRadiation;
-			mCloudHeight = aCloudHeight;
-			mGravity = aGravity;
-			mMeteorFreq = aMeteorFreq;
-			mCanRainOrSnow = aCanRainOrSnow;
-			mDayLength = aDayLength;
-			mChunkProvider = aChunkProvider;
-		}
-
-		public boolean canSpaceshipTierPass(int tier) {
-			return tier >= mTierRequirement;
-		}
-
-		@SideOnly(Side.CLIENT)
-		public float getCloudHeight() {
-			return mCloudHeight;
-		}
-
-		public double getHorizon() {
-			return 44.0D;
-		}
-
-		public float getFallDamageModifier() {
-			return 0.16F;
-		}
-
-		public double getFuelUsageMultiplier() {
-			return 0.8D;
-		}
-
-		public float getGravity() {
-			return mGravity;
-		}
-
-		public double getMeteorFrequency() {
-			return mMeteorFreq;
-		}
-
-		public float getSoundVolReductionAmount() {
-			return Float.MAX_VALUE;
-		}
-
-		public float getThermalLevelModifier() {
-			return 0.0F;
-		}
-
-		public float getWindLevel() {
-			return 0.6F;
-		}
-
-		public boolean canRainOrSnow() {
-			return mCanRainOrSnow;
-		}
-
-		public boolean canBlockFreeze(int x, int y, int z, boolean byWater) {
-			return false;
-		}
-
-		public CelestialBody getCelestialBody() {
-			return mPlanet.getPlanet();
-		}
-
-		public Class<? extends IChunkProvider> getChunkProviderClass() {
-			return mChunkProvider;
-		}
-
-		public long getDayLength() {
-			return mDayLength;
-		}
-
-		public boolean hasBreathableAtmosphere() {
-			return mAtmosphere;
-		}
-
-		public Vector3 getFogColor() {
-			float f = 1.0F - this.getStarBrightness(1.0F);
-			return new Vector3((double) (0.65882355F * f), (double) (0.84705883F * f), (double) (1.0F * f));
-		}
-
-		public Vector3 getSkyColor() {
-			float f = 1.0F - this.getStarBrightness(1.0F);
-			return new Vector3((double) (0.25882354F * f), (double) (0.6666667F * f), (double) (1.0F * f));
-		}
-
-		public boolean isSkyColored() {
-			return true;
-		}
-
-		public Class<? extends WorldChunkManagerGalactic> getWorldChunkManagerClass() {
-			return WorldChunkManagerGalactic.class;
-		}
-
-		public boolean hasSunset() {
-			return false;
-		}
-
-		public boolean shouldForceRespawn() {
-			return !ConfigManagerCore.forceOverworldRespawn;
-		}
-
-		public double getSolarEnergyMultiplier() {
-			return 0.8D;
-		}
-
-		public double getYCoordinateToTeleport() {
-			return 800.0D;
-		}
-
-		public Vector3 getEntitySpawnLocation(WorldServer arg0, Entity arg1) {
-			return new Vector3(arg1.posX, ConfigManagerCore.disableLander ? 250.0D : 900.0D, arg1.posZ);
-		}
-
-		public Vector3 getParaChestSpawnLocation(WorldServer arg0, EntityPlayerMP arg1, Random arg2) {
-			if (ConfigManagerCore.disableLander) {
-				double x = (arg2.nextDouble() * 2.0D - 1.0D) * 5.0D;
-				double z = (arg2.nextDouble() * 2.0D - 1.0D) * 5.0D;
-				return new Vector3(x, 220.0D, z);
-			} else {
-				return null;
-			}
-		}
-
-		public Vector3 getPlayerSpawnLocation(WorldServer arg0, EntityPlayerMP arg1) {
-			if (arg1 != null) {
-				GCPlayerStats stats = GCPlayerStats.get(arg1);
-				return new Vector3(stats.coordsTeleportedFromX, ConfigManagerCore.disableLander ? 250.0D : 900.0D,
-						stats.coordsTeleportedFromZ);
-			} else {
-				return null;
-			}
-		}
-
-		public void onSpaceDimensionChanged(World arg0, EntityPlayerMP player, boolean arg2) {
-			if (player != null && GCPlayerStats.get(player).teleportCooldown <= 0) {
-				if (player.capabilities.isFlying) {
-					player.capabilities.isFlying = false;
-				}
-
-				EntityLandingBalloons lander = new EntityLandingBalloons(player);
-				if (!arg0.isRemote) {
-					arg0.spawnEntityInWorld(lander);
-				}
-
-				GCPlayerStats.get(player).teleportCooldown = 10;
-			}
-
-		}
-
-		public boolean useParachute() {
-			return ConfigManagerCore.disableLander;
-		}
-
-		@SideOnly(Side.CLIENT)
-		public float getStarBrightness(float par1) {
-			float var2 = this.worldObj.getCelestialAngle(par1);
-			float var3 = 1.0F - (MathHelper.cos(var2 * 3.1415927F * 2.0F) * 2.0F + 0.25F);
-			if (var3 < 0.0F) {
-				var3 = 0.0F;
-			}
-
-			if (var3 > 1.0F) {
-				var3 = 1.0F;
-			}
-
-			return var3 * var3 * 0.5F + 0.3F;
-		}
-
-		@SideOnly(Side.CLIENT)
-		public float getSunBrightness(float par1) {
-			float f1 = this.worldObj.getCelestialAngle(1.0F);
-			float f2 = 1.25F - (MathHelper.cos(f1 * 3.1415927F * 2.0F) * 2.0F + 0.2F);
-			if (f2 < 0.0F) {
-				f2 = 0.0F;
-			}
-
-			if (f2 > 1.0F) {
-				f2 = 1.0F;
-			}
-
-			f2 = 1.2F - f2;
-			return f2 * 0.2F;
-		}
-
-		public void setupAdventureSpawn(EntityPlayerMP player) {
-		}
-
-		public int AtmosphericPressure() {
-			return mPressure;
-		}
-
-		public boolean SolarRadiation() {
-			return mSolarRadiation;
-		}
-	}
-
-	public synchronized final WorldChunkManagerGalactic getGlobalChunkManager() {
-		return mGlobalChunkManager;
-	}
-
-	public synchronized final WorldProviderGalactic getWorldProvider() {
-		return mWorldProvider;
-	}
-	
-	public synchronized final Class<? extends WorldProviderSpace> getWorldProviderClass() {
-		return mWorldProvider.getClass();
-	}
-
-	public synchronized final Class<? extends IChunkProvider> getChunkProvider() {
-		return mChunkProvider;
-	}
-
-	public synchronized final PlanetGenerator getPlanet() {
-		return mPlanet;
-	}
-
-
-
-}
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseSolarSystem.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseSolarSystem.java
deleted file mode 100644
index cb629f211f..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/space/BaseSolarSystem.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.space;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.galacticraft.system.objects.IPlanetBlockRegister;
-import gtPlusPlus.xmod.galacticraft.system.objects.PlanetGenerator;
-import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
-import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry;
-import micdoodle8.mods.galacticraft.api.galaxies.Planet;
-import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem;
-import micdoodle8.mods.galacticraft.api.galaxies.Star;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace;
-import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody.ScalableDistance;
-import micdoodle8.mods.galacticraft.api.vector.Vector3;
-import micdoodle8.mods.galacticraft.api.world.ITeleportType;
-import micdoodle8.mods.galacticraft.planets.mars.dimension.WorldProviderMars;
-import net.minecraft.util.ResourceLocation;
-
-public abstract class BaseSolarSystem {
-	
-	public final String mSystemName;
-	private SolarSystem mSolarSystem;
-	private Star mStar;
-	private AutoMap<Planet> mPlanetMap = new AutoMap<Planet>();
-
-	
-	public BaseSolarSystem(String aSystemName) {
-		mSystemName = aSystemName;
-		Logger.SPACE("Creating new Solar System: "+aSystemName);
-	}
-	
-	public SolarSystem getSystem() {
-		return mSolarSystem;
-	}
-	
-	public Star getStar() {
-		return mStar;
-	}
-	
-	public AutoMap<Planet> getPlanets(){
-		return mPlanetMap;
-	}
-	
-	public abstract void preInit();
-
-	public final void init() {
-		Logger.SPACE("Initialising planetary masses within "+mSystemName);
-		initSolarSystem();
-	}
-	
-	public abstract void initSolarSystem();
-
-	public static void registryteleport(Class<? extends WorldProviderSpace> aWorldProvider, ITeleportType aWorldProviderInstance) {
-		Logger.SPACE("Registering world teleporter for "+aWorldProvider.getName());
-		GalacticraftRegistry.registerTeleportType(aWorldProvider, aWorldProviderInstance);
-	}
-	
-	public boolean registerSolarSystem(SolarSystem aSystem) {
-		this.mSolarSystem = aSystem;
-		Logger.SPACE("Registering "+mSystemName);
-		return GalaxyRegistry.registerSolarSystem(aSystem);
-	}
-
-	public boolean registerPlanet(BaseGalacticDimension aDimension) {
-		return registerPlanet(aDimension.getPlanet().getPlanet(), aDimension.getWorldProviderClass(), aDimension.getWorldProvider());
-	}
-	public boolean registerPlanet(Planet aPlanet, Class<? extends WorldProviderSpace> aWorldProvider, ITeleportType aWorldProviderInstance) {
-		try {
-			Logger.SPACE("Registering "+aPlanet.getLocalizedName());
-			mPlanetMap.put(aPlanet);
-			GalaxyRegistry.registerPlanet(aPlanet);		
-			registryteleport(aWorldProvider, aWorldProviderInstance);
-			GalacticraftRegistry.registerRocketGui(aWorldProvider,	new ResourceLocation(CORE.MODID, "textures/space/RocketGui.png"));
-			return true;
-		}
-		catch(Throwable t) {
-			return false;
-		}
-	}
-	
-	public SolarSystem createSolarSystem(String aSystemName, String aParentGalaxyName, Vector3 aMapPosition) {
-		Logger.SPACE("Creating Solar System in GC using information from "+mSystemName);
-		SolarSystem aSolarSystem = (new SolarSystem(aSystemName, aParentGalaxyName)).setMapPosition(aMapPosition);
-		return aSolarSystem;
-	}
-	
-	public Star createStar(String aStarName, int aTierRequired) {
-		Logger.SPACE("Creating new Star named "+aStarName);
-		Star aStar = (Star) (new Star(aStarName)).setParentSolarSystem(getSystem()).setTierRequired(aTierRequired);
-		aStar.setBodyIcon(getGalacticTexture(aStarName));
-		return aStar;
-	}
-	
-	public PlanetGenerator createPlanet(String aPlanetName, int aTier, float[] aRingRGB, float aPhaseShift, float aRelativeDistanceFromCentMin, float aRelativeDistanceFromCentMax, float aRelativeOrbitTime, IPlanetBlockRegister aPlanetBlocks) {		
-		Logger.SPACE("Creating "+aPlanetName);
-		Planet aNewPlanet = (new Planet(aPlanetName)).setParentSolarSystem(getSystem());
-		aNewPlanet.setRingColorRGB(aRingRGB[0], aRingRGB[1], aRingRGB[2]);
-		aNewPlanet.setPhaseShift(aPhaseShift);
-		aNewPlanet.setBodyIcon(getGalacticTexture(aPlanetName));
-		aNewPlanet.setRelativeDistanceFromCenter(new ScalableDistance(aRelativeDistanceFromCentMin, aRelativeDistanceFromCentMax));
-		aNewPlanet.setRelativeOrbitTime(aRelativeOrbitTime);
-		if (aTier > 0)
-		aNewPlanet.setTierRequired(aTier);
-		PlanetGenerator aPlanet = new PlanetGenerator(aNewPlanet, aPlanetBlocks);
-		return aPlanet;
-	}
-	
-	public void setMainStarForSolarSystem(Star aStar) {
-		this.mStar = aStar;
-		getSystem().setMainStar(aStar);
-		Logger.SPACE("Setting "+aStar.getName()+" as main Star for "+getSystem().getName()+" within the "+getSystem().getLocalizedParentGalaxyName()+" Galaxy.");
-	}
-	
-	private ResourceLocation getGalacticTexture(String aName) {
-		String aText = getSystem().getUnlocalizedName();
-		aText = aText.replace("solarsystem.", "");
-		aName = aName.replace(aText+"-", "");
-		
-		ResourceLocation aVal = new ResourceLocation(CORE.MODID, "textures/space/"+aText.toLowerCase()+"/"+aName+".png");	
-		Logger.SPACE("Trying to obtain ResourceLocation for "+aVal.toString());		
-		return aVal;
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java
deleted file mode 100644
index aafa9ef9a1..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalactic.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.world.gen;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta;
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
-import net.minecraft.world.chunk.IChunkProvider;
-
-public abstract class ChunkProviderGalactic extends ChunkProviderGalaxyLakes {
-	
-	private List<MapGenBaseMeta> worldGenerators;
-	private BiomeGenBase[] biomesForGeneration = this.getBiomesForGeneration();
-	private final GalacticMapGenCavesBase caveGenerator = new GalacticMapGenCavesBase();
-
-	protected List<MapGenBaseMeta> getWorldGenerators() {
-		List<MapGenBaseMeta> generators = Lists.newArrayList();
-		return generators;
-	}		
-
-	public ChunkProviderGalactic(World par1World, long seed, boolean mapFeaturesEnabled) {
-		super(par1World, seed, mapFeaturesEnabled);
-	}
-
-	public abstract BiomeDecoratorSpace getBiomeGenerator();
-
-	protected BiomeGenBase[] getBiomesForGeneration() {
-		return new BiomeGenBase[] { GalacticBiomeGenBase.mGalaxy };
-	}
-
-	protected SpawnListEntry[] getCreatures() {
-		return new SpawnListEntry[0];
-	}
-
-	public double getHeightModifier() {
-		return 24.0D;
-	}
-
-	protected SpawnListEntry[] getMonsters() {
-
-		Class aSkele = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton");
-		Class aCreeper = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper");
-		Class aSpider = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider");
-		Class aEnderman = ReflectionUtils.getClass("galaxyspace.SolarSystem.planets.pluto.entities.EntityEvolvedEnderman");
-
-		SpawnListEntry skele;
-		SpawnListEntry creeper;
-		SpawnListEntry spider;
-		SpawnListEntry enderman;
-		
-		AutoMap<SpawnListEntry> aMobs = new AutoMap<SpawnListEntry>();
-		
-		if (aSkele != null) {
-			skele = new SpawnListEntry(aSkele, 100, 4, 4);
-			aMobs.put(skele);
-		}
-		if (aCreeper != null) {
-			creeper = new SpawnListEntry(aCreeper, 100, 4, 4);
-			aMobs.put(creeper);
-		}
-		if (aSpider != null) {
-			spider = new SpawnListEntry(aSpider, 100, 4, 4);
-			aMobs.put(spider);
-		}
-		if (aEnderman != null) {
-			enderman = new SpawnListEntry(aEnderman, 100, 4, 4);
-			aMobs.put(enderman);
-		}
-
-		return aMobs.toArray();
-	}
-
-	public void onPopulate(IChunkProvider arg0, int arg1, int arg2) {
-	}
-
-	public boolean chunkExists(int x, int y) {
-		return false;
-	}
-
-	protected SpawnListEntry[] getWaterCreatures() {
-		return new SpawnListEntry[0];
-	}
-
-	public BlockMetaPair getGrassBlock() {
-		return new BlockMetaPair(null, (byte) 0);
-	}
-
-	public BlockMetaPair getDirtBlock() {
-		return new BlockMetaPair(null, (byte) 0);
-	}
-
-	public BlockMetaPair getStoneBlock() {
-		return new BlockMetaPair(null, (byte) 0);
-	}
-
-	protected boolean enableBiomeGenBaseBlock() {
-		return false;
-	}
-
-	public void onChunkProvider(int cX, int cZ, Block[] blocks, byte[] metadata) {
-	}
-
-	public int getWaterLevel() {
-		return 110;
-	}
-
-	public boolean canGenerateWaterBlock() {
-		return true;
-	}
-
-	protected BlockMetaPair getWaterBlock() {
-		return new BlockMetaPair(null, (byte) 0);
-	}
-
-	public boolean canGenerateIceBlock() {
-		return false;
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalaxyLakes.java b/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalaxyLakes.java
deleted file mode 100644
index a3d696d7c5..0000000000
--- a/src/Java/gtPlusPlus/xmod/galacticraft/system/core/world/gen/ChunkProviderGalaxyLakes.java
+++ /dev/null
@@ -1,529 +0,0 @@
-package gtPlusPlus.xmod.galacticraft.system.core.world.gen;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
-import gtPlusPlus.api.objects.random.XSTR;
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta;
-import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFalling;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IProgressUpdate;
-import net.minecraft.util.Ma