Merge pull request #65 from GTNewHorizons/unified-build-script2

Move sources and resources

38 files changed, 0 insertions, 10690 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
deleted file mode 100644
index a5981b15d9..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-import cpw.mods.fml.common.FMLLog;
-import gtPlusPlus.preloader.Preloader_Logger;
-
-import java.io.File;
-import java.util.ArrayList;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
-import org.apache.logging.log4j.Level;
-
-public class AsmConfig {
-	
-	public static boolean loaded;
-	public static Configuration config;
-
-	public static boolean enableOreDictPatch;
-	public static boolean enableTiConFluidLighting;
-	public static boolean enableGtTooltipFix;
-	public static boolean enableGtNbtFix;
-	public static boolean enableGtCharcoalPitFix;
-	public static boolean enableChunkDebugging;
-	public static boolean enableCofhPatch;
-	public static boolean enableGcFuelChanges;
-	public static boolean enableRcFlowFix;
-	public static int maxRailcraftTankProcessVolume;
-	public static int maxRailcraftFluidLoaderFlow;
-	public static int maxRailcraftFluidUnloaderFlow;
-	public static boolean enableRcItemDupeFix;
-	public static boolean enableTcAspectSafety;
-	public static boolean enabledLwjglKeybindingFix;
-	public static boolean enabledFixEntitySetHealth;
-	public static boolean enableThaumicTinkererRepairFix;
-
-	public static boolean disableAllLogging;
-	public static boolean debugMode;
-
-	public AsmConfig(File file) {
-		if (!loaded) {
-			config = new Configuration(file);
-			syncConfig(true);
-		}
-
-	}
-
-	public static void syncConfig(boolean load) {
-		ArrayList<String> propOrder = new ArrayList<String>();
-		ArrayList<String> propOrderDebug = new ArrayList<String>();
-
-		try {
-			if (!config.isChild && load) {
-				config.load();
-			}
-
-			Property prop;	
-			
-			//Debug			
-			prop = config.get("debug", "disableAllLogging", false);
-			prop.comment = "Disables ALL logging from GT++.";
-			prop.setLanguageKey("gtpp.disableAllLogging").setRequiresMcRestart(false);
-			disableAllLogging = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "debugMode", false);
-			prop.comment = "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)";
-			prop.setLanguageKey("gtpp.debugMode").setRequiresMcRestart(false);
-			debugMode = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "enabledFixEntitySetHealth", false);
-			prop.comment = "Enable/Disable entity setHealth() fix.";
-			prop.setLanguageKey("gtpp.enabledFixEntitySetHealth").setRequiresMcRestart(true);
-			enabledFixEntitySetHealth = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "enableChunkDebugging", false);
-			prop.comment = "Enable/Disable Chunk Debugging Features, Must Be enabled on Client and Server.";
-			prop.setLanguageKey("gtpp.enableChunkDebugging").setRequiresMcRestart(true);
-			enableChunkDebugging = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "enableGtNbtFix", true);
-			prop.comment = "Enable/Disable GT NBT Persistency Fix";
-			prop.setLanguageKey("gtpp.enableGtNbtFix").setRequiresMcRestart(true);
-			enableGtNbtFix = prop.getBoolean(true);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "enableCofhPatch", false);
-			prop.comment = "Enable/Disable COFH OreDictionaryArbiter Patch (Useful for Development)";
-			prop.setLanguageKey("gtpp.enableCofhPatch").setRequiresMcRestart(true);
-			enableCofhPatch = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());
-			
-			prop = config.get("debug", "enableOreDictPatch", false);
-			prop.comment = "Enable/Disable Forge OreDictionary Patch (Useful for Development)";
-			prop.setLanguageKey("gtpp.enableOreDictPatch").setRequiresMcRestart(true);
-			enableOreDictPatch = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());	
-			
-			prop = config.get("debug", "enableThaumicTinkererRepairFix", false);
-			prop.comment = "Enable/Disable Patch for Thaumic Repairer";
-			prop.setLanguageKey("gtpp.enableThaumicTinkererRepairFix").setRequiresMcRestart(true);
-			enableThaumicTinkererRepairFix = prop.getBoolean(false);
-			propOrderDebug.add(prop.getName());	
-			
-			
-			
-			
-			
-
-			//General Features
-			prop = config.get("general", "enableTiConFluidLighting", true);
-			prop.comment = "Enable/Disable Brightness Visuals for Tinkers Fluids, only required on the Client.";
-			prop.setLanguageKey("gtpp.enableTiConFluidLighting").setRequiresMcRestart(true);
-			enableTiConFluidLighting = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-
-			prop = config.get("general", "enabledLwjglKeybindingFix", true);
-			prop.comment = "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544";
-			prop.setLanguageKey("gtpp.enabledLwjglKeybindingFix").setRequiresMcRestart(true);
-			enabledLwjglKeybindingFix = prop.getBoolean(true);
-			propOrder.add(prop.getName());			
-			
-			prop = config.get("general", "enableGtTooltipFix", true);
-			prop.comment = "Enable/Disable Custom GT Tooltips";
-			prop.setLanguageKey("gtpp.enableGtTooltipFix").setRequiresMcRestart(true);
-			enableGtTooltipFix = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-			
-				
-			
-			prop = config.get("general", "enableGtCharcoalPitFix", true);
-			prop.comment = "Makes the Charcoal Pile Igniter work better.";
-			prop.setLanguageKey("gtpp.enableGtCharcoalPitFix").setRequiresMcRestart(true);
-			enableGtCharcoalPitFix = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-			
-			prop = config.get("general", "enableGcFuelChanges", true);
-			prop.comment = "Enable/Disable changes to Galacticraft Rocket Fuels.";
-			prop.setLanguageKey("gtpp.enableGcFuelChanges").setRequiresMcRestart(true);			
-			//Disabled because Broken
-			//enableGcFuelChanges = prop.getBoolean(true);			
-			enableGcFuelChanges = false;			
-			propOrder.add(prop.getName());
-			
-			
-			//Railcraft Tank fix
-			prop = config.get("general", "enableRcFlowFix", true);
-			prop.comment = "Allows Custom max IO rates on RC tanks";
-			prop.setLanguageKey("gtpp.enableRcFlowFix").setRequiresMcRestart(true);
-			enableRcFlowFix = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-			
-			prop = config.get("general", "maxRailcraftTankProcessVolume", 4000);
-			prop.comment = "Max IO for RC fluid tanks (Not Carts). 'enableRcFlowFix' Must be enabled.";
-			prop.setLanguageKey("gtpp.maxRailcraftTankProcessVolume").setRequiresMcRestart(true);
-			maxRailcraftTankProcessVolume = prop.getInt(4000);
-			propOrder.add(prop.getName());
-			
-			// Railcraft Loader Max flowrate
-			prop = config.get("general", "maxRailcraftFluidLoaderFlow", 20);
-			prop.comment = "Max Output rate for RC Fluid Loaders";
-			prop.setLanguageKey("gtpp.maxRailcraftFluidLoaderFlow").setRequiresMcRestart(true);
-			maxRailcraftFluidLoaderFlow = prop.getInt(20);
-			propOrder.add(prop.getName());
-			
-			// Railcraft Unloader Max flowrate
-			prop = config.get("general", "maxRailcraftFluidUnloaderFlow", 80);
-			prop.comment = "Max Output rate for RC Fluid Unloaders";
-			prop.setLanguageKey("gtpp.maxRailcraftFluidUnloaderFlow").setRequiresMcRestart(true);
-			maxRailcraftFluidUnloaderFlow = prop.getInt(80);
-			propOrder.add(prop.getName());
-			
-			//Railcraft Dupe Fix			
-			prop = config.get("general", "enableRcItemDupeFix", true);
-			prop.comment = "Fixes possible negative itemstacks";
-			prop.setLanguageKey("gtpp.enableRcItemDupeFix").setRequiresMcRestart(true);
-			enableRcItemDupeFix = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-			
-			
-			//TC Aspect Safety			
-			prop = config.get("general", "enableTcAspectSafety", true);
-			prop.comment = "Fixes small oversights in Thaumcraft 4.";
-			prop.setLanguageKey("gtpp.enableTcAspectSafety").setRequiresMcRestart(true);
-			enableTcAspectSafety = prop.getBoolean(true);
-			propOrder.add(prop.getName());
-			
-
-			config.setCategoryPropertyOrder("general", propOrder);
-			config.setCategoryPropertyOrder("debug", propOrderDebug);
-			if (config.hasChanged()) {
-				config.save();
-			}
-
-			Preloader_Logger.INFO("Chunk Debugging - Enabled: "+enableChunkDebugging);
-			Preloader_Logger.INFO("Gt Nbt Fix - Enabled: "+enableGtNbtFix);
-			Preloader_Logger.INFO("TiCon Fluid Lighting - Enabled: "+enableTiConFluidLighting);
-			Preloader_Logger.INFO("Gt Tooltip Fix - Enabled: "+enableGtTooltipFix);
-			Preloader_Logger.INFO("COFH Patch - Enabled: "+enableCofhPatch);
-			Preloader_Logger.INFO("Gc Fuel Changes Patch - Enabled: "+enableGcFuelChanges);
-			Preloader_Logger.INFO("Railcraft Fluid Flow Patch - Enabled: "+enableRcFlowFix);
-			Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: "+enableTcAspectSafety);
-			Preloader_Logger.INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: "+enabledFixEntitySetHealth);
-			
-		} catch (Exception var3) {
-			FMLLog.log(Level.ERROR, var3, "GT++ ASM had a problem loading it's config", new Object[0]);
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java b/src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java
deleted file mode 100644
index 1dcbff439f..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-public class ClassesToTransform {
-
-
-	public static final String LWJGL_KEYBOARD = "org.lwjgl.input.Keyboard";
-
-
-	public static final String MINECRAFT_GAMESETTINGS = "net.minecraft.client.settings.GameSettings";
-	public static final String MINECRAFT_GAMESETTINGS_OBF = "bbj";
-
-
-	public static final String FORGE_CHUNK_MANAGER = "net.minecraftforge.common.ForgeChunkManager";
-	public static final String FORGE_ORE_DICTIONARY = "net.minecraftforge.oredict.OreDictionary";
-
-
-	public static final String COFH_ORE_DICTIONARY_ARBITER = "cofh.core.util.oredict.OreDictionaryArbiter";
-
-
-	public static final String TINKERS_FLUID_BLOCK = "tconstruct.smeltery.blocks.TConstructFluid";
-
-
-	public static final String RAILCRAFT_FLUID_HELPER = "mods.railcraft.common.fluids.FluidHelper";
-	public static final String RAILCRAFT_TILE_FLUID_LOADER = "mods.railcraft.common.blocks.machine.gamma.TileFluidLoader";
-	public static final String RAILCRAFT_INVENTORY_TOOLS = "mods.railcraft.common.util.inventory.InvTools";
-
-
-	public static final String GALACTICRAFT_FLUID_UTILS = "micdoodle8.mods.galacticraft.core.util.FluidUtil";
-	public static final String GALACTICRAFT_TILE_ENTITY_FUEL_LOADER = "micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader";
-	public static final String GALACTICRAFT_ENTITY_AUTO_ROCKET = "micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket";
-
-
-	public static final String GT_UTILITY = "gregtech.api.util.GT_Utility";
-	public static final String GT_ACHIEVEMENTS = "gregtech.loaders.misc.GT_Achievements";
-	public static final String GT_CLIENT_PROXY = "gregtech.common.GT_Client";
-	public static final String GT_PACKET_TILE_ENTITY = "gregtech.api.net.GT_Packet_TileEntity";
-	public static final String GT_BASE_META_TILE_ENTITY = "gregtech.api.metatileentity.BaseMetaTileEntity";
-	public static final String GT_MTE_CHARCOAL_PIT = "gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit";
-	public static final String GT_ITEM_MACHINES = "gregtech.common.blocks.GT_Item_Machines";
-	public static final String GT_METAGENERATED_TOOL = "gregtech.api.items.GT_MetaGenerated_Tool";
-	public static final String GT_BLOCK_MACHINES = "gregtech.common.blocks.GT_Block_Machines";
-	public static final String GT_MTE_HATCH_ENERGY = "gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy";
-	public static final String GT_METAPIPE_ITEM = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item";
-	public static final String GT_METAPIPE_FLUID = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid";
-	public static final String GT_METAPIPE_FRAME = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame";
-
-
-	public static final String GTPP_MTE_HATCH_RTG = "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG";
-
-
-	public static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence";
-	public static final String THAUMCRAFT_CRAFTING_MANAGER = "thaumcraft.common.lib.crafting.ThaumcraftCraftingManager";
-	public static final String THAUMCRAFT_TILE_ALCHEMY_FURNACE = "thaumcraft.common.tiles.TileAlchemyFurnace";
-	public static final String THAUMICTINKERER_TILE_REPAIRER = "thaumic.tinkerer.common.block.tile.TileRepairer";
-
-	public static final String IC2_ITEM_ARMOUR_HAZMAT = "ic2.core.item.armor.ItemArmorHazmat";
-	public static final String IC2_BLOCK_BASE_TILE_ENTITY = "ic2.core.block.BlockTileEntity";
-	public static final String IC2_BLOCK_MACHINE1 = "ic2.core.block.machine.BlockMachine";
-	public static final String IC2_BLOCK_MACHINE2 = "ic2.core.block.machine.BlockMachine2";
-	public static final String IC2_BLOCK_MACHINE3 = "ic2.core.block.machine.BlockMachine3";
-	public static final String IC2_BLOCK_KINETIC_GENERATOR = "ic2.core.block.kineticgenerator.block.BlockKineticGenerator";
-	public static final String IC2_BLOCK_HEAT_GENERATOR = "ic2.core.block.heatgenerator.block.BlockHeatGenerator";
-	public static final String IC2_BLOCK_GENERATOR = "ic2.core.block.generator.block.BlockGenerator";
-	public static final String IC2_BLOCK_REACTOR_ACCESS_HATCH = "ic2.core.block.reactor.block.BlockReactorAccessHatch";
-	public static final String IC2_BLOCK_REACTOR_CHAMBER = "ic2.core.block.reactor.block.BlockReactorChamber";
-	public static final String IC2_BLOCK_REACTOR_FLUID_PORT = "ic2.core.block.reactor.block.BlockReactorFluidPort";
-	public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT = "ic2.core.block.reactor.block.BlockReactorRedstonePort";
-	public static final String IC2_BLOCK_REACTOR_VESSEL = "ic2.core.block.reactor.block.BlockReactorVessel";
-	public static final String IC2_BLOCK_PERSONAL = "ic2.core.block.personal.BlockPersonal.class";
-	public static final String IC2_BLOCK_CHARGEPAD = "ic2.core.block.wiring.BlockChargepad.class";
-	public static final String IC2_BLOCK_ELECTRIC = "ic2.core.block.wiring.BlockElectric.class";
-	public static final String IC2_BLOCK_LUMINATOR = "ic2.core.block.wiring.BlockLuminator.class";
-
-}
diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
deleted file mode 100644
index 2a0082754a..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-import java.io.File;
-import java.util.Arrays;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-import cpw.mods.fml.common.DummyModContainer;
-import cpw.mods.fml.common.LoadController;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.event.FMLConstructionEvent;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
-import net.minecraftforge.common.config.Configuration;
-
-public class Preloader_DummyContainer extends DummyModContainer {
-
-	public Preloader_DummyContainer() {
-		super(new ModMetadata());
-		ModMetadata meta = getMetadata();
-		meta.modId = CORE_Preloader.MODID;
-		meta.name = CORE_Preloader.NAME;
-		meta.version = CORE_Preloader.VERSION;
-		meta.credits = "Roll Credits ...";
-		meta.authorList = Arrays.asList("Alkalus");
-		meta.description = "";
-		meta.url = "";
-		meta.updateUrl = "";
-		meta.screenshots = new String[0];
-		meta.logoFile = "";
-		//meta.dependencies = (List<ArtifactVersion>) CORE_Preloader.DEPENDENCIES;
-		Preloader_Logger.INFO("Initializing DummyModContainer");
-
-	}
-	
-	@Override
-	public boolean registerBus(EventBus bus, LoadController controller) {
-		bus.register(this);
-		return true;
-	}
-
-	@Subscribe
-	public void modConstruction(FMLConstructionEvent evt){
-		Preloader_Logger.INFO("Constructing DummyModContainer");
-
-	}
-	
-	@Subscribe
-	public void preInit(FMLPreInitializationEvent event) {
-		Preloader_Logger.INFO("Loading " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION);
-		// Handle GT++ Config
-		handleConfigFile(event);
-	}
-
-	@Subscribe
-	public void init(FMLInitializationEvent evt) {
-		Preloader_Logger.INFO("Begin resource allocation for " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION);
-
-	}
-
-	@Subscribe
-	public void postInit(FMLPostInitializationEvent evt) {
-		Preloader_Logger.INFO("Finished loading.");
-	}
-	
-	public static void handleConfigFile(final FMLPreInitializationEvent event) {
-		final Configuration config = new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
-		config.load();
-
-		//BGM Watchdog
-		CORE_Preloader.enableWatchdogBGM = config.getInt("enableWatchdogBGM", "features", 0, 0, Short.MAX_VALUE, "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
-		
-		// Circuits
-		CORE_Preloader.enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", false, "Restores circuits and their recipes from Pre-5.09.28 times.");
-	}
-	
-	public static boolean getConfig(){
-		final Configuration config = new Configuration(	new File(gtPlusPlus.preloader.CORE_Preloader.MC_DIR, "config/GTplusplus/GTplusplus.cfg"));
-		if (config != null){		
-			config.load();
-			// Circuits
-			CORE_Preloader.enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", false, "Restores circuits and their recipes from Pre-5.09.28 times.");
-			CORE_Preloader.enableWatchdogBGM = config.getInt("enableWatchdogBGM", "features", 0, 0, Short.MAX_VALUE, "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
-						
-			Preloader_Logger.INFO("Loaded the configuration file.");
-			return true;
-		}
-		Preloader_Logger.INFO("Failed loading the configuration file.");
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
deleted file mode 100644
index 22568e6de7..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-import java.io.File;
-import java.text.NumberFormat;
-import java.util.Locale;
-import java.util.Map;
-
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
-import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
-import net.minecraft.launchwrapper.Launch;
-
-@SortingIndex(10097) 
-@MCVersion(value = "1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions("gtPlusPlus.preloader")
-@IFMLLoadingPlugin.Name(CORE_Preloader.NAME)
-public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin  {
-
-	//-Dfml.coreMods.load=gtPlusPlus.preloader.asm.Preloader_FMLLoadingPlugin
-	
-	static {
-		Preloader_Logger.INFO("Initializing IFMLLoadingPlugin");
-	}
-	
-	@Override
-	public String getAccessTransformerClass() {
-		return null;
-	}
-
-	@Override
-	public String[] getASMTransformerClass() {
-		//This will return the name of the class
-		return new String[]{
-				Preloader_Transformer_Handler.class.getName()
-		};
-	}
-
-	@Override
-	public String getModContainerClass() {
-		//This is the name of our dummy container
-		return Preloader_DummyContainer.class.getName();
-	}
-
-	@Override
-	public String getSetupClass() {
-		//return Preloader_SetupClass.class.getName();
-		return null;
-	}
-
-	@Override
-	public void injectData(Map<String, Object> data) {
-		boolean isDeObf = (boolean) data.get("runtimeDeobfuscationEnabled");
-        File mcDir = (File) data.get("mcLocation");
-        //LaunchClassLoader classLoader = (LaunchClassLoader) data.get("classLoader");
-        File coremodLocation = (File) data.get("coremodLocation");
-        String deobfuscationFileName = (String) data.get("deobfuscationFileName");
-        if (mcDir != null && mcDir.exists()) {
-        	CORE_Preloader.setMinecraftDirectory(mcDir);
-        	Preloader_Logger.INFO("Set McDir via Preloader_SetupClass");
-        }
-		Preloader_Logger.INFO("runtimeDeobfuscationEnabled: "+isDeObf);
-		Preloader_Logger.INFO("deobfuscationFileName: "+deobfuscationFileName);
-        if (coremodLocation != null && coremodLocation.exists()) {
-    		Preloader_Logger.INFO("coremodLocation: "+coremodLocation.getPath());        	
-        }
-        else {
-    		Preloader_Logger.INFO("coremodLocation: null");    
-    		Preloader_Logger.ERROR("Unable to determine CoreMod location");
-        }
-        CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
-        CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
-        Preloader_Logger.INFO("Running on "+gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION+" | Development Environment: "+CORE_Preloader.DEV_ENVIRONMENT);
-        Locale aDefaultLocale = Locale.getDefault();
-        NumberFormat aFormat = NumberFormat.getInstance();
-        Locale aDisplayLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
-        Locale aFormatLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale"));
-        Preloader_Logger.INFO("Locale: "+aDefaultLocale+" | Test: "+aFormat.format(1000000000)+" | Display: "+aDisplayLocale+" | Format: "+aFormatLocale);
-	}
-
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java
deleted file mode 100644
index a6d2b6c863..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-import java.io.File;
-import java.util.Map;
-
-import cpw.mods.fml.relauncher.IFMLCallHook;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
-
-public class Preloader_SetupClass implements IFMLCallHook {
-
-	@Override
-	public Void call() throws Exception {
-		Preloader_Logger.INFO("Executing IFMLCallHook");
-		return null;
-	}
-
-	@Override
-	public void injectData(Map<String, Object> data) {
-		
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java b/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java
deleted file mode 100644
index 664ffe7b2d..0000000000
--- a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gtPlusPlus.preloader.asm.helpers;
-
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-public class MethodHelper_CC {
-
-
-    public void mouseUp2(int mousex, int mousey, int button) {
-    	MethodHelper_CC.mouseUp(mousex, mousey, button);
-    }
-	
-    public static void mouseUp(int mousex, int mousey, int button) {
-    	GuiContainerManager aManager = codechicken.nei.guihook.GuiContainerManager.getManager();
-    	if (aManager != null) {
-    		GuiContainer aWindow = aManager.window;    	
-    		for (IContainerInputHandler inputhander : GuiContainerManager.inputHandlers) {
-            	//Preloader_Logger.INFO("Found Handler: "+aWindow.getClass().getName() + " | "+inputhander.getClass().getName());
-            }
-            for (IConta