+ Added some @Optional and Reflection checks.

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

2 files changed, 30 insertions, 14 deletions

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;
-	}
 }