Add way to make Sunnarium without MT.

Fix early init of FmlCommonHandler.

5 files changed, 119 insertions, 50 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index 03ca846b7d..2cf40160a3 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -23,7 +23,7 @@ import gtPlusPlus.core.lib.CORE;
 
 public class BlockCompressedObsidian extends BlockObsidian {
 
-	private final IIcon textureArray[] = new IIcon[6];
+	private final IIcon textureArray[] = new IIcon[11];
 
 	public BlockCompressedObsidian() {
 		this.setBlockName("blockCompressedObsidian");
@@ -36,9 +36,12 @@ public class BlockCompressedObsidian extends BlockObsidian {
 
 	@Override
 	public MapColor getMapColor(final int meta) {
-		if (meta != 5) {
+		if (meta < 5) {
 			return MapColor.obsidianColor;
 		}
+		if (meta > 5) {
+			return MapColor.goldColor;
+		}
 		else {
 			return MapColor.sandColor;
 		}
@@ -53,6 +56,11 @@ public class BlockCompressedObsidian extends BlockObsidian {
 		this.textureArray[3] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian4");
 		this.textureArray[4] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian5");
 		this.textureArray[5] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "obsidian_invert");
+		this.textureArray[6] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone1");
+		this.textureArray[7] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone2");
+		this.textureArray[8] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone3");
+		this.textureArray[9] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone4");
+		this.textureArray[10] = iicon.registerIcon(CORE.MODID + ":" + "compressed/" + "glowstone5");
 	}
 
 	/**
@@ -71,7 +79,7 @@ public class BlockCompressedObsidian extends BlockObsidian {
 
 	@Override
 	public void getSubBlocks(final Item item, final CreativeTabs tab, final List list) {
-		for (int i = 0; i < 6; i++) {
+		for (int i = 0; i < 11; i++) {
 			list.add(new ItemStack(item, 1, i));
 		}
 	}
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 99ecd96d87..fd3d8c7a2b 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -305,6 +305,8 @@ public final class ModItems {
 	public static ItemGenericToken itemGenericToken;
 
 	public static Item itemControlCore;
+	
+	public static Item itemSunnariumBit;
 
 	public static ItemStack itemHotTitaniumIngot;
 
@@ -867,6 +869,8 @@ public final class ModItems {
 		itemDragonJar = new ItemEntityCatcher();
 		
 		itemControlCore = new ItemControlCore();
+		
+		itemSunnariumBit = new ItemSunnariumBit();
 
 		//Chemistry
 		new CoalTar();
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java
new file mode 100644
index 0000000000..fb713d4962
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java
@@ -0,0 +1,16 @@
+package gtPlusPlus.core.item.general;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.util.EnumChatFormatting;
+
+public class ItemSunnariumBit extends CoreItem {
+
+	public ItemSunnariumBit() {
+		super("item.SunnariumBit", "Sunnarium Bit", AddToCreativeTab.tabMisc, 64, 0, new String[] {}, EnumRarity.uncommon, EnumChatFormatting.GOLD, false, null);
+		this.setTextureName(CORE.MODID+":"+"itemSunnariumBit");
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index adf93c0f69..57c44207a5 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -4,15 +4,13 @@ import static gtPlusPlus.core.lib.CORE.GTNH;
 
 import java.util.ArrayList;
 
+import advsolar.common.AdvancedSolarPanel;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.HotFuel;
-import gregtech.api.util.ThermalFuel;
+import gregtech.api.util.*;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
@@ -93,6 +91,7 @@ public class RECIPES_GREGTECH {
 		fluidheaterRecipes();
 		chemplantRecipes();
 		packagerRecipes();
+		implosionRecipes();
 
 
 		/**
@@ -112,8 +111,18 @@ public class RECIPES_GREGTECH {
 
 
 	private static void packagerRecipes() {
-		
-		
+
+
+	}
+
+	private static void implosionRecipes() {
+
+        GT_Values.RA.addImplosionRecipe(
+        		ItemUtils.getSimpleStack(ModItems.itemSunnariumBit, 9),
+        		16, 
+        		ItemUtils.getSimpleStack(AdvancedSolarPanel.itemSunnariumPart, 1),
+        		GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glowstone, 8));
+
 	}
 
 	private static void chemplantRecipes() {
@@ -358,7 +367,7 @@ public class RECIPES_GREGTECH {
 						CI.getTertiaryTieredFluid(aLaureniumTier-2, 6 * 144)
 				},
 				new ItemStack[] {
-					GregtechItemList.Casing_Machine_Custom_3.get(1)
+						GregtechItemList.Casing_Machine_Custom_3.get(1)
 				},
 				new FluidStack[] {
 
@@ -366,7 +375,7 @@ public class RECIPES_GREGTECH {
 				20 * 20,
 				MaterialUtils.getVoltageForTier(aLaureniumTier-2),
 				5);
-		
+
 		int aBotmiumTier = ALLOY.BOTMIUM.vTier;
 		// Adding Recipes for Casings
 		CORE.RA.addChemicalPlantRecipe(
@@ -382,7 +391,7 @@ public class RECIPES_GREGTECH {
 						CI.getTertiaryTieredFluid(aBotmiumTier-2, 6 * 144)
 				},
 				new ItemStack[] {
-					GregtechItemList.Casing_Machine_Custom_4.get(1)
+						GregtechItemList.Casing_Machine_Custom_4.get(1)
 				},
 				new FluidStack[] {
 
@@ -390,7 +399,7 @@ public class RECIPES_GREGTECH {
 				20 * 20,
 				MaterialUtils.getVoltageForTier(aBotmiumTier-2),
 				6);
-		
+
 
 		//Refine GT HF into GT++ HF
 		if (FluidUtils.doesHydrofluoricAcidGtExist()) {			
@@ -873,7 +882,12 @@ public class RECIPES_GREGTECH {
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(5));
 
-
+		GT_Values.RA.addLaserEngraverRecipe(
+				GregtechItemList.Laser_Lens_WoodsGlass.get(0),
+				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 8, 1),
+				ItemUtils.getSimpleStack(ModItems.itemSunnariumBit, 3),
+				20 * 60 * 5,
+				MaterialUtils.getVoltageForTier(3));
 
 
 	}
@@ -1682,7 +1696,7 @@ public class RECIPES_GREGTECH {
 
 		final FluidStack[] sulfurdioxideOutput = { 
 				FluidUtils.getFluidStack("oxygen", 2000) 
-				};
+		};
 		GT_Values.RA.addDistillationTowerRecipe(
 				FluidUtils.getFluidStack("sulfurdioxide", 144 * 3),
 				sulfurdioxideOutput,
@@ -1718,7 +1732,7 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
 						ItemUtils.getSimpleStack(Blocks.obsidian) },
 				new int[] { 750, 250, 250, 250, 1850 }, 0);
-		
+
 		HotFuel.addNewHotFuel(
 				MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000),
 				MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000), 
@@ -1751,15 +1765,15 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void fluidExtractorRecipes() {
-		
+
 	}
 
 	private static void chemicalBathRecipes() {
-		
+
 	}
 
 	private static void centrifugeRecipes() {
-		
+
 		GT_Values.RA.addCentrifugeRecipe(
 				CI.getNumberedAdvancedCircuit(2),
 				MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10), 
@@ -1774,11 +1788,11 @@ public class RECIPES_GREGTECH {
 				null,
 				20 * 30, 
 				120);
-		
+
 	}
 
 	private static void mixerRecipes() {
-		
+
 		GT_Values.RA.addMixerRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1),
 				null, 
@@ -1789,7 +1803,7 @@ public class RECIPES_GREGTECH {
 				null,
 				600, 
 				60);
-		
+
 		GT_Values.RA.addMixerRecipe(
 				CI.getNumberedAdvancedCircuit(2),
 				CI.emptyCells(10),
@@ -1800,13 +1814,13 @@ public class RECIPES_GREGTECH {
 				MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10),
 				20 * 10, 
 				120);
-		
-		
-		
+
+
+
 	}
 
 	private static void chemicalReactorRecipes() {
-		
+
 		//Bombs
 		GT_Values.RA.addChemicalRecipe(
 				ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4),
@@ -1823,7 +1837,7 @@ public class RECIPES_GREGTECH {
 				null,
 				ItemUtils.getSimpleStack(ModItems.itemBomb, 4),
 				10 * 20);	
-		
+
 		GT_Values.RA.addChemicalRecipe(
 				CI.getNumberedAdvancedCircuit(21),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 32),
@@ -1832,24 +1846,24 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 8), 
 				20 * 20);		
 
-    	GT_Values.RA.addChemicalRecipe(
-    			Materials.Potassium.getDust(1),
-    			CI.getNumberedAdvancedCircuit(1), 
-    			Materials.NitricAcid.getFluid(1000),
-    			GT_Values.NF, 
-    			MISC_MATERIALS.POTASSIUM_NITRATE.getDust(1), 
-    			100, 
-    			30);    	
-
-    	GT_Values.RA.addChemicalRecipe(
-    			ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 1),
-    			CI.getNumberedAdvancedCircuit(1), 
-    			Materials.NitricAcid.getFluid(1000),
-    			GT_Values.NF, 
-    			MISC_MATERIALS.SODIUM_NITRATE.getDust(1), 
-    			100, 
-    			30);
-		
+		GT_Values.RA.addChemicalRecipe(
+				Materials.Potassium.getDust(1),
+				CI.getNumberedAdvancedCircuit(1), 
+				Materials.NitricAcid.getFluid(1000),
+				GT_Values.NF, 
+				MISC_MATERIALS.POTASSIUM_NITRATE.getDust(1), 
+				100, 
+				30);    	
+
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 1),
+				CI.getNumberedAdvancedCircuit(1), 
+				Materials.NitricAcid.getFluid(1000),
+				GT_Values.NF, 
+				MISC_MATERIALS.SODIUM_NITRATE.getDust(1), 
+				100, 
+				30);
+
 
 	}
 
@@ -1903,7 +1917,7 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void autoclaveRecipes() {
-		
+
 	}
 
 	private static void benderRecipes() {
@@ -1926,7 +1940,7 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void macerationRecipes() {
-		
+
 		GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9));
 
@@ -2266,11 +2280,11 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void sifterRecipes() {
-		
+
 	}
 
 	private static void electroMagneticSeperatorRecipes() {
-		
+
 		if (!GTNH) {		
 			// Trinium
 			GT_Values.RA.addElectromagneticSeparatorRecipe(
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 61bae54b31..218c3a1408 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -381,11 +381,12 @@ public class RECIPES_General {
 
 	private static boolean addCompressedObsidian(){
 		//Invert Obsidian
+		ItemStack aInvertedObsidian = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1);
 		if (RecipeUtils.addShapedRecipe(
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
 				getSimpleStack(Items.glowstone_dust), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 1, 1), getSimpleStack(Items.glowstone_dust),
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
-				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1))){
+				aInvertedObsidian)){
 			Logger.INFO("Added a recipe for Inverted Obsidian.");
 		}
 
@@ -394,6 +395,12 @@ public class RECIPES_General {
 		for (int r=0;r<5;r++){
 			mItems[r+1] = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, r, 1);
 		}
+		
+		final ItemStack[] mItems2 = new ItemStack[6];
+		mItems2[0] = ItemUtils.getSimpleStack(Blocks.glowstone);
+		for (int r=0;r<5;r++){
+			mItems2[r+1] = ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 6+r, 1);
+		}
 
 		//Compressed Obsidian 1-5
 		for (int r=0;r<5;r++){
@@ -414,6 +421,26 @@ public class RECIPES_General {
 			}
 
 		}
+		
+		//Compressed Glowstone 1-5
+		for (int r=0;r<5;r++){
+
+			final ItemStack input = mItems2[r];
+			final ItemStack output = mItems2[r+1];
+
+			if (RecipeUtils.addShapedRecipe(
+					input, input, input,
+					input, aInvertedObsidian, input,
+					input, input, input,
+					output)){
+				Logger.INFO("Added a recipe for Compressed Glowstone ["+r+"]");
+			}
+
+			if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9))){
+				Logger.INFO("Added a shapeless recipe for Compressed Glowstone ["+r+"]");
+			}
+
+		}
 		return true;
 	}