+ Added a config option for the new Alveary blocks (Disabled by default, they don't work properly yet.)

- Removed some dead classes.

6 files changed, 19 insertions, 162 deletions

diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
index 8a6a265962..8f5426e1fa 100644
--- a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
+++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
@@ -1,5 +1,6 @@
 package miscutil.core.xmod.forestry;
 
+import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.xmod.forestry.bees.alveary.TileAlvearyFrameHousing;
 import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry;
@@ -11,8 +12,9 @@ public class HANDLER_FR {
 	public static void preInit(){		
 		if (LoadedMods.Forestry){
 			FR_ItemRegistry.Register();
-
-			GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");
+			if (CORE.configSwitches.enableCustomAlvearyBlocks){
+				GameRegistry.registerTileEntity(TileAlvearyFrameHousing.class, "FrameHousing");
+			}
 			//FR_BlockRegistryApiculture.RegistryApiculture();
 		}		
 	}
diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
index 230992ceb5..3a9a1e2040 100644
--- a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -9,6 +9,7 @@
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
 package miscutil.core.xmod.forestry.bees.items;
+import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.xmod.forestry.bees.alveary.FR_BlockAlveary;
 import net.minecraft.block.Block;
@@ -29,20 +30,20 @@ public class FR_ItemRegistry {
 	//public static FR_ItemHiveFrame frameUntreated;
 	//public static FR_ItemHiveFrame frameImpregnated;
 	//public static FR_ItemHiveFrame frameProven;
-	
+
 	//Magic Bee Frame Items
 	public static MB_ItemFrame hiveFrameAccelerated;
 	public static MB_ItemFrame hiveFrameVoid;
 	public static MB_ItemFrame hiveFrameMutagenic;
 	public static MB_ItemFrame haveFrameBusy;
-	
+
 	//Extra Bee Frame Items
 	public static MB_ItemFrame hiveFrameCocoa;
 	public static MB_ItemFrame hiveFrameCaged;
 	public static MB_ItemFrame hiveFrameSoul;
 	public static MB_ItemFrame hiveFrameClay;
 	public static MB_ItemFrame hiveFrameNova;
-	
+
 	//Alveary Stuff
 	public static FR_BlockAlveary alveary;
 
@@ -62,16 +63,17 @@ public class FR_ItemRegistry {
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23));
 		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_DESERT_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 18));
 		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 23));
-		
+
 		//Extra Bee like Frames
 		if (!LoadedMods.ExtraBees){
-		hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, "");
-		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.");
-		
-		alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
+			hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common, "");
+			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 = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary");
+			}
 		}
 
 
@@ -84,12 +86,12 @@ public class FR_ItemRegistry {
 		GameRegistry.registerItem(item, StringUtil.cleanItemName(item));
 		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/miscutil/core/xmod/forestry/core/interfaces/IFilterSlotDelegate.java b/src/Java/miscutil/core/xmod/forestry/core/interfaces/IFilterSlotDelegate.java
deleted file mode 100644
index d3290d7491..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/core/interfaces/IFilterSlotDelegate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package miscutil.core.xmod.forestry.core.interfaces;
-
-import net.minecraft.item.ItemStack;
-
-public abstract interface IFilterSlotDelegate
-{
-  public abstract boolean canSlotAccept(int paramInt, ItemStack paramItemStack);
-  
-  public abstract boolean isLocked(int paramInt);
-}
diff --git a/src/Java/miscutil/core/xmod/forestry/core/interfaces/IInventoryAdapter.java b/src/Java/miscutil/core/xmod/forestry/core/interfaces/IInventoryAdapter.java
deleted file mode 100644
index 95a24d90e3..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/core/interfaces/IInventoryAdapter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package miscutil.core.xmod.forestry.core.interfaces;
-
-import net.minecraft.inventory.ISidedInventory;
-
-public abstract interface IInventoryAdapter
-  extends ISidedInventory, IFilterSlotDelegate, INBTTagable
-{}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/xmod/forestry/core/interfaces/INBTTagable.java b/src/Java/miscutil/core/xmod/forestry/core/interfaces/INBTTagable.java
deleted file mode 100644
index 6053e5f5ba..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/core/interfaces/INBTTagable.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package miscutil.core.xmod.forestry.core.interfaces;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-public abstract interface INBTTagable
-{
-  public abstract void readFromNBT(NBTTagCompound paramNBTTagCompound);
-  
-  public abstract void writeToNBT(NBTTagCompound paramNBTTagCompound);
-}
diff --git a/src/Java/miscutil/core/xmod/forestry/core/inventory/FakeInventoryAdapter.java b/src/Java/miscutil/core/xmod/forestry/core/inventory/FakeInventoryAdapter.java
deleted file mode 100644
index 39d1075dc7..0000000000
--- a/src/Java/miscutil/core/xmod/forestry/core/inventory/FakeInventoryAdapter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package miscutil.core.xmod.forestry.core.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import forestry.core.inventory.IInventoryAdapter;
-
-public class FakeInventoryAdapter implements IInventoryAdapter {
-
-	public static final int[] SLOTS_NONE = new int[0];
-	private static FakeInventoryAdapter instance;
-	public static FakeInventoryAdapter instance(){
-		if (instance == null) {
-			instance = new FakeInventoryAdapter();
-		}
-		return instance;
-	}
-
-	@Override
-	public boolean canSlotAccept(int slotIndex, ItemStack itemStack){
-		return false;
-	}
-
-	@Override
-	public boolean isLocked(int slotIndex)
-	{
-		return false;
-	}
-
-	@Override
-	public int[] getAccessibleSlotsFromSide(int p_94128_1_)
-	{
-		return SLOTS_NONE;
-	}
-
-	@Override
-	public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_)
-	{
-		return false;
-	}
-
-	@Override
-	public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_)
-	{
-		return false;
-	}
-
-	@Override
-	public int getSizeInventory()
-	{
-		return 0;
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int p_70301_1_)
-	{
-		return null;
-	}
-
-	@Override
-	public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_)
-	{
-		return null;
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int p_70304_1_)
-	{
-		return null;
-	}
-
-	@Override
-	public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {}
-
-	@Override
-	public String getInventoryName()
-	{
-		return null;
-	}
-
-	@Override
-	public boolean hasCustomInventoryName()
-	{
-		return false;
-	}
-
-	@Override
-	public int getInventoryStackLimit()
-	{
-		return 0;
-	}
-
-	@Override
-	public void markDirty() {}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer p_70300_1_)
-	{
-		return false;
-	}
-
-	@Override
-	public void openInventory() {}
-
-	@Override
-	public void closeInventory() {}
-
-	@Override
-	public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_)
-	{
-		return false;
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbttagcompound) {}
-
-	@Override
-	public void writeToNBT(NBTTagCompound nbttagcompound) {}
-
-}