Updated default XML files list

Renamed conf to config

src/main/java/cr0s/warpdrive/CommonProxy.java

@@ -1,7 +1,7 @@
 package cr0s.warpdrive;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.render.EntityCamera;
 import cr0s.warpdrive.world.EntitySphereGen;
 import cr0s.warpdrive.world.EntityStarCore;

src/main/java/cr0s/warpdrive/EntityJump.java

@@ -27,7 +27,7 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import net.minecraftforge.common.ForgeChunkManager.Type;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.block.movement.TileEntityShipCore;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.JumpBlock;
 import cr0s.warpdrive.data.MovingEntity;
 import cr0s.warpdrive.data.Planet;

src/main/java/cr0s/warpdrive/GravityManager.java

@@ -1,6 +1,6 @@
 package cr0s.warpdrive;
 
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;

src/main/java/cr0s/warpdrive/SpaceEventHandler.java

@@ -18,7 +18,7 @@ import net.minecraftforge.event.entity.living.LivingFallEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cr0s.warpdrive.api.IBreathingHelmet;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.world.SpaceTeleporter;
 
 /**

src/main/java/cr0s/warpdrive/WarpDrive.java

@@ -95,7 +95,7 @@ import cr0s.warpdrive.command.CommandGenerate;
 import cr0s.warpdrive.command.CommandInvisible;
 import cr0s.warpdrive.command.CommandJumpgates;
 import cr0s.warpdrive.command.CommandSpace;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.CamerasRegistry;
 import cr0s.warpdrive.data.CloakManager;
 import cr0s.warpdrive.data.JumpgatesRegistry;

src/main/java/cr0s/warpdrive/block/BlockAirGenerator.java

@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IAirCanister;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class BlockAirGenerator extends BlockContainer
 {

src/main/java/cr0s/warpdrive/block/TileEntityAbstractChunkLoading.java

@@ -10,7 +10,7 @@ import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import com.google.common.collect.ImmutableSet;
 
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public abstract class TileEntityAbstractChunkLoading extends TileEntityAbstractEnergy
 {

src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java

@@ -16,7 +16,7 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.api.IBlockUpdateDetector;
 import cr0s.warpdrive.data.EnumUpgradeTypes;
 

src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java

@@ -18,7 +18,7 @@ import li.cil.oc.api.network.Visibility;
 import net.minecraft.nbt.NBTTagCompound;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;

src/main/java/cr0s/warpdrive/block/TileEntityAirGenerator.java

@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class TileEntityAirGenerator extends TileEntityAbstractEnergy {
 	private int cooldownTicks = 0;

src/main/java/cr0s/warpdrive/block/TileEntityChunkLoader.java

@@ -7,7 +7,7 @@ import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.chunk.Chunk;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IUpgradable;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.EnumUpgradeTypes;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;

src/main/java/cr0s/warpdrive/block/TileEntityLaser.java

@@ -21,7 +21,7 @@ import net.minecraft.world.ChunkPosition;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;

src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java

@@ -3,7 +3,7 @@ package cr0s.warpdrive.block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class TileEntityLaserMedium extends TileEntityAbstractEnergy {
 	private int ticks = 0;

src/main/java/cr0s/warpdrive/block/building/TileEntityShipScanner.java

@@ -23,7 +23,7 @@ import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
 import cr0s.warpdrive.block.movement.TileEntityShipCore;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.JumpBlock;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.network.PacketHandler;

src/main/java/cr0s/warpdrive/block/collection/TileEntityAbstractMiner.java

@@ -15,7 +15,7 @@ import net.minecraftforge.fluids.IFluidBlock;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractLaser;
 import cr0s.warpdrive.block.TileEntityLaserMedium;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.data.VectorI;
 import cr0s.warpdrive.network.PacketHandler;

src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java

@@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.VectorI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;

src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java

@@ -21,7 +21,7 @@ import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractInterfaced;
 import cr0s.warpdrive.block.TileEntityLaserMedium;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.data.VectorI;
 import cr0s.warpdrive.network.PacketHandler;

src/main/java/cr0s/warpdrive/block/detection/TileEntityCamera.java

@@ -9,7 +9,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractInterfaced;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;

src/main/java/cr0s/warpdrive/block/detection/TileEntityCloakingCore.java

@@ -13,7 +13,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.CloakedArea;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.network.PacketHandler;

src/main/java/cr0s/warpdrive/block/detection/TileEntityMonitor.java

@@ -8,7 +8,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractInterfaced;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;

src/main/java/cr0s/warpdrive/block/detection/TileEntityRadar.java

@@ -12,7 +12,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.StarMapEntry;
 import cr0s.warpdrive.data.VectorI;
 import dan200.computercraft.api.lua.ILuaContext;

src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorCore.java

@@ -10,7 +10,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IBlockUpdateDetector;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 

src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java

@@ -8,7 +8,7 @@ import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IBlockUpdateDetector;
 import cr0s.warpdrive.block.TileEntityAbstractLaser;
 import cr0s.warpdrive.block.TileEntityLaserMedium;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;

src/main/java/cr0s/warpdrive/block/energy/TileEntityEnergyBank.java

@@ -2,7 +2,7 @@ package cr0s.warpdrive.block.energy;
 
 import net.minecraftforge.common.util.ForgeDirection;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 

src/main/java/cr0s/warpdrive/block/energy/TileEntityIC2reactorLaserMonitor.java

@@ -13,7 +13,7 @@ import net.minecraft.util.ChunkCoordinates;
 import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.block.TileEntityAbstractLaser;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.item.ItemIC2reactorLaserFocus;
 import cr0s.warpdrive.network.PacketHandler;

src/main/java/cr0s/warpdrive/block/movement/TileEntityLift.java

@@ -14,7 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.network.PacketHandler;
 import dan200.computercraft.api.lua.ILuaContext;

src/main/java/cr0s/warpdrive/block/movement/TileEntityShipController.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.common.Optional;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractInterfaced;
 import cr0s.warpdrive.block.movement.TileEntityShipCore.ShipCoreMode;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 

src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java

@@ -25,7 +25,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.EntityJump;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Jumpgate;
 import cr0s.warpdrive.data.StarMapEntry;
 import cr0s.warpdrive.world.SpaceTeleporter;

src/main/java/cr0s/warpdrive/block/movement/TileEntityTransporter.java

@@ -16,7 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IUpgradable;
 import cr0s.warpdrive.block.TileEntityAbstractEnergy;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.EnumUpgradeTypes;
 import cr0s.warpdrive.data.Vector3;
 import dan200.computercraft.api.lua.ILuaContext;

src/main/java/cr0s/warpdrive/block/passive/BlockAir.java

@@ -12,7 +12,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class BlockAir extends Block
 {

src/main/java/cr0s/warpdrive/block/passive/BlockGas.java

@@ -11,7 +11,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class BlockGas extends Block {
 	private IIcon[] iconBuffer;

src/main/java/cr0s/warpdrive/command/CommandDebug.java

@@ -9,7 +9,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 /*
  *   /wdebug <dimension> <coordinates> <blockId> <Metadata> <actions>

src/main/java/cr0s/warpdrive/command/CommandGenerate.java

@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.MathHelper;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.world.JumpgateGenerator;
 import cr0s.warpdrive.world.WorldGenSmallShip;
 import cr0s.warpdrive.world.WorldGenStation;

src/main/java/cr0s/warpdrive/command/CommandSpace.java

@@ -10,7 +10,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.WorldServer;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.world.SpaceTeleporter;
 
 public class CommandSpace extends CommandBase {

src/main/java/cr0s/warpdrive/config/InvalidXmlException.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf;
+package cr0s.warpdrive.config;
 
 public class InvalidXmlException extends Exception {
 

src/main/java/cr0s/warpdrive/config/MetaBlock.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf;
+package cr0s.warpdrive.config;
 
 import java.util.HashMap;
 

src/main/java/cr0s/warpdrive/config/ModRequirementChecker.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf;
+package cr0s.warpdrive.config;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf;
+package cr0s.warpdrive.config;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -25,14 +25,19 @@ import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.filler.FillerManager;
-import cr0s.warpdrive.conf.structures.StructureManager;
+import cr0s.warpdrive.config.filler.FillerManager;
+import cr0s.warpdrive.config.structures.StructureManager;
 import cr0s.warpdrive.data.Planet;
 
 public class WarpDriveConfig {
 	private static File configDirectory;
 	private static DocumentBuilder xmlDocumentBuilder;
-	private static final String[] defaultXMLfilenames = { "structures-default.xml" };
+	private static final String[] defaultXMLfilenames = {
+			// fillers
+			"filler-default.xml", "filler-ae2.xml", "filler-ic2.xml", "filler-netherores.xml",
+			// structures
+			"structures-default.xml", "structures-netherores.xml",
+	};
 	
 	/*
 	 * The variables which store whether or not individual mods are loaded

src/main/java/cr0s/warpdrive/config/XmlRepresentable.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf;
+package cr0s.warpdrive.config;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

src/main/java/cr0s/warpdrive/config/filler/FillerFactory.java

@@ -1,11 +1,11 @@
-package cr0s.warpdrive.conf.filler;
+package cr0s.warpdrive.config.filler;
 
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import net.minecraft.block.Block;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.MetaBlock;
+import cr0s.warpdrive.config.MetaBlock;
 
 /**
  * Used for constructing FillerSets from a combination of Weights and Ratios

src/main/java/cr0s/warpdrive/config/filler/FillerManager.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.filler;
+package cr0s.warpdrive.config.filler;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -14,9 +14,9 @@ import org.xml.sax.SAXException;
 
 import scala.actors.threadpool.Arrays;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.InvalidXmlException;
-import cr0s.warpdrive.conf.ModRequirementChecker;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.InvalidXmlException;
+import cr0s.warpdrive.config.ModRequirementChecker;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class FillerManager {
 

src/main/java/cr0s/warpdrive/config/filler/FillerSet.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.filler;
+package cr0s.warpdrive.config.filler;
 
 import java.util.Random;
 
@@ -9,9 +9,9 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.InvalidXmlException;
-import cr0s.warpdrive.conf.MetaBlock;
-import cr0s.warpdrive.conf.XmlRepresentable;
+import cr0s.warpdrive.config.InvalidXmlException;
+import cr0s.warpdrive.config.MetaBlock;
+import cr0s.warpdrive.config.XmlRepresentable;
 
 /**
  * Represents a set of fillers. Before using after construction, finishContruction() must be called.

src/main/java/cr0s/warpdrive/config/structures/DeployableStructure.java

@@ -1,7 +1,7 @@
 /**
  *
  */
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 import java.util.Random;
 

