Removed remainder of AE

src/java/cr0s/warpdrive/WarpDrive.java

@@ -27,7 +27,6 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
-import appeng.api.AEApi;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
@@ -107,7 +106,6 @@ import cr0s.warpdrive.world.HyperSpaceWorldGenerator;
 import cr0s.warpdrive.world.SpaceProvider;
 import cr0s.warpdrive.world.SpaceWorldGenerator;
 import dan200.computercraft.api.ComputerCraftAPI;
-import extracells.api.ECApi;
 
 @Mod(modid = "WarpDrive", name = "WarpDrive", version = "1.3.0.0", dependencies = "required-after:IC2;" + " required-after:CoFHCore;" + " after:ComputerCraft;"
 		+ " after:OpenComputer;" + " after:CCTurtle;" + " after:gregtech_addon;" + " required-after:AppliedEnergistics;" + " after:AdvancedSolarPanel;"
@@ -415,10 +413,6 @@ public class WarpDrive implements LoadingCallback {
 		if (WarpDriveConfig.isICLoaded && WarpDriveConfig.G_ENABLE_IC2_RECIPES) {
 			initIC2Recipes();
 		}
-		if (WarpDriveConfig.isAppliedEnergisticsLoaded && WarpDriveConfig.isThermalExpansionLoaded && WarpDriveConfig.isAtomicScienceLoaded
-				&& WarpDriveConfig.G_ENABLE_TDK_RECIPES) {
-			initAETERecipes();
-		}
 		if (WarpDriveConfig.G_ENABLE_VANILLA_RECIPES) {
 			initVanillaRecipes();
 		}
@@ -521,47 +515,6 @@ public class WarpDrive implements LoadingCallback {
 				Blocks.glass, 'c', componentItem.getIS(8)));
 	}
 
