diff --git a/build.gradle b/build.gradle index 42c6a34e..c645faa1 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ dependencies { exportedCompile 'cglib:cglib-nodep:3.1' compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" - compile "mcp.mobius.waila:Waila:${waila_version}:dev" + compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" compile "net.sengir.forestry:${forestry_version}:api" String endercore = "com.enderio.core:EnderCore:${minecraft_version}-${endercore_version}:dev" diff --git a/gradle.properties b/gradle.properties index 0f88e200..f8919966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ minecraft_version=1.7.10 forge_version=10.13.2.1291 +forgeDep_version=10.13.2.1291 mod_version=2.3.0 @@ -7,9 +8,9 @@ mod_version=2.3.0 mod_appendix=beta buildcraft_version=6.1.5 -waila_version=1.5.9_1.7.10 +waila_version=1.5.9 ae2_version=rv1-stable-1 -endercore_version=1.7.0.0.1.2_alpha +endercore_version=1.0.0.6_alpha forestry_version=forestry_1.7.10:3.3.0.423-unstable toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,) diff --git a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java index b2958de4..51bbfbdd 100644 --- a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -12,16 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.client.render.VertexRotation; -import com.enderio.core.common.vecmath.Vector3d; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; @@ -57,34 +52,6 @@ public class BlockVat extends AbstractMachineBlock { return 0; } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { - // used to render the block in the world - TileEntity te = world.getTileEntity(x, y, z); - boolean on = false; - if(te instanceof AbstractMachineEntity) { - AbstractMachineEntity me = (AbstractMachineEntity) te; - on = me.isActive(); - } - - if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { - return topIcon; - } else if(blockSide == ForgeDirection.EAST.ordinal() || blockSide == ForgeDirection.WEST.ordinal()) { - if(on) { - return blockIconSingleOn; - } else { - return blockIconSingle; - } - } - - if(on) { - return onIcon; - } else { - return blockIcon; - } - } - @SideOnly(Side.CLIENT) @Override protected void registerOverlayIcons(IIconRegister iIconRegister) { @@ -116,15 +83,6 @@ public class BlockVat extends AbstractMachineBlock { } } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int blockSide, int blockMeta) { - if(blockSide == ForgeDirection.UP.ordinal() || blockSide == ForgeDirection.DOWN.ordinal()) { - return topIcon; - } - return blockIcon; - } - @Override public int getRenderType() { return renderId;