4 files changed, 9 insertions, 13 deletions
diff --git a/src/main/java/net/transit/impl/IAcceptor.java b/src/main/java/net/transit/impl/IAcceptor.java
index 9433ea3..7fe06aa 100644
--- a/src/main/java/net/transit/impl/IAcceptor.java
+++ b/src/main/java/net/transit/impl/IAcceptor.java
@@ -1,13 +1,13 @@
 package net.transit.impl;
 
-import net.transit.type.IType;
+import net.transit.packet.IPacket;
 import net.minecraft.util.math.Direction;
 
-public interface IAcceptor<T extends IType<?, ?>>
+public interface IAcceptor<T>
 {
     //  Direction given if acceptor is a block
     public boolean canAccept(Direction d);
 
     //  Accept (or not) a provided T (should trigger ITransferEvent)
-    public boolean accept(T provided);
+    public boolean accept(IPacket<T> provided);
 }
 \ No newline at end of file
diff --git a/src/main/java/net/transit/impl/IConsumer.java b/src/main/java/net/transit/impl/IConsumer.java
index d709430..7b3b070 100644
--- a/src/main/java/net/transit/impl/IConsumer.java
+++ b/src/main/java/net/transit/impl/IConsumer.java
@@ -1,8 +1,6 @@
 package net.transit.impl;
 
-import net.transit.type.IType;
-
-public interface IConsumer<T extends IType<?, ?>> extends IAcceptor<T>
+public interface IConsumer<T> extends IAcceptor<T>
 {
     public boolean canConsume();
 
diff --git a/src/main/java/net/transit/impl/IGenerator.java b/src/main/java/net/transit/impl/IGenerator.java
index 009f268..f69de2f 100644
--- a/src/main/java/net/transit/impl/IGenerator.java
+++ b/src/main/java/net/transit/impl/IGenerator.java
@@ -1,8 +1,6 @@
 package net.transit.impl;
 
-import net.transit.type.IType;
-
-public interface IGenerator<T extends IType<?, ?>> extends IProvider<T>
+public interface IGenerator<T> extends IProvider<T>
 {
     public boolean canGenerate();
 
diff --git a/src/main/java/net/transit/impl/IProvider.java b/src/main/java/net/transit/impl/IProvider.java
index b613436..94e903f 100644
--- a/src/main/java/net/transit/impl/IProvider.java
+++ b/src/main/java/net/transit/impl/IProvider.java
@@ -1,17 +1,17 @@
 package net.transit.impl;
 
-import net.transit.type.IType;
+import net.transit.packet.IPacket;
 import net.minecraft.util.math.Direction;
 
-public interface IProvider<T extends IType<?, ?>>
+public interface IProvider<T>
 {
 
     //  Direction given if provider is a block
     public boolean canProvide(Direction d);
 
     //  Provide the next T (should trigger ITransferEvent)
-    public T provide();
+    public IPacket<T> provide();
 
     //  Retain the rejected T if the acceptor did not accept it (should trigger ITransferEvent)
-    public void accept(T rejected);
+    public void retain(IPacket<T> rejected);
 }
 \ No newline at end of file