-	private static void initAETERecipes() {
-		ItemStack redstoneEnergycell = GameRegistry.findItemStack("ThermalExpansion", "cellReinforced", 1);
-		ItemStack resonantEnergycell = GameRegistry.findItemStack("ThermalExpansion", "cellResonant", 1);
-		ItemStack bucketEnder = GameRegistry.findItemStack("ThermalExpansion", "bucketEnder", 1);
-		ItemStack fluixCrystal = AEApi.instance().definitions().materials().fluixCrystal().maybeStack(1).get();
-		ItemStack quantumEntangledSingularity = AEApi.instance().definitions().materials().qESingularity().maybeStack(1).get();
-		ItemStack vibrantQuartzGlass = new ItemStack(AEApi.instance().definitions().blocks().quartzVibrantGlass().maybeBlock().get(), 1);
-		vibrantQuartzGlass.setItemDamage(4);
-		ItemStack antimatter = GameRegistry.findItemStack("ResonantInduction|Atomic", "antimatter", 1);
-		antimatter.setItemDamage(0);
-		ItemStack floppy = GameRegistry.findItemStack("ComputerCraft", "disk", 1);
-		ItemStack ultimateLappack = new ItemStack(WarpDriveConfig.GS_ultimateLappack);
-
-		// top = advancedCircuit, redstoneEnergycell, advancedCircuit
-		// middle = fluix crystal, advancedMachine, fluix crystal
-		// bottom = advancedCircuit, bucket Resonant ender, advancedCircuit
-		GameRegistry.addRecipe(new ItemStack(warpCore), "crc", "fmf", "cec", 'm', WarpDriveConfig.getIC2Item("advancedMachine"), 'c',
-				WarpDriveConfig.getIC2Item("advancedCircuit"), 'r', redstoneEnergycell, 'e', bucketEnder, 'f', fluixCrystal);
-
-		// top = advancedCircuit, floppy, advancedCircuit
-		// middle = advancedCircuit, advancedMachine, advancedCircuit
-		// bottom = advancedCircuit, fluix crystal, advancedCircuit
-		GameRegistry.addRecipe(new ItemStack(protocolBlock), "coc", "cmc", "cfc", 'm', WarpDriveConfig.getIC2Item("advancedMachine"), 'c',
-				WarpDriveConfig.getIC2Item("advancedCircuit"), 'o', floppy, 'f', fluixCrystal);
-
-		// top = Iridium plate, Resonant Energycell, Iridium plate
-		// middle = Singularity, 125 milligram antimatter, Singularity
-		// bottom = Iridium plate, Ultimate lappack, Iridium plate
-		GameRegistry.addRecipe(new ItemStack(powerReactorBlock), "iri", "sas", "ili", 'i', WarpDriveConfig.getIC2Item("iridiumPlate"), 's',
-				quantumEntangledSingularity, 'a', antimatter, 'l', ultimateLappack, 'r', resonantEnergycell);
-
-		// top = Advanced circuit, Advanced alloy, Advanced alloy
-		// middle = Advanced circuit, Warp drive laser, Vibrant quartz glass
-		// bottom = Advanced circuit, Certus quartz tank, Advanced alloy
-		ItemStack isMiningLaserBlock = new ItemStack(miningLaserBlock, 1, 0);
-		ItemStack isCertusQuartzTank = new ItemStack(ECApi.instance().blocks().certusTank().block(), 1, 0);
-
-		GameRegistry.addRecipe(new ItemStack(powerLaserBlock), "caa", "czg", "cta", 'c', WarpDriveConfig.getIC2Item("advancedCircuit"), 'a',
-				WarpDriveConfig.getIC2Item("advancedAlloy"), 'z', isMiningLaserBlock, 't', isCertusQuartzTank, 'g', vibrantQuartzGlass);
-	}
-
 	private static void initIC2Recipes() {
 		GameRegistry.addRecipe(new ItemStack(warpCore), "ici", "cmc", "ici", 'i', WarpDriveConfig.getIC2Item("iridiumPlate"), 'm',
 				WarpDriveConfig.getIC2Item("advancedMachine"), 'c', WarpDriveConfig.getIC2Item("advancedCircuit"));

src/java/cr0s/warpdrive/WarpDriveConfig.java

@@ -20,7 +20,6 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.oredict.OreDictionary;
 import powercrystals.netherores.NetherOresCore;
 import advsolar.api.ASPItemAPI;
-import appeng.api.AEApi;
 import cpw.mods.fml.common.Loader;
 import cr0s.warpdrive.data.TransitionPlane;
 import dan200.computercraft.ComputerCraft;
@@ -32,10 +31,8 @@ public class WarpDriveConfig {
 	 * The variables which store whether or not individual mods are loaded
 	 */
 	public static boolean isForgeMultipartLoaded = false;
-	public static boolean isAppliedEnergisticsLoaded = false;
 	public static boolean isAdvSolPanelLoaded = false;
 	public static boolean isAtomicScienceLoaded = false;
-	public static boolean isAEExtraLoaded = false;
 	public static boolean isICBMLoaded = false;
 	public static boolean isMFFSLoaded = false;
 	public static boolean isGraviSuiteLoaded = false;
@@ -458,14 +455,6 @@ public class WarpDriveConfig {
 		if (isCCLoaded)
 			loadCC();
 
-		isAppliedEnergisticsLoaded = Loader.isModLoaded("AppliedEnergistics");
-		if (isAppliedEnergisticsLoaded)
-			loadAppliedEnergistics();
-
-		isAEExtraLoaded = Loader.isModLoaded("extracells");
-		if (isAEExtraLoaded)
-			loadAEExtra();
-
 		isAdvSolPanelLoaded = Loader.isModLoaded("AdvancedSolarPanel");
 		if (isAdvSolPanelLoaded)
 			loadASP();
@@ -632,26 +621,6 @@ public class WarpDriveConfig {
 		}
 	}
 
-	private static void loadAppliedEnergistics() {
-		try {
-			minerOres.add(AEApi.instance().definitions().blocks().quartzOre().maybeBlock().get());
-		} catch (Exception e) {
-			WarpDrive.logger.warning("WarpDriveConfig Error loading AppliedEnergistics classes");
-			e.printStackTrace();
-			isAppliedEnergisticsLoaded = false;
-		}
-	}
-
-	private static void loadAEExtra() {
-		try {
-			//Should be references as ECApi.instanc()
-		} catch (Exception e) {
-			WarpDrive.logger.warning("WarpDriveConfig Error loading AEExtra classes");
-			e.printStackTrace();
-			isAEExtraLoaded = false;
-		}
-	}
-
 	private static void loadASP() {
 		try {
 			spaceHelmets.add(ASPItemAPI.get("advancedSolarHelmet").getItem());
@@ -789,8 +758,6 @@ public class WarpDriveConfig {
 	public static Block getRandomOverworldBlock(Random random, Block def) {
 		if (random.nextInt(25) == 5) {
 			return commonWorldGenOres.get(random.nextInt(commonWorldGenOres.size()));
-		} else if (isAppliedEnergisticsLoaded && random.nextInt(750) == 1) {
-			return AEApi.instance().definitions().blocks().quartzOre().maybeBlock().get();
 		} else if (random.nextInt(250) == 1) {
 			return Blocks.diamond_ore;
 		} else if (!isNetherOresLoaded && (random.nextInt(10000) == 42)) {

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

@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
-import appeng.api.AEApi;
 import cpw.mods.fml.common.IWorldGenerator;
 import cr0s.warpdrive.LocalProfiler;
 import cr0s.warpdrive.WarpDrive;
@@ -76,12 +75,6 @@ public class SpaceWorldGenerator implements IWorldGenerator {
 			if (random.nextBoolean()) {
 				generateGasCloudOfColor(world, x, y, z, 6, 11, random.nextInt(12));
 			}
-		} else if (WarpDriveConfig.isAppliedEnergisticsLoaded && random.nextInt(1600) == 1) {// Quartz
-			// asteroid
-			generateAsteroidOfBlock(world, x, y, z, 3, 2, AEApi.instance().definitions().blocks().quartzOre().maybeBlock().get(), 0);
-			if (random.nextBoolean()) {
-				generateGasCloudOfColor(world, x, y, z, 4, 7, random.nextInt(12));
-			}
 		}
 	}
 

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

@@ -11,7 +11,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
-import appeng.api.AEApi;
 import cr0s.warpdrive.WarpDrive;
 import cr0s.warpdrive.WarpDriveConfig;
 
@@ -631,23 +630,8 @@ public class WorldGenSmallShip extends WorldGenerator {
 				isDone = true;
 				break;// skipped
 
-				// AE Quarz
 			case 9:
-				if (WarpDriveConfig.isAppliedEnergisticsLoaded) {
-					res = AEApi.instance().definitions().materials().fluixCrystal().maybeStack(2 + rand.nextInt(22)).get();
-					isDone = true;
-				}
-
-				break;
-
-				// AE improved processor
 			case 10:
-				if (WarpDriveConfig.isAppliedEnergisticsLoaded) {
-					res = AEApi.instance().definitions().materials().advCard().maybeStack(res.stackSize = 1 + rand.nextInt(3)).get();
-					isDone = true;
-				}
-				break;
-
 				// Rocket launcher platform Tier3
 			case 11:
 				if (WarpDriveConfig.isICBMLoaded) {