src/main/java/cr0s/warpdrive/config/structures/Orb.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -10,10 +10,10 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.InvalidXmlException;
-import cr0s.warpdrive.conf.XmlRepresentable;
-import cr0s.warpdrive.conf.filler.FillerManager;
-import cr0s.warpdrive.conf.filler.FillerSet;
+import cr0s.warpdrive.config.InvalidXmlException;
+import cr0s.warpdrive.config.XmlRepresentable;
+import cr0s.warpdrive.config.filler.FillerManager;
+import cr0s.warpdrive.config.filler.FillerSet;
 import cr0s.warpdrive.world.EntitySphereGen;
 
 public abstract class Orb extends DeployableStructure implements XmlRepresentable {

src/main/java/cr0s/warpdrive/config/structures/Planetoid.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 public class Planetoid extends Orb {
 	

src/main/java/cr0s/warpdrive/config/structures/SchematicStructure.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 import java.util.Random;
 

src/main/java/cr0s/warpdrive/config/structures/Star.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 import java.util.Random;
 

src/main/java/cr0s/warpdrive/config/structures/StructureManager.java

@@ -1,4 +1,4 @@
-package cr0s.warpdrive.conf.structures;
+package cr0s.warpdrive.config.structures;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -12,9 +12,9 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.InvalidXmlException;
-import cr0s.warpdrive.conf.ModRequirementChecker;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.InvalidXmlException;
+import cr0s.warpdrive.config.ModRequirementChecker;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 
 public class StructureManager {

src/main/java/cr0s/warpdrive/data/CamerasRegistry.java

@@ -7,7 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class CamerasRegistry {
 	private LinkedList<CameraRegistryItem> registry;

src/main/java/cr0s/warpdrive/data/CloakedArea.java

@@ -13,7 +13,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.network.PacketHandler;
 
 public class CloakedArea {

src/main/java/cr0s/warpdrive/data/JumpBlock.java

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class JumpBlock {
 	public Block block;

src/main/java/cr0s/warpdrive/data/StarMapEntry.java

@@ -7,7 +7,7 @@ import net.minecraft.world.WorldServer;
 import net.minecraft.world.gen.ChunkProviderServer;
 import net.minecraftforge.common.DimensionManager;
 import cr0s.warpdrive.block.movement.TileEntityShipCore;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class StarMapEntry {
 	public StarMapEntryType type = StarMapEntryType.UNDEFINED;

src/main/java/cr0s/warpdrive/data/StarMapRegistry.java

@@ -14,7 +14,7 @@ import cr0s.warpdrive.LocalProfiler;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.movement.TileEntityShipCore;
 import cr0s.warpdrive.block.movement.TileEntityShipCore.ShipCoreMode;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.StarMapEntry.StarMapEntryType;
 
 /**

src/main/java/cr0s/warpdrive/item/ItemHelmet.java

@@ -10,7 +10,7 @@ import net.minecraft.util.IIcon;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.api.IAirCanister;
 import cr0s.warpdrive.api.IBreathingHelmet;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class ItemHelmet extends ItemArmor implements IBreathingHelmet {
 	// private static Random ran = new Random();

src/main/java/cr0s/warpdrive/network/MessageBeamEffect.java

@@ -10,7 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.render.EntityFXBeam;
 

src/main/java/cr0s/warpdrive/network/MessageCloak.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 import cr0s.warpdrive.render.EntityFXBeam;
 

src/main/java/cr0s/warpdrive/network/MessageFrequency.java

@@ -13,7 +13,7 @@ import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityLaser;
 import cr0s.warpdrive.block.detection.TileEntityCamera;
 import cr0s.warpdrive.block.detection.TileEntityMonitor;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 
 

src/main/java/cr0s/warpdrive/network/MessageTargeting.java

@@ -8,7 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.block.TileEntityLaser;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 
 

src/main/java/cr0s/warpdrive/network/PacketHandler.java

@@ -21,7 +21,7 @@ import cr0s.warpdrive.network.MessageFrequency;
 import cr0s.warpdrive.network.MessageBeamEffect;
 import cr0s.warpdrive.network.MessageTargeting;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.data.Vector3;
 
 public class PacketHandler {

src/main/java/cr0s/warpdrive/render/ClientCameraHandler.java

@@ -10,7 +10,7 @@ import org.lwjgl.input.Keyboard;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class ClientCameraHandler {
 	public static boolean isOverlayEnabled = false;

src/main/java/cr0s/warpdrive/render/RenderOverlayCamera.java

@@ -9,7 +9,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class RenderOverlayCamera {
 	private Minecraft mc;

src/main/java/cr0s/warpdrive/world/EntitySphereGen.java

@@ -8,9 +8,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.MetaBlock;
-import cr0s.warpdrive.conf.structures.Orb;
-import cr0s.warpdrive.conf.structures.Orb.OrbShell;
+import cr0s.warpdrive.config.MetaBlock;
+import cr0s.warpdrive.config.structures.Orb;
+import cr0s.warpdrive.config.structures.Orb.OrbShell;
 import cr0s.warpdrive.data.JumpBlock;
 
 /*

src/main/java/cr0s/warpdrive/world/HyperSpaceProvider.java

@@ -13,7 +13,7 @@ import net.minecraft.world.chunk.IChunkProvider;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 import cr0s.warpdrive.render.RenderBlank;
 
 public class HyperSpaceProvider extends WorldProvider {

src/main/java/cr0s/warpdrive/world/HyperSpaceWorldGenerator.java

@@ -5,7 +5,7 @@ import java.util.Random;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import cpw.mods.fml.common.IWorldGenerator;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 /**
  * @author Cr0s

src/main/java/cr0s/warpdrive/world/SpaceWorldGenerator.java

@@ -9,12 +9,12 @@ import net.minecraft.world.chunk.IChunkProvider;
 import cpw.mods.fml.common.IWorldGenerator;
 import cr0s.warpdrive.LocalProfiler;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.MetaBlock;
-import cr0s.warpdrive.conf.WarpDriveConfig;
-import cr0s.warpdrive.conf.structures.DeployableStructure;
-import cr0s.warpdrive.conf.structures.Orb;
-import cr0s.warpdrive.conf.structures.StructureManager;
-import cr0s.warpdrive.conf.structures.Orb.OrbShell;
+import cr0s.warpdrive.config.MetaBlock;
+import cr0s.warpdrive.config.WarpDriveConfig;
+import cr0s.warpdrive.config.structures.DeployableStructure;
+import cr0s.warpdrive.config.structures.Orb;
+import cr0s.warpdrive.config.structures.StructureManager;
+import cr0s.warpdrive.config.structures.Orb.OrbShell;
 
 /**
  * @author Cr0s

src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java

@@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import cr0s.warpdrive.WarpDrive;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class WorldGenSmallShip extends WorldGenerator {
 	private boolean corrupted;

src/main/java/cr0s/warpdrive/world/WorldGenStructure.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
-import cr0s.warpdrive.conf.WarpDriveConfig;
+import cr0s.warpdrive.config.WarpDriveConfig;
 
 public class WorldGenStructure {
 	public static Block getStoneBlock(boolean corrupted, Random rand) {