Update to 1.7.10

Author: tterrag1098

build.gradle

@@ -5,9 +5,13 @@ buildscript {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
@@ -50,7 +54,7 @@ version = "MC${config.minecraft_version}-${artifact_version}-${buildInfo.buildNu
 def actualVersion = "${artifact_version}-${buildInfo.buildNum}"
 
 minecraft {
-	version = "1.6.4-9.11.1.964"
+	version = "1.7.10-10.13.0.1188"
 }
 
 dependencies {

src/main/java/cofh/api/block/IBlockDebug.java

@@ -0,0 +1,21 @@
+package cofh.api.energy;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not
+ * accept it; otherwise just use IEnergyHandler.
+ * 
+ * Note that {@link IEnergyHandler} is an extension of this.
+ * 
+ * @author King Lemming
+ * 
+ */
+public interface IEnergyConnection {
+
+	/**
+	 * Returns TRUE if the TileEntity can connect on a given side.
+	 */
+	boolean canConnectEnergy(ForgeDirection from);
+
+}

src/main/java/cofh/api/block/IBlockInfo.java

@@ -1,16 +1,16 @@
 package cofh.api.energy;
 
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 
 /**
- * Implement this interface on TileEntities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
+ * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects.
  * 
  * A reference implementation is provided {@link TileEnergyHandler}.
  * 
  * @author King Lemming
  * 
  */
-public interface IEnergyHandler {
+public interface IEnergyHandler extends IEnergyConnection {
 
 	/**
 	 * Add energy to an IEnergyHandler, internal distribution is left entirely to the IEnergyHandler.
@@ -38,11 +38,6 @@ public interface IEnergyHandler {
 	 */
 	int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate);
 
-	/**
-	 * Returns true if the Handler functions on a given side - if a Tile Entity can receive or send energy on a given side, this should return true.
-	 */
-	boolean canInterface(ForgeDirection from);
-
 	/**
 	 * Returns the amount of energy currently stored.
 	 */

src/main/java/cofh/api/block/IDismantleable.java

@@ -16,24 +16,22 @@ public class ItemEnergyContainer extends Item implements IEnergyContainerItem {
 	protected int maxReceive;
 	protected int maxExtract;
 
-	public ItemEnergyContainer(int itemID) {
+	public ItemEnergyContainer() {
 
-		super(itemID);
 	}
 
-	public ItemEnergyContainer(int itemID, int capacity) {
+	public ItemEnergyContainer(int capacity) {
 
-		this(itemID, capacity, capacity, capacity);
+		this(capacity, capacity, capacity);
 	}
 
-	public ItemEnergyContainer(int itemID, int capacity, int maxTransfer) {
+	public ItemEnergyContainer(int capacity, int maxTransfer) {
 
-		this(itemID, capacity, maxTransfer, maxTransfer);
+		this(capacity, maxTransfer, maxTransfer);
 	}
 
-	public ItemEnergyContainer(int itemID, int capacity, int maxReceive, int maxExtract) {
+	public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) {
 
-		super(itemID);
 		this.capacity = capacity;
 		this.maxReceive = maxReceive;
 		this.maxExtract = maxExtract;

src/main/java/cofh/api/core/IInitializer.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.util.ForgeDirection;
 
 /**
  * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own.
@@ -30,21 +30,21 @@ public void writeToNBT(NBTTagCompound nbt) {
 
 	/* IEnergyHandler */
 	@Override
-	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
+	public boolean canConnectEnergy(ForgeDirection from) {
 
-		return storage.receiveEnergy(maxReceive, simulate);
+		return true;
 	}
 
 	@Override
-	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
+	public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
 
-		return storage.extractEnergy(maxExtract, simulate);
+		return storage.receiveEnergy(maxReceive, simulate);
 	}
 
 	@Override
-	public boolean canInterface(ForgeDirection from) {
+	public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
 
-		return true;
+		return storage.extractEnergy(maxExtract, simulate);
 	}
 
 	@Override

src/main/java/cofh/api/core/ISimpleRegistry.java

@@ -0,0 +1,9 @@
+/**
+ * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = "1.0", owner = "CoFHCore", provides = "CoFHAPI|energy")
+package cofh.api.energy;
+
+import cpw.mods.fml.common.API;
+

src/main/java/cofh/api/core/NullSimpleRegistry.java

@@ -0,0 +1,9 @@
+/**
+ * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub
+ * http://www.teamcofh.com
+ */
+@API(apiVersion = "1.0", owner = "CoFHCore", provides = "CoFHAPI")
+package cofh.api;
+
+import cpw.mods.fml.common.API;
+