Update to current EnderIO/Core

HenryLoenwind · Oct 6, 2015 · 8789f44 · 8789f44
1 parent 93dc018
commit 8789f44
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
 forge_version=10.13.4.1492-1.7.10
 forgeDep_version=10.13.4
 
-mod_version=0.2.0
+mod_version=0.2.1
 
 #Comment out this line to get rid of the appendix
 mod_appendix=beta
@@ -12,8 +12,8 @@ waila_version=1.5.10
 ccc_version=1.0.7.46
 ccl_version=1.1.3.138
 ae2_version=rv1-stable-1
-endercore_version=1.7.10-0.1.0.24_beta
-enderio_version=1.7.10-2.3.0.415_beta
+endercore_version=1.7.10-0.1.0.25_beta
+enderio_version=1.7.10-2.3.0.416_beta
 forestry_version=forestry_1.7.10:3.6.2.19
 waterhooks_version=1.1.2
 

diff --git a/src/main/java/info/loenwind/enderioaddons/machine/drain/BlockDrain.java b/src/main/java/info/loenwind/enderioaddons/machine/drain/BlockDrain.java
@@ -9,7 +9,6 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -182,20 +181,9 @@ protected String getTopIconKey(boolean active) {
     return EnderIOAddons.DOMAIN + ":blockDrain";
   }
 
-  @SuppressWarnings("static-method")
-  // TODO: @Override after EIO#2827
-  protected String getBottomIconKey(@SuppressWarnings("unused") boolean active) {
-    return "enderio:machineTemplate";
-  }
-
   @Override
-  @SideOnly(Side.CLIENT)
-  public void registerBlockIcons(IIconRegister iIconRegister) { // TODO: remove after EIO#2827
-    super.registerBlockIcons(iIconRegister);
-
-    iconBuffer[0][0] = iIconRegister.registerIcon(getBottomIconKey(false));
-
-    iconBuffer[0][6] = iIconRegister.registerIcon(getBottomIconKey(true));
+  protected String getBottomIconKey(boolean active) {
+    return "enderio:machineTemplate";
   }
 
   @Override

diff --git a/src/main/java/info/loenwind/enderioaddons/machine/waterworks/TaskWaterworks.java b/src/main/java/info/loenwind/enderioaddons/machine/waterworks/TaskWaterworks.java
@@ -80,10 +80,6 @@ public void writeToNBT(NBTTagCompound nbtRoot) {
 
   @Nullable
   public static IPoweredTask readFromNBT(NBTTagCompound nbtRoot) {
-    if (!nbtRoot.hasKey(KEY_REQUIRED_ENERGY)) { // TODO: remove after EIO#2802 is live
-      return null; // TODO: remove after EIO#2802 is live
-    } // TODO: remove after EIO#2802 is live
-
     return new TaskWaterworks(nbtRoot.getFloat(KEY_REQUIRED_ENERGY), nbtRoot.getFloat(KEY_USED_ENERGY), nbtRoot.getFloat(KEY_LIQUID_IN_FACTOR));
   }