2 files changed, 4 insertions, 127 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
deleted file mode 100644
index 8f5b36f6e3..0000000000
--- a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package gtPlusPlus.xmod.forestry;
-
-import static cpw.mods.fml.common.registry.GameRegistry.findBlock;
-import static cpw.mods.fml.common.registry.GameRegistry.findItem;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-
-import cofh.mod.ChildMod;
-import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.Mod.CustomProperty;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-
-@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "Gregtech++|CompatForestry",
-name = "GT++ Compat: Forestry",
-version = CORE.VERSION,
-dependencies = "after:Miscutils;after:Forestry",
-customProperties = @CustomProperty(k = "cofhversion", v = "true")))
-public class Forestry {
-
-	private static final String name = "Forestry";
-
-	@EventHandler
-	public void load(final FMLInitializationEvent e) {
-
-		try {
-			initForestry();
-		} catch (final Throwable $) {
-			final ModContainer This = FMLCommonHandler.instance().findContainerFor(this);
-			LogManager.getLogger(This.getModId()).log(Level.ERROR, "There was a problem loading " + This.getName(), $);
-		}
-	}
-
-	private static void initForestry() {
-
-		Item item;
-
-		item = findItem(name, "sapling");
-		Block block = findBlock(name, "saplingGE");
-		if ((item != null) && (block != null)) {
-			//ForestrySapling sapling = new ForestrySapling(item, block);
-			//MFRRegistry.registerPlantable(sapling);
-			//MFRRegistry.registerFertilizable(sapling);
-		} else {
-			block = findBlock(name, "soil");
-		}
-		if (block != null) {
-			//ForestryBogEarth bog = new ForestryBogEarth(block);
-			//MFRRegistry.registerPlantable(bog);
-			//MFRRegistry.registerFertilizable(bog);
-			//MFRRegistry.registerHarvestable(bog);
-			//MFRRegistry.registerFruit(bog);
-		} else {
-			for (int i = 1; true; ++i) {
-				block = findBlock(name, "log" + i);
-				l: if (block == null) {
-					if (i > 1) {
-						Utils.LOG_WARNING("Forestry logs null at " + i + ".");
-					} else {
-						block = findBlock(name, "logs");
-						if (block != null) {
-							break l;
-						}
-						Utils.LOG_WARNING("Forestry logs null!");
-					}
-					break;
-				}
-				//MFRRegistry.registerHarvestable(new HarvestableWood(block));
-				//MFRRegistry.registerFruitLogBlock(block);
-			}
-		}
-
-		for (int i = 1; true; ++i) {
-			block = findBlock(name, "fireproofLog" + i);
-			l: if (block == null) {
-				if (i > 1) {
-					Utils.LOG_WARNING("Forestry logs null at " + i + ".");
-				} else {
-					block = findBlock(name, "logsFireproof");
-					if (block != null) {
-						break l;
-					}
-					Utils.LOG_WARNING("Forestry logs null!");
-				}
-				break;
-			}
-			//MFRRegistry.registerHarvestable(new HarvestableWood(block));
-			//MFRRegistry.registerFruitLogBlock(block);
-		}
-
-		block = findBlock(name, "leaves");
-		if (block != null) {
-			//ForestryLeaf leaf = new ForestryLeaf(block);
-			//MFRRegistry.registerFertilizable(leaf);
-			//MFRRegistry.registerHarvestable(leaf);
-			//MFRRegistry.registerFruit(leaf);
-		} else {
-			Utils.LOG_WARNING("Forestry leaves null!");
-		}
-
-		block = findBlock(name, "pods");
-		item = findItem(name, "grafterProven");
-		if (block != null) {
-			//ForestryPod pod = new ForestryPod(block, item);
-			//MFRRegistry.registerFertilizable(pod);
-			//MFRRegistry.registerHarvestable(pod);
-			//MFRRegistry.registerFruit(pod);
-		} else {
-			Utils.LOG_WARNING("Forestry pods null!");
-		}
-	}
-
-	@EventHandler
-	public static void postInit(final FMLPostInitializationEvent e) {
-		//MFRRegistry.registerLiquidDrinkHandler("bioethanol", new DrinkHandlerBiofuel());
-		//TileEntityUnifier.updateUnifierLiquids();
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
index 8b3fe7b0ef..5ce8f94068 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
@@ -20,7 +20,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -59,7 +58,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
 		if (aSide == aFacing) {
-			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[78], new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active : TexturesGtBlock.Overlay_Machine_Diesel_Vertical)};
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[78], new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active : TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)};
 		}
 		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[78]};
 	}
@@ -227,6 +226,9 @@ extends GregtechMeta_MultiBlockBase {
 		if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) {
 			return false;
 		}
+		
+		Utils.LOG_INFO("Checking structure for Industrial Sifter.");
+		
 		int tAmount = 0;
 		controller = false;
 		for (int i = -2; i < 3; i++) {