From 9191d8d29e700ba8d6bb048bd31ca55e48ce3505 Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Sat, 28 Jun 2014 00:25:54 -0500
Subject: [PATCH] Split RF into RF Tiles and RF Items, should fix some crashes.

---
 integration/modules/RFItem.java               | 27 +++++++++++++++++++
 .../tools/powered/powersink/RedstoneFlux.java |  2 +-
 transformer/asm/ASMIntegration.java           |  5 +++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 integration/modules/RFItem.java

diff --git a/integration/modules/RFItem.java b/integration/modules/RFItem.java
new file mode 100644
index 00000000..2cb3a475
--- /dev/null
+++ b/integration/modules/RFItem.java
@@ -0,0 +1,27 @@
+package appeng.integration.modules;
+
+import appeng.integration.BaseModule;
+import appeng.integration.IIntegrationModule;
+
+public class RFItem extends BaseModule implements IIntegrationModule
+{
+
+	public static RFItem instance;
+
+	public RFItem() {
+		TestClass( cofh.api.energy.IEnergyContainerItem.class );
+	}
+
+	@Override
+	public void Init()
+	{
+
+	}
+
+	@Override
+	public void PostInit()
+	{
+
+	}
+
+}
diff --git a/items/tools/powered/powersink/RedstoneFlux.java b/items/tools/powered/powersink/RedstoneFlux.java
index d2f0f843..b371c258 100644
--- a/items/tools/powered/powersink/RedstoneFlux.java
+++ b/items/tools/powered/powersink/RedstoneFlux.java
@@ -5,7 +5,7 @@ import appeng.api.config.PowerUnits;
 import appeng.transformer.annotations.integration.Interface;
 import cofh.api.energy.IEnergyContainerItem;
 
-@Interface(iface = "cofh.api.energy.IEnergyContainerItem", iname = "RF")
+@Interface(iface = "cofh.api.energy.IEnergyContainerItem", iname = "RFItem")
 public class RedstoneFlux extends IC2 implements IEnergyContainerItem
 {
 
diff --git a/transformer/asm/ASMIntegration.java b/transformer/asm/ASMIntegration.java
index 64215be4..d8941ab0 100644
--- a/transformer/asm/ASMIntegration.java
+++ b/transformer/asm/ASMIntegration.java
@@ -37,7 +37,10 @@ public class ASMIntegration implements IClassTransformer
 		integrationModules.add( IntegrationSide.BOTH, "BuildCraft", "BuildCraft|Silicon", "BC" );
 		integrationModules.add( IntegrationSide.BOTH, "BuildCraft5 Power", null, "MJ5" );
 		integrationModules.add( IntegrationSide.BOTH, "BuildCraft6 Power", null, "MJ6" );
-		integrationModules.add( IntegrationSide.BOTH, "RedstoneFlux Power", null, "RF" );
+
+		integrationModules.add( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", null, "RF" );
+		integrationModules.add( IntegrationSide.BOTH, "RedstoneFlux Power - Items", null, "RFItem" );
+
 		// integrationModules.add( IntegrationSide.BOTH, "Greg Tech", "gregtech_addon", "GT" );
 		// integrationModules.add( IntegrationSide.BOTH, "Universal Electricity", null, "UE" );
 		// integrationModules.add( IntegrationSide.BOTH, "Logistics Pipes", "LogisticsPipes|Main", "LP" );