+ Added some @Optional and Reflection checks.

> Not really sure, haven't had a desktop in 2 weeks. Think this fixes alvearies? dunno.

4 files changed, 44 insertions, 24 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index ff26064e98..89020edcf9 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -2,30 +2,31 @@ package gtPlusPlus.xmod.forestry;
 
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
+import gtPlusPlus.xmod.forestry.bees.alveary.AlvearyHandler;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
-import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.Optional;
 
 public class HANDLER_FR {
 
+	@Optional.Method(modid = "Forestry")
 	public static void preInit(){		
 		if (LoadedMods.Forestry){
 			FR_ItemRegistry.Register();
 			if (CORE.configSwitches.enableCustomAlvearyBlocks){
-				GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");
+				AlvearyHandler.run();
 			}
 			//FR_BlockRegistryApiculture.RegistryApiculture();
 		}		
 	}
-
+	@Optional.Method(modid = "Forestry")
 	public static void Init(){
 		if (LoadedMods.Forestry){
 			//FR_TileHandler.init();	
 			//new FR_GuiIDRegistry();
 		}		
 	}
-
+	@Optional.Method(modid = "Forestry")
 	public static void postInit(){
 		if (LoadedMods.Forestry){
 			FR_Gregtech_Recipes.registerItems();	
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java
new file mode 100644
index 0000000000..18fed57968
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java
@@ -0,0 +1,29 @@
+package gtPlusPlus.xmod.forestry.bees.alveary;
+
+import forestry.core.items.ItemBlockForestry;
+import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class AlvearyHandler {
+
+	public static void run(){
+		if (!LoadedMods.ExtraBees){
+		if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff
+			FR_BlockAlveary alveary;
+			alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
+			GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");			
+		}
+		}
+	}	
+
+	protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) {
+		block.setBlockName("for." + name);
+		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
+		return block;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index f3d751690e..b2de1f0ce4 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -9,12 +9,8 @@
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package gtPlusPlus.xmod.forestry.bees.items;
-import forestry.core.items.ItemBlockForestry;
 import forestry.core.utils.StringUtil;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.forestry.bees.alveary.FR_BlockAlveary;
-import net.minecraft.block.Block;
 import net.minecraft.item.*;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
@@ -65,11 +61,7 @@ public class FR_ItemRegistry {
 			hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common, "");
 			hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, "");
 			hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
-			hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
-			if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff
-				FR_BlockAlveary alveary;
-				alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
-			}
+			hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");			
 		}
 
 
@@ -83,11 +75,6 @@ public class FR_ItemRegistry {
 		return item;
 	}
 
-	protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name, Object... itemCtorArgs) {
-		block.setBlockName("for." + name);
-		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
-		return block;
-	}
 }
 
 
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 4d89207817..a4d22ad1bf 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.thermalfoundation.item;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
 import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids;
 import net.minecraft.init.Items;
@@ -23,7 +24,7 @@ public class TF_Items {
 	public static ItemBucket itemBucket;
 	public static ItemStack bucketPyrotheum;
 	public static ItemStack bucketCryotheum;
-	
+
 	public static ItemStack itemDustBlizz;
 	public static ItemStack itemDustPyrotheum;
 	public static ItemStack itemDustCryotheum;
@@ -33,8 +34,8 @@ public class TF_Items {
 
 
 		itemBucket = (ItemBucket)new ItemBucket("MiscUtils").setUnlocalizedName("bucket").setCreativeTab(AddToCreativeTab.tabMisc);
-	    itemMaterial = (ItemBase)new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
-	    
+		itemMaterial = (ItemBase)new ItemBase("MiscUtils").setUnlocalizedName("material").setCreativeTab(AddToCreativeTab.tabMisc);
+
 
 		bucketPyrotheum = itemBucket.addOreDictItem(1, "bucketPyrotheum");
 		bucketCryotheum = itemBucket.addOreDictItem(2, "bucketCryotheum");
@@ -42,8 +43,10 @@ public class TF_Items {
 		dustBlizz = itemMaterial.addOreDictItem(2, "dustBlizz");
 		dustPyrotheum = itemMaterial.addOreDictItem(3, "dustPyrotheum");
 		dustCryotheum = itemMaterial.addOreDictItem(4, "dustCryotheum");
-		
-		FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400);
+
+		if (ReflectionUtils.doesClassExist("cofh.core.util.energy.FurnaceFuelHandler")){
+			FurnaceFuelHandler.registerFuel(dustPyrotheum, 2400); //cofh.core.util.energy.FurnaceFuelHandler.registerFuel(ItemStack, int)
+		}
 
 
 		itemRodBlizz = ItemUtils.simpleMetaStack(itemMaterial, 1, 1);