From 2d61ca3fd029679c7f108a8f27e6b97e793a3b0d Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Sat, 1 Feb 2014 20:52:37 -0600
Subject: [PATCH] Removed TE p2p wrapper.

---
 integration/abstraction/ITE.java |  2 ++
 integration/modules/TE.java      | 24 ++++++++++++++++++++----
 parts/p2p/PartP2PItems.java      | 24 +++++-------------------
 util/inv/WrapperTEPipe.java      |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/integration/abstraction/ITE.java b/integration/abstraction/ITE.java
index 845e8d6fa..8c1fea5ac 100644
--- a/integration/abstraction/ITE.java
+++ b/integration/abstraction/ITE.java
@@ -13,4 +13,6 @@ public interface ITE
 
 	boolean isPipe(TileEntity te, ForgeDirection opposite);
 
+	ItemStack addItemsToPipe(TileEntity ad, ItemStack itemstack, ForgeDirection dir);
+
 }
diff --git a/integration/modules/TE.java b/integration/modules/TE.java
index c6fbfee8d..daa35d3be 100644
--- a/integration/modules/TE.java
+++ b/integration/modules/TE.java
@@ -6,8 +6,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.integration.IIntegrationModule;
+import appeng.integration.abstraction.ITE;
+import cofh.api.transport.IItemConduit;
 
-public class TE implements IIntegrationModule
+public class TE implements IIntegrationModule, ITE
 {
 
 	public static TE instance;
@@ -39,16 +41,30 @@ public class TE implements IIntegrationModule
 		thermalexpansion.api.crafting.CraftingManagers.pulverizerManager.addRecipe( 320, in, out );
 	}
 
-	public void addItemsToPipe(TileEntity ad, ItemStack itemstack, ForgeDirection dir)
+	@Override
+	public ItemStack addItemsToPipe(TileEntity ad, ItemStack itemstack, ForgeDirection dir)
+	{
+		return ((IItemConduit) ad).insertItem( dir, itemstack );
+	}
+
+	@Override
+	public void addPulverizerRecipe(int i, ItemStack blkQuartz, ItemStack blockDust)
 	{
 		// TODO Auto-generated method stub
 
 	}
 
-	public boolean canAddItemsToPipe(TileEntity ad, ItemStack itemstack, ForgeDirection dir)
+	@Override
+	public void addPulverizerRecipe(int i, ItemStack blkQuartzOre, ItemStack matQuartz, ItemStack matQuartzDust)
 	{
 		// TODO Auto-generated method stub
-		return false;
+
+	}
+
+	@Override
+	public boolean isPipe(TileEntity te, ForgeDirection opposite)
+	{
+		return te instanceof IItemConduit;
 	}
 
 }
diff --git a/parts/p2p/PartP2PItems.java b/parts/p2p/PartP2PItems.java
index 72add5818..26f830213 100644
--- a/parts/p2p/PartP2PItems.java
+++ b/parts/p2p/PartP2PItems.java
@@ -19,7 +19,6 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.core.AppEng;
 import appeng.integration.abstraction.IBC;
-import appeng.integration.abstraction.ITE;
 import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.tile.inventory.AppEngNullInventory;
@@ -27,7 +26,6 @@ import appeng.util.Platform;
 import appeng.util.inv.WrapperBCPipe;
 import appeng.util.inv.WrapperChainedInventory;
 import appeng.util.inv.WrapperMCISidedInventory;
-import appeng.util.inv.WrapperTEPipe;
 import buildcraft.api.transport.IPipeConnection;
 import buildcraft.api.transport.IPipeTile.PipeType;
 import cpw.mods.fml.common.Optional.Interface;
@@ -83,23 +81,11 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
 				}
 			}
 
-			if ( AppEng.instance.isIntegrationEnabled( "TE" ) )
-			{
-				ITE thermal = (ITE) AppEng.instance.getIntegration( "TE" );
-				if ( thermal != null )
-				{
-					if ( thermal.isPipe( te, side.getOpposite() ) )
-					{
-						try
-						{
-							output = new WrapperTEPipe( te, side.getOpposite() );
-						}
-						catch (Throwable _)
-						{
-						}
-					}
-				}
-			}
+			/*
+			 * if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration(
+			 * "TE" ); if ( thermal != null ) { if ( thermal.isPipe( te, side.getOpposite() ) ) { try { output = new
+			 * WrapperTEPipe( te, side.getOpposite() ); } catch (Throwable _) { } } } }
+			 */
 
 			if ( output == null )
 			{
diff --git a/util/inv/WrapperTEPipe.java b/util/inv/WrapperTEPipe.java
index f03fbf656..dde41f8b5 100644
--- a/util/inv/WrapperTEPipe.java
+++ b/util/inv/WrapperTEPipe.java
@@ -93,7 +93,7 @@ public class WrapperTEPipe implements IInventory
 	@Override
 	public boolean isItemValidForSlot(int i, ItemStack itemstack)
 	{
-		return TE.instance.canAddItemsToPipe( ad, itemstack, dir );
+		return false;
 	}
 
